summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-05-08 23:35:15 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-05-08 23:47:23 +0200
commit27cff71ce4db252d78d144411233c85adc114f5c (patch)
treebed2dcf0db8e7302bb8db47d2dc0540716d82425 /vcl
parent9a744dea1dccb73d77e38ed06d1275f00425a65b (diff)
loplugin:staticmethods
Change-Id: Ie99d1dd241dc2bfa5c5ac2bff9f2330c491327bc
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/osx/salmenu.h1
-rw-r--r--vcl/osx/salmenu.cxx32
2 files changed, 18 insertions, 15 deletions
diff --git a/vcl/inc/osx/salmenu.h b/vcl/inc/osx/salmenu.h
index cac87f023b23..1419050c484d 100644
--- a/vcl/inc/osx/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -50,7 +50,6 @@ private:
std::vector< MenuBarButtonEntry > maButtons;
MenuBarButtonEntry* findButtonItem( sal_uInt16 i_nItemId );
- void releaseButtonEntry( MenuBarButtonEntry& i_rEntry );
static void statusLayout();
public:
AquaSalMenu( bool bMenuBar );
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 61e7b766dad6..4d7fb8f5c9c4 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -39,6 +39,24 @@
#include <objc/objc-runtime.h>
+namespace {
+
+void releaseButtonEntry( AquaSalMenu::MenuBarButtonEntry& i_rEntry )
+{
+ if( i_rEntry.mpNSImage )
+ {
+ [i_rEntry.mpNSImage release];
+ i_rEntry.mpNSImage = nil;
+ }
+ if( i_rEntry.mpToolTipString )
+ {
+ [i_rEntry.mpToolTipString release];
+ i_rEntry.mpToolTipString = nil;
+ }
+}
+
+}
+
const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL;
@interface MainMenuSelector : NSObject
@@ -797,20 +815,6 @@ void AquaSalMenu::statusLayout()
}
}
-void AquaSalMenu::releaseButtonEntry( MenuBarButtonEntry& i_rEntry )
-{
- if( i_rEntry.mpNSImage )
- {
- [i_rEntry.mpNSImage release];
- i_rEntry.mpNSImage = nil;
- }
- if( i_rEntry.mpToolTipString )
- {
- [i_rEntry.mpToolTipString release];
- i_rEntry.mpToolTipString = nil;
- }
-}
-
bool AquaSalMenu::AddMenuBarButton( const SalMenuButtonItem& i_rNewItem )
{
if( ! mbMenuBar || ! VisibleMenuBar() )