diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 10:07:15 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-04 10:07:15 +0000 |
commit | c2433529e68d52f00fd4f2a55afdffa2dead4cd2 (patch) | |
tree | d03b2ccf213d9f0a45f16d694eb059999c9289bf /framework | |
parent | ed437e1ac8df66f5741af5f321436e35beeaa8d0 (diff) |
INTEGRATION: CWS pb17 (1.15.36); FILE MERGED
2006/07/26 11:52:28 cd 1.15.36.1: #i67792# RetrieveImage must be virtual in base class toolbar manager. Images from add-on must have higher priority
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 031b2613ee75..29d3ca747c52 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -4,9 +4,9 @@ * * $RCSfile: toolbarmanager.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: hr $ $Date: 2006-06-19 11:06:04 $ + * last change: $Author: ihi $ $Date: 2006-08-04 11:07:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -174,7 +174,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< XEventListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); void CheckAndUpdateImages(); - void RefreshImages(); + virtual 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(); |