[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source editeng/source extensions/source forms/source include/dbaccess include/editeng include/oox include/svl include/svtools include/svx include/vcl lotuswordpro/source oox/source scaddins/source sc/inc sc/source sd/source svtools/source svx/source sw/inc sw/source writerfilter/source xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Oct 28 12:56:45 UTC 2016
compilerplugins/clang/unnecessaryoverride.cxx | 93 +++++++++++++--
dbaccess/source/core/api/query.hxx | 2
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 5
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 2
dbaccess/source/ui/inc/sbagrid.hxx | 2
dbaccess/source/ui/inc/singledoccontroller.hxx | 2
dbaccess/source/ui/misc/singledoccontroller.cxx | 6
dbaccess/source/ui/tabledesign/TableFieldControl.hxx | 4
editeng/source/uno/unoedhlp.cxx | 5
extensions/source/dbpilots/controlwizard.hxx | 2
forms/source/component/Edit.cxx | 5
forms/source/component/Edit.hxx | 2
forms/source/component/FormattedField.cxx | 5
forms/source/component/FormattedField.hxx | 2
include/dbaccess/genericcontroller.hxx | 2
include/editeng/acorrcfg.hxx | 4
include/editeng/cmapitem.hxx | 4
include/editeng/crossedoutitem.hxx | 4
include/editeng/udlnitem.hxx | 4
include/editeng/unoedhlp.hxx | 2
include/oox/dump/oledumper.hxx | 1
include/svl/filerec.hxx | 4
include/svtools/ctrlbox.hxx | 5
include/svtools/headbar.hxx | 3
include/svtools/simptabl.hxx | 2
include/svtools/wizardmachine.hxx | 4
include/svx/galmisc.hxx | 1
include/vcl/tabctrl.hxx | 6
lotuswordpro/source/filter/lwpproplist.cxx | 5
lotuswordpro/source/filter/lwpproplist.hxx | 2
oox/source/dump/oledumper.cxx | 5
sc/inc/chartuno.hxx | 2
sc/inc/optutil.hxx | 2
sc/source/core/data/funcdesc.cxx | 6
sc/source/ui/inc/gridwin.hxx | 2
sc/source/ui/unoobj/chartuno.cxx | 7 -
sc/source/ui/view/gridwin.cxx | 5
scaddins/source/analysis/analysis.cxx | 4
scaddins/source/datefunc/datefunc.hxx | 6
scaddins/source/pricing/pricing.hxx | 6
sd/source/ui/app/optsitem.cxx | 5
sd/source/ui/inc/ViewShellBase.hxx | 2
sd/source/ui/inc/optsitem.hxx | 2
sd/source/ui/view/ViewShellBase.cxx | 5
svtools/source/config/colorcfg.cxx | 4
svtools/source/config/extcolorcfg.cxx | 4
svtools/source/contnr/simptabl.cxx | 5
svtools/source/uno/wizard/wizardshell.hxx | 4
svx/source/gallery2/galmisc.cxx | 5
svx/source/inc/fmexch.hxx | 6
svx/source/inc/tabwin.hxx | 4
sw/inc/modcfg.hxx | 10 -
sw/inc/numrule.hxx | 2
sw/inc/swbaslnk.hxx | 2
sw/inc/unoframe.hxx | 2
sw/inc/unosett.hxx | 2
sw/source/core/doc/number.cxx | 5
sw/source/core/unocore/unorefmk.cxx | 2
sw/source/ui/dbui/mailmergewizard.cxx | 5
sw/source/uibase/inc/mailmergewizard.hxx | 2
sw/source/uibase/inc/usrpref.hxx | 10 -
writerfilter/source/dmapper/DomainMapperTableManager.hxx | 5
xmloff/source/draw/ximpshap.hxx | 3
63 files changed, 150 insertions(+), 181 deletions(-)
New commits:
commit 8a22bc93e0988188a87c0a787a9b32a7f74da84d
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Sat Oct 22 10:04:52 2016 +0200
update unnecessaryoverride plugin to find pure forwarding methods
which can be replaced with using declarations.
Is there a more efficient way to code the search? Seems to slow the
build down a little.
Change-Id: I08cda21fa70dce6572e1acc71bf5e6df36bb951f
Reviewed-on: https://gerrit.libreoffice.org/30157
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/compilerplugins/clang/unnecessaryoverride.cxx b/compilerplugins/clang/unnecessaryoverride.cxx
index b031c50..7136cc6 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 c7d32d0..16ce7a2 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 a5f8509..a7e0ec2 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 68586c6..3ddeca4 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 4908ab9..4ca7001 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 8be6633..f1d5212 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 76c1245..b1bd493 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 e8e84b7..6706598 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 68e5ccb..268d188 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 7c62c45..117f617 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 d082fc9..76a2cea 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 6a0b95a..5430920 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 6154097..d3841a1 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 e3d1f21..53fc2ff 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 0b1501d..9998f49 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 b773c25..ee21ebc 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 3b32064..f140a88 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 e50d947b..e91d9af 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 93a91af..900c212 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 836bb51..995b50d 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 95d9db4..d79e4d5 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 4ab1d05..e8c6683 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 68fef12..c1ad071 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 3e1f281..44250e8 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 5f180ea..ca0f5b6 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 58c20dd..d2a91cc 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 fd0aa8b..4598c26 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 8783895..18f3e44 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 119179e..4bf5d8c 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 3419ba0..463c659 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 1361ab0..376b500 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 76a14ad..0cc5e50 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 17e752e..3403bd1 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 8784ae3..56288b9 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 2eb028c..25e66e0 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 f604e9d..467e41c 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 4dabdef..b57737e 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 04bfbbd..4b000b59 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 f9876af..de1a0b4 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 3794300..97da8cc 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 ceb7ff9..f360981 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 5cddc42..a2b15a5a 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 e7001bd..cde1ed3 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 71c1d01..668127a 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 12dda23..5546f90 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 3fd7601..cdf060c 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 966596f..95725e6 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 dd1442e..34016a1 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 26521a73..e897606 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 c0cd1dc..b750e49 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 5a4278e..6440fc4 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 61e3f0d..766cf14a 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 4dd9647..88b8d5c 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 f87a707..0ec3d01 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 efbef6b..c6bbd1f 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 21e1d69..6386f4f 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 f46c7f8..ddb8440 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 1b1d797..6a69bed 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 dc4a8bd..6bc5eb3 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 f1b61c7..567f989 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 b43cf67..8e40de3 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 11e1a7b..330a20d 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 540abd3..fe35475 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 );
More information about the Libreoffice-commits
mailing list