diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-05-17 21:05:15 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-05-20 15:23:08 +0100 |
commit | 415b8e8e577b388b0b76f73c32066f8efa39d896 (patch) | |
tree | a2a645df2636f207bfdf58ffe91f41d60a79b19d | |
parent | 85cfb6009aa8ab4a4901d6b09c5da5096499d446 (diff) |
return by reference instead of pointer
-rw-r--r-- | sfx2/source/appl/sfxpicklist.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/inc/sfxpicklist.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index dfcc03c9d3..7b43139475 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -170,7 +170,7 @@ SfxPickList::PickListEntry* SfxPickList::GetPickListEntry( sal_uInt32 nIndex ) return 0; } -SfxPickList* SfxPickList::GetOrCreate( const sal_uInt32 nMenuSize ) +SfxPickList& SfxPickList::GetOrCreate( const sal_uInt32 nMenuSize ) { if ( !pUniqueInstance ) { @@ -179,13 +179,13 @@ SfxPickList* SfxPickList::GetOrCreate( const sal_uInt32 nMenuSize ) pUniqueInstance = new SfxPickList( nMenuSize ); } - return pUniqueInstance; + return *pUniqueInstance; } -SfxPickList* SfxPickList::Get() +SfxPickList& SfxPickList::Get() { ::osl::MutexGuard aGuard( thePickListMutex::get() ); - return pUniqueInstance; + return *pUniqueInstance; } void SfxPickList::Delete() @@ -258,10 +258,10 @@ void SfxPickList::CreatePickListEntries() void SfxPickList::CreateMenuEntries( Menu* pMenu ) { - static sal_Bool bPickListMenuInitializing = sal_False; - ::osl::MutexGuard aGuard( thePickListMutex::get() ); + static sal_Bool bPickListMenuInitializing = sal_False; + if ( bPickListMenuInitializing ) // method is not reentrant! return; @@ -295,7 +295,7 @@ void SfxPickList::ExecuteEntry( sal_uInt32 nIndex ) { ::osl::ClearableMutexGuard aGuard( thePickListMutex::get() ); - PickListEntry *pPick = SfxPickList::Get()->GetPickListEntry( nIndex ); + PickListEntry *pPick = SfxPickList::Get().GetPickListEntry( nIndex ); if ( pPick ) { @@ -327,7 +327,7 @@ void SfxPickList::ExecuteMenuEntry( sal_uInt16 nId ) String SfxPickList::GetMenuEntryTitle( sal_uInt32 nIndex ) { - PickListEntry *pPick = SfxPickList::Get()->GetPickListEntry( nIndex ); + PickListEntry *pPick = SfxPickList::Get().GetPickListEntry( nIndex ); if ( pPick ) return pPick->aTitle; diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 28845aa97b..987e1b9502 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -67,8 +67,8 @@ class SfxPickList : public SfxListener void RemovePickListEntries(); public: - static SfxPickList* GetOrCreate( const sal_uInt32 nMenuSize ); - static SfxPickList* Get(); + static SfxPickList& GetOrCreate( const sal_uInt32 nMenuSize ); + static SfxPickList& Get(); static void Delete(); sal_uInt32 GetAllowedMenuSize() { return m_nAllowedMenuSize; } diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index b9fd4146ce..457c0654c5 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -899,7 +899,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) // ggf. Pick-Menu erzeugen if ( pParent && pSVMenu == pParent->pPickMenu ) { - SfxPickList::Get()->CreateMenuEntries( pParent->pPickMenu ); + SfxPickList::Get().CreateMenuEntries( pParent->pPickMenu ); } else pPickMenu = pSVMenu->GetPopupMenu(SID_PICKLIST); @@ -1068,7 +1068,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu ) } else if ( nSlotId >= START_ITEMID_PICKLIST && nSlotId <= END_ITEMID_PICKLIST ) { - SfxPickList::Get()->ExecuteMenuEntry( nSlotId ); + SfxPickList::Get().ExecuteMenuEntry( nSlotId ); return sal_True; } |