diff options
author | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:12:28 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2005-07-12 13:12:28 +0000 |
commit | 3843bd6a58ea0f4ed25e08572f3e078618b89f06 (patch) | |
tree | 257b2087d6d7155b931b6f1916f9d2f81854dd6b /framework | |
parent | 828eba88a97a38a74850bbff0a94fe44d94f271c (diff) |
INTEGRATION: CWS fwk16 (1.9.54); FILE MERGED
2005/07/07 07:56:13 cd 1.9.54.1: #124193# Fix potential crash on toolbarmanager dtor. As this class gets disposed it must destroy it members in the dispose method and not in the dtor
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 9b534d0c1281..d241cca95a27 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -2,9 +2,9 @@ * * $RCSfile: toolbarmanager.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2005-03-21 14:02:18 $ + * last change: $Author: kz $ $Date: 2005-07-12 14:12:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -190,6 +190,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener void RefreshImages(); void FillToolbar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rToolBarData ); void notifyRegisteredControllers( const rtl::OUString& aUIElementName, const rtl::OUString& aCommand ); + void Destroy(); static sal_Int16 GetCurrentSymbolSize(); protected: |