[Libreoffice-commits] core.git: accessibility/inc accessibility/source chart2/source dbaccess/source hwpfilter/source idl/inc idl/source

Noel Grandin noel.grandin at collabora.co.uk
Fri Mar 30 10:56:22 UTC 2018


 accessibility/inc/standard/accessiblemenubasecomponent.hxx    |    2 -
 accessibility/inc/standard/accessiblemenuitemcomponent.hxx    |    4 +--
 accessibility/source/standard/accessiblemenubasecomponent.cxx |   10 ---------
 chart2/source/view/axes/Tickmarks.cxx                         |    4 ---
 chart2/source/view/axes/Tickmarks.hxx                         |   10 +++------
 dbaccess/source/core/api/CRowSetDataColumn.hxx                |    2 -
 dbaccess/source/core/api/CacheSet.cxx                         |   10 ---------
 dbaccess/source/core/api/CacheSet.hxx                         |    6 -----
 dbaccess/source/core/api/KeySet.hxx                           |    4 +--
 dbaccess/source/core/api/RowSet.hxx                           |    3 +-
 dbaccess/source/core/api/RowSetBase.cxx                       |    4 ---
 dbaccess/source/core/api/RowSetBase.hxx                       |    2 -
 dbaccess/source/core/api/StaticSet.hxx                        |    4 +--
 dbaccess/source/core/api/column.cxx                           |    5 ----
 dbaccess/source/core/inc/column.hxx                           |    2 -
 dbaccess/source/core/recovery/storagestream.cxx               |   11 ----------
 dbaccess/source/core/recovery/storagestream.hxx               |    4 ---
 dbaccess/source/core/recovery/storagexmlstream.hxx            |    3 --
 dbaccess/source/ui/browser/brwctrlr.cxx                       |    4 ---
 dbaccess/source/ui/inc/RTableConnectionData.hxx               |    2 -
 dbaccess/source/ui/inc/TableConnectionData.hxx                |    2 -
 dbaccess/source/ui/inc/brwctrlr.hxx                           |    2 -
 dbaccess/source/ui/inc/unodatbr.hxx                           |    2 -
 dbaccess/source/ui/querydesign/QTableConnectionData.hxx       |    2 -
 dbaccess/source/ui/querydesign/TableConnectionData.cxx        |    5 ----
 hwpfilter/source/hbox.cxx                                     |    8 -------
 hwpfilter/source/hbox.h                                       |    5 +---
 idl/inc/basobj.hxx                                            |    1 
 idl/inc/types.hxx                                             |    2 -
 idl/source/objects/basobj.cxx                                 |    5 ----
 30 files changed, 20 insertions(+), 110 deletions(-)

New commits:
commit f657ab7bbb36219f6270236ae0e6b8238b7dd9b5
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Mar 29 11:21:02 2018 +0200

    loplugin:virtualdown in various
    
    Change-Id: I4db71fda953ea1d20712ae8033f6fc09b3b2855d
    Reviewed-on: https://gerrit.libreoffice.org/52068
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
index 2447b0d6c1d3..a6c9da485f30 100644
--- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx
@@ -101,8 +101,6 @@ protected:
     void                    DeSelectAll();
     bool                IsChildSelected( sal_Int32 i );
 
-    virtual void            Select();
-    virtual void            DeSelect();
     virtual void            Click();
     virtual bool            IsPopupMenuOpen();
 
diff --git a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
index 0d893dde1c1f..adba565647b4 100644
--- a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
+++ b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx
@@ -38,8 +38,8 @@ protected:
 
     virtual bool            IsEnabled() override;
     virtual bool            IsVisible() override;
-    virtual void            Select() override;
-    virtual void            DeSelect() override;
+    virtual void            Select();
+    virtual void            DeSelect();
     virtual void            Click() override;
 
     void                    SetItemPos( sal_uInt16 nItemPos );
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 33e67b3bc63a..2534eb40eda7 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -501,16 +501,6 @@ bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i )
 }
 
 
-void OAccessibleMenuBaseComponent::Select()
-{
-}
-
-
-void OAccessibleMenuBaseComponent::DeSelect()
-{
-}
-
-
 void OAccessibleMenuBaseComponent::Click()
 {
 }
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index 05dfe08520d0..6d4b302fcf6b 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -132,10 +132,6 @@ void TickFactory::getAllTicksShifted( TickInfoArraysType& rAllTickInfos ) const
         EquidistantTickFactory( m_rScale, m_rIncrement ).getAllTicksShifted( rAllTickInfos );
 }
 
-void TickFactory::updateScreenValues( TickInfoArraysType& /*rAllTickInfos*/ ) const
-{
-}
-
 // ___TickFactory_2D___
 TickFactory2D::TickFactory2D(
           const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement
diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx
index dbf51d9762bf..78434e25355a 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -92,11 +92,6 @@ public:
     void getAllTicks( TickInfoArraysType& rAllTickInfos ) const;
     void getAllTicksShifted( TickInfoArraysType& rAllTickInfos ) const;
 
-    /**
-     * Determine the screen positions of all ticks based on their numeric values.
-     */
-    virtual void updateScreenValues( TickInfoArraysType& rAllTickInfos ) const;
-
 private: //methods
     bool        isDateAxis() const;
 
@@ -132,7 +127,10 @@ public:
         , bool bIncludeFarAwayDistanceIfSo = false
         , bool bIncludeSpaceBetweenTickAndText = true ) const;
 
-    virtual void updateScreenValues( TickInfoArraysType& rAllTickInfos ) const override;
+    /**
+     * Determine the screen positions of all ticks based on their numeric values.
+     */
+    virtual void updateScreenValues( TickInfoArraysType& rAllTickInfos ) const;
 
     bool  isHorizontalAxis() const;
     bool  isVerticalAxis() const;
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index 83fae4e89c10..336f6770ab3e 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -70,7 +70,7 @@ namespace dbaccess
         virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const css::uno::Any& rValue ) override;
 
-        virtual void fireValueChange(const ::connectivity::ORowSetValue& _rOldValue) override;
+        virtual void fireValueChange(const ::connectivity::ORowSetValue& _rOldValue);
     protected:
         using ODataColumn::getFastPropertyValue;
     };
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 9a7303cf52a1..c8ba3635aa2f 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -498,16 +498,6 @@ bool OCacheSet::next()
     return m_xDriverSet->next();
 }
 
-bool OCacheSet::isBeforeFirst(  )
-{
-    return m_xDriverSet->isBeforeFirst();
-}
-
-bool OCacheSet::isAfterLast(  )
-{
-    return m_xDriverSet->isAfterLast();
-}
-
 void OCacheSet::beforeFirst(  )
 {
     m_bInserted = m_bUpdated = m_bDeleted = false;
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index ddfef905cdc8..0fc0e5777a6e 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -107,12 +107,6 @@ namespace dbaccess
         virtual bool next();
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
-        virtual bool isBeforeFirst(  );
-        /// @throws css::sdbc::SQLException
-        /// @throws css::uno::RuntimeException
-        virtual bool isAfterLast(  );
-        /// @throws css::sdbc::SQLException
-        /// @throws css::uno::RuntimeException
         virtual void beforeFirst(  );
         /// @throws css::sdbc::SQLException
         /// @throws css::uno::RuntimeException
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index bea06818dbe9..11312dbc5dda 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -187,8 +187,8 @@ namespace dbaccess
         virtual bool rowDeleted(  ) override;
         // css::sdbc::XResultSet
         virtual bool next() override;
-        virtual bool isBeforeFirst(  ) override;
-        virtual bool isAfterLast(  ) override;
+        virtual bool isBeforeFirst(  );
+        virtual bool isAfterLast(  );
         virtual void beforeFirst(  ) override;
         virtual void afterLast(  ) override;
         virtual bool first() override;
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 261864096bae..cddf6c95299a 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -234,7 +234,8 @@ namespace dbaccess
                 void notifyAllListenersRowChanged(::osl::ResettableMutexGuard& _rGuard,const css::sdb::RowsChangeEvent& rEvt);
         virtual bool notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& _rGuard) override;
         virtual void notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& _rGuard) override;
-        virtual void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard) override;
+        // notify all that rowset changed
+        virtual void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard);
 
         virtual void doCancelModification( ) override;
         virtual bool isModification( ) override;
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index 8e77f4b39731..fd800d291aaf 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -1201,10 +1201,6 @@ void ORowSetBase::notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& /*_
 {
 }
 
-void ORowSetBase::notifyAllListeners(::osl::ResettableMutexGuard& /*_rGuard*/)
-{
-}
-
 bool ORowSetBase::isPropertyChangeNotificationEnabled() const
 {
     return true;
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 339b5dfc9e14..2df45da2ab40 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -126,8 +126,6 @@ namespace dbaccess
         virtual bool notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& _rGuard);
         // notify cursor moved
         virtual void notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& _rGuard);
-        // notify all that rowset changed
-        virtual void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard);
 
         // cancel the insertion, if necessary (means if we're on the insert row)
         virtual void        doCancelModification( ) = 0;
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index 92f4d55ce7b0..0a2219c6a067 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -53,8 +53,8 @@ namespace dbaccess
 
         // css::sdbc::XResultSet
         virtual bool next() override;
-        virtual bool isBeforeFirst(  ) override;
-        virtual bool isAfterLast(  ) override;
+        virtual bool isBeforeFirst(  );
+        virtual bool isAfterLast(  );
         virtual void beforeFirst(  ) override;
         virtual void afterLast(  ) override;
         virtual bool first() override;
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index 430b5c1f9517..e9e7ae90dbf6 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -125,11 +125,6 @@ void SAL_CALL OColumn::setName( const OUString& _rName )
     m_sName = _rName;
 }
 
-void OColumn::fireValueChange(const ::connectivity::ORowSetValue& /*_rOldValue*/)
-{
-    OSL_FAIL( "OColumn::fireValueChange: not implemented!" );
-}
-
 void OColumn::registerProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType )
 {
     ::comphelper::OPropertyContainer::registerProperty( _rName, _nHandle, _nAttributes, _pPointerToMember, _rMemberType );
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index 2fd16937cb5a..f32a00f6c8d8 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -103,8 +103,6 @@ namespace dbaccess
         virtual OUString SAL_CALL getName(  ) override;
         virtual void SAL_CALL setName( const OUString& _rName ) override;
 
-        virtual void fireValueChange( const ::connectivity::ORowSetValue& _rOldValue );
-
     protected:
         // IPropertyContainer
         virtual void registerProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const css::uno::Type& _rMemberType ) override;
diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
index 6f23cbaf3e7e..75ceb4042ac5 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -50,17 +50,6 @@ namespace dbaccess
     {
     }
 
-    void StorageOutputStream::close()
-    {
-        ENSURE_OR_RETURN_VOID( m_xOutputStream.is(), "already closed" );
-        m_xOutputStream->closeOutput();
-        m_xOutputStream.clear();
-
-        // if you add additional functionality here, be aware that there are derived classes which
-        // (legitimately) do not call this method here.
-    }
-
-
 } // namespace dbaccess
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx
index 6ed2b93a104d..5d567f314517 100644
--- a/dbaccess/source/core/recovery/storagestream.hxx
+++ b/dbaccess/source/core/recovery/storagestream.hxx
@@ -40,10 +40,6 @@ namespace dbaccess
         );
         virtual ~StorageOutputStream();
 
-        /** simply calls closeOutput on our output stream, override to extend/modify this behavior
-        */
-        virtual void close();
-
     protected:
         const css::uno::Reference< css::io::XOutputStream >&
                                                 getOutputStream() const { return m_xOutputStream; }
diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx
index a4f9a2a4c871..ec4bb0b46116 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.hxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.hxx
@@ -43,8 +43,7 @@ namespace dbaccess
         );
         virtual ~StorageXMLOutputStream() override;
 
-        // StorageOutputStream overridables
-        virtual void close() override;
+        virtual void close();
 
         void    addAttribute( const OUString& i_rName, const OUString& i_rValue ) const;
 
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index d6c6415ebec5..fc03605fc880 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -2607,10 +2607,6 @@ void SbaXDataBrowserController::addColumnListeners(const Reference< css::awt::XC
     }
 }
 
-void SbaXDataBrowserController::InitializeGridModel(const Reference< css::form::XFormComponent > & /*xGrid*/)
-{
-}
-
 }   // namespace dbaui
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx
index fe26d68bb2ba..41cad914eb74 100644
--- a/dbaccess/source/ui/inc/RTableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx
@@ -46,7 +46,7 @@ namespace dbaui
         bool IsSourcePrimKey()  const { return checkPrimaryKey(getReferencingTable()->getTable(),JTCS_FROM);    }
         bool IsDestPrimKey()    const { return checkPrimaryKey(getReferencedTable()->getTable(),JTCS_TO);       }
 
-        virtual OConnectionLineDataRef CreateLineDataObj() override;
+        virtual OConnectionLineDataRef CreateLineDataObj();
 
         ORelationTableConnectionData& operator=( const ORelationTableConnectionData& rConnData );
     public:
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index 52b2792f6fe4..1ad4fcea9056 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.hxx
@@ -45,8 +45,6 @@ namespace dbaui
 
         void    Init();
 
-        virtual OConnectionLineDataRef CreateLineDataObj();
-
         OTableConnectionData& operator=( const OTableConnectionData& rConnData );
     public:
         OTableConnectionData();
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index fa38eb03e802..e9a7c523c7a7 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -236,8 +236,6 @@ namespace dbaui
             // do any initialization (data source etc.) here. the form should be fully functional after that.
             // return sal_False if you didn't succeed (don't throw exceptions, they won't be caught)
 
-        virtual void InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid);
-
         css::uno::Reference< css::form::XFormComponent >  CreateGridModel();
             // our default implementation simply instantiates a stardiv.one.form.component.Grid service
             // you most probably don't want to override this behavior
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 60f55d121218..ee438c21dfbe 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -205,7 +205,7 @@ namespace dbaui
     private:
         // SbaXDataBrowserController overridables
         virtual bool     InitializeForm( const css::uno::Reference< css::beans::XPropertySet >& i_formProperties ) override;
-        virtual void     InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid) override;
+        virtual void     InitializeGridModel(const css::uno::Reference< css::form::XFormComponent > & xGrid);
 
         virtual bool     preReloadForm() override;
         virtual void     postReloadForm() override;
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index f28974dceea0..5a2a88472935 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -33,7 +33,7 @@ namespace dbaui
         bool            m_bNatural;
 
         // for creation and duplication of lines of own type
-        virtual OConnectionLineDataRef CreateLineDataObj() override;
+        virtual OConnectionLineDataRef CreateLineDataObj();
 
         OQueryTableConnectionData& operator=( const OQueryTableConnectionData& rConnData );
     public:
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index 93bf1b5506b8..ec5b98f4999c 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -120,11 +120,6 @@ void OTableConnectionData::ResetConnLines()
     OConnectionLineDataVec().swap(m_vConnLineData);
 }
 
-OConnectionLineDataRef OTableConnectionData::CreateLineDataObj()
-{
-    return new OConnectionLineData();
-}
-
 OTableConnectionData* OTableConnectionData::NewInstance() const
 {
     return new OTableConnectionData();
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index ca94bf27fe57..7be2c61db81e 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -63,14 +63,6 @@ int HBox::WSize()
 }
 
 
-hchar_string HBox::GetString()
-{
-    hchar_string ret;
-    ret.push_back(hh);
-    return ret;
-}
-
-
 // skip block
 SkipData::SkipData(hchar hch)
     : HBox(hch)
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index ce479c4c34dc..841143c53434 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -63,7 +63,6 @@ struct HBox
  */
         virtual bool Read(HWPFile &hwpf);
 
-        virtual hchar_string GetString();
     private:
         static int boxCount;
 };
@@ -157,7 +156,7 @@ struct DateCode: public HBox
     DateCode();
     virtual bool Read(HWPFile &hwpf) override;
 
-    virtual hchar_string GetString() override;
+    virtual hchar_string GetString();
 };
 
 /**
@@ -832,7 +831,7 @@ struct MailMerge: public HBox
     MailMerge();
 
     virtual bool Read(HWPFile &hwpf) override;
-    virtual hchar_string GetString() override;
+    virtual hchar_string GetString();
 };
 
 // char composition(23)
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 342d1e84f1ab..f74b9230fb8a 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -102,7 +102,6 @@ public:
     void                      SetName( const OString& rName );
     virtual const OString &  GetName() const { return aName; }
 
-    virtual bool        Test( SvTokenStream & rInStm );
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm );
 };
 
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 0d7de1c59a63..e946ed35436b 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -41,7 +41,7 @@ public:
     const SvIdentifier& GetSlotId() const;
     SvMetaType *        GetType() const;
 
-    virtual bool        Test( SvTokenStream & rInStm ) override;
+    virtual bool        Test( SvTokenStream & rInStm );
     virtual bool        ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
     sal_uLong           MakeSfx( OStringBuffer& rAtrrArray ) const;
     virtual void        Insert( SvSlotElementList& );
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index ccd555e530b8..18784acbab93 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -107,11 +107,6 @@ void SvMetaObject::ReadContextSvIdl( SvIdlDataBase &, SvTokenStream & )
 {
 }
 
-bool SvMetaObject::Test( SvTokenStream & )
-{
-    return true;
-}
-
 bool SvMetaObject::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
     sal_uInt32 nTokPos = rInStm.Tell();


More information about the Libreoffice-commits mailing list