summaryrefslogtreecommitdiff
path: root/cui/source/inc/macroass.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-06-10 09:37:39 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-06-10 08:28:36 +0000
commitfebeefc6c7b4d48d6371eaf8664fc7f9ab2ab5d3 (patch)
tree9bda7d5779b61c32550a0744e3d1ce3950a585df /cui/source/inc/macroass.hxx
parent8970f569f1309d16d3686c75925810c94504f891 (diff)
loplugin:mergeclasses SfxMacroTabPage
Change-Id: I74790c665fbd191914291365ce711fea9f1cf320 Reviewed-on: https://gerrit.libreoffice.org/26147 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui/source/inc/macroass.hxx')
-rw-r--r--cui/source/inc/macroass.hxx23
1 files changed, 8 insertions, 15 deletions
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 0dc1c9c31e56..1ec314f035f7 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -32,7 +32,7 @@ class SvTabListBox;
class SvTreeListBox;
class SfxMacroTabPage_Impl;
-class SfxMacroTabPage_ : public SfxTabPage
+class SfxMacroTabPage : public SfxTabPage
{
SvxMacroTableDtor aTbl;
DECL_DLLPRIVATE_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void );
@@ -45,9 +45,7 @@ class SfxMacroTabPage_ : public SfxTabPage
DECL_DLLPRIVATE_LINK_TYPED( TimeOut_Impl, Idle*, void );
protected:
- SfxMacroTabPage_Impl* mpImpl;
-
- SfxMacroTabPage_( vcl::Window* pParent, const SfxItemSet& rItemSet );
+ SfxMacroTabPage_Impl* mpImpl;
void InitAndSetHandler();
void FillEvents();
@@ -55,8 +53,13 @@ protected:
void EnableButtons();
public:
+ SfxMacroTabPage(
+ vcl::Window* pParent,
+ const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame,
+ const SfxItemSet& rSet
+ );
- virtual ~SfxMacroTabPage_();
+ virtual ~SfxMacroTabPage();
virtual void dispose() override;
void AddEvent( const OUString & rEventName, sal_uInt16 nEventId );
@@ -72,16 +75,6 @@ public:
virtual void Reset( const SfxItemSet* rSet ) override;
bool IsReadOnly() const override;
-};
-
-class SfxMacroTabPage : public SfxMacroTabPage_
-{
-public:
- SfxMacroTabPage(
- vcl::Window* pParent,
- const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame,
- const SfxItemSet& rSet
- );
// --------- inherit from the base -------------
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );