diff options
| -rw-r--r-- | vcl/inc/vcl/toolbox.hxx | 2 | ||||
| -rwxr-xr-x | vcl/source/window/toolbox.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/toolbox2.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index a0842420f5a0..5badbc2d13bd 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -281,7 +281,6 @@ private: SAL_DLLPRIVATE void ImplHideFocus(); SAL_DLLPRIVATE void ImplUpdateInputEnable(); SAL_DLLPRIVATE void ImplFillLayoutData() const; - SAL_DLLPRIVATE void ImplUpdateCustomMenu(); SAL_DLLPRIVATE sal_Bool ImplHasClippedItems(); SAL_DLLPRIVATE Point ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) const; SAL_DLLPRIVATE void ImplExecuteCustomMenu(); @@ -599,6 +598,7 @@ public: sal_uInt16 GetMenuType() const; sal_Bool IsMenuEnabled() const; PopupMenu* GetMenu() const; + void UpdateCustomMenu(); void SetMenuButtonHdl( const Link& rLink ); const Link& GetMenuButtonHdl() const; diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 53c5de0c3fc0..989b49627438 100755 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -5729,7 +5729,7 @@ sal_Bool ToolBox::ImplOpenItem( KeyCode aKeyCode ) if( ImplCloseLastPopup( GetParent() ) ) return bRet; - ImplUpdateCustomMenu(); + UpdateCustomMenu(); Application::PostUserEvent( mpData->mnEventId, LINK( this, ToolBox, ImplCallExecuteCustomMenu ) ); } else if( mnHighItemId && ImplGetItem( mnHighItemId ) && diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 08ffb453b06a..348ecec00104 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -2175,7 +2175,7 @@ sal_Bool ToolBox::ImplHasClippedItems() return sal_False; } -void ToolBox::ImplUpdateCustomMenu() +void ToolBox::UpdateCustomMenu() { // fill clipped items into menu if( !IsMenuEnabled() ) @@ -2296,7 +2296,7 @@ void ToolBox::ExecuteCustomMenu() { // handle custom menu asynchronously // to avoid problems if the toolbox is closed during menu execute - ImplUpdateCustomMenu(); + UpdateCustomMenu(); Application::PostUserEvent( mpData->mnEventId, LINK( this, ToolBox, ImplCallExecuteCustomMenu ) ); } } |