diff options
63 files changed, 150 insertions, 181 deletions
diff --git a/compilerplugins/clang/unnecessaryoverride.cxx b/compilerplugins/clang/unnecessaryoverride.cxx index b031c50b7b87..7136cc632739 100644 --- a/compilerplugins/clang/unnecessaryoverride.cxx +++ b/compilerplugins/clang/unnecessaryoverride.cxx @@ -13,6 +13,7 @@ #include <fstream> #include <set> +#include <clang/AST/CXXInheritance.h> #include "compat.hxx" #include "plugin.hxx" @@ -57,6 +58,15 @@ public: } bool VisitCXXMethodDecl(const CXXMethodDecl *); + +private: + const CXXMethodDecl * findOverriddenOrSimilarMethodInSuperclasses(const CXXMethodDecl *); + bool BaseCheckCallback( + const CXXRecordDecl *BaseDefinition + #if CLANG_VERSION < 30800 + , void * + #endif + ); }; bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl) @@ -64,11 +74,18 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl) if (ignoreLocation(methodDecl->getCanonicalDecl()) || !methodDecl->doesThisDeclarationHaveABody()) { return true; } - // if we are overriding more than one method, then this is a disambiguating override - if (!methodDecl->isVirtual() || methodDecl->size_overridden_methods() != 1 - || (*methodDecl->begin_overridden_methods())->isPure()) { + if (isa<CXXConstructorDecl>(methodDecl) || isa<CXXDestructorDecl>(methodDecl)) { return true; } + + // if we are overriding more than one method, then this is a disambiguating override + if (methodDecl->isVirtual()) { + if (methodDecl->size_overridden_methods() != 1 + || (*methodDecl->begin_overridden_methods())->isPure()) + { + return true; + } + } if (dyn_cast<CXXDestructorDecl>(methodDecl)) { return true; } @@ -90,15 +107,16 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl) return true; - const CXXMethodDecl* overriddenMethodDecl = *methodDecl->begin_overridden_methods(); + const CXXMethodDecl* overriddenMethodDecl = findOverriddenOrSimilarMethodInSuperclasses(methodDecl); + if (!overriddenMethodDecl) { + return true; + } if (compat::getReturnType(*methodDecl).getCanonicalType() != compat::getReturnType(*overriddenMethodDecl).getCanonicalType()) { return true; } - if (methodDecl->getAccess() == AS_public && overriddenMethodDecl->getAccess() == AS_protected) - return true; //TODO: check for identical exception specifications @@ -179,9 +197,10 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl) } report( - DiagnosticsEngine::Warning, "%0 virtual function just calls %1 parent", + DiagnosticsEngine::Warning, "%0%1 function just calls %2 parent", methodDecl->getSourceRange().getBegin()) << methodDecl->getAccess() + << (methodDecl->isVirtual() ? " virtual" : "") << overriddenMethodDecl->getAccess() << methodDecl->getSourceRange(); if (methodDecl->getCanonicalDecl()->getLocation() != methodDecl->getLocation()) { @@ -195,6 +214,66 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl) return true; } +const CXXMethodDecl* UnnecessaryOverride::findOverriddenOrSimilarMethodInSuperclasses(const CXXMethodDecl* methodDecl) +{ + if (methodDecl->isVirtual()) { + return *methodDecl->begin_overridden_methods(); + } + if (!methodDecl->getDeclName().isIdentifier()) { + return nullptr; + } + + std::vector<const CXXMethodDecl*> maSimilarMethods; + + auto BaseMatchesCallback = [&](const CXXBaseSpecifier *cxxBaseSpecifier, CXXBasePath& ) + { + if (cxxBaseSpecifier->getAccessSpecifier() != AS_public && cxxBaseSpecifier->getAccessSpecifier() != AS_protected) + return false; + if (!cxxBaseSpecifier->getType().getTypePtr()) + return false; + const CXXRecordDecl* baseCXXRecordDecl = cxxBaseSpecifier->getType()->getAsCXXRecordDecl(); + if (!baseCXXRecordDecl) + return false; + if (baseCXXRecordDecl->isInvalidDecl()) + return false; + for (const CXXMethodDecl* baseMethod : baseCXXRecordDecl->methods()) + { + if (!baseMethod->getDeclName().isIdentifier() || methodDecl->getName() != baseMethod->getName()) { + continue; + } + if (compat::getReturnType(*methodDecl).getCanonicalType() + != compat::getReturnType(*baseMethod).getCanonicalType()) + { + continue; + } + if (methodDecl->param_size() != baseMethod->param_size()) + continue; + if (methodDecl->getNumParams() != baseMethod->getNumParams()) + continue; + bool bParamsMatch = true; + for (unsigned i=0; i<methodDecl->param_size(); ++i) + { + if (methodDecl->parameters()[i]->getType() != baseMethod->parameters()[i]->getType()) + { + bParamsMatch = false; + break; + } + } + if (bParamsMatch) + maSimilarMethods.push_back(baseMethod); + } + return false; + }; + + CXXBasePaths aPaths; + methodDecl->getParent()->lookupInBases(BaseMatchesCallback, aPaths); + + if (maSimilarMethods.size() == 1) { + return maSimilarMethods[0]; + } + return nullptr; +} + loplugin::Plugin::Registration< UnnecessaryOverride > X("unnecessaryoverride", true); diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index c7d32d0aa4ca..16ce7a25463b 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -87,7 +87,7 @@ protected: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; - ::cppu::IPropertyArrayHelper* getArrayHelper() { return OQuery_ArrayHelperBase::getArrayHelper(); } + using OQuery_ArrayHelperBase::getArrayHelper; public: OQuery( diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index a5f8509d9be1..a7e0ec20ab8c 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -284,11 +284,6 @@ namespace dbaui return true; } - bool IndexFieldsControl::IsModified() const - { - return EditBrowseBox::IsModified(); - } - bool IndexFieldsControl::SaveModified() { if (!IsModified()) diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 68586c62dfb3..3ddeca497062 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -62,7 +62,7 @@ namespace dbaui void commitTo(IndexFields& _rFields); bool SaveModified() override; - bool IsModified() const override; + using EditBrowseBox::IsModified; const IndexFields& GetSavedValue() const { return m_aSavedValue; } void SaveValue() { m_aSavedValue = m_aFields; } diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 4908ab97c826..4ca7001affb7 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -230,7 +230,7 @@ namespace dbaui virtual void ActivateCell(long nRow, sal_uInt16 nCol, bool bSetCellFocus = true) override; virtual void DeactivateCell(bool bUpdate = true) override; - void ActivateCell() { FmGridControl::ActivateCell(); } + using FmGridControl::ActivateCell; bool IsAllSelected() const { return (GetSelectRowCount() == GetRowCount()) && (GetRowCount() > 0); } diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx index 8be66336e397..f1d5212044be 100644 --- a/dbaccess/source/ui/inc/singledoccontroller.hxx +++ b/dbaccess/source/ui/inc/singledoccontroller.hxx @@ -67,7 +67,7 @@ namespace dbaui virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; + using OSingleDocumentController_Base::disposing; private: ::std::unique_ptr< OSingleDocumentController_Data > m_pData; diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index 76c1245b1c7f..b1bd4936cab8 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -68,12 +68,6 @@ namespace dbaui m_pData->m_xUndoManager->disposing(); } - void SAL_CALL OSingleDocumentController::disposing( const EventObject& i_event ) throw( RuntimeException, std::exception ) - { - // simply disambiguate - OSingleDocumentController_Base::disposing( i_event ); - } - void OSingleDocumentController::ClearUndoManager() { GetUndoManager().Clear(); diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index e8e84b7a0532..6706598c5267 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -48,8 +48,8 @@ namespace dbaui public: OTableFieldControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar); - OUString BoolStringPersistent(const OUString& rUIString) const { return OFieldDescControl::BoolStringPersistent(rUIString); } - OUString BoolStringUI(const OUString& rPersistentString) const { return OFieldDescControl::BoolStringUI(rPersistentString); } + using OFieldDescControl::BoolStringPersistent; + using OFieldDescControl::BoolStringUI; virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() override; virtual css::uno::Reference< css::sdbc::XConnection> getConnection() override; diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx index 68e5ccbc6350..268d18872cd5 100644 --- a/editeng/source/uno/unoedhlp.cxx +++ b/editeng/source/uno/unoedhlp.cxx @@ -40,11 +40,6 @@ SvxEditSourceHint::SvxEditSourceHint( sal_uInt32 _nId, sal_uLong nValue, sal_Int { } -sal_uLong SvxEditSourceHint::GetValue() const -{ - return TextHint::GetValue(); -} - ::std::unique_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify ) { diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 7c62c45214f9..117f6170a39b 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -104,7 +104,7 @@ namespace dbp virtual ~OControlWizard() override; // make the some base class methods public - bool travelNext() { return OControlWizard_Base::travelNext(); } + using OControlWizard_Base::travelNext; public: const css::uno::Reference< css::uno::XComponentContext >& diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index d082fc98f792..76a2ceaee79b 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -259,11 +259,6 @@ IMPL_LINK_NOARG(OEditControl, OnKeyPressed, void*, void) } -void SAL_CALL OEditControl::createPeer( const Reference< XToolkit>& _rxToolkit, const Reference< XWindowPeer>& _rxParent ) throw ( RuntimeException, std::exception ) -{ - OBoundControl::createPeer(_rxToolkit, _rxParent); -} - OEditModel::OEditModel(const Reference<XComponentContext>& _rxFactory) :OEditBaseModel( _rxFactory, FRM_SUN_COMPONENT_RICHTEXTCONTROL, FRM_SUN_CONTROL_TEXTFIELD, true, true ) diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 6a0b95aa4189..5430920ce335 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -161,7 +161,7 @@ public: virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override; // XControl - virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& _rxToolkit, const css::uno::Reference< css::awt::XWindowPeer >& _rxParent ) throw ( css::uno::RuntimeException, std::exception ) override; + using OBoundControl::createPeer; private: DECL_LINK( OnKeyPressed, void*, void ); diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 61540977d345..d3841a1ea649 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -254,11 +254,6 @@ css::uno::Sequence<OUString> OFormattedControl::getSupportedServiceNames() thro return aSupported; } -void OFormattedControl::setDesignMode(sal_Bool bOn) throw ( css::uno::RuntimeException, std::exception) -{ - OBoundControl::setDesignMode(bOn); -} - void OFormattedModel::implConstruct() { // members diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index e3d1f21744e1..53fc2ffde260 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -168,7 +168,7 @@ class OFormattedModel virtual void SAL_CALL keyReleased(const css::awt::KeyEvent& e) throw ( css::uno::RuntimeException, std::exception) override; // css::awt::XControl - virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw ( css::uno::RuntimeException, std::exception) override; + using OBoundControl::setDesignMode; // disambiguation using OBoundControl::disposing; diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 0b1501d6a99c..9998f495deff 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -282,7 +282,7 @@ namespace dbaui // attribute access - ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); } + using OGenericUnoController_MBASE::getMutex; ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; } diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx index b773c259c15c..ee21ebc5f931 100644 --- a/include/editeng/acorrcfg.hxx +++ b/include/editeng/acorrcfg.hxx @@ -38,7 +38,7 @@ public: void Load(bool bInit); virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override; - void SetModified() {ConfigItem::SetModified();} + using ConfigItem::SetModified; }; class EDITENG_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem @@ -55,7 +55,7 @@ public: void Load(bool bInit); virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames) override; - void SetModified() {ConfigItem::SetModified();} + using ConfigItem::SetModified; }; /*-------------------------------------------------------------------- Description: Configuration for Auto Correction diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index 3b320647a6d9..f140a88f090b 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -52,9 +52,7 @@ public: virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual sal_uInt16 GetValueCount() const override; - // MS VC4.0 kommt durcheinander - void SetValue( sal_uInt16 nNewVal ) - {SfxEnumItem::SetValue(nNewVal); } + using SfxEnumItem::SetValue; inline SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap) { diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index e50d947bf526..e91d9af09ddb 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -53,9 +53,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - // MS VC4.0 messes things up - void SetValue( sal_uInt16 nNewVal ) - {SfxEnumItem::SetValue(nNewVal); } + using SfxEnumItem::SetValue; virtual bool HasBoolValue() const override; virtual bool GetBoolValue() const override; diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index 93a91afc6579..900c212c9298 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -54,9 +54,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - // MS VC4.0 messes things up - void SetValue( sal_uInt16 nNewVal ) - {SfxEnumItem::SetValue(nNewVal); } + using SfxEnumItem::SetValue; virtual bool HasBoolValue() const override; virtual bool GetBoolValue() const override; virtual void SetBoolValue( bool bVal ) override; diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx index 836bb51180c8..995b50d41f39 100644 --- a/include/editeng/unoedhlp.hxx +++ b/include/editeng/unoedhlp.hxx @@ -48,7 +48,7 @@ public: SvxEditSourceHint( sal_uInt32 nId ); SvxEditSourceHint( sal_uInt32 nId, sal_uLong nValue, sal_Int32 nStart=0, sal_Int32 nEnd=0 ); - sal_uLong GetValue() const; + using TextHint::GetValue; sal_Int32 GetStartValue() const { return mnStart;} sal_Int32 GetEndValue() const { return mnEnd;} }; diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index 95d9db445a1a..d79e4d545093 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -144,7 +144,6 @@ protected: OleStorageObject() {} using StorageObjectBase::construct; - void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ); virtual void implDumpStream( const css::uno::Reference< css::io::XInputStream >& rxStrm, diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index 4ab1d05e69b7..e8c668354100 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -317,10 +317,6 @@ protected: , _nRecordType(0) { } - void Construct_Impl( SvStream *pStream ) - { - SfxMiniRecordReader::Construct_Impl( pStream ); - } bool FindHeader_Impl( sal_uInt16 nTypes, sal_uInt16 nTag ); }; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 68fef1251b41..c1ad071123eb 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -178,10 +178,7 @@ public: { ListBox::SelectEntry( rStr ); } void SelectEntry( const Color& rColor ); Color GetSelectEntryColor() const; - bool IsEntrySelected(const OUString& rStr ) const - { - return ListBox::IsEntrySelected(rStr); - } + using ListBox::IsEntrySelected; bool IsEntrySelected(const Color& rColor) const { diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx index 3e1f281b9960..44250e874810 100644 --- a/include/svtools/headbar.hxx +++ b/include/svtools/headbar.hxx @@ -319,8 +319,7 @@ public: Size CalcWindowSizePixel() const; - inline void SetHelpId( const OString& rId ) { Window::SetHelpId( rId ); } - + using Window::SetHelpId; inline void SetStartDragHdl( const Link<HeaderBar*,void>& rLink ) { maStartDragHdl = rLink; } inline void SetDragHdl( const Link<HeaderBar*,void>& rLink ) { maDragHdl = rLink; } diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 5f180eac1ccc..ca0f5b6d22e6 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -98,7 +98,7 @@ public: sal_uInt16 nCol=HEADERBAR_APPEND, HeaderBarItemBits nBits = HeaderBarItemBits::STDSTYLE); - void SetTabs(const long* pTabs, MapUnit = MapUnit::MapAppFont); + using SvHeaderTabListBox::SetTabs; void ClearHeader(); diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 58c20ddf16c4..d2a91ccf49b2 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -146,8 +146,8 @@ namespace svt { private: // restrict access to some aspects of our base class - SVT_DLLPRIVATE void AddPage( TabPage* pPage ) { WizardDialog::AddPage(pPage); } - SVT_DLLPRIVATE void SetPage( sal_uInt16 nLevel, TabPage* pPage ) { WizardDialog::SetPage(nLevel, pPage); } + using WizardDialog::AddPage; + using WizardDialog::SetPage; // TabPage* GetPage( sal_uInt16 nLevel ) const { return WizardDialog::GetPage(nLevel); } // TODO: probably the complete page handling (next, previous etc.) should be prohibited ... diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index fd0aa8badf82..4598c262cb39 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -181,7 +181,6 @@ protected: virtual void DragFinished( sal_Int8 nDropAction ) override; virtual void ObjectReleased() override; - void CopyToClipboard( vcl::Window* pWindow ); void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions ); }; diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 87838958e5bf..18f3e448f11d 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -155,10 +155,8 @@ public: void SetPageImage( sal_uInt16 nPageId, const Image& rImage ); - void SetHelpId( const OString& rId ) - { Control::SetHelpId( rId ); } - const OString& GetHelpId() const - { return Control::GetHelpId(); } + using Control::SetHelpId; + using Control::GetHelpId; void SetActivatePageHdl( const Link<TabControl*,void>& rLink ) { maActivateHdl = rLink; } void SetDeactivatePageHdl( const Link<TabControl*, bool>& rLink ) { maDeactivateHdl = rLink; } diff --git a/lotuswordpro/source/filter/lwpproplist.cxx b/lotuswordpro/source/filter/lwpproplist.cxx index 119179e6ce73..4bf5d8c0d5b5 100644 --- a/lotuswordpro/source/filter/lwpproplist.cxx +++ b/lotuswordpro/source/filter/lwpproplist.cxx @@ -106,11 +106,6 @@ LwpPropListElement* LwpPropList::FindPropByName(const OUString& name) return nullptr; } -void LwpPropList::Read(LwpObjectStream* pObjStrm) -{ - LwpDLVListHead::Read(pObjStrm); -} - LwpPropListElement* LwpPropList::GetFirst() { return dynamic_cast<LwpPropListElement*>(LwpDLVListHead::GetFirst().obj().get()); diff --git a/lotuswordpro/source/filter/lwpproplist.hxx b/lotuswordpro/source/filter/lwpproplist.hxx index 3419ba0c6543..463c659b785c 100644 --- a/lotuswordpro/source/filter/lwpproplist.hxx +++ b/lotuswordpro/source/filter/lwpproplist.hxx @@ -86,7 +86,7 @@ class LwpPropList : public LwpDLVListHead public: LwpPropList(){} ~LwpPropList(){} - void Read(LwpObjectStream* pObjStrm); + using LwpDLVListHead::Read; LwpPropListElement* GetFirst(); OUString GetNamedProperty(const OUString& name); OUString EnumNamedProperty(OUString& name,OUString& value); diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index 1361ab01b721..376b500ce15d 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -496,11 +496,6 @@ OleStorageObject::OleStorageObject( const ObjectBase& rParent, const StorageRef& construct( rParent, rxStrg, rSysPath ); } -void OleStorageObject::construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ) -{ - StorageObjectBase::construct( rParent, rxStrg, rSysPath ); -} - void OleStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm, const OUString& /*rStrgPath*/, const OUString& rStrmName, const OUString& rSysFileName ) { if ( rStrmName == "\001CompObj" ) diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index 76a14adfc6c4..0cc5e50eb89b 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -152,7 +152,7 @@ public: DECLARE_XTYPEPROVIDER() // XComponent - virtual void SAL_CALL disposing() override; + using ScChartObj_Base::disposing; // XTableChart virtual sal_Bool SAL_CALL getHasColumnHeaders() throw(css::uno::RuntimeException, std::exception) override; diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index 17e752e5fbbb..3403bd1ae549 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -47,7 +47,7 @@ public: virtual void Notify( const css::uno::Sequence<OUString>& aPropertyNames ) override; virtual void ImplCommit() override; - void SetModified() { ConfigItem::SetModified(); } + using ConfigItem::SetModified; css::uno::Sequence< css::uno::Any> GetProperties(const css::uno::Sequence< OUString >& rNames) { return ConfigItem::GetProperties( rNames ); } diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 8784ae372898..56288b936166 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -49,13 +49,11 @@ private: class ScResourcePublisher : public Resource { private: - void FreeResource() { Resource::FreeResource(); } + using Resource::FreeResource; public: explicit ScResourcePublisher( const ScResId& rId ) : Resource( rId ) {} ~ScResourcePublisher() { FreeResource(); } - bool IsAvailableRes( const ResId& rId ) const - { return Resource::IsAvailableRes( rId ); } - + using Resource::IsAvailableRes; }; // class ScFuncDesc: diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 2eb028ccde0b..25e66e08c434 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -343,7 +343,7 @@ public: void ClickExtern(); - void SetPointer( const Pointer& rPointer ); + using Window::SetPointer; void MoveMouseStatus( ScGridWindow &rDestWin ); diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index f604e9dfc574..467e41c14f62 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -649,13 +649,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( ScChartObj, ScChartObj_Base, ScChartObj_PBase ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScChartObj, ScChartObj_Base, ScChartObj_PBase ) -// XComponent - -void ScChartObj::disposing() -{ - ScChartObj_Base::disposing(); -} - // XTableChart sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 4dabdef7c626..b57737e99210 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -1389,11 +1389,6 @@ void ScGridWindow::ExecFilter( sal_uLong nSel, } } -void ScGridWindow::SetPointer( const Pointer& rPointer ) -{ - Window::SetPointer( rPointer ); -} - void ScGridWindow::MoveMouseStatus( ScGridWindow& rDestWin ) { if (nButtonDown) diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index 04bfbbd8cc63..4b000b5943fe 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -83,8 +83,8 @@ class AnalysisResourcePublisher : public Resource { public: explicit AnalysisResourcePublisher( const AnalysisResId& rId ) : Resource( rId ) {} - bool IsAvailableRes( const ResId& rId ) const { return Resource::IsAvailableRes( rId ); } - void FreeResource() { Resource::FreeResource(); } + using Resource::IsAvailableRes; + using Resource::FreeResource; }; class AnalysisFuncRes : public Resource diff --git a/scaddins/source/datefunc/datefunc.hxx b/scaddins/source/datefunc/datefunc.hxx index f9876afd3fe5..de1a0b4543d0 100644 --- a/scaddins/source/datefunc/datefunc.hxx +++ b/scaddins/source/datefunc/datefunc.hxx @@ -90,10 +90,8 @@ class ScaResPublisher : public Resource public: explicit ScaResPublisher( const ScaResId& rResId ) : Resource( rResId ) {} - bool IsAvailableRes( const ResId& rResId ) const - { return Resource::IsAvailableRes( rResId ); } - void FreeResource() - { Resource::FreeResource(); } + using Resource::IsAvailableRes; + using Resource::FreeResource; }; diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx index 379430013e14..97da8cc747a1 100644 --- a/scaddins/source/pricing/pricing.hxx +++ b/scaddins/source/pricing/pricing.hxx @@ -99,10 +99,8 @@ class ScaResPublisher : public Resource public: explicit ScaResPublisher( const ScaResId& rResId ) : Resource( rResId ) {} - bool IsAvailableRes( const ResId& rResId ) const - { return Resource::IsAvailableRes( rResId ); } - void FreeResource() - { Resource::FreeResource(); } + using Resource::IsAvailableRes; + using Resource::FreeResource; }; diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index ceb7ff94f9f9..f360981b715e 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -77,11 +77,6 @@ bool SdOptionsItem::PutProperties( const Sequence< OUString >& rNames, const Seq return ConfigItem::PutProperties( rNames, rValues ); } -void SdOptionsItem::SetModified() -{ - ConfigItem::SetModified(); -} - SdOptionsGeneric::SdOptionsGeneric(sal_uInt16 nConfigId, const OUString& rSubTree) : maSubTree(rSubTree) , mpCfgItem( nullptr) diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 5cddc4244876..a2b15a5a2246 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -152,7 +152,7 @@ public: virtual void UIActivating( SfxInPlaceClient* ) override; virtual void UIDeactivated( SfxInPlaceClient* ) override; virtual void Activate (bool IsMDIActivate) override; - virtual void Deactivate (bool IsMDIActivate) override; + using SfxViewShell::Deactivate; virtual void SetZoomFactor ( const Fraction &rZoomX, const Fraction &rZoomY) override; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index e7001bd3da22..cde1ed3eae17 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -55,7 +55,7 @@ public: css::uno::Sequence< css::uno::Any > GetProperties( const css::uno::Sequence< OUString >& rNames ); bool PutProperties( const css::uno::Sequence< OUString >& rNames, const css::uno::Sequence< css::uno::Any>& rValues ); - void SetModified(); + using ConfigItem::SetModified; }; class SD_DLLPUBLIC SdOptionsGeneric diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 71c1d012342a..668127a48ed2 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -759,11 +759,6 @@ void ViewShellBase::Activate (bool bIsMDIActivate) GetToolBarManager()->RequestUpdate(); } -void ViewShellBase::Deactivate (bool bIsMDIActivate) -{ - SfxViewShell::Deactivate(bIsMDIActivate); -} - void ViewShellBase::SetZoomFactor ( const Fraction &rZoomX, const Fraction &rZoomY) diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 12dda23476ab..5546f90499bb 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -92,8 +92,8 @@ public: void AddScheme(const OUString& rNode); void RemoveScheme(const OUString& rNode); - void SetModified(){ConfigItem::SetModified();} - void ClearModified(){ConfigItem::ClearModified();} + using ConfigItem::SetModified; + using ConfigItem::ClearModified; void SettingsChanged(); bool GetAutoDetectSystemHC() {return m_bAutoDetectSystemHC;} diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 3fd760171bc1..cdf060cb2def 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -119,8 +119,8 @@ public: void AddScheme(const OUString& rNode); void RemoveScheme(const OUString& rNode); - void SetModified(){ConfigItem::SetModified();} - void ClearModified(){ConfigItem::ClearModified();} + using ConfigItem::SetModified; + using ConfigItem::ClearModified; void SettingsChanged(); static void DisableBroadcast(); diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 966596f6e218..95725e692df1 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -192,11 +192,6 @@ void SvSimpleTable::SetTabs() } } -void SvSimpleTable::SetTabs(const long* pTabs, MapUnit eMapUnit) -{ - SvHeaderTabListBox::SetTabs(pTabs,eMapUnit); -} - void SvSimpleTable::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) { SvHeaderTabListBox::Paint(rRenderContext, rRect); diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx index dd1442e16a8d..34016a16f259 100644 --- a/svtools/source/uno/wizard/wizardshell.hxx +++ b/svtools/source/uno/wizard/wizardshell.hxx @@ -71,8 +71,8 @@ namespace svt { namespace uno { return skipBackwardUntil( impl_pageIdToState( i_nPageId ) ); } - bool travelNext() { return WizardShell_Base::travelNext(); } - bool travelPrevious() { return WizardShell_Base::travelPrevious(); } + using WizardShell_Base::travelNext; + using WizardShell_Base::travelPrevious; void activatePath( const sal_Int16 i_nPathID, const bool i_bFinal ) { diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 26521a734d97..e8976066af13 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -578,11 +578,6 @@ void GalleryTransferable::ObjectReleased() mpURL = nullptr; } -void GalleryTransferable::CopyToClipboard( vcl::Window* pWindow ) -{ - TransferableHelper::CopyToClipboard( pWindow ); -} - void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions ) { INetURLObject aURL; diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index c0cd1dc27416..b750e490114b 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -81,10 +81,8 @@ namespace svxform virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; private: - void StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE ) - { // don't allow this base class method to be called from outside - TransferableHelper::StartDrag(pWindow, nDragSourceActions, nDragPointer); - } + // don't allow this base class method to be called from outside + using TransferableHelper::StartDrag; }; diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index 5a4278e493d3..6440fc4bc755 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -105,9 +105,7 @@ protected: virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override; protected: - inline SfxBindings& GetBindings() { return SfxControllerItem::GetBindings(); } - inline const SfxBindings& GetBindings() const { return SfxControllerItem::GetBindings(); } - + using SfxControllerItem::GetBindings; using SfxFloatingWindow::StateChanged; }; diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 61e3f0dd2a17..766cf14a2144 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -84,7 +84,7 @@ public: virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); - void SetModified(){ConfigItem::SetModified();} + using ConfigItem::SetModified; }; enum class SwCompareMode @@ -115,7 +115,7 @@ public: virtual void Notify( const css::uno::Sequence< OUString >& ) override { }; void Load(); - void SetModified() {ConfigItem::SetModified(); } + using ConfigItem::SetModified; }; class SwInsertConfig : public utl::ConfigItem @@ -143,7 +143,7 @@ public: virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); - void SetModified(){ConfigItem::SetModified();} + using ConfigItem::SetModified; }; class SwTableConfig : public utl::ConfigItem @@ -170,7 +170,7 @@ public: virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); - void SetModified(){ConfigItem::SetModified();} + using ConfigItem::SetModified; }; class SwMiscConfig : public utl::ConfigItem @@ -200,7 +200,7 @@ public: virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); - void SetModified(){ConfigItem::SetModified();} + using ConfigItem::SetModified; }; class SW_DLLPUBLIC SwModuleOptions diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 4dd9647a7c78..88b8d5c35b35 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -75,7 +75,7 @@ public: SwCharFormat* GetCharFormat() const { return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn())); } void SetCharFormat( SwCharFormat* ); - void SetCharFormatName(const OUString& rSet); + using SvxNumberFormat::SetCharFormatName; virtual OUString GetCharFormatName() const override; //For i120928,access the cp info of graphic within bullet diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index f87a70763249..0ec3d018c970 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -52,7 +52,7 @@ public: bool Connect() { return nullptr != SvBaseLink::GetRealObject(); } // Only for graphics-links (for switching between DDE / Grf-link). - void SetObjType( sal_uInt16 nType ) { SvBaseLink::SetObjType( nType ); } + using SvBaseLink::SetObjType; bool IsRecursion( const SwBaseLink* pChkLnk ) const; virtual bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, sal_Int32 nStt = 0, diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index efbef6b83a1f..c6bbd1f24ebb 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -188,7 +188,7 @@ public: CreateXTextFrame(SwDoc & rDoc, SwFrameFormat * pFrameFormat); // FIXME: EVIL HACK: make available for SwXFrame::attachToRange - void SetDoc(SwDoc *const pDoc) { SwXText::SetDoc(pDoc); }; + using SwXText::SetDoc; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( ) throw() override; diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index 21e1d69196af..6386f4fcb0e8 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -227,7 +227,7 @@ protected: public: SwXChapterNumbering(SwDocShell& rDocSh); - void Invalidate() {SwXNumberingRules::Invalidate();} + using SwXNumberingRules::Invalidate; //XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index f46c7f83310c..ddb844013bff 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -301,11 +301,6 @@ void SwNumFormat::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) CheckRegistration( pOld, pNew ); } -void SwNumFormat::SetCharFormatName(const OUString& rSet) -{ - SvxNumberFormat::SetCharFormatName(rSet); -} - OUString SwNumFormat::GetCharFormatName() const { if(static_cast<const SwCharFormat*>(GetRegisteredIn())) diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 1b1d797dd160..6a69bedfb79c 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -544,7 +544,7 @@ public: SwXMetaText(SwDoc & rDoc, SwXMeta & rMeta); /// make available for SwXMeta - void Invalidate() { SwXText::Invalidate(); }; + using SwXText::Invalidate; // XInterface virtual void SAL_CALL acquire() throw() override { cppu::OWeakObject::acquire(); } diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index dc4a8bda113f..6bc5eb36751b 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -232,11 +232,6 @@ void SwMailMergeWizard::UpdateRoadmap() } } -void SwMailMergeWizard::updateRoadmapItemLabel( WizardState _nState ) -{ - svt::RoadmapWizard::updateRoadmapItemLabel( _nState ); -} - short SwMailMergeWizard::Execute() { OSL_FAIL("SwMailMergeWizard cannot be executed via Dialog::Execute!\n" diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx index f1b61c765643..567f989684dc 100644 --- a/sw/source/uibase/inc/mailmergewizard.hxx +++ b/sw/source/uibase/inc/mailmergewizard.hxx @@ -80,7 +80,7 @@ public: bool skipUntil( sal_uInt16 nPage) {return ::svt::RoadmapWizard::skipUntil(WizardState(nPage));} - void updateRoadmapItemLabel( WizardState _nState ); + using svt::RoadmapWizard::updateRoadmapItemLabel; virtual short Execute() override; }; diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index b43cf673a12a..8e40de357cce 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -44,7 +44,7 @@ public: virtual void Notify( const css::uno::Sequence< OUString > &rPropertyNames ) override; void Load(); - void SetModified(){ConfigItem::SetModified();} + using ConfigItem::SetModified; }; class SwLayoutViewConfig : public utl::ConfigItem @@ -63,7 +63,7 @@ public: virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); - void SetModified(){ConfigItem::SetModified();} + using ConfigItem::SetModified; }; class SwGridConfig : public utl::ConfigItem @@ -81,7 +81,7 @@ public: virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); - void SetModified(){ConfigItem::SetModified();} + using ConfigItem::SetModified; }; class SwCursorConfig : public utl::ConfigItem @@ -99,7 +99,7 @@ public: virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); - void SetModified(){ConfigItem::SetModified();} + using ConfigItem::SetModified; }; class SwWebColorConfig : public utl::ConfigItem @@ -116,7 +116,7 @@ public: virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); - void SetModified(){ConfigItem::SetModified();} + using ConfigItem::SetModified; }; class SwMasterUsrPref : public SwViewOption diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 11e1a7b782cc..330a20d43713 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -151,10 +151,7 @@ public: m_nLayoutType = nLayoutType; } - bool isInCell() - { - return TableManager::isInCell(); - } + using TableManager::isInCell; void setIsInShape(bool bIsInShape); diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 540abd3bcb64..fe35475eb5e4 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -92,8 +92,7 @@ protected: void AddShape(OUString const & serviceName); void SetTransformation(); - SvXMLImport& GetImport() { return SvXMLImportContext::GetImport(); } - const SvXMLImport& GetImport() const { return SvXMLImportContext::GetImport(); } + using SvXMLImportContext::GetImport; void addGluePoint( const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList ); |