Kill .src based Writer context menus

Change-Id: I854e2dd48b2f59b561c0d0cd3e52297046d25b96

12 files changed, 4 insertions, 1679 deletions

diff --git a/include/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h
index 3769ea9853e8..bcfa15d42c22 100644
--- a/include/sfx2/sfxcommands.h
+++ b/include/sfx2/sfxcommands.h
@@ -36,9 +36,6 @@
 #define CMD_SID_OPENDOC                             ".uno:Open"
 #define CMD_SID_GALLERY_BG_BRUSH                    ".uno:BackgroundImage"
 #define CMD_SID_PASTE                               ".uno:Paste"
-#define CMD_SID_PASTE_SPECIAL                       ".uno:PasteSpecial"
-#define CMD_SID_PASTE_UNFORMATTED                   ".uno:PasteUnformatted"
-#define CMD_SID_PRINTPREVIEW                        ".uno:PrintPreview"
 #define CMD_SID_RELOAD                              ".uno:Reload"
 #define CMD_SID_BASICIDE_RENAMECURRENT              ".uno:RenameCurrent"
 #define CMD_SID_UNICODE_NOTATION_TOGGLE             ".uno:UnicodeNotationToggle"
diff --git a/include/svx/SmartTagCtl.hxx b/include/svx/SmartTagCtl.hxx
deleted file mode 100644
index 458966d54f7b..000000000000
--- a/include/svx/SmartTagCtl.hxx
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_SMARTTAGCTL_HXX
-#define INCLUDED_SVX_SMARTTAGCTL_HXX
-
-#include <tools/link.hxx>
-#include <sfx2/mnuitem.hxx>
-#include <svx/svxdllapi.h>
-#include <com/sun/star/uno/Reference.hxx>
-
-#include <memory>
-#include <vector>
-
-class SfxBindings;
-class SvxSmartTagItem;
-class PopupMenu;
-
-namespace com { namespace sun { namespace star { namespace smarttags {
-    class XSmartTagAction;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace container {
-    class XStringKeyMap;
-} } } }
-
-// class SvxFontMenuControl ----------------------------------------------
-
-class SVX_DLLPUBLIC SvxSmartTagsControl : public SfxMenuControl
-{
-private:
-    std::unique_ptr< PopupMenu > mpMenu;
-    std::vector< std::unique_ptr< PopupMenu > > maSubMenus;
-    Menu&                       mrParent;
-    std::unique_ptr< const SvxSmartTagItem >    mpSmartTagItem;
-
-    struct InvokeAction
-    {
-        css::uno::Reference< css::smarttags::XSmartTagAction > mxAction;
-        css::uno::Reference< css::container::XStringKeyMap > mxSmartTagProperties;
-        sal_uInt32 mnActionID;
-        InvokeAction( css::uno::Reference< css::smarttags::XSmartTagAction > xAction,
-                      css::uno::Reference< css::container::XStringKeyMap > xSmartTagProperties,
-                      sal_uInt32 nActionID ) : mxAction( xAction ), mxSmartTagProperties( xSmartTagProperties ), mnActionID( nActionID ) {}
-    };
-
-    std::vector< InvokeAction > maInvokeActions;
-
-    void            FillMenu();
-    DECL_LINK_TYPED( MenuSelect, Menu *, bool);
-    virtual void    StateChanged( sal_uInt16 nSID, SfxItemState eState,
-                                  const SfxPoolItem* pState ) override;
-
-public:
-    SvxSmartTagsControl( sal_uInt16 nId, Menu&, SfxBindings& );
-    virtual ~SvxSmartTagsControl();
-
-    SFX_DECL_MENU_CONTROL();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index d5d6eaeaa9bf..1149e3df10d3 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -43,7 +43,6 @@
 #define CMD_SID_ATTR_CHAR_FONT                      ".uno:CharFontName"
 #define CMD_SID_FM_CHECKBOX                         ".uno:CheckBox"
 #define CMD_SID_FM_COMBOBOX                         ".uno:ComboBox"
-#define CMD_SID_CONTOUR_DLG                         ".uno:ContourDialog"
 #define CMD_SID_FM_CONVERTTO_BUTTON                 ".uno:ConvertToButton"
 #define CMD_SID_FM_CONVERTTO_CHECKBOX               ".uno:ConvertToCheckBox"
 #define CMD_SID_FM_CONVERTTO_COMBOBOX               ".uno:ConvertToCombo"
@@ -131,7 +130,6 @@
 #define CMD_SID_TABLE_SELECT_COL                    ".uno:EntireColumn"
 #define CMD_SID_TABLE_SELECT_ROW                    ".uno:EntireRow"
 #define CMD_SID_FORMAT_TABLE_DLG                    ".uno:TableDialog"
-#define CMD_SID_OPEN_SMARTTAGMENU                   ".uno:OpenSmartTagMenuOnCursor"
 #define CMD_SID_TABLE_INSERT_COL_DLG                ".uno:InsertColumnDialog"
 #define CMD_SID_TABLE_INSERT_ROW_DLG                ".uno:InsertRowDialog"
 
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 6f70a783be7b..c26c0366487d 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -165,7 +165,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/mnuctrls/clipboardctl \
     svx/source/mnuctrls/fntctl \
     svx/source/mnuctrls/fntszctl \
-    svx/source/mnuctrls/SmartTagCtl \
     svx/source/mnuctrls/smarttagmenu \
     svx/source/sidebar/ContextChangeEventMultiplexer \
     svx/source/sidebar/EmptyPanel \
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 65f31cc8513d..5701b9967d33 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -48,11 +48,6 @@
     Command = ".uno:FontDialog" ; \
     Text [ en-US ] = "C~haracter..." ;\
 
-#define ITEM_FORMAT_PARA_DLG \
-    Identifier = SID_PARA_DLG ; \
-    Command = ".uno:ParagraphDialog" ; \
-    Text [ en-US ] = "P~aragraph..." ;\
-
 #define ITEM_FORMAT_FONTWORK \
     Identifier = SID_FONTWORK ; \
     Command = ".uno:FontWork" ; \
@@ -218,11 +213,6 @@
     Command = ".uno:FormatArea" ; \
     Text [ en-US ] = "A~rea..." ;\
 
-#define ITEM_FORMAT_ATTR_TRANSFORM \
-    Identifier = SID_ATTR_TRANSFORM ; \
-    Command = ".uno:TransformDialog" ; \
-    Text [ en-US ] = "Position and Si~ze..." ;\
-
 #define ITEM_FORMAT_OBJECT_HEAVEN \
     Identifier = SID_OBJECT_HEAVEN ; \
     Command = ".uno:SetObjectToForeground" ; \
@@ -248,11 +238,6 @@
     Command = ".uno:ExternalEdit" ; \
     Text [ en-US ] = "Edit with External Tool..." ; \
 
-#define ITEM_OBJECT_CROP \
-    Identifier = SID_OBJECT_CROP ; \
-    Command = ".uno:Crop" ; \
-    Text [ en-US ] = "Crop I~mage" ; \
-
 #define ITEM_COMPRESS_GRAPHIC \
     Identifier = SID_COMPRESS_GRAPHIC ; \
     Command = ".uno:CompressGraphic" ; \
@@ -268,11 +253,6 @@
     Command = ".uno:ChangePicture" ; \
     Text [ en-US ] = "Replace Image..." ; \
 
-#define ITEM_VIEW_ATTR_ZOOM \
-    Identifier = SID_ATTR_ZOOM ; \
-    Command = ".uno:Zoom" ; \
-    Text [ en-US ] = "~Zoom..." ; \
-
 #define ITEM_FORMAT_NUMBERING \
     MenuItem\
     {\
@@ -376,66 +356,6 @@
     };
 
 /*------------------------------------------------------------------------
-                             Context Menus
-------------------------------------------------------------------------*/
-
-#define ITEM_POPUP_TEMPLATE_EDIT \
-    Identifier = SID_STYLE_EDIT ; \
-    Command = ".uno:EditStyle" ; \
-    Text [ en-US ] = "Edit Paragraph Style..." ; \
-
- // Gruppen-/Kombination-Funktionen
-#define ITEM_POPUP_GROUP \
-    Identifier = SID_GROUP ; \
-    Command = ".uno:FormatGroup" ; \
-    Text [ en-US ] = "~Group" ; \
-
-#define ITEM_POPUP_UNGROUP \
-    Identifier = SID_UNGROUP ; \
-    Command = ".uno:FormatUngroup" ; \
-    Text [ en-US ] = "~Ungroup" ; \
-
-#define ITEM_POPUP_ENTER_GROUP \
-    Identifier = SID_ENTER_GROUP ; \
-    Command = ".uno:EnterGroup" ; \
-    Text [ en-US ] = "~Enter Group" ; \
-
-#define ITEM_POPUP_LEAVE_GROUP \
-    Identifier = SID_LEAVE_GROUP ; \
-    Command = ".uno:LeaveGroup" ; \
-    Text [ en-US ] = "E~xit Group" ; \
-
-#define ITEM_GROUP_MENU \
-    MenuItem\
-    {\
-        Identifier = SID_MN_GROUP ; \
-        Command = ".uno:GroupMenu" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    ITEM_POPUP_GROUP\
-                };\
-                MenuItem\
-                {\
-                    ITEM_POPUP_UNGROUP\
-                };\
-                MenuItem\
-                {\
-                    ITEM_POPUP_ENTER_GROUP\
-                };\
-                MenuItem\
-                {\
-                    ITEM_POPUP_LEAVE_GROUP\
-                };\
-            };\
-        };\
-        Text [ en-US ] = "~Group" ; \
-            };
-
-/*------------------------------------------------------------------------
                              Toolbar-IDs
 ------------------------------------------------------------------------*/
 
@@ -542,11 +462,6 @@
     Command = CMD_SID_OPEN_HYPERLINK; \
     Text [ en-US ] = "~Open Hyperlink" ;    \
 
-#define ITEM_OPEN_SMARTTAGMENU \
-    Identifier = SID_OPEN_SMARTTAGMENU ; \
-    Command = CMD_SID_OPEN_SMARTTAGMENU; \
-    Text [ en-US ] = "Open ~Smart Tag Menu" ;   \
-
 #endif // #ifndef _GLOBLMN_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
deleted file mode 100644
index ab7d1fd1a63e..000000000000
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ /dev/null
@@ -1,199 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <svx/SmartTagCtl.hxx>
-#include <com/sun/star/smarttags/XSmartTagAction.hpp>
-#include <com/sun/star/container/XStringKeyMap.hpp>
-#include <svtools/stdmenu.hxx>
-#include <svl/eitem.hxx>
-#include <sfx2/dispatch.hxx>
-#include <svx/svxids.hrc>
-
-#include <svx/SmartTagItem.hxx>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-
-SFX_IMPL_MENU_CONTROL(SvxSmartTagsControl, SvxSmartTagItem);
-
-
-
-SvxSmartTagsControl::SvxSmartTagsControl
-(
-    sal_uInt16          _nId,
-    Menu&           rMenu,
-    SfxBindings&    /*rBindings*/
-) :
-    mpMenu  ( new PopupMenu ),
-    mrParent    ( rMenu ),
-    mpSmartTagItem( nullptr )
-{
-    rMenu.SetPopupMenu( _nId, mpMenu.get() );
-}
-
-
-
-const sal_uInt16 MN_ST_INSERT_START = 500;
-
-void SvxSmartTagsControl::FillMenu()
-{
-    if ( !mpSmartTagItem )
-        return;
-
-    sal_uInt16 nMenuPos = 0;
-    sal_uInt16 nSubMenuPos = 0;
-    sal_uInt16 nMenuId = 1;
-    sal_uInt16 nSubMenuId = MN_ST_INSERT_START;
-
-    const Sequence < Sequence< Reference< smarttags::XSmartTagAction > > >& rActionComponentsSequence = mpSmartTagItem->GetActionComponentsSequence();
-    const Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence = mpSmartTagItem->GetActionIndicesSequence();
-    const Sequence< Reference< container::XStringKeyMap > >& rStringKeyMaps = mpSmartTagItem->GetStringKeyMaps();
-    const lang::Locale& rLocale = mpSmartTagItem->GetLocale();
-    const OUString aApplicationName = mpSmartTagItem->GetApplicationName();
-    const OUString aRangeText = mpSmartTagItem->GetRangeText();
-    const Reference<text::XTextRange>& xTextRange = mpSmartTagItem->GetTextRange();
-    const Reference<frame::XController>& xController = mpSmartTagItem->GetController();
-
-    for ( sal_Int32 j = 0; j < rActionComponentsSequence.getLength(); ++j )
-    {
-        Reference< container::XStringKeyMap > xSmartTagProperties = rStringKeyMaps[j];
-
-        // Get all actions references associated with the current smart tag type:
-        const Sequence< Reference< smarttags::XSmartTagAction > >& rActionComponents = rActionComponentsSequence[j];
-        const Sequence< sal_Int32 >& rActionIndices = rActionIndicesSequence[j];
-
-        if ( 0 == rActionComponents.getLength() || 0 == rActionIndices.getLength() )
-            continue;
-
-        // Ask first entry for the smart tag type caption:
-        Reference< smarttags::XSmartTagAction > xAction = rActionComponents[0];
-
-        if ( !xAction.is() )
-            continue;
-
-        const sal_Int32 nSmartTagIndex = rActionIndices[0];
-        const OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex );
-        const OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale);
-
-        // no sub-menus if there's only one smart tag type listed:
-        PopupMenu* pSbMenu = mpMenu.get();
-        if ( 1 < rActionComponentsSequence.getLength() )
-        {
-            mpMenu->InsertItem(nMenuId, aSmartTagCaption, MenuItemBits::NONE, OString(), nMenuPos++);
-            pSbMenu = new PopupMenu;
-            mpMenu->SetPopupMenu( nMenuId++, pSbMenu );
-            maSubMenus.push_back( std::unique_ptr< PopupMenu >( pSbMenu ) );
-        }
-        pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl, MenuSelect ) );
-
-        // sub-menu starts with smart tag caption and separator
-        const OUString aSmartTagCaption2 = aSmartTagCaption + ": " + aRangeText;
-        nSubMenuPos = 0;
-        pSbMenu->InsertItem(nMenuId++, aSmartTagCaption2, MenuItemBits::NOSELECT, OString(), nSubMenuPos++);
-        pSbMenu->InsertSeparator(OString(), nSubMenuPos++);
-
-        // Add subitem for every action reference for the current smart tag type:
-        for ( sal_Int32 i = 0; i < rActionComponents.getLength(); ++i )
-        {
-            xAction = rActionComponents[i];
-
-            for ( sal_Int32 k = 0; k < xAction->getActionCount( aSmartTagType, xController, xSmartTagProperties ); ++k )
-            {
-                const sal_uInt32 nActionID = xAction->getActionID( aSmartTagType, k, xController );
-                OUString aActionCaption = xAction->getActionCaptionFromID( nActionID,
-                                                                                aApplicationName,
-                                                                                rLocale,
-                                                                                xSmartTagProperties,
-                                                                                aRangeText,
-                                                                                OUString(),
-                                                                                xController,
-                                                                                xTextRange );
-
-                pSbMenu->InsertItem( nSubMenuId++, aActionCaption, MenuItemBits::NONE, OString(), nSubMenuPos++ );
-                InvokeAction aEntry( xAction, xSmartTagProperties, nActionID );
-                maInvokeActions.push_back( aEntry );
-            }
-        }
-    }
-}
-
-
-
-void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
-
-{
-    mrParent.EnableItem( GetId(), SfxItemState::DISABLED != eState );
-
-    if ( SfxItemState::DEFAULT == eState )
-    {
-        const SvxSmartTagItem* pSmartTagItem = dynamic_cast<const SvxSmartTagItem*>( pState  );
-        if ( nullptr != pSmartTagItem )
-        {
-            mpSmartTagItem.reset( new SvxSmartTagItem( *pSmartTagItem ) );
-            FillMenu();
-        }
-    }
-}
-
-
-
-IMPL_LINK_TYPED( SvxSmartTagsControl, MenuSelect, Menu *, pMen, bool )
-{
-    if ( !mpSmartTagItem )
-        return false;
-
-    sal_uInt16 nMyId = pMen->GetCurItemId();
-
-    if ( nMyId < MN_ST_INSERT_START)
-        return false;
-
-    nMyId -= MN_ST_INSERT_START;
-
-    // compute smarttag lib index and action index
-    Reference< smarttags::XSmartTagAction > xSmartTagAction = maInvokeActions[ nMyId ].mxAction;
-
-    // execute action
-    if ( xSmartTagAction.is() )
-    {
-        xSmartTagAction->invokeAction( maInvokeActions[ nMyId ].mnActionID,
-                                       mpSmartTagItem->GetApplicationName(),
-                                       mpSmartTagItem->GetController(),
-                                       mpSmartTagItem->GetTextRange(),
-                                       maInvokeActions[ nMyId ].mxSmartTagProperties,
-                                       mpSmartTagItem->GetRangeText(),
-                                       OUString(),
-                                       mpSmartTagItem->GetLocale() );
-    }
-
-    // ohne dispatcher!!!
-    // GetBindings().Execute( GetId(), SfxCallMode::RECORD,meine beiden items, 0L );*/
-    //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, sal_True);
-    //GetBindings().GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SfxCallMode::ASYNCHRON, &aBool, 0L );
-
-    return false;
-}
-
-SvxSmartTagsControl::~SvxSmartTagsControl()
-{
-}
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 5a4c351dc498..aa0d9d1a8f33 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -119,10 +119,8 @@
 #define HID_MN_SUB_FIELD                                        "SW_HID_MN_SUB_FIELD"
 #define HID_MN_SUB_GRAPHIC                                      "SW_HID_MN_SUB_GRAPHIC"
 #define HID_MN_SUB_TEMPLATES                                    "SW_HID_MN_SUB_TEMPLATES"
-#define HID_MN_SUB_ARRANGE                                      "SW_HID_MN_SUB_ARRANGE"
 #define HID_MN_SUB_SPELLING                                     "SW_HID_MN_SUB_SPELLING"
 #define HID_MN_SUB_MIRROR                                       "SW_HID_MN_SUB_MIRROR"
-#define HID_MN_SUB_ALIGN                                        "SW_HID_MN_SUB_ALIGN"
 
 #define HID_MN_CALC_PHD                                         "SW_HID_MN_CALC_PHD"
 #define HID_MN_CALC_SQRT                                        "SW_HID_MN_CALC_SQRT"
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index 4478a4d5b88a..6a235d87bc2a 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -20,88 +20,32 @@
 #define INCLUDED_SW_INC_SWCOMMANDS_H
 
 #define CMD_SID_CREATE_SW_DRAWVIEW                  ".uno:CreateSWDrawView"
-#define CMD_FN_ADD_TEXT_BOX                         ".uno:AddTextBox"
-#define CMD_FN_FRAME_ALIGN_VERT_BOTTOM              ".uno:AlignBottom"
-#define CMD_FN_FRAME_ALIGN_HORZ_CENTER              ".uno:AlignHorizontalCenter"
-#define CMD_FN_FRAME_ALIGN_HORZ_LEFT                ".uno:AlignLeft"
-#define CMD_FN_FRAME_ALIGN_HORZ_RIGHT               ".uno:AlignRight"
-#define CMD_FN_FRAME_ALIGN_VERT_TOP                 ".uno:AlignTop"
-#define CMD_FN_FRAME_ALIGN_VERT_CENTER              ".uno:AlignVerticalCenter"
-#define CMD_FN_EDIT_AUTH_ENTRY_DLG                  ".uno:AuthoritiesEntryDialog"
 #define CMD_SID_TABLE_VERT_BOTTOM                   ".uno:CellVertBottom"
 #define CMD_SID_TABLE_VERT_CENTER                   ".uno:CellVertCenter"
 #define CMD_SID_TABLE_VERT_NONE                     ".uno:CellVertTop"
-#define CMD_FN_NUM_BULLET_DOWN                      ".uno:DecrementLevel"
-#define CMD_FN_TABLE_DELETE_COL                     ".uno:DeleteColumns"
-#define CMD_FN_TABLE_DELETE_ROW                     ".uno:DeleteRows"
-#define CMD_FN_TABLE_BALANCE_CELLS                  ".uno:DistributeColumns"
-#define CMD_FN_TABLE_BALANCE_ROWS                   ".uno:DistributeRows"
-#define CMD_FN_EDIT_CURRENT_TOX                     ".uno:EditCurIndex"
-#define CMD_FN_EDIT_HYPERLINK                       ".uno:EditHyperlink"
 #define CMD_FN_TABLE_SELECT_COL                     ".uno:EntireColumn"
 #define CMD_FN_TABLE_SELECT_ROW                     ".uno:EntireRow"
-#define CMD_FN_EDIT_FIELD                           ".uno:FieldDialog"
-#define CMD_FN_EDIT_FOOTNOTE                        ".uno:EditFootnote"
-#define CMD_FN_FORMAT_FRAME_DLG                     ".uno:FrameDialog"
-#define CMD_FN_FORMAT_GRAFIC_DLG                    ".uno:GraphicDialog"
-#define CMD_FN_NUM_BULLET_UP                        ".uno:IncrementLevel"
-#define CMD_FN_EDIT_IDX_ENTRY_DLG                   ".uno:IndexEntryDialog"
 #define CMD_FN_INSERT_FLD_AUTHOR                    ".uno:InsertAuthorField"
-#define CMD_FN_INSERT_CAPTION                       ".uno:InsertCaptionDialog"
-#define CMD_FN_TABLE_INSERT_COL_DLG                 ".uno:InsertColumnDialog"
 #define CMD_FN_INSERT_FLD_DATE                      ".uno:InsertDateField"
 #define CMD_FN_INSERT_FIELD                         ".uno:InsertField"
 #define CMD_FN_INSERT_FLD_PGCOUNT                   ".uno:InsertPageCountField"
 #define CMD_FN_INSERT_FLD_PGNUMBER                  ".uno:InsertPageNumberField"
-#define CMD_FN_TABLE_INSERT_ROW_DLG                 ".uno:InsertRowDialog"
 #define CMD_FN_INSERT_FLD_TIME                      ".uno:InsertTimeField"
 #define CMD_FN_INSERT_FLD_TITLE                     ".uno:InsertTitleField"
 #define CMD_FN_INSERT_FLD_TOPIC                     ".uno:InsertTopicField"
-#define CMD_FN_TABLE_MERGE_CELLS                    ".uno:MergeCells"
 #define CMD_FN_TABLE_MERGE_TABLE                    ".uno:MergeTable"
-#define CMD_FN_TITLE_DESCRIPTION_SHAPE              ".uno:ObjectTitleDescription"
-#define CMD_FN_NAME_SHAPE                           ".uno:NameGroup"
-#define CMD_FN_NUMBER_NEWSTART                      ".uno:NumberingStart"
 #define CMD_FN_FRAME_DOWN                           ".uno:ObjectBackOne"
-#define CMD_FN_FRAME_UP                             ".uno:ObjectForwardOne"
-#define CMD_FN_FORMAT_PAGE_DLG                      ".uno:PageDialog"
-#define CMD_FN_PAGEDOWN                             ".uno:PageDown"
-#define CMD_FN_PAGEUP                               ".uno:PageUp"
-#define CMD_FN_PRINT_PAGEPREVIEW                    ".uno:PrintPagePreview"
 #define CMD_FN_TABLE_SET_READ_ONLY_CELLS            ".uno:Protect"
-#define CMD_FN_REMOVE_CUR_TOX                       ".uno:RemoveTableOf"
-#define CMD_FN_REMOVE_TEXT_BOX                      ".uno:RemoveTextBox"
 #define CMD_FN_FORMAT_RESET                         ".uno:ResetAttributes"
-#define CMD_FN_TOOL_ANCHOR_AT_CHAR                  ".uno:SetAnchorAtChar"
-#define CMD_FN_TOOL_ANCHOR_CHAR                     ".uno:SetAnchorToChar"
-#define CMD_FN_TOOL_ANCHOR_FRAME                    ".uno:SetAnchorToFrame"
 #define CMD_FN_TOOL_ANCHOR_PAGE                     ".uno:SetAnchorToPage"
 #define CMD_FN_TOOL_ANCHOR_PARAGRAPH                ".uno:SetAnchorToPara"
-#define CMD_FN_TABLE_SET_COL_WIDTH                  ".uno:SetColumnWidth"
-#define CMD_FN_TABLE_ADJUST_CELLS                   ".uno:SetOptimalColumnWidth"
-#define CMD_FN_TABLE_OPTIMAL_HEIGHT                 ".uno:SetOptimalRowHeight"
-#define CMD_FN_TABLE_SET_ROW_HEIGHT                 ".uno:SetRowHeight"
 #define CMD_FN_TABLE_SPLIT_CELLS                    ".uno:SplitCell"
 #define CMD_FN_TABLE_SPLIT_TABLE                    ".uno:SplitTable"
 #define CMD_FN_SET_SUB_SCRIPT                       ".uno:SubScript"
 #define CMD_FN_SET_SUPER_SCRIPT                     ".uno:SuperScript"
-#define CMD_FN_FORMAT_TABLE_DLG                     ".uno:TableDialog"
-#define CMD_FN_NUM_FORMAT_TABLE_DLG                 ".uno:TableNumberFormatDialog"
-#define CMD_FN_DRAWTEXT_ATTR_DLG                    ".uno:TextAttributes"
-#define CMD_FN_DRAW_WRAP_DLG                        ".uno:TextWrap"
 #define CMD_FN_TOOL_ANCHOR                          ".uno:ToggleAnchorType"
-#define CMD_FN_TABLE_UNSET_READ_ONLY_CELLS          ".uno:UnsetCellsReadOnly"
-#define CMD_FN_UPDATE_CUR_TOX                       ".uno:UpdateCurIndex"
-#define CMD_FN_WRAP_ANCHOR_ONLY                     ".uno:WrapAnchorOnly"
-#define CMD_FN_FRAME_WRAP_CONTOUR                   ".uno:WrapContour"
-#define CMD_FN_FRAME_WRAP_IDEAL                     ".uno:WrapIdeal"
-#define CMD_FN_FRAME_NOWRAP                         ".uno:WrapOff"
-#define CMD_FN_FRAME_WRAP                           ".uno:WrapOn"
-#define CMD_FN_FRAME_WRAPTHRU                       ".uno:WrapThrough"
-#define CMD_FN_FRAME_WRAPTHRU_TRANSP                ".uno:WrapThroughTransparent"
 #define CMD_FN_READONLY_SELECTION_MODE              ".uno:SelectTextMode"
 #define CMD_FN_TABLE_ROW_SPLIT                      ".uno:RowSplit"
-#define CMD_FN_NUM_CONTINUE                         ".uno:ContinueNumbering"
 #define CMD_FN_REPLY                                ".uno:ReplyNote"
 #define CMD_FN_DELETE_COMMENT                       ".uno:DeleteComment"
 #define CMD_FN_DELETE_NOTE_AUTHOR                   ".uno:DeleteAuthor"
@@ -114,8 +58,6 @@
 #define CMD_FN_REDLINE_REJECT_DIRECT                ".uno:RejectTrackedChange"
 #define CMD_FN_REDLINE_NEXT_CHANGE                  ".uno:NextTrackedChange"
 #define CMD_FN_REDLINE_PREV_CHANGE                  ".uno:PreviousTrackedChange"
-#define CMD_FN_REMOVE_HYPERLINK                     ".uno:RemoveHyperlink"
-#define CMD_FN_COPY_HYPERLINK_LOCATION              ".uno:CopyHyperlinkLocation"
 #define CMD_FN_HEADERFOOTER_EDIT                    ".uno:HeaderFooterEdit"
 #define CMD_FN_HEADERFOOTER_DELETE                  ".uno:HeaderFooterDelete"
 #define CMD_FN_HEADERFOOTER_BORDERBACK              ".uno:HeaderFooterBorderBackground"
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 355bbab5faef..7b197251ae8d 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -26,613 +26,11 @@
 #include "popup.hrc"
 #include "redline.hrc"
 
-/* --------------------- F O R M A T --------------------------------- */
 #define SEPARATOR       MenuItem { Separator = TRUE; }
-//define for ITEM_FORMAT_NUMBERING
-#define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS
-#define MN_NUMBERING ITEM_FORMAT_NUMBERING
-
- // DUMMY is a ID where a SubMenu is following
- // (it has to be increased every time!)
-#define DUMMY 333
- // not object related
-
-#define MN_TXT\
-    MenuItem\
-    {\
-        ITEM_FORMAT_CHAR_DLG\
-    };\
-    MenuItem\
-    {\
-        ITEM_FORMAT_PARA_DLG\
-    };
-
-#define MN_PAGE\
-    MenuItem\
-    {\
-        Identifier = FN_FORMAT_PAGE_DLG ; \
-        HelpId = CMD_FN_FORMAT_PAGE_DLG ; \
-        Text [ en-US ] = "Pa~ge..." ; \
-    };
-
-/* --------------------- D O C U M E N T -------------------------- */
-
-#define _MN_EDIT_FIELD                                                      \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_EDIT_FIELD ;                                    \
-            HelpId = CMD_FN_EDIT_FIELD ;                                        \
-            Text [ en-US ] = "Fields..." ;                             \
-    };
-#define _MN_EDIT_FOOTNOTE                                                    \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_EDIT_FOOTNOTE ;                                 \
-            HelpId = CMD_FN_EDIT_FOOTNOTE ;                                     \
-            Text [ en-US ] = "Footnote/Endnote~..." ;                          \
-        };
-    #define _MN_EDIT_IDX_ENTRY_DLG                                          \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_EDIT_IDX_ENTRY_DLG ;                            \
-            HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG ;                                \
-            Text [ en-US ] = "Edit Inde~x Entry..." ;                       \
-    };
-
-#define _MN_EDIT_BIB_ENTRY_DLG                                              \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_EDIT_AUTH_ENTRY_DLG ;                           \
-            HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ;                               \
-            Text [ en-US ] = "~Bibliography Entry...";                  \
-    };                                                                  \
-        SEPARATOR ;
-
-#define _MN_EDIT_OPEN_HYPERLINK                                             \
-    MenuItem                                                                \
-    {                                                                       \
-        ITEM_OPEN_HYPERLINK                                                 \
-    };\
-    MenuItem                                                            \
-    {                                                                   \
-        Identifier = FN_EDIT_HYPERLINK ;                           \
-        HelpId = CMD_FN_EDIT_HYPERLINK ;                               \
-        Text [ en-US ] = "Edit Hyperlink...";                  \
-    };                                                                  \
-    MenuItem                                                            \
-    {                                                                   \
-        Identifier =  FN_COPY_HYPERLINK_LOCATION;                           \
-        HelpId = CMD_FN_COPY_HYPERLINK_LOCATION;                               \
-        Text [ en-US ] = "Copy Hyper~link";                  \
-    };                                                                  \
-    MenuItem                                                            \
-    {                                                                   \
-        Identifier = FN_REMOVE_HYPERLINK ;                           \
-        HelpId = CMD_FN_REMOVE_HYPERLINK ;                               \
-        Text [ en-US ] = "Remo~ve Hyperlink";                  \
-    };
-
-#define _MN_EDIT_OPEN_SMARTTAGMENU                                          \
-    MenuItem                                                                \
-    {                                                                       \
-        ITEM_OPEN_SMARTTAGMENU                                              \
-    };
-
-#define _DEFAULT_TEXT_EDIT_ELEMENTS                                         \
-    _MN_EDIT_FIELD                                                              \
-    _MN_EDIT_FOOTNOTE                                                           \
-    _MN_EDIT_IDX_ENTRY_DLG                                                      \
-    _MN_EDIT_BIB_ENTRY_DLG                                                      \
-    MN_EDIT_REDLINE                                                            \
-    SEPARATOR ;                                                                \
-    MenuItem                                                            \
-    {                                                                   \
-        ITEM_POPUP_TEMPLATE_EDIT                                        \
-    };                                                                  \
-    SEPARATOR ;                                                         \
-    _MN_EDIT_OPEN_HYPERLINK                                             \
-    _MN_EDIT_OPEN_SMARTTAGMENU
-
-#define MN_RESET\
-    MenuItem\
-    {\
-        Identifier = FN_FORMAT_RESET ; \
-        HelpId = CMD_FN_FORMAT_RESET ; \
-        Text [ en-US ] = "Clear ~Direct Formatting" ; \
-    };
-
-#define _NUMBERING_RELATED_MENU \
-        SEPARATOR ;                                                         \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_NUMBER_NEWSTART;                                \
-            HelpId = CMD_FN_NUMBER_NEWSTART;                                    \
-            Text[ en-US ] = "Restart Numbering";                            \
-        };                                                                  \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_NUM_CONTINUE;                                   \
-            HelpId = CMD_FN_NUM_CONTINUE;                                       \
-            Text[ en-US ] = "Continue previous numbering";                  \
-        };                                                                  \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_NUM_BULLET_UP;                              \
-            HelpId = CMD_FN_NUM_BULLET_UP;                                  \
-            Text[ en-US ] = "Up One Level";                              \
-        };                                                                  \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_NUM_BULLET_DOWN;                              \
-            HelpId = CMD_FN_NUM_BULLET_DOWN;                                  \
-            Text[ en-US ] = "Down One Level";                              \
-        };
-
-#define MENU_PASTE_SPECIAL \
-    MenuItem\
-    {\
-        Identifier = SID_MENU_PASTE_SPECIAL ; \
-        Text [ en-US ] = "Paste ~Special" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    Identifier = SID_PASTE_UNFORMATTED ; \
-                    HelpId =  CMD_SID_PASTE_UNFORMATTED ; \
-                    Text [ en-US ] = "~Unformatted Text" ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_PASTE_SPECIAL ; \
-                    HelpId =  CMD_SID_PASTE_SPECIAL ; \
-                    Text [ en-US ] = "~More Options..." ; \
-                };\
-            };\
-        };\
-    };
-
-#define BASE_TEXT_POPUPMENU_BEGIN \
-{                                                                           \
-    ItemList =                                                              \
-    {                                                                       \
-        MENU_PASTE_SPECIAL                                                  \
-        _NUMBERING_RELATED_MENU                                             \
-        SEPARATOR ;                                                         \
-        MN_RESET                                                            \
-        SEPARATOR ;                                                         \
-        MN_TXT                                                              \
-        MN_NUMBERING                                                        \
-        MN_PAGE                                                             \
-        ITEM_TRANSLITERATE_MENU                                             \
-        SEPARATOR ;
-
-// not in Writer/Web
-#define BASE_TEXT_POPUPMENU_NOWEB \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_UPDATE_CUR_TOX ;                                \
-            HelpId = CMD_FN_UPDATE_CUR_TOX ;                                    \
-            Text [ en-US ] = "~Update Index or Table of Contents";          \
-        };                                                                  \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_EDIT_CURRENT_TOX;                               \
-            HelpId = CMD_FN_EDIT_CURRENT_TOX;                                   \
-            Text [ en-US ] = "~Edit Index or Table of Contents";                           \
-        };                                                                  \
-        MenuItem                                                            \
-        {                                                                   \
-            Identifier = FN_REMOVE_CUR_TOX;                                 \
-            HelpId = CMD_FN_REMOVE_CUR_TOX;                                     \
-            Text [ en-US ] = "Delete Index or Table of Contents";                          \
-        };                                                                  \
-        SEPARATOR ;
-
-#define BASE_TEXT_POPUPMENU_END \
-        _DEFAULT_TEXT_EDIT_ELEMENTS                                         \
-    };                                                                      \
-};
-
 /*------------------------------------------------------------------------
    Description: Menu Window
 ------------------------------------------------------------------------*/
 
-#define MN_FRM_CAPTION_ITEM \
-        MenuItem\
-        {\
-            Identifier = FN_INSERT_CAPTION ;\
-            HelpId = CMD_FN_INSERT_CAPTION ;\
-            Text [ en-US ] = "Insert ~Caption..." ;\
-    };
-
-#define MN_TABLE \
-    MenuItem\
-    {\
-       Identifier = DUMMY ; \
-       Command = ".uno:TableInsertMenu" ; \
-       Text [ en-US ] = "~Insert" ; \
-       SubMenu = Menu\
-       {\
-           ItemList =\
-           {\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_INSERT_ROW_BEFORE ; \
-                        Text [ en-US ] = "Rows Above" ; \
-                    };\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_INSERT_ROW_AFTER ; \
-                        Text [ en-US ] = "Rows Below" ; \
-                    };\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_INSERT_ROW_DLG ; \
-                        HelpId = CMD_FN_TABLE_INSERT_ROW_DLG ; \
-                        Text [ en-US ] = "~Rows..." ; \
-                    };\
-                    SEPARATOR ; \
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_INSERT_COL_BEFORE ; \
-                        Text [ en-US ] = "Columns Left" ; \
-                    };\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_INSERT_COL_AFTER ; \
-                        Text [ en-US ] = "Columns Right" ; \
-                    };\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_INSERT_COL_DLG ; \
-                        HelpId = CMD_FN_TABLE_INSERT_COL_DLG ; \
-                        Text [ en-US ] = "~Columns..." ; \
-                    };\
-           };\
-       };\
-    };\
-    MenuItem\
-    {\
-       Identifier = DUMMY + 1; \
-       Command = ".uno:TableDeleteMenu" ; \
-       Text [ en-US ] = "~Delete" ; \
-       SubMenu = Menu\
-       {\
-           ItemList =\
-           {\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_DELETE_ROW ; \
-                        HelpId = CMD_FN_TABLE_DELETE_ROW ; \
-                        Text [ en-US ] = "~Rows" ; \
-                    };\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_DELETE_COL ; \
-                        HelpId = CMD_FN_TABLE_DELETE_COL ; \
-                        Text [ en-US ] = "~Columns" ; \
-                    };\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_DELETE_TABLE ; \
-                        Command = ".uno:DeleteTable" ; \
-                        Text [ en-US ] = "~Table" ; \
-                    };\
-           };\
-       };\
-    };\
-    MenuItem\
-    {\
-       Identifier = DUMMY + 2; \
-       Command = ".uno:TableSelectMenu" ; \
-       Text [ en-US ] = "~Select" ; \
-       SubMenu = Menu\
-       {\
-           ItemList =\
-           {\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_SELECT_ROW ; \
-                        HelpId = CMD_FN_TABLE_SELECT_ROW ; \
-                        Text [ en-US ] = "~Rows" ; \
-                    };\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_SELECT_COL ; \
-                        HelpId = CMD_FN_TABLE_SELECT_COL ; \
-                        Text [ en-US ] = "~Columns" ; \
-                    };\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_SELECT_ALL ; \
-                        Command = ".uno:SelectTable" ; \
-                        Text [ en-US ] = "~Table" ; \
-                    };\
-                    MenuItem\
-                    {\
-                        Identifier = FN_TABLE_SELECT_CELL ; \
-                        Command = ".uno:EntireCell" ; \
-                        Text [ en-US ] = "C~ell" ; \
-                    };\
-           };\
-       };\
-    };\
-    MenuItem\
-    {\
-        Identifier = FN_TABLE_MERGE_CELLS ; \
-        HelpId = CMD_FN_TABLE_MERGE_CELLS ; \
-        Text [ en-US ] = "~Merge" ; \
-    };\
-    MenuItem\
-    {\
-        Identifier = MN_FORMAT_ALGN ; \
-        Command = ".uno:AlignTextMenu" ; \
-        Text [ en-US ] = "A~lignment" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = SID_TABLE_VERT_NONE ; \
-                    HelpId = CMD_SID_TABLE_VERT_NONE ; \
-                    Text [ en-US ] = "~Top" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = SID_TABLE_VERT_CENTER ; \
-                    HelpId = CMD_SID_TABLE_VERT_CENTER ; \
-                    Text [ en-US ] = "C~enter" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = SID_TABLE_VERT_BOTTOM ; \
-                    HelpId = CMD_SID_TABLE_VERT_BOTTOM ; \
-                    Text [ en-US ] = "~Bottom" ; \
-                };\
-            };\
-        };\
-    };\
-    MenuItem\
-    {\
-        Identifier = DUMMY + 4 ; \
-        Command = ".uno:TableAutoFitMenu" ; \
-        Text [ en-US ] = "Si~ze" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    Identifier = FN_TABLE_SET_COL_WIDTH ; \
-                    HelpId = CMD_FN_TABLE_SET_COL_WIDTH ; \
-                    Text [ en-US ] = "~Column Width..." ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = FN_TABLE_ADJUST_CELLS ; \
-                    HelpId = CMD_FN_TABLE_ADJUST_CELLS ; \
-                    Text [ en-US ] = "~Optimal Column Width" ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = FN_TABLE_BALANCE_CELLS ; \
-                    HelpId = CMD_FN_TABLE_BALANCE_CELLS ; \
-                    Text [ en-US ] = "~Distribute Columns Equally" ; \
-                };\
-                SEPARATOR ; \
-                MenuItem\
-                {\
-                    Identifier = FN_TABLE_SET_ROW_HEIGHT ; \
-                    HelpId = CMD_FN_TABLE_SET_ROW_HEIGHT ; \
-                    Text [ en-US ] = "~Row Height..." ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = FN_TABLE_OPTIMAL_HEIGHT ; \
-                    HelpId = CMD_FN_TABLE_OPTIMAL_HEIGHT ; \
-                    Text [ en-US ] = "Optimal Row ~Height" ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = FN_TABLE_BALANCE_ROWS ; \
-                    HelpId = CMD_FN_TABLE_BALANCE_ROWS ; \
-                    Text [ en-US ] = "Distribute Rows ~Equally" ; \
-                };\
-            };\
-        };\
-    };\
-    MenuItem\
-    {\
-        Identifier = FN_NUM_FORMAT_TABLE_DLG ; \
-        HelpId = CMD_FN_NUM_FORMAT_TABLE_DLG ; \
-        Text [ en-US ] = "N~umber Format..." ; \
-    };\
-    MenuItem\
-    {\
-        Identifier = FN_FORMAT_TABLE_DLG ; \
-        HelpId = CMD_FN_FORMAT_TABLE_DLG ; \
-        Text [ en-US ] = "~Table Properties..." ; \
-    };
-
-#define MN_DRWTXT \
-    MenuItem\
-    {\
-        ITEM_FORMAT_CHAR_DLG\
-    };\
-    MenuItem\
-    {\
-        ITEM_FORMAT_PARA_DLG\
-    };\
-
-#define MN_DRWTXTATTR \
-    MenuItem\
-    {\
-        Identifier = FN_DRAWTEXT_ATTR_DLG ; \
-        HelpId = CMD_FN_DRAWTEXT_ATTR_DLG ; \
-        Text [ en-US ] = "Te~xt..." ; \
-    };
-
-#define MN_NAME_SHAPE \
-    MenuItem\
-    {\
-        Identifier = FN_NAME_SHAPE ; \
-        HelpId = CMD_FN_NAME_SHAPE ; \
-        Text [ en-US ] = "Name..." ; \
-    };
-
-#define MN_TITLE_DESCRIPTION_SHAPE\
-    MenuItem\
-    {\
-        Identifier = FN_TITLE_DESCRIPTION_SHAPE; \
-        HelpId = CMD_FN_TITLE_DESCRIPTION_SHAPE; \
-        Text [ en-US ] = "Description..." ; \
-    };
-
-#define MN_FRM \
-    MenuItem\
-    {\
-        Identifier = FN_FORMAT_FRAME_DLG ; \
-        HelpId = CMD_FN_FORMAT_FRAME_DLG ; \
-        Text [ en-US ] = "~Frame..." ; \
-    };
-
-#define MN_DRAW1 \
-    MenuItem\
-    {\
-        ITEM_FORMAT_ATTRIBUTES_LINE\
-    };\
-    MenuItem\
-    {\
-        ITEM_FORMAT_ATTRIBUTES_AREA\
-    };
-
-#define MN_ALIGN \
-    MenuItem\
-    {\
-        ITEM_FORMAT_OBJECT_ALIGN\
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_OBJECT_ALIGN_LEFT\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_OBJECT_ALIGN_CENTER\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_OBJECT_ALIGN_RIGHT\
-                };\
-                SEPARATOR ; \
-                MenuItem\
-                {\
-                    ITEM_FORMAT_OBJECT_ALIGN_UP\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_OBJECT_ALIGN_MIDDLE\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_OBJECT_ALIGN_DOWN\
-                };\
-            };\
-        };\
-    };
-
-#define MN_ONE_STEP \
-    MenuItem\
-    {\
-        Identifier = FN_FRAME_UP ; \
-        HelpId = CMD_FN_FRAME_UP ; \
-        Text [ en-US ] = "Bring ~Forward" ; \
-    };\
-    MenuItem\
-    {\
-        Identifier = FN_FRAME_DOWN ; \
-        HelpId = CMD_FN_FRAME_DOWN ; \
-        Text [ en-US ] = "Send Back~ward" ; \
-    };
-
-#define MN_TOP \
-    MenuItem\
-    {\
-        ITEM_FORMAT_FRAME_TO_TOP\
-    };\
-
-#define MN_DRAW5 \
-    MenuItem\
-    {\
-        Identifier = MN_SUB_ARRANGE ; \
-        HelpID = HID_MN_SUB_ARRANGE ; \
-        Command = ".uno:ArrangeMenu" ; \
-        Text [ en-US ] = "~Arrange" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MN_TOP\
-                MN_ONE_STEP\
-                MN_BOTTOM\
-                SEPARATOR ; \
-                MenuItem\
-                {\
-                    ITEM_FORMAT_OBJECT_HEAVEN\
-                };\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_OBJECT_HELL\
-                };\
-            };\
-        };\
-    };\
-    MN_ALIGN\
-
-#define MN_DRAW6 \
-    MenuItem\
-    {\
-        Identifier = MN_SUB_ARRANGE ; \
-        HelpID = HID_MN_SUB_ARRANGE ; \
-        Command = ".uno:ArrangeMenu" ; \
-        Text [ en-US ] = "~Arrange" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MN_TOP\
-                MN_ONE_STEP\
-                MN_BOTTOM\
-            };\
-        };\
-    };\
-    MN_ALIGN\
-
-#define MN_DRAW3 \
-    ITEM_GROUP_MENU
-
-#define MN_FORM \
-    MenuItem\
-    {\
-        ITEM_FORM_CONTROL_PROPERTIES\
-    };\
-    MenuItem\
-    {\
-        ITEM_FORM_PROPERTIES\
-    };\
-    MenuItem\
-    {\
-        ITEM_REPLACE_CONTROL\
-    };\
-
 #define MN_ANNOTATIONS \
     MenuItem\
     {\
@@ -688,348 +86,6 @@
 
 /*--Popups---------------------------------------------------------------*/
 
-String MN_TEXT_POPUPMENU
-{
-    Text [ en-US ] = "Text" ;
-};
-
-String MN_TAB_POPUPMENU
-{
-    Text [ en-US ] = "Table" ;
-};
-
-Menu MN_TAB_POPUPMENU
-{
-    ItemList =
-    {
-        MENU_PASTE_SPECIAL
-        _NUMBERING_RELATED_MENU
-        SEPARATOR ;
-        MN_TABLE
-        SEPARATOR ;
-        MN_RESET
-        SEPARATOR ;
-        MenuItem
-        {
-            ITEM_FORMAT_CHAR_DLG
-        };
-        MenuItem
-        {
-            ITEM_FORMAT_PARA_DLG
-        };
-        MN_NUMBERING
-        ITEM_TRANSLITERATE_MENU
-        SEPARATOR ;
-        _DEFAULT_TEXT_EDIT_ELEMENTS
-    };
-};
-
-#define MN_WRAP_CONTOUR \
-    MenuItem\
-    {\
-        Identifier = FN_FRAME_WRAP_CONTOUR ; \
-        HelpId = CMD_FN_FRAME_WRAP_CONTOUR ; \
-        Text [ en-US ] = "Enable ~Contour" ; \
-    };
-
-#define MN_EDIT_CONTOUR \
-    MenuItem\
-    {\
-        Identifier = SID_CONTOUR_DLG ; \
-        HelpId = CMD_SID_CONTOUR_DLG ; \
-        Text [ en-US ] = "~Edit Contour..." ; \
-    };
-
-#define  MN_WRAP_CONTOUR_1 MN_WRAP_CONTOUR
-
-#define MN_MOUSE_FRAME_BEGIN \
-    MenuItem\
-    {\
-        Identifier = MN_WRAP ; \
-        Command = ".uno:WrapMenu" ; \
-        Text [ en-US ] = "~Wrap" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_NOWRAP ; \
-                    HelpId = CMD_FN_FRAME_NOWRAP ; \
-                    Text [ en-US ] = "~No Wrap" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_WRAP ; \
-                    HelpId = CMD_FN_FRAME_WRAP ; \
-                    Text [ en-US ] = "~Page Wrap" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_WRAP_IDEAL ; \
-                    HelpId = CMD_FN_FRAME_WRAP_IDEAL ; \
-                    Text [ en-US ] = "~Optimal Page Wrap" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_WRAP_LEFT ; \
-                    Text [ en-US ] = "Wrap ~Before" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_WRAP_RIGHT ; \
-                    Text [ en-US ] = "Wrap ~After" ; \
-                };\
-                SEPARATOR ; \
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_WRAPTHRU ; \
-                    HelpId = CMD_FN_FRAME_WRAPTHRU ; \
-                    Text [ en-US ] = "~Wrap Through" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_WRAPTHRU_TRANSP ; \
-                    HelpId = CMD_FN_FRAME_WRAPTHRU_TRANSP ; \
-                    Text [ en-US ] = "In ~Background" ; \
-                };\
-                SEPARATOR ; \
-                MN_WRAP_CONTOUR_1\
-                MN_EDIT_CONTOUR\
-                MenuItem\
-                {\
-                    Checkable = TRUE ; \
-                    Identifier = FN_WRAP_ANCHOR_ONLY ; \
-                    HelpId = CMD_FN_WRAP_ANCHOR_ONLY ; \
-                    Text [ en-US ] = "~First Paragraph" ; \
-                    };\
-            };\
-        };\
-    };
-
-#define MN_MOUSE_FRAME_WITH_CONTOUR MN_MOUSE_FRAME_BEGIN
-
-String MN_DRAW_POPUPMENU
-{
-    Text [ en-US ] = "Graphic" ;
-};
-#define MN_WRAP_DRAW                                                                                                            \
-    MenuItem\
-    {\
-        Identifier = MN_WRAP ; \
-        Command = ".uno:WrapMenu" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_NOWRAP ; \
-                    HelpId = CMD_FN_FRAME_NOWRAP ; \
-                    Text [ en-US ] = "~No Wrap" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_WRAP ; \
-                    HelpId = CMD_FN_FRAME_WRAP ; \
-                    Text [ en-US ] = "~Page Wrap" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_WRAP_IDEAL ; \
-                    HelpId = CMD_FN_FRAME_WRAP_IDEAL ; \
-                    Text [ en-US ] = "~Optimal Page Wrap" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_WRAPTHRU ; \
-                    HelpId = CMD_FN_FRAME_WRAPTHRU ; \
-                    Text [ en-US ] = "~Wrap Through" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_FRAME_WRAPTHRU_TRANSP ; \
-                    HelpId = CMD_FN_FRAME_WRAPTHRU_TRANSP ; \
-                    Text [ en-US ] = "In ~Background" ; \
-                };\
-                SEPARATOR ; \
-                MN_WRAP_CONTOUR_1\
-                MenuItem\
-                {\
-                    Checkable = TRUE ; \
-                    Identifier = FN_WRAP_ANCHOR_ONLY ; \
-                    HelpId = CMD_FN_WRAP_ANCHOR_ONLY ; \
-                    Text [ en-US ] = "~First Paragraph" ; \
-                };\
-                SEPARATOR ; \
-                MenuItem\
-                {\
-                    Identifier = FN_DRAW_WRAP_DLG ; \
-                    HelpId = CMD_FN_DRAW_WRAP_DLG ; \
-                    Text [ en-US ] = "~Edit..." ; \
-                };\
-            };\
-        };\
-        Text [ en-US ] = "~Wrap" ; \
-    };
-
-#define MN_BOTTOM \
-    MenuItem\
-    {\
-        ITEM_FORMAT_FRAME_TO_BOTTOM\
-    };\
-
-#define MN_AT_FRAME \
-    MenuItem\
-    {\
-        RadioCheck = TRUE ; \
-        Identifier = FN_TOOL_ANCHOR_FRAME ; \
-        HelpId = CMD_FN_TOOL_ANCHOR_FRAME ; \
-        Text [ en-US ] = "To ~Frame" ; \
-    };
-
-#define MN_ANCHOR \
-    MenuItem\
-    {\
-        Identifier = FN_TOOL_ANCHOR ; \
-        HelpId = CMD_FN_TOOL_ANCHOR ; \
-        Command = ".uno:AnchorMenu" ; \
-        Text [ en-US ] = "An~chor" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_TOOL_ANCHOR_PAGE ; \
-                    HelpId = CMD_FN_TOOL_ANCHOR_PAGE ; \
-                    Text [ en-US ] = "To P~age" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_TOOL_ANCHOR_PARAGRAPH ; \
-                    HelpId = CMD_FN_TOOL_ANCHOR_PARAGRAPH ; \
-                    Text [ en-US ] = "To ~Paragraph" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_TOOL_ANCHOR_AT_CHAR ; \
-                    HelpId = CMD_FN_TOOL_ANCHOR_AT_CHAR ; \
-                    Text [ en-US ] = "To ~Character" ; \
-                };\
-                MenuItem\
-                {\
-                    RadioCheck = TRUE ; \
-                    Identifier = FN_TOOL_ANCHOR_CHAR ; \
-                    HelpId = CMD_FN_TOOL_ANCHOR_CHAR ; \
-                    Text [ en-US ] = "As C~haracter" ; \
-                };\
-                MN_AT_FRAME\
-            };\
-        };\
-    };
-
-Menu MN_DRAW_POPUPMENU
-{
-    ItemList =
-    {
-        MN_DRAW1
-        MN_DRWTXTATTR
-        MenuItem
-        {
-            ITEM_FORMAT_ATTR_TRANSFORM
-        };
-
-        SEPARATOR ;
-        MN_TITLE_DESCRIPTION_SHAPE
-        MN_NAME_SHAPE
-
-        SEPARATOR ;
-        MN_DRAW5
-        MN_WRAP_DRAW
-        MN_ANCHOR
-        MN_FRM_CAPTION_ITEM
-        SEPARATOR ;
-        MN_DRAW3
-        MenuItem
-        {
-            Identifier = FN_ADD_TEXT_BOX;
-            HelpId = CMD_FN_ADD_TEXT_BOX;
-            Text [ en-US ] = "Add Text Box";
-        };
-        MenuItem
-        {
-            Identifier = FN_REMOVE_TEXT_BOX;
-            HelpId = CMD_FN_REMOVE_TEXT_BOX;
-            Text [ en-US ] = "Remove Text Box";
-        };
-    };
-};
-
-String MN_DRAWFORM_POPUPMENU
-{
-    Text [ en-US ] = "Control" ;
-};
-
-Menu MN_DRAWFORM_POPUPMENU
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            ITEM_FORMAT_ATTR_TRANSFORM
-        };
-
-        SEPARATOR ;
-        MN_TITLE_DESCRIPTION_SHAPE
-        MN_NAME_SHAPE
-
-        SEPARATOR ;
-        MN_FORM
-        SEPARATOR ;
-        MN_DRAW6
-        MN_WRAP_DRAW
-        MN_ANCHOR
-        SEPARATOR ;
-        MN_DRAW3
-    };
-};
-
-String MN_DRWTXT_POPUPMENU
-{
-    Text [ en-US ] = "Draw Object text" ;
-};
-
-Menu MN_DRWTXT_POPUPMENU
-{
-    ItemList =
-    {
-        MENU_PASTE_SPECIAL
-        SEPARATOR ;
-        MN_RESET
-        SEPARATOR ;
-        ITEM_TRANSLITERATE_MENU
-        SEPARATOR ;
-        MN_DRWTXT
-        MN_FRM_CAPTION_ITEM
-    };
-};
-
 Menu MN_ANNOTATION_POPUPMENU
 {
     ItemList =
@@ -1046,261 +102,6 @@ Menu MN_ANNOTATION_BUTTON
     };
 };
 
-String MN_GRF_POPUPMENU
-{
-    Text [ en-US ] = "Graphic" ;
-};
-
-#define MN_ARRANGE_FRAME \
-    MenuItem\
-    {\
-        Identifier = MN_SUB_ALIGN ; \
-        HelpID = HID_MN_SUB_ALIGN ; \
-        Command = ".uno:ArrangeFrameMenu" ; \
-        Text [ en-US ] = "~Arrange" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_FRAME_TO_TOP\
-                };\
-                MN_ONE_STEP\
-                MenuItem\
-                {\
-                    ITEM_FORMAT_FRAME_TO_BOTTOM\
-                };\
-            };\
-        };\
-    };\
-
-#define MN_ALIGNMENT_FRAME \
-    MenuItem\
-    {\
-        Identifier = MN_FORMAT_FRM_HORZ ; \
-        Command = ".uno:AlignFrameMenu" ; \
-        Text [ en-US ] = "A~lignment" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    Identifier = FN_FRAME_ALIGN_HORZ_LEFT ; \
-                    HelpId = CMD_FN_FRAME_ALIGN_HORZ_LEFT ; \
-                    Text [ en-US ] = "~Left" ; \
-                    };\
-                MenuItem\
-                {\
-                    Identifier = FN_FRAME_ALIGN_HORZ_CENTER ; \
-                    HelpId = CMD_FN_FRAME_ALIGN_HORZ_CENTER ; \
-                    Text [ en-US ] = "~Centered" ; \
-                    };\
-                MenuItem\
-                {\
-                    Identifier = FN_FRAME_ALIGN_HORZ_RIGHT ; \
-                    HelpId = CMD_FN_FRAME_ALIGN_HORZ_RIGHT ; \
-                    Text [ en-US ] = "~Right" ; \
-                    };\
-                SEPARATOR ; \
-                MenuItem\
-                {\
-                    Identifier = FN_FRAME_ALIGN_VERT_TOP ; \
-                    HelpId = CMD_FN_FRAME_ALIGN_VERT_TOP ; \
-                    Text [ en-US ] = "Base at ~Top" ; \
-                    };\
-                MenuItem\
-                {\
-                    Identifier = FN_FRAME_ALIGN_VERT_CENTER ; \
-                    HelpId = CMD_FN_FRAME_ALIGN_VERT_CENTER ; \
-                    Text [ en-US ] = "Base in ~Middle" ; \
-                    };\
-                MenuItem\
-                {\
-                    Identifier = FN_FRAME_ALIGN_VERT_BOTTOM ; \
-                    HelpId = CMD_FN_FRAME_ALIGN_VERT_BOTTOM ; \
-                    Text [ en-US ] = "Base at ~Bottom" ; \
-                    };\
-            };\
-        };\
-    };\
-
-#define MN_ROTATE_IMAGE \
-    MenuItem\
-    {\
-        Identifier = SID_MENU_MANAGE_GRAPHIC ; \
-        Command = ".uno:ManageGraphicMenu" ; \
-        Text [ en-US ] = "~Rotate" ; \
-        SubMenu = Menu\
-        {\
-            ItemList = \
-            {\
-                MenuItem\
-                {\
-                    Identifier = SID_ROTATE_GRAPHIC_LEFT ; \
-                    Command = ".uno:RotateLeft" ; \
-                    Text [ en-US ] = "Rotate 90° Left" ; \
-                };\
-                MenuItem\
-                {\
-                    Identifier = SID_ROTATE_GRAPHIC_RIGHT ; \
-                    Command = ".uno:RotateRight" ; \
-                    Text [ en-US ] = "Rotate 90° Right" ; \
-                };\
-            };\
-        };\
-    };\
-
-#define MN_ALIGN_FRAME \
-    MN_ARRANGE_FRAME \
-    MN_ALIGNMENT_FRAME \
-    MN_ANCHOR
-
-Menu MN_GRF_POPUPMENU
-{
-    ItemList =
-    {
-        MenuItem { ITEM_EXTERNAL_EDIT };
-        MenuItem { ITEM_CHANGE_PICTURE };
-        MenuItem { ITEM_COMPRESS_GRAPHIC };
-        MenuItem { ITEM_SAVE_GRAPHIC };
-        SEPARATOR ;
-
-        MenuItem { ITEM_OBJECT_CROP };
-        SEPARATOR ;
-
-        MN_ANCHOR
-        MN_MOUSE_FRAME_WITH_CONTOUR
-        MN_ALIGNMENT_FRAME
-        MN_ARRANGE_FRAME
-        MN_ROTATE_IMAGE
-        SEPARATOR ;
-
-        MN_FRM_CAPTION_ITEM
-        MenuItem
-        {
-            Identifier = FN_FORMAT_GRAFIC_DLG ;
-            HelpId = CMD_FN_FORMAT_GRAFIC_DLG ;
-            Text [ en-US ] = "Format ~Image..." ;
-        };
-    };
-};
-
-String MN_OLE_POPUPMENU
-{
-    Text [ en-US ] = "Object" ;
-};
-
-Menu MN_OLE_POPUPMENU
-{
-    ItemList =
-    {
-        MN_ALIGN_FRAME
-        MN_MOUSE_FRAME_WITH_CONTOUR
-        SEPARATOR ;
-        MN_TITLE_DESCRIPTION_SHAPE
-        SEPARATOR ;
-        MenuItem
-        {
-            Identifier = FN_FORMAT_FRAME_DLG ;
-            HelpId = CMD_FN_FORMAT_FRAME_DLG ;
-            Text [ en-US ] = "Object..." ;
-        };
-        MN_FRM_CAPTION_ITEM
-    };
-};
-
-#define MN_MOUSE_FRAME_WITHOUT_CONTOUR MN_MOUSE_FRAME_BEGIN
-
-String MN_FRM_POPUPMENU
-{
-    Text [ en-US ] = "Frame" ;
-};
-
-Menu MN_FRM_POPUPMENU
-{
-    ItemList =
-    {
-        MN_ALIGN_FRAME
-        MN_MOUSE_FRAME_WITHOUT_CONTOUR
-        SEPARATOR ;
-        MN_TITLE_DESCRIPTION_SHAPE
-        SEPARATOR ;
-        MN_FRM
-        MN_FRM_CAPTION_ITEM
-    };
-};
-
-String MN_PPREVIEW_POPUPMENU
-{
-    Text [ en-US ] = "Draw Object text" ;
-};
-
-Menu MN_PPREVIEW_POPUPMENU
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            Identifier = FN_PAGEUP ;
-            HelpId = CMD_FN_PAGEUP ;
-            Text [ en-US ] = "Previous Page" ;
-        };
-        MenuItem
-        {
-            Identifier = FN_PAGEDOWN ;
-            HelpId = CMD_FN_PAGEDOWN ;
-            Text [ en-US ] = "Next Page" ;
-        };
-        MenuItem
-        {
-            ITEM_VIEW_ATTR_ZOOM
-        };
-        SEPARATOR ;
-        MenuItem
-        {
-            Identifier = FN_PRINT_PAGEPREVIEW ;
-            HelpId = CMD_FN_PRINT_PAGEPREVIEW ;
-            Text [ en-US ] = "Print" ;
-        };
-        SEPARATOR ;
-        MenuItem
-        {
-            Identifier = SID_PRINTPREVIEW;
-            HelpId = CMD_SID_PRINTPREVIEW;
-            Text [ en-US ] = "Close Preview" ;
-        };
-    };
-};
-
-String MN_MEDIA_POPUPMENU
-{
-    Text [ en-US ] = "Media object" ;
-};
-
-Menu MN_MEDIA_POPUPMENU
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            ITEM_FORMAT_ATTR_TRANSFORM
-        };
-
-        SEPARATOR ;
-        MN_TITLE_DESCRIPTION_SHAPE
-        MN_NAME_SHAPE
-
-        SEPARATOR ;
-        MN_DRAW6
-        MN_WRAP_DRAW
-        MN_ANCHOR
-        SEPARATOR ;
-        MN_DRAW3
-    };
-};
-
 Menu MN_HEADERFOOTER_BUTTON
 {
     ItemList =
@@ -1343,9 +144,4 @@ Menu MN_PAGEBREAK_BUTTON
     };
 };
 
-Menu MN_TEXT_POPUPMENU
-    BASE_TEXT_POPUPMENU_BEGIN
-    BASE_TEXT_POPUPMENU_NOWEB
-    BASE_TEXT_POPUPMENU_END
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 0f3af657eddf..2c3559be17a4 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -28,7 +28,6 @@
 #include <svx/svdobj.hxx>
 #include <svx/fntszctl.hxx>
 #include <svx/fntctl.hxx>
-#include <svx/SmartTagCtl.hxx>
 #include <svx/pszctrl.hxx>
 #include <svx/insctrl.hxx>
 #include <svx/selctrl.hxx>
@@ -377,7 +376,6 @@ void SwDLL::RegisterControls()
     ::avmedia::MediaToolBoxControl::RegisterControl(SID_AVMEDIA_TOOLBOX, pMod);
     ::avmedia::MediaPlayer::RegisterChildWindow(false, pMod);
 
-    SvxSmartTagsControl::RegisterControl(SID_OPEN_SMARTTAGMENU, pMod);
     ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod);
     SwJumpToSpecificPageControl::RegisterControl(SID_JUMP_TO_SPECIFIC_PAGE, pMod);
 }
diff --git a/sw/source/uibase/inc/popup.hrc b/sw/source/uibase/inc/popup.hrc
index 4fea654a72e0..343b710850bc 100644
--- a/sw/source/uibase/inc/popup.hrc
+++ b/sw/source/uibase/inc/popup.hrc
@@ -22,21 +22,10 @@
 
 #include "rcid.hrc"
 
-#define MN_TEXT_POPUPMENU           (RC_POPUPS_BEGIN + 0)
-#define MN_TAB_POPUPMENU            (RC_POPUPS_BEGIN + 1)
-#define MN_FRM_POPUPMENU            (RC_POPUPS_BEGIN + 2)
-#define MN_DRAW_POPUPMENU           (RC_POPUPS_BEGIN + 3)
-#define MN_DRWTXT_POPUPMENU         (RC_POPUPS_BEGIN + 4)
-#define MN_GRF_POPUPMENU            (RC_POPUPS_BEGIN + 5)
-#define MN_OLE_POPUPMENU            (RC_POPUPS_BEGIN + 6)
-#define MN_PPREVIEW_POPUPMENU       (RC_POPUPS_BEGIN + 7)
-#define MN_SRCVIEW_POPUPMENU        (RC_POPUPS_BEGIN + 8)
-#define MN_DRAWFORM_POPUPMENU       (RC_POPUPS_BEGIN + 9)
-#define MN_MEDIA_POPUPMENU          (RC_POPUPS_BEGIN + 10)
-#define MN_ANNOTATION_POPUPMENU     (RC_POPUPS_BEGIN + 14)
-#define MN_ANNOTATION_BUTTON        (RC_POPUPS_BEGIN + 15)
-#define MN_HEADERFOOTER_BUTTON      (RC_POPUPS_BEGIN + 18)
-#define MN_PAGEBREAK_BUTTON         (RC_POPUPS_BEGIN + 19)
+#define MN_ANNOTATION_POPUPMENU     (RC_POPUPS_BEGIN + 0)
+#define MN_ANNOTATION_BUTTON        (RC_POPUPS_BEGIN + 1)
+#define MN_HEADERFOOTER_BUTTON      (RC_POPUPS_BEGIN + 2)
+#define MN_PAGEBREAK_BUTTON         (RC_POPUPS_BEGIN + 3)
 
 #if MN_PAGEBREAK_BUTTON > RC_POPUPS_END
 
diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src
index abbba43b8850..55b3640fcb4b 100644
--- a/sw/source/uibase/uiview/view.src
+++ b/sw/source/uibase/uiview/view.src
@@ -106,38 +106,9 @@ String STR_SAVEAS_SRC
 {
     Text [ en-US ] = "~Export source..." ;
 };
-String MN_SRCVIEW_POPUPMENU
-{
-    Text [ en-US ] = "HTML source" ;
-};
 String RID_PVIEW_TOOLBOX
 {
     Text [ en-US ] = "Print Preview" ;
 };
 
-Menu MN_SRCVIEW_POPUPMENU
-{
-    ItemList =
-    {
-        MenuItem
-        {
-            ITEM_FORMAT_ATTR_CHAR_FONT
-        };
-        MenuItem
-        {
-            ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT
-        };
-        MenuItem
-        {
-            Separator = TRUE ;
-        };
-        MenuItem
-        {
-            Identifier = SID_SOURCEVIEW ;
-            HelpID = HID_SOURCEVIEW ;
-            Text [ en-US ] = "HTML Source" ;
-        };
-    };
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */