[Libreoffice-commits] core.git: 4 commits - unotools/source unoxml/source vbahelper/source writerfilter/source

Stephan Bergmann sbergman at redhat.com
Thu Nov 24 10:29:32 UTC 2016


 unotools/source/config/configitem.cxx                |    5 ---
 unotools/source/config/lingucfg.cxx                  |    6 ----
 unotools/source/config/saveopt.cxx                   |    9 -------
 unotools/source/ucbhelper/ucblockbytes.cxx           |   24 -------------------
 unoxml/source/dom/elementlist.cxx                    |    4 ---
 unoxml/source/rdf/CBlankNode.cxx                     |    1 
 unoxml/source/rdf/CLiteral.cxx                       |    1 
 unoxml/source/rdf/CURI.cxx                           |    1 
 unoxml/source/rdf/librdf_repository.cxx              |    2 -
 vbahelper/source/msforms/vbacontrol.cxx              |    6 ----
 writerfilter/source/dmapper/GraphicImport.cxx        |    6 ----
 writerfilter/source/filter/RtfFilter.cxx             |    3 --
 writerfilter/source/filter/WriterFilter.cxx          |    1 
 writerfilter/source/filter/WriterFilterDetection.cxx |    3 --
 14 files changed, 1 insertion(+), 71 deletions(-)

New commits:
commit 223607e0363230116d09e51b0025057e766ed022
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 24 11:28:54 2016 +0100

    loplugin:unnecessaryoverride (dtors) in unotools
    
    Change-Id: I14f10addc701be143b0482dc62d2e90a0862062d

diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index f6957e4..b40d0cc 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -71,7 +71,6 @@ namespace utl{
             ConfigItem*                 pParent;
             const Sequence< OUString >  aPropertyNames;
             ConfigChangeListener_Impl(ConfigItem& rItem, const Sequence< OUString >& rNames);
-            virtual ~ConfigChangeListener_Impl() override;
 
         //XChangesListener
         virtual void SAL_CALL changesOccurred( const ChangesEvent& Event ) throw(RuntimeException, std::exception) override;
@@ -104,10 +103,6 @@ ConfigChangeListener_Impl::ConfigChangeListener_Impl(
 {
 }
 
-ConfigChangeListener_Impl::~ConfigChangeListener_Impl()
-{
-}
-
 static bool lcl_Find(
         const OUString& rTemp,
         const OUString* pCheckPropertyNames,
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 96f2157..14f4898 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -158,7 +158,6 @@ class SvtLinguConfigItem : public utl::ConfigItem
 
 public:
     SvtLinguConfigItem();
-    virtual ~SvtLinguConfigItem() override;
 
     // utl::ConfigItem
     virtual void    Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override;
@@ -198,11 +197,6 @@ SvtLinguConfigItem::SvtLinguConfigItem() :
     EnableNotification( rPropertyNames );
 }
 
-SvtLinguConfigItem::~SvtLinguConfigItem()
-{
-    //! Commit (SaveOptions) will be called by the d-tor of the base called !
-}
-
 void SvtLinguConfigItem::Notify( const uno::Sequence< OUString > &rPropertyNames )
 {
     LoadOptions( rPropertyNames );
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index fdad10a..8999d21 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -97,7 +97,6 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
 
 public:
                             SvtSaveOptions_Impl();
-                            virtual ~SvtSaveOptions_Impl() override;
 
     virtual void            Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
@@ -581,9 +580,6 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
     }
 }
 
-SvtSaveOptions_Impl::~SvtSaveOptions_Impl()
-{}
-
 void SvtSaveOptions_Impl::ImplCommit()
 {
     Sequence< OUString > aOrgNames = GetPropertyNames();
@@ -770,7 +766,6 @@ private:
 
 public:
                             SvtLoadOptions_Impl();
-                            virtual ~SvtLoadOptions_Impl() override;
 
     virtual void            Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
 
@@ -792,10 +787,6 @@ SvtLoadOptions_Impl::SvtLoadOptions_Impl()
     pValues[0] >>= bLoadUserDefinedSettings;
 }
 
-SvtLoadOptions_Impl::~SvtLoadOptions_Impl()
-{
-}
-
 void SvtLoadOptions_Impl::ImplCommit()
 {
     PutProperties(
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 70dd91f..7c0096e 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -229,8 +229,6 @@ public:
             RuntimeException
         );
 
-    virtual ~Moderator() override;
-
     enum ResultType {
         NORESULT,
 
@@ -341,8 +339,6 @@ public:
 
     explicit ModeratorsActiveDataStreamer(Moderator &theModerator);
 
-    virtual ~ModeratorsActiveDataStreamer() override;
-
     // XActiveDataStreamer
     virtual void SAL_CALL
     setStream(
@@ -377,8 +373,6 @@ public:
 
     explicit ModeratorsActiveDataSink(Moderator &theModerator);
 
-    virtual ~ModeratorsActiveDataSink() override;
-
     // XActiveDataSink.
     virtual void SAL_CALL
     setInputStream (
@@ -410,10 +404,6 @@ ModeratorsActiveDataSink::ModeratorsActiveDataSink(Moderator &theModerator)
 {
 }
 
-ModeratorsActiveDataSink::~ModeratorsActiveDataSink()
-{
-}
-
 // XActiveDataSink.
 void SAL_CALL
 ModeratorsActiveDataSink::setInputStream (
@@ -435,10 +425,6 @@ ModeratorsActiveDataStreamer::ModeratorsActiveDataStreamer(
 {
 }
 
-ModeratorsActiveDataStreamer::~ModeratorsActiveDataStreamer()
-{
-}
-
 // XActiveDataStreamer.
 void SAL_CALL
 ModeratorsActiveDataStreamer::setStream (
@@ -460,8 +446,6 @@ public:
 
     explicit ModeratorsInteractionHandler(Moderator &theModerator);
 
-    virtual ~ModeratorsInteractionHandler() override;
-
     virtual void SAL_CALL
     handle( const Reference<XInteractionRequest >& Request )
         throw (RuntimeException, std::exception) override;
@@ -477,10 +461,6 @@ ModeratorsInteractionHandler::ModeratorsInteractionHandler(
 {
 }
 
-ModeratorsInteractionHandler::~ModeratorsInteractionHandler()
-{
-}
-
 void SAL_CALL
 ModeratorsInteractionHandler::handle(
     const Reference<XInteractionRequest >& Request
@@ -555,10 +535,6 @@ Moderator::Moderator(
         m_aArg.Argument <<= aOpenArg;
 }
 
-Moderator::~Moderator()
-{
-}
-
 Moderator::Result Moderator::getResult(const sal_uInt32 milliSec)
 {
     Result ret;
commit 31e2e2de4571139bde2fe55a986c8b067cca1dee
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 24 11:28:35 2016 +0100

    loplugin:unnecessaryoverride (dtors) in unoxml
    
    Change-Id: Ieca0d355031f25731a519be26145cda3b2172cb1

diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx
index 3b38cc7..c851faf 100644
--- a/unoxml/source/dom/elementlist.cxx
+++ b/unoxml/source/dom/elementlist.cxx
@@ -44,10 +44,6 @@ namespace
         {
         }
 
-        virtual ~WeakEventListener() override
-        {
-        }
-
         virtual void SAL_CALL handleEvent(const css::uno::Reference<css::xml::dom::events::XEvent>& rEvent)
             throw(css::uno::RuntimeException, std::exception) override
         {
diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx
index 47f5af2..761082c 100644
--- a/unoxml/source/rdf/CBlankNode.cxx
+++ b/unoxml/source/rdf/CBlankNode.cxx
@@ -39,7 +39,6 @@ class CBlankNode:
 {
 public:
     CBlankNode();
-    virtual ~CBlankNode() override {}
 
     // css::lang::XServiceInfo:
     virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx
index 9d488d9..bfcf0f1 100644
--- a/unoxml/source/rdf/CLiteral.cxx
+++ b/unoxml/source/rdf/CLiteral.cxx
@@ -41,7 +41,6 @@ class CLiteral:
 {
 public:
     explicit CLiteral();
-    virtual ~CLiteral() override {}
 
     // css::lang::XServiceInfo:
     virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx
index 82413a0..6473ae3 100644
--- a/unoxml/source/rdf/CURI.cxx
+++ b/unoxml/source/rdf/CURI.cxx
@@ -40,7 +40,6 @@ class CURI:
 {
 public:
     explicit CURI();
-    virtual ~CURI() override {}
 
     // css::lang::XServiceInfo:
     virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 1cb8230..5d0de18 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -695,8 +695,6 @@ public:
         , m_xName(i_xName)
     { };
 
-    virtual ~librdf_NamedGraph() override {}
-
     // css::rdf::XNode:
     virtual OUString SAL_CALL getStringValue()
         throw (uno::RuntimeException, std::exception) override;
commit 675df4a72e7cc695fec18869dd015a872c287c6e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 24 11:28:15 2016 +0100

    loplugin:unnecessaryoverride (dtors) in vbahelper
    
    Change-Id: I809869a438b710b2c4722027cc78d39a81b0a092

diff --git a/vbahelper/source/msforms/vbacontrol.cxx b/vbahelper/source/msforms/vbacontrol.cxx
index 69e1651..7d72fc8 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -102,7 +102,7 @@ private:
     ScVbaControl *pControl;
 public:
     explicit ScVbaControlListener( ScVbaControl *pTmpControl );
-    virtual ~ScVbaControlListener() override;
+
     virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) throw( uno::RuntimeException, std::exception ) override;
 };
 
@@ -110,10 +110,6 @@ ScVbaControlListener::ScVbaControlListener( ScVbaControl *pTmpControl ): pContro
 {
 }
 
-ScVbaControlListener::~ScVbaControlListener()
-{
-}
-
 void SAL_CALL
 ScVbaControlListener::disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception )
 {
commit 5ebfc3ad9b27eed8571fa501ed3727218e0008fb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 24 11:27:53 2016 +0100

    loplugin:unnecessaryoverride (dtors) in writerfilter
    
    Change-Id: I2d21d47e8471daf3125a6c81b5b3919820caef46

diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 837308c..3531093 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -80,7 +80,6 @@ class XInputStreamHelper : public cppu::WeakImplHelper<io::XInputStream>
     sal_Int32        m_nHeaderLength;
 public:
     XInputStreamHelper(const sal_uInt8* buf, size_t len);
-    virtual ~XInputStreamHelper() override;
 
     virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
     virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 >& aData, ::sal_Int32 nMaxBytesToRead ) throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception) override;
@@ -100,11 +99,6 @@ XInputStreamHelper::XInputStreamHelper(const sal_uInt8* buf, size_t len) :
     m_nHeaderLength = 0;
 }
 
-
-XInputStreamHelper::~XInputStreamHelper()
-{
-}
-
 sal_Int32 XInputStreamHelper::readBytes( uno::Sequence<sal_Int8>& aData, sal_Int32 nBytesToRead )
     throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception)
 {
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index e734fb6..ad7ed9a 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -53,7 +53,6 @@ class RtfFilter : public cppu::WeakImplHelper
 
 public:
     explicit RtfFilter(const uno::Reference<uno::XComponentContext>& xContext);
-    ~RtfFilter() override;
 
     // XFilter
     sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
@@ -80,8 +79,6 @@ RtfFilter::RtfFilter(const uno::Reference< uno::XComponentContext >& rxContext)
 {
 }
 
-RtfFilter::~RtfFilter() = default;
-
 sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescriptor) throw(uno::RuntimeException, std::exception)
 {
     sal_uInt32 nStartTime = osl_getGlobalTimer();
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx
index c59718f..6ff2f7a 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -98,7 +98,6 @@ public:
     explicit WriterFilter(const uno::Reference<uno::XComponentContext>& rxContext)
         : m_xContext(rxContext)
     {}
-    ~WriterFilter() override = default;
 
     // XFilter
     sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override;
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 442eaf0..f72323b 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -35,7 +35,6 @@ class WriterFilterDetection : public cppu::WeakImplHelper
 {
 public:
     explicit WriterFilterDetection();
-    ~WriterFilterDetection() override;
 
     //XExtendedFilterDetection
     OUString SAL_CALL detect(uno::Sequence<beans::PropertyValue>& Descriptor) throw (uno::RuntimeException, std::exception) override;
@@ -52,8 +51,6 @@ WriterFilterDetection::WriterFilterDetection()
 {
 }
 
-WriterFilterDetection::~WriterFilterDetection() = default;
-
 OUString WriterFilterDetection::detect(uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception)
 {
     OUString sTypeName;


More information about the Libreoffice-commits mailing list