summaryrefslogtreecommitdiff
path: root/sd/source
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 /sd/source
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 'sd/source')
-rw-r--r--sd/source/ui/app/optsitem.cxx5
-rw-r--r--sd/source/ui/inc/ViewShellBase.hxx2
-rw-r--r--sd/source/ui/inc/optsitem.hxx2
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx5
4 files changed, 2 insertions, 12 deletions
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)