diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-02-10 09:17:43 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-02-10 09:17:43 +0000 |
| commit | 08d98337b957ca896eafebd26146bd123c240b21 (patch) | |
| tree | f4c5304970f229c22fb0764e19e3b921749c97c3 /svx/source | |
| parent | 7c45ee7260ddf935c41839abe54bbbb564fe7806 (diff) | |
INTEGRATION: CWS c0301 (1.28.46); FILE MERGED
2006/02/07 09:36:19 pb 1.28.46.1: fix: #120971# special handling of '.uno.formatmenu' removed
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/cfg.cxx | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/svx/source/dialog/cfg.cxx b/svx/source/dialog/cfg.cxx index 0df3c505cdd7..99164816852b 100644 --- a/svx/source/dialog/cfg.cxx +++ b/svx/source/dialog/cfg.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cfg.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: rt $ $Date: 2006-02-07 10:16:25 $ + * last change: $Author: rt $ $Date: 2006-02-10 10:17:43 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1419,23 +1419,6 @@ void MenuSaveInData::ApplyMenu( { uno::Sequence< beans::PropertyValue > aPropValueSeq = ConvertSvxConfigEntry( m_xCommandToLabelMap, pEntry ); - - if ( pEntry->GetCommand().equalsAscii( ".uno:FormatMenu" )) - { - // Special popup menu "Format". It must be an empty popup menu! - uno::Reference< lang::XSingleComponentFactory > - xFactory( rMenuBar, uno::UNO_QUERY ); - - uno::Reference< container::XIndexContainer > - xSubMenuBar( xFactory->createInstanceWithContext( - m_xComponentContext ), uno::UNO_QUERY ); - - sal_Int32 nIndex = aPropValueSeq.getLength(); - aPropValueSeq.realloc( nIndex + 1 ); - aPropValueSeq[nIndex].Name = m_aDescriptorContainer; - aPropValueSeq[nIndex].Value <<= xSubMenuBar; - } - rMenuBar->insertByIndex( rMenuBar->getCount(), uno::makeAny( aPropValueSeq )); } |