[Libreoffice-commits] core.git: 6 commits - comphelper/source connectivity/source cppcanvas/qa cppcanvas/source cppuhelper/source cui/source filter/source

Stephan Bergmann sbergman at redhat.com
Mon Nov 28 13:16:12 UTC 2016


 comphelper/source/container/IndexedPropertyValuesContainer.cxx |    5 -----
 comphelper/source/container/NamedPropertyValuesContainer.cxx   |    5 -----
 comphelper/source/container/namecontainer.cxx                  |    5 -----
 comphelper/source/eventattachermgr/eventattachermgr.cxx        |    6 ------
 comphelper/source/property/genericpropertyset.cxx              |    4 ----
 comphelper/source/streaming/memorystream.cxx                   |    5 -----
 comphelper/source/xml/ofopxmlhelper.cxx                        |    7 -------
 connectivity/source/drivers/postgresql/pq_connection.cxx       |    4 ----
 connectivity/source/sdbcx/VCollection.cxx                      |    3 ---
 cppcanvas/qa/extras/emfplus/emfplus.cxx                        |    4 ----
 cppcanvas/source/mtfrenderer/emfplus.cxx                       |    4 ----
 cppuhelper/source/macro_expander.cxx                           |    4 ----
 cui/source/customize/acccfg.cxx                                |    5 -----
 cui/source/customize/cfg.cxx                                   |    2 --
 cui/source/dialogs/SpellDialog.cxx                             |    8 --------
 cui/source/options/treeopt.cxx                                 |    5 -----
 cui/source/tabpages/borderconn.cxx                             |    2 --
 filter/source/msfilter/escherex.cxx                            |    1 -
 filter/source/pdf/pdfexport.cxx                                |    7 -------
 filter/source/svg/svgexport.cxx                                |    5 -----
 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx          |    7 -------
 21 files changed, 98 deletions(-)

New commits:
commit 79799b9b32dedd0ae13c2eba5b04588e7a2ecbdc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 28 14:15:30 2016 +0100

    loplugin:unnecessaryoverride (dtors) in cui
    
    Change-Id: Ibb78c2a16defbd523a079b651a27e9639d26953f

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 6d36d9c..b0d27ed 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -631,8 +631,6 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString
 public:
     explicit SfxAccCfgLBoxString_Impl(const OUString& sText);
 
-    virtual ~SfxAccCfgLBoxString_Impl() override;
-
     virtual void Paint(const Point& aPos, SvTreeListBox& rDevice, vcl::RenderContext& rRenderContext,
                        const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override;
 };
@@ -642,9 +640,6 @@ SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl(const OUString& sText)
     : SvLBoxString(sText)
 {}
 
-SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl()
-{}
-
 void SfxAccCfgLBoxString_Impl::Paint(const Point& aPos, SvTreeListBox& /*rDevice*/, vcl::RenderContext& rRenderContext,
                                      const SvViewDataEntry* /*pView*/, const SvTreeListEntry& rEntry)
 {
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index cf734f7..27b6ea1 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1539,8 +1539,6 @@ public:
     {
     }
 
-    virtual ~PopupPainter() override { }
-
     virtual void Paint(const Point& rPos, SvTreeListBox& rOutDev, vcl::RenderContext& rRenderContext,
                        const SvViewDataEntry* pView, const SvTreeListEntry& rEntry) override
     {
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 0abdd39..daf08b2 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -118,8 +118,6 @@ public:
         m_nOffset(0)
         {}
 
-    virtual ~SpellUndoAction_Impl() override;
-
     virtual void            Undo() override;
     virtual sal_uInt16          GetId() const override;
 
@@ -153,12 +151,6 @@ public:
 }//namespace svx
 using namespace ::svx;
 
-
-SpellUndoAction_Impl::~SpellUndoAction_Impl()
-{
-}
-
-
 void SpellUndoAction_Impl::Undo()
 {
     m_rActionLink.Call(*this);
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 2f59464..964f43b 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -252,7 +252,6 @@ private:
 
 public:
     MailMergeCfg_Impl();
-    virtual ~MailMergeCfg_Impl() override;
 
     virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override;
 
@@ -271,10 +270,6 @@ MailMergeCfg_Impl::MailMergeCfg_Impl() :
         pValues[0] >>= bIsEmailSupported;
 }
 
-MailMergeCfg_Impl::~MailMergeCfg_Impl()
-{
-}
-/* -------------------------------------------------------------------------*/
 void MailMergeCfg_Impl::ImplCommit()
 {
 }
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 70243d055..2361724 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -43,8 +43,6 @@ class LineItemWrapper : public sfx::SingleItemWrapper< SvxLineItem, const editen
 public:
     inline explicit     LineItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapperType( nSlot ) {}
 
-    virtual ~LineItemWrapper() override {}
-
     virtual const editeng::SvxBorderLine* GetItemValue( const SvxLineItem& rItem ) const override
                             { return rItem.GetLine(); }
     virtual void        SetItemValue( SvxLineItem& rItem, const editeng::SvxBorderLine* pLine ) const override
commit 7a10def6327300f15cec2111508f77fec8b446f5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 28 14:15:09 2016 +0100

    loplugin:unnecessaryoverride (dtors) in cppuhelper
    
    Change-Id: Ia23b1fdf126fc57ce929feef60e57b64c782fb50

diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 8a4a2e2..b128e8d 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -129,7 +129,6 @@ public:
     inline Bootstrap_MacroExpander()
         : t_uno_impl( m_mutex )
         {}
-    virtual ~Bootstrap_MacroExpander() override;
 
     // XMacroExpander impl
     virtual OUString SAL_CALL expandMacros( OUString const & exp )
@@ -147,9 +146,6 @@ public:
 void Bootstrap_MacroExpander::disposing()
 {}
 
-Bootstrap_MacroExpander::~Bootstrap_MacroExpander()
-{}
-
 // XServiceInfo impl
 
 OUString Bootstrap_MacroExpander::getImplementationName()
commit ef3a9951e092a377a7da8b6c468a92977a409e63
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 28 14:14:53 2016 +0100

    loplugin:unnecessaryoverride (dtors) in cppcanvas
    
    Change-Id: I4f6f6e36a965b5c01ffd51b1710fa8cc57d497fa

diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx
index c83c2e9..5ccbea1 100644
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@@ -29,10 +29,6 @@ public:
     {
     }
 
-    virtual ~Test() override
-    {
-    }
-
     virtual void setUp() override
     {
         UnoApiTest::setUp();
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index d05dd2f..b1c02f1 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -774,10 +774,6 @@ namespace cppcanvas
             {
             }
 
-            virtual ~EMFPCustomLineCap() override
-            {
-            }
-
             void SetAttributes(rendering::StrokeAttributes& aAttributes)
             {
                 aAttributes.StartCapType = lcl_convertStrokeCap(strokeStartCap);
commit 507f1a34a791f6756a61d85c0f7097820669ee70
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 28 14:14:35 2016 +0100

    loplugin:unnecessaryoverride (dtors) in connectivity
    
    Change-Id: Icba385b3b7f6991f4dab7b2fd57beab5ac184df0

diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 9ea8471..9a7c039 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -105,10 +105,6 @@ public:
     {
     }
 
-    virtual ~ClosableReference() override
-    {
-    }
-
     virtual void SAL_CALL dispose() throw (std::exception) override
     {
         if( m_conn.is() )
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 690e790..f1eee60 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -59,9 +59,6 @@ namespace
             : m_aNameMap(_bCase)
         {
         }
-        virtual ~OHardRefMap() override
-        {
-        }
 
         virtual bool exists(const OUString& _sName ) override
         {
commit 0c59e2ddd6a174629618acea97cf5406c36ce7f3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 28 14:14:04 2016 +0100

    loplugin:unnecessaryoverride (dtors) in comphelper
    
    Change-Id: I13ebc4efa7f8bd0d3732ed65e397c710ae65d14e

diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index d0ee59d..803b171 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -35,7 +35,6 @@ class IndexedPropertyValuesContainer : public cppu::WeakImplHelper< container::X
 {
 public:
     IndexedPropertyValuesContainer() throw();
-    virtual ~IndexedPropertyValuesContainer() throw() override;
 
     // XIndexContainer
     virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement )
@@ -76,10 +75,6 @@ IndexedPropertyValuesContainer::IndexedPropertyValuesContainer() throw()
 {
 }
 
-IndexedPropertyValuesContainer::~IndexedPropertyValuesContainer() throw()
-{
-}
-
 // XIndexContainer
 void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement )
     throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException,
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 7bd50eb..4ac5b42 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -36,7 +36,6 @@ class NamedPropertyValuesContainer : public cppu::WeakImplHelper< container::XNa
 {
 public:
     NamedPropertyValuesContainer() throw();
-    virtual ~NamedPropertyValuesContainer() throw() override;
 
     // XNameContainer
     virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
@@ -79,10 +78,6 @@ NamedPropertyValuesContainer::NamedPropertyValuesContainer() throw()
 {
 }
 
-NamedPropertyValuesContainer::~NamedPropertyValuesContainer() throw()
-{
-}
-
 // XNameContainer
 void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, const uno::Any& aElement )
     throw(css::lang::IllegalArgumentException, css::container::ElementExistException,
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index f20be21..1b2641f 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.cxx
@@ -42,7 +42,6 @@ namespace comphelper
     {
     public:
         explicit NameContainer( css::uno::Type aType );
-        virtual ~NameContainer() override;
 
         // XNameContainer
         virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement )
@@ -90,10 +89,6 @@ NameContainer::NameContainer( css::uno::Type aType )
 {
 }
 
-NameContainer::~NameContainer()
-{
-}
-
 // XNameContainer
 void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aElement )
     throw(IllegalArgumentException, ElementExistException,
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 1523333..77f3a30 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -95,7 +95,6 @@ class ImplEventAttacherManager
 public:
     ImplEventAttacherManager( const Reference< XIntrospection > & rIntrospection,
                               const Reference< XComponentContext >& rContext );
-    virtual ~ImplEventAttacherManager() override;
 
     // Methods of XEventAttacherManager
     virtual void SAL_CALL registerScriptEvent(sal_Int32 Index, const ScriptEventDescriptor& ScriptEvent)
@@ -380,11 +379,6 @@ ImplEventAttacherManager::ImplEventAttacherManager( const Reference< XIntrospect
     }
 }
 
-
-ImplEventAttacherManager::~ImplEventAttacherManager()
-{
-}
-
 Reference< XIdlReflection > ImplEventAttacherManager::getReflection() throw( Exception )
 {
     Guard< Mutex > aGuard( aLock );
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index f30a7b2..6ee1da2 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -63,7 +63,6 @@ namespace comphelper
 
     public:
         explicit GenericPropertySet( PropertySetInfo* pInfo ) throw();
-        virtual ~GenericPropertySet() throw() override;
 
         // XInterface
         virtual  Any SAL_CALL queryAggregation( const  Type & rType ) throw( RuntimeException, std::exception) override;
@@ -94,9 +93,6 @@ GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw()
 {
 }
 
-GenericPropertySet::~GenericPropertySet() throw()
-{
-}
 void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
 {
     Reference < XPropertySetInfo > xInfo = getPropertySetInfo(  );
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx
index b402642..addb093 100644
--- a/comphelper/source/streaming/memorystream.cxx
+++ b/comphelper/source/streaming/memorystream.cxx
@@ -45,7 +45,6 @@ class UNOMemoryStream : public WeakImplHelper<XServiceInfo, XStream, XSeekableIn
 {
 public:
     UNOMemoryStream();
-    virtual ~UNOMemoryStream() override;
 
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
@@ -86,10 +85,6 @@ UNOMemoryStream::UNOMemoryStream()
 {
 }
 
-UNOMemoryStream::~UNOMemoryStream()
-{
-}
-
 // XServiceInfo
 OUString SAL_CALL UNOMemoryStream::getImplementationName() throw (css::uno::RuntimeException, std::exception)
 {
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index 6946e0e..062c723 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -70,7 +70,6 @@ public:
     css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > const & GetParsingResult();
 
     explicit OFOPXMLHelper_Impl( sal_uInt16 nFormat ); // must not be created directly
-    virtual ~OFOPXMLHelper_Impl() override;
 
     // XDocumentHandler
     virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override;
@@ -277,12 +276,6 @@ OFOPXMLHelper_Impl::OFOPXMLHelper_Impl( sal_uInt16 nFormat )
 {
 }
 
-
-OFOPXMLHelper_Impl::~OFOPXMLHelper_Impl()
-{
-}
-
-
 uno::Sequence< uno::Sequence< beans::StringPair > > const & OFOPXMLHelper_Impl::GetParsingResult()
 {
     if ( m_aElementsSeq.size() )
commit 3d9c3ed1afc8d37d3bee800ca5988724fd758a6b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 28 14:13:26 2016 +0100

    loplugin:unnecessaryoverride (dtors) in filter
    
    Change-Id: I0f859829a02721dd78b4bd0cc99bad6b864855d8

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index b8b5b83..b6d5640 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4938,7 +4938,6 @@ protected:
 
 public:
     SvNullStream() : SvStream() {}
-    virtual ~SvNullStream() override {}
 };
 
 EscherEx::EscherEx(const std::shared_ptr<EscherExGlobal>& rxGlobal, SvStream* pOutStrm, bool bOOXML)
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 307d39e..99d1b4d 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -264,17 +264,10 @@ public:
     : m_xSrcDoc( xDoc ),
       m_aPreparedPassword( rPwd )
     {}
-    virtual ~PDFExportStreamDoc() override;
 
     virtual void write( const Reference< XOutputStream >& xStream ) override;
 };
 
-
-PDFExportStreamDoc::~PDFExportStreamDoc()
-{
-}
-
-
 void PDFExportStreamDoc::write( const Reference< XOutputStream >& xStream )
 {
     Reference< css::frame::XStorable > xStore( m_xSrcDoc, UNO_QUERY );
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 7db79d2..44c4863 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -145,7 +145,6 @@ public:
         SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", true, true );
         pSVGExport->GetDocHandler()->characters( text );
     }
-    virtual ~FixedTextField() override {}
 };
 
 
@@ -161,7 +160,6 @@ public:
     {
         implGrowCharSet( aTextFieldCharSets, text, aOOOAttrDateTimeField );
     }
-    virtual ~FixedDateTimeField() override {}
 };
 
 
@@ -178,7 +176,6 @@ public:
         static const OUString sFieldId = aOOOAttrFooterField;
         implGrowCharSet( aTextFieldCharSets, text, sFieldId );
     }
-    virtual ~FooterField() override {}
 };
 
 
@@ -189,7 +186,6 @@ public:
     {
         return OUString( "VariableTextField" );
     }
-    virtual ~VariableTextField() override {}
 };
 
 
@@ -288,7 +284,6 @@ public:
             aTextFieldCharSets[ *aMasterPageIt ][ sFieldId ].insert( (sal_Unicode)( format ) );
         }
     }
-    virtual ~VariableDateTimeField() override {}
 };
 
 
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 7d4bb28..785a7d0 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -68,7 +68,6 @@ class XMLFilterDialogComponent :    public XMLFilterDialogComponentBase,
 {
 public:
     explicit XMLFilterDialogComponent( const Reference< XComponentContext >& rxContext );
-    virtual ~XMLFilterDialogComponent() override;
 
 protected:
     // XInterface
@@ -119,12 +118,6 @@ XMLFilterDialogComponent::XMLFilterDialogComponent( const css::uno::Reference< X
     xDesktop->addTerminateListener( xListener );
 }
 
-
-XMLFilterDialogComponent::~XMLFilterDialogComponent()
-{
-}
-
-
 // XInterface
 Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw (RuntimeException, std::exception)
 {


More information about the Libreoffice-commits mailing list