diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-02-02 15:38:53 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-02-02 15:38:53 +0000 |
| commit | 11d84f305fc036727458d8b076c112feb997a7f9 (patch) | |
| tree | d4e9358102972f7e921dbb1b153e21e2cf6dd0ad | |
| parent | 99abc4cabe501a4648fccc334974a5fdc2ae1e8c (diff) | |
INTEGRATION: CWS fwkbetashowstop01 (1.3.166); FILE MERGED
2005/01/31 17:34:32 cd 1.3.166.1: #i39268# Format menu must be saved completely
| -rw-r--r-- | framework/source/xml/menudocumenthandler.cxx | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/framework/source/xml/menudocumenthandler.cxx b/framework/source/xml/menudocumenthandler.cxx index 4209e4a40943..0a358afbe892 100644 --- a/framework/source/xml/menudocumenthandler.cxx +++ b/framework/source/xml/menudocumenthandler.cxx @@ -2,9 +2,9 @@ * * $RCSfile: menudocumenthandler.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2004-05-03 13:23:36 $ + * last change: $Author: rt $ $Date: 2005-02-02 16:38:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -156,7 +156,6 @@ static const sal_Int32 CMD_PROTOCOL_SIZE = 5; static const char CMD_PROTOCOL[] = ".uno:"; static const char ADDDIRECT_CMD[] = ".uno:AddDirect" ; static const char AUTOPILOTMENU_CMD[] = ".uno:AutoPilotMenu" ; -static const char FORMATMENU_CMD[] = ".uno:FormatMenu" ; static const char FILEMENU_CMD[] = ".uno:Picklist" ; static const char WINDOWMENU_CMD[] = ".uno:WindowList" ; @@ -892,26 +891,6 @@ throw ( SAXException, RuntimeException ) WriteMenuItem( aCommandURL, aLabel, aHelpURL ); bSeparator = sal_False; } - else if ( aCommandURL.equalsAscii( FORMATMENU_CMD )) - { - // special popup menu - must be written as empty popup! - AttributeListImpl* pListMenu = new AttributeListImpl; - Reference< XAttributeList > xListMenu( (XAttributeList *)pListMenu , UNO_QUERY ); - - pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), - m_aAttributeType, - aCommandURL ); - - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - bSeparator = FALSE; - } else if (( aCommandURL.getLength() > 0 ) && !AddonPopupMenu::IsCommandURLPrefix ( aCommandURL )) { AttributeListImpl* pListMenu = new AttributeListImpl; |