diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-21 12:15:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:29 +0200 |
| commit | f61dbc302975aaa253b00ea6b141bb12474b3c95 (patch) | |
| tree | 7150ea10f0111c4e6677030ac568c7be03424e08 /cui | |
| parent | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (diff) | |
followup code removal after changing virtual methods to non-virtual
This cleanups up indentation and removes dead classes.
This is a followup patch to commit
272b1dd55797aacf511fb4342b0054e3697243f6
"new loplugin: change virtual methods to non-virtual"
Change-Id: I1c2139589cf8cb23bb9808defe22c51039d38de1
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/factory/dlgfact.hxx | 14 | ||||
| -rw-r--r-- | cui/source/inc/iconcdlg.hxx | 6 | ||||
| -rw-r--r-- | cui/source/inc/macroass.hxx | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 8c7420f858f4..0f12a217a8af 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -511,7 +511,7 @@ class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory public: virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE; virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE; - SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId, + SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId, vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame, const SfxItemSet* pAttrSet=0 ); @@ -519,12 +519,14 @@ public: const SfxItemSet& rAttr, const SdrView* pView, sal_uInt32 nResId ) SAL_OVERRIDE; - virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, + virtual SfxAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxItemSet& rAttr, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame, - sal_uInt32 nResId - ) SAL_OVERRIDE; - virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, sal_uInt32 nResId, const OUString& rParameter ) SAL_OVERRIDE; + const css::uno::Reference< css::frame::XFrame >& _rxFrame, + sal_uInt32 nResId ) SAL_OVERRIDE; + virtual VclAbstractDialog* CreateFrameDialog( vcl::Window* pParent, + const css::uno::Reference< css::frame::XFrame >& rxFrame, + sal_uInt32 nResId, + const OUString& rParameter ) SAL_OVERRIDE; virtual SfxAbstractTabDialog* CreateTabDialog( sal_uInt32 nResId, vcl::Window* pParent, const SfxItemSet* pAttrSet, diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index c98fe8cd4e95..29317d3ecaf2 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -112,9 +112,9 @@ public : virtual int DeactivatePage( SfxItemSet* pSet = 0 ); void SetUserData(const OUString& rString) { aUserString = rString; } OUString GetUserData() { return aUserString; } - void FillUserData(); - bool IsReadOnly() const; - virtual bool QueryClose(); + void FillUserData(); + bool IsReadOnly() const; + virtual bool QueryClose(); void StateChanged( StateChangedType nType ) SAL_OVERRIDE; void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 22c70eb36350..c0e4fd66492b 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -63,7 +63,7 @@ public: const SvxMacroTableDtor& GetMacroTbl() const; void SetMacroTbl( const SvxMacroTableDtor& rTbl ); - void ScriptChanged(); + void ScriptChanged(); virtual void PageCreated (const SfxAllItemSet& aSet) SAL_OVERRIDE; using TabPage::ActivatePage; // FIXME WTF is this nonsense? virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; |