diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-05 17:10:28 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-05 17:10:28 +0000 |
| commit | 1a8511c45b734e9913f0c512b0b2fd33b2b22b16 (patch) | |
| tree | 8d06e02a30e6eb8b14e1facf20513405778781f1 /framework | |
| parent | 2dbe7c600df66ed85cdbf225c7bad3e75c8da9cf (diff) | |
INTEGRATION: CWS iconswitching1 (1.10.4); FILE MERGED
2005/11/01 20:30:08 kendy 1.10.4.3: RESYNC: (1.10-1.11); FILE MERGED
2005/07/20 14:04:03 kendy 1.10.4.2: #i36518#
Implement the icon switching
2005/07/20 13:48:26 kendy 1.10.4.1: #i36518#
Cleanup after cutnpaste in CWS oooicons
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index f944814f28e9..177a8397de7a 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -4,9 +4,9 @@ * * $RCSfile: toolbarmanager.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2005-09-09 00:48:02 $ + * last change: $Author: kz $ $Date: 2006-01-05 18:10:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -165,7 +165,6 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener 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: struct ControllerParams @@ -248,6 +247,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener CommandToInfoMap m_aCommandMap; SubToolBarToSubToolBarControllerMap m_aSubToolBarControllerMap; Timer m_aAsyncUpdateControllersTimer; + sal_Int16 m_nSymbolsStyle; }; } |