diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 16:24:54 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 16:24:54 +0000 |
| commit | df4c3080302f1e71837cc33952a39caa1d2d2df5 (patch) | |
| tree | 3780aa9a4e7152f070d9b613f93894e2cbe46bcd /framework/source | |
| parent | 92f541be50755ade3e18ac60d31b696e36717a46 (diff) | |
INTEGRATION: CWS fwk79 (1.36.2); FILE MERGED
2007/12/13 06:18:24 cd 1.36.2.1: #i84193# Add merged command URLs to the list of dirty images
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 3531e65b1dbf..21187f111983 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: toolbarmanager.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: obo $ $Date: 2008-01-04 16:23:17 $ + * last change: $Author: ihi $ $Date: 2008-01-14 17:24:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1406,6 +1406,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine m_pToolBar, aRefPoint.nPos, nItemId, + m_aCommandMap, m_aModuleIdentifier, rInstruction.aMergeCommand, rInstruction.aMergeCommandParameter, @@ -1417,6 +1418,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine m_pToolBar, aRefPoint.nPos, nItemId, + m_aCommandMap, m_aModuleIdentifier, rInstruction.aMergeCommand, rInstruction.aMergeFallback, @@ -1489,6 +1491,8 @@ void ToolBarManager::RequestImages() pIter = m_aCommandMap.begin(); while ( pIter != m_aCommandMap.end() ) { + rtl::OUString aCommandURL = aCmdURLSeq[i]; + Image aImage; if ( aDocGraphicSeq.getLength() > 0 ) aImage = Image( aDocGraphicSeq[i] ); |