diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-21 08:38:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-21 14:25:44 +0000 |
| commit | 42eb8d310c15e05fc224c9b7a61fdf4bf3118f70 (patch) | |
| tree | 2269bc77bed95fd458d55f9d2da01e2aa8a8723a /sfx2 | |
| parent | 4bb264574a9136ae39e5557b080d3f49a853ce6e (diff) | |
unwrap ifdefs with unused members
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/inc/sfx2/mnuitem.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 5 | ||||
| -rw-r--r-- | sfx2/source/menu/thessubmenu.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/menu/thessubmenu.hxx | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx index 62ebce679ed4..88871d598084 100644 --- a/sfx2/inc/sfx2/mnuitem.hxx +++ b/sfx2/inc/sfx2/mnuitem.hxx @@ -138,7 +138,7 @@ protected: DECL_LINK( Activate, Menu * ); public: - SFX_DECL_MENU_CONTROL(); + static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings ); ~SfxAppMenuControl_Impl(); }; diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 4f6e1b4e147f..c01f7b37a3b7 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -303,7 +303,10 @@ PopupMenu* SfxMenuControl::GetPopup () const long Select_Impl( void* pHdl, void* pVoid ); -SFX_IMPL_MENU_CONTROL( SfxAppMenuControl_Impl, SfxStringItem ); +SfxMenuControl* SfxAppMenuControl_Impl::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ) +{ + return new SfxAppMenuControl_Impl(nId, rMenu, rBindings); +} SfxAppMenuControl_Impl::SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings ) diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx index 318b287173f7..1bda672e3610 100644 --- a/sfx2/source/menu/thessubmenu.cxx +++ b/sfx2/source/menu/thessubmenu.cxx @@ -53,9 +53,10 @@ using ::rtl::OUString; // STATIC DATA ----------------------------------------------------------- -SFX_IMPL_MENU_CONTROL(SfxThesSubMenuControl, SfxStringItem); - - +SfxMenuControl* SfxThesSubMenuControl::CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ) +{ + return new SfxThesSubMenuControl(nId, rMenu, rBindings); +} /* Constructor; sets the Select-Handler for the Menu and inserts it into diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx index 8ec3977f318b..b177b112d58a 100644 --- a/sfx2/source/menu/thessubmenu.hxx +++ b/sfx2/source/menu/thessubmenu.hxx @@ -57,7 +57,7 @@ public: virtual PopupMenu* GetPopup() const; - SFX_DECL_MENU_CONTROL(); + static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); }; |