summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-22 10:04:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-28 12:56:17 +0000
commit8a22bc93e0988188a87c0a787a9b32a7f74da84d (patch)
tree5b0c9bd79ee88be0754687fe552729e8470f5db2 /include
parent99fbcffa3d85c00770977e205626493ec2be1883 (diff)
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@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/dbaccess/genericcontroller.hxx2
-rw-r--r--include/editeng/acorrcfg.hxx4
-rw-r--r--include/editeng/cmapitem.hxx4
-rw-r--r--include/editeng/crossedoutitem.hxx4
-rw-r--r--include/editeng/udlnitem.hxx4
-rw-r--r--include/editeng/unoedhlp.hxx2
-rw-r--r--include/oox/dump/oledumper.hxx1
-rw-r--r--include/svl/filerec.hxx4
-rw-r--r--include/svtools/ctrlbox.hxx5
-rw-r--r--include/svtools/headbar.hxx3
-rw-r--r--include/svtools/simptabl.hxx2
-rw-r--r--include/svtools/wizardmachine.hxx4
-rw-r--r--include/svx/galmisc.hxx1
-rw-r--r--include/vcl/tabctrl.hxx6
14 files changed, 14 insertions, 32 deletions
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; }