summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-02-21 08:38:35 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-02-21 14:25:44 +0000
commit42eb8d310c15e05fc224c9b7a61fdf4bf3118f70 (patch)
tree2269bc77bed95fd458d55f9d2da01e2aa8a8723a /vcl
parent4bb264574a9136ae39e5557b080d3f49a853ce6e (diff)
unwrap ifdefs with unused members
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/vcl/menu.hxx2
-rw-r--r--vcl/source/window/menu.cxx5
2 files changed, 1 insertions, 6 deletions
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index dd7f5c12168d..c2d10476461b 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -207,7 +207,7 @@ protected:
SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel );
public:
SAL_DLLPRIVATE void ImplKillLayoutData() const;
- SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const;
+ SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const { return pStartedFrom; }
Menu();
Menu( sal_Bool bMenuBar );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index fb8557de56c4..1f104f40cd7e 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -977,11 +977,6 @@ void Menu::ImplInit()
mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu( bIsMenuBar, this );
}
-Menu* Menu::ImplGetStartedFrom() const
-{
- return pStartedFrom;
-}
-
void Menu::ImplLoadRes( const ResId& rResId )
{
ResMgr* pMgr = rResId.GetResMgr();