diff options
| -rw-r--r-- | framework/source/fwe/classes/addonmenu.cxx | 6 | ||||
| -rw-r--r-- | framework/source/fwe/xml/menudocumenthandler.cxx | 10 | ||||
| -rw-r--r-- | include/framework/addonmenu.hxx | 3 |
3 files changed, 1 insertions, 18 deletions
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index ebfcb0a494ae..4fd79253dafb 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -55,12 +55,6 @@ AddonMenu::~AddonMenu() disposeOnce(); } -// Check if command URL string has the unique prefix to identify addon popup menus -bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL ) -{ - return aCmdURL.startsWith( ADDONSPOPUPMENU_URL_PREFIX_STR ); -} - AddonPopupMenu::AddonPopupMenu() : AddonMenu() { diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index ea6473771d77..a7d8bd0e1acf 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -22,7 +22,6 @@ #include <xml/menudocumenthandler.hxx> #include <framework/menuconfiguration.hxx> -#include <framework/addonmenu.hxx> #include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> @@ -790,14 +789,7 @@ void OWriteMenuDocumentHandler::WriteMenu( const Reference< XIndexAccess >& rMen ExtractMenuParameters( aProps, aCommandURL, aLabel, aHelpURL, xSubMenu, nType, nItemBits ); if ( xSubMenu.is() ) { - // special popup menus (filled during runtime) must be saved as an empty popup menu or menuitem!!! - if ( aCommandURL == ".uno:AddDirect" || - aCommandURL == ".uno:AutoPilotMenu" ) - { - WriteMenuItem( aCommandURL, aLabel, aHelpURL, nItemBits ); - bSeparator = false; - } - else if ( !aCommandURL.isEmpty() && !AddonPopupMenu::IsCommandURLPrefix( aCommandURL )) + if ( !aCommandURL.isEmpty() ) { ::comphelper::AttributeList* pListMenu = new ::comphelper::AttributeList; Reference< XAttributeList > xListMenu( static_cast<XAttributeList *>(pListMenu) , UNO_QUERY ); diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx index 859c1b428f8e..9da7ec714a69 100644 --- a/include/framework/addonmenu.hxx +++ b/include/framework/addonmenu.hxx @@ -48,9 +48,6 @@ class FWE_DLLPUBLIC AddonPopupMenu : public AddonMenu public: virtual ~AddonPopupMenu() override; - // Check if command URL string has the unique prefix to identify addon popup menus - static bool IsCommandURLPrefix( const OUString& aCmdURL ); - void SetCommandURL( const OUString& aCmdURL ) { m_aCommandURL = aCmdURL; } private: |