[Libreoffice-commits] core.git: configmgr/qa include/sfx2 officecfg/registry sc/uiconfig sd/uiconfig sfx2/sdi sfx2/source sw/inc sw/source sw/uiconfig

Bryan Quigley gquigs at gmail.com
Tue May 3 09:17:30 UTC 2016


 configmgr/qa/unit/data.xcd                                           |    8 
 include/sfx2/sfxsids.hrc                                             |    2 
 include/sfx2/viewsh.hxx                                              |    2 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    8 
 sc/uiconfig/scalc/menubar/menubar.xml                                |    1 
 sd/uiconfig/sdraw/menubar/menubar.xml                                |    1 
 sd/uiconfig/simpress/menubar/menubar.xml                             |    1 
 sfx2/sdi/sfx.sdi                                                     |   19 -
 sfx2/sdi/viwslots.sdi                                                |    5 
 sfx2/source/view/ipclient.cxx                                        |    2 
 sfx2/source/view/viewimp.hxx                                         |    1 
 sfx2/source/view/viewsh.cxx                                          |  110 ----------
 sw/inc/helpid.h                                                      |    1 
 sw/source/uibase/docvw/docvw.hrc                                     |    2 
 sw/source/uibase/docvw/docvw.src                                     |    6 
 sw/source/uibase/docvw/romenu.cxx                                    |    6 
 sw/uiconfig/sglobal/menubar/menubar.xml                              |    1 
 sw/uiconfig/sweb/menubar/menubar.xml                                 |    1 
 sw/uiconfig/swform/menubar/menubar.xml                               |    1 
 sw/uiconfig/swreport/menubar/menubar.xml                             |    1 
 sw/uiconfig/swriter/menubar/menubar.xml                              |    1 
 sw/uiconfig/swxform/menubar/menubar.xml                              |    1 
 22 files changed, 10 insertions(+), 171 deletions(-)

New commits:
commit 4b3c211cfb4f64f0f31461aa2e623d64224c4423
Author: Bryan Quigley <gquigs at gmail.com>
Date:   Fri Apr 29 15:55:22 2016 -0400

    Remove Edit -> Plug-in as no longer used
    
    This functionality seems to only have been used with NPAPI plugins.
    They've been previously removed.  Per the help text, if it is still
    used by anything, you can use the context menu instead.
    
    MN_READONLY_PLUGINOFF also appeared to be unused, so removed.
    
    More code might be removable, but would affect activate on click/visible.
    
    Change-Id: I12d5bf54edd3a2f716912179b87e798b47b3cc3d
    Reviewed-on: https://gerrit.libreoffice.org/24500
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index 4cc86ab..12eedc2 100644
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -2421,14 +2421,6 @@
           <value>1</value>
         </prop>
       </node>
-      <node oor:name=".uno:PlugInsActive" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="x-no-translate"></value><value xml:lang="en-US">P~lug-in</value>
-        </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>1</value>
-        </prop>
-      </node>
       <node oor:name=".uno:HFixedLine" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Horizontal Line</value>
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 2e3743b..c722c51 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -154,7 +154,7 @@
 #define SID_BOOKMARK_URL                    (SID_SFX_START + 1311)
 #define SID_EDITDOC                         (SID_SFX_START + 1312)
 #define SID_BROWSER_MODE                    (SID_SFX_START + 1313)
-#define SID_PLUGINS_ACTIVE                  (SID_SFX_START + 1314)
+// FREE (was SID_PLUGINS_ACTIVE)                  (SID_SFX_START + 1314)
 #define SID_BROWSER                         (SID_SFX_START + 1318)
 #define SID_MACROEXECMODE                   (SID_SFX_START + 1319)
 
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 8abf52c..865f758 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -315,7 +315,7 @@ public:
     SAL_DLLPRIVATE void ExecPrint_Impl(SfxRequest &);
     SAL_DLLPRIVATE void ExecMisc_Impl(SfxRequest &);
     SAL_DLLPRIVATE void GetState_Impl(SfxItemSet&);
-    SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient*, const Rectangle& );
+    SAL_DLLPRIVATE void CheckIPClient_Impl( SfxInPlaceClient* );
     SAL_DLLPRIVATE void PushSubShells_Impl( bool bPush=true );
     SAL_DLLPRIVATE void PopSubShells_Impl() { PushSubShells_Impl( false ); }
     SAL_DLLPRIVATE void TakeOwnership_Impl();
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 52fc8f1..8e28bf8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2634,14 +2634,6 @@
           <value>1</value>
         </prop>
       </node>
-      <node oor:name=".uno:PlugInsActive" oor:op="replace">
-        <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Plug-in</value>
-        </prop>
-        <prop oor:name="Properties" oor:type="xs:int">
-          <value>1</value>
-        </prop>
-      </node>
       <node oor:name=".uno:HFixedLine" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Horizontal Line</value>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 44b5272..39fabaa 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -98,7 +98,6 @@
             <menu:menuitem menu:id=".uno:MergeDocuments"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:EditLinks"/>
-            <menu:menuitem menu:id=".uno:PlugInsActive"/>
             <menu:menuitem menu:id=".uno:ImageMapDialog"/>
             <menu:menuitem menu:id=".uno:ObjectMenue"/>
             <menu:menuseparator/>
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 3868304..a6844f8 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -90,7 +90,6 @@
       <menu:menuitem menu:id=".uno:DeletePage"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ManageLinks"/>
-      <menu:menuitem menu:id=".uno:PlugInsActive"/>
       <menu:menuitem menu:id=".uno:ImageMapDialog"/>
       <menu:menuitem menu:id=".uno:ObjectMenue"/>
       <menu:menuitem menu:id=".uno:EditHyperlink"/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 0d01083..6eb337f 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -88,7 +88,6 @@
             <menu:menuitem menu:id=".uno:EditHyperlink"/>
             <menu:menuitem menu:id=".uno:ModifyField"/>
             <menu:menuitem menu:id=".uno:ManageLinks"/>
-            <menu:menuitem menu:id=".uno:PlugInsActive"/>
             <menu:menuitem menu:id=".uno:ImageMapDialog"/>
             <menu:menuitem menu:id=".uno:ObjectMenue"/>
             <menu:menuseparator/>
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index d41c7141..97e3523 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3198,25 +3198,6 @@ SfxVoidItem PickList SID_PICKLIST
 ]
 
 
-SfxBoolItem PlugInsActive SID_PLUGINS_ACTIVE
-
-[
-    AutoUpdate = TRUE,
-    FastCall = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-
-
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_EDIT;
-]
-
-
 SfxBoolItem Print SID_PRINTDOC
 (SfxStringItem PrinterName SID_PRINTER_NAME,SfxStringItem FileName SID_FILE_NAME,SfxInt16Item From SID_PRINT_FIRST_PAGE,SfxInt16Item To SID_PRINT_LAST_PAGE,SfxInt16Item Copies SID_PRINT_COPIES,SfxStringItem RangeText SID_PRINT_PAGES,SfxBoolItem Selection SID_SELECTION,SfxBoolItem Asynchron SID_ASYNCHRON,SfxBoolItem Collate SID_PRINT_COLLATE,SfxBoolItem Silent SID_SILENT)
 [
diff --git a/sfx2/sdi/viwslots.sdi b/sfx2/sdi/viwslots.sdi
index 9009270..111180b 100644
--- a/sfx2/sdi/viwslots.sdi
+++ b/sfx2/sdi/viwslots.sdi
@@ -78,11 +78,6 @@ interface View
     [
         ExecMethod = ExecMisc_Impl ;
     ]
-    SID_PLUGINS_ACTIVE // ole(no) api(play/rec)
-    [
-        ExecMethod = ExecMisc_Impl ;
-        StateMethod = GetState_Impl ;
-    ]
     SID_STYLE_FAMILY
     [
         ExecMethod = ExecMisc_Impl ;
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index de5043e..1861d33 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -593,7 +593,7 @@ void SfxInPlaceClient_Impl::SizeHasChanged()
 IMPL_LINK_NOARG_TYPED(SfxInPlaceClient_Impl, TimerHdl, Timer *, void)
 {
     if ( m_pClient && m_xObject.is() )
-        m_pClient->GetViewShell()->CheckIPClient_Impl( m_pClient, m_pClient->GetViewShell()->GetObjectShell()->GetVisArea() );
+        m_pClient->GetViewShell()->CheckIPClient_Impl( m_pClient );
 }
 
 
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 0bd8e00..e3e60e2 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -48,7 +48,6 @@ struct SfxViewShell_Impl
     sal_uInt16                  m_nPrinterLocks;
     bool                        m_bCanPrint;
     bool                        m_bHasPrintOptions;
-    bool                        m_bPlugInsActive;
     bool                        m_bIsShowView;
     bool                        m_bGotOwnership;
     bool                        m_bGotFrameOwnership;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index ca3d51a..93a2b8b 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -242,7 +242,6 @@ SfxViewShell_Impl::SfxViewShell_Impl(SfxViewShellFlags const nFlags)
 ,   m_nPrinterLocks(0)
 ,   m_bCanPrint(nFlags & SfxViewShellFlags::CAN_PRINT)
 ,   m_bHasPrintOptions(nFlags & SfxViewShellFlags::HAS_PRINTOPTIONS)
-,   m_bPlugInsActive(true)
 ,   m_bIsShowView(!(nFlags & SfxViewShellFlags::NO_SHOW))
 ,   m_bGotOwnership(false)
 ,   m_bGotFrameOwnership(false)
@@ -680,70 +679,6 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
                 return;
             }
         }
-
-        // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        case SID_PLUGINS_ACTIVE:
-        {
-            const SfxBoolItem* pShowItem = rReq.GetArg<SfxBoolItem>(nId);
-            bool const bActive = (pShowItem)
-                ? pShowItem->GetValue()
-                : !pImp->m_bPlugInsActive;
-            // ggf. recorden
-            if ( !rReq.IsAPI() )
-                rReq.AppendItem( SfxBoolItem( nId, bActive ) );
-
-            // Jetzt schon DONE aufrufen, da die Argumente evtl. einen Pool
-            // benutzen, der demn"achst weg ist
-            rReq.Done(true);
-
-            // ausfuehren
-            if (!pShowItem || (bActive != pImp->m_bPlugInsActive))
-            {
-                SfxFrame* pTopFrame = &GetFrame()->GetTopFrame();
-                if ( pTopFrame != &GetFrame()->GetFrame() )
-                {
-                    // FramesetDocument
-                    SfxViewShell *pShell = pTopFrame->GetCurrentViewFrame()->GetViewShell();
-                    if ( pShell->GetInterface()->GetSlot( nId ) )
-                        pShell->ExecuteSlot( rReq );
-                    break;
-                }
-
-                SfxFrameIterator aIter( *pTopFrame );
-                while ( pTopFrame )
-                {
-                    if ( pTopFrame->GetCurrentViewFrame() )
-                    {
-                        SfxViewShell *pView = pTopFrame->GetCurrentViewFrame()->GetViewShell();
-                        if ( pView )
-                        {
-                            pView->pImp->m_bPlugInsActive = bActive;
-                            Rectangle aVisArea = GetObjectShell()->GetVisArea();
-                            VisAreaChanged(aVisArea);
-
-                            // the plugins might need change in their state
-                            SfxInPlaceClientList *pClients = pView->pImp->GetIPClientList_Impl(false);
-                            if ( pClients )
-                            {
-                                for ( size_t n = 0; n < pClients->size(); n++)
-                                {
-                                    SfxInPlaceClient* pIPClient = pClients->at( n );
-                                    if ( pIPClient )
-                                        pView->CheckIPClient_Impl( pIPClient, aVisArea );
-                                }
-                            }
-                        }
-                    }
-
-                    if ( !pTopFrame->GetParentFrame() )
-                        pTopFrame = aIter.FirstFrame();
-                    else
-                        pTopFrame = aIter.NextFrame( *pTopFrame );
-                }
-            }
-
-            break;
-        }
     }
 }
 
@@ -803,13 +738,6 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
                 }
                 break;
             }
-
-            // PlugIns running
-            case SID_PLUGINS_ACTIVE:
-            {
-                rSet.Put( SfxBoolItem( SID_PLUGINS_ACTIVE, !pImp->m_bPlugInsActive) );
-                break;
-            }
             case SID_STYLE_FAMILY :
             {
                 rSet.Put( SfxUInt16Item( SID_STYLE_FAMILY, pImp->m_nFamily ) );
@@ -1175,11 +1103,6 @@ SfxViewShell::SfxViewShell
 ,   mbPrinterSettingsModified(false)
 {
 
-    if ( pViewFrame->GetParentViewFrame() )
-    {
-        pImp->m_bPlugInsActive = pViewFrame->GetParentViewFrame()
-            ->GetViewShell()->pImp->m_bPlugInsActive;
-    }
     SetMargin( pViewFrame->GetMargin_Impl() );
 
     SetPool( &pViewFrame->GetObjectShell()->GetPool() );
@@ -1641,7 +1564,7 @@ void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/)
 }
 
 
-void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectangle& rVisArea )
+void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient )
 {
     if ( GetObjectShell()->IsInClose() )
         return;
@@ -1651,32 +1574,11 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan
     bool bActiveWhenVisible =
         ( (( pIPClient->GetObjectMiscStatus() & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) != 0 ) ||
          svt::EmbeddedObjectRef::IsGLChart(pIPClient->GetObject()));
-
-    // this method is called when either a client is created or the "Edit/Plugins" checkbox is checked
-    if ( !pIPClient->IsObjectInPlaceActive() && pImp->m_bPlugInsActive )
-    {
-        // object in client is currently not active
-        // check if the object wants to be activated always or when it becomes at least partially visible
-        // TODO/LATER: maybe we should use the scaled area instead of the ObjArea?!
-        if ( bAlwaysActive || (bActiveWhenVisible && rVisArea.IsOver(pIPClient->GetObjArea())) )
-        {
-            try
-            {
-                pIPClient->GetObject()->changeState( embed::EmbedStates::INPLACE_ACTIVE );
-            }
-            catch (const uno::Exception&)
-            {
-            }
-        }
-    }
-    else if (!pImp->m_bPlugInsActive)
-    {
-        // object in client is currently active and "Edit/Plugins" checkbox is selected
-        // check if the object wants to be activated always or when it becomes at least partially visible
-        // in this case selecting of the "Edit/Plugin" checkbox should let such objects deactivate
-        if ( bAlwaysActive || bActiveWhenVisible )
-            pIPClient->GetObject()->changeState( embed::EmbedStates::RUNNING );
-    }
+    // object in client is currently active
+    // check if the object wants to be activated always or when it becomes at least partially visible
+    // in this case selecting of the "Edit/Plugin" checkbox should let such objects deactivate
+    if ( bAlwaysActive || bActiveWhenVisible )
+        pIPClient->GetObject()->changeState( embed::EmbedStates::RUNNING );
 }
 
 
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index aa0d9d1..9793528 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -161,7 +161,6 @@
 #define HID_MN_READONLY_COPYGRAPHIC                             "SW_HID_MN_READONLY_COPYGRAPHIC"
 #define HID_MN_READONLY_LOADGRAPHIC                             "SW_HID_MN_READONLY_LOADGRAPHIC"
 #define HID_MN_READONLY_GRAPHICOFF                              "SW_HID_MN_READONLY_GRAPHICOFF"
-#define HID_MN_READONLY_PLUGINOFF                               "SW_HID_MN_READONLY_PLUGINOFF"
 
 #define HID_LINGU_ADD_WORD                                      "SW_HID_LINGU_ADD_WORD"
 #define HID_LINGU_IGNORE_WORD                                   "SW_HID_LINGU_IGNORE_WORD"
diff --git a/sw/source/uibase/docvw/docvw.hrc b/sw/source/uibase/docvw/docvw.hrc
index 1161bca..723ea8a 100644
--- a/sw/source/uibase/docvw/docvw.hrc
+++ b/sw/source/uibase/docvw/docvw.hrc
@@ -36,7 +36,7 @@
 #define MN_READONLY_COPYGRAPHIC         (RC_DOCVW_BEGIN + 14)
 #define MN_READONLY_LOADGRAPHIC         (RC_DOCVW_BEGIN + 15)
 #define MN_READONLY_GRAPHICOFF          (RC_DOCVW_BEGIN + 16)
-#define MN_READONLY_PLUGINOFF           (RC_DOCVW_BEGIN + 17)
+// free                                 (RC_DOCVW_BEGIN + 17)
 #define MN_READONLY_TOGALLERYLINK       (RC_DOCVW_BEGIN + 18)
 #define MN_READONLY_TOGALLERYCOPY       (RC_DOCVW_BEGIN + 19)
 #define MN_READONLY_SOURCEVIEW          (RC_DOCVW_BEGIN + 20)
diff --git a/sw/source/uibase/docvw/docvw.src b/sw/source/uibase/docvw/docvw.src
index 71654f2..171c298 100644
--- a/sw/source/uibase/docvw/docvw.src
+++ b/sw/source/uibase/docvw/docvw.src
@@ -169,12 +169,6 @@ Menu MN_READONLY_POPUP
             HelpID = HID_MN_READONLY_GRAPHICOFF ;
             Text [ en-US ] = "Image Off" ;
         };
-        MenuItem
-        {
-            Identifier = MN_READONLY_PLUGINOFF ;
-            HelpID = HID_MN_READONLY_PLUGINOFF ;
-            Text [ en-US ] = "Plug-ins Off" ;
-        };
         SEPARATOR
         MenuItem
         {
diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx
index 9b863d5..3aef486 100644
--- a/sw/source/uibase/docvw/romenu.cxx
+++ b/sw/source/uibase/docvw/romenu.cxx
@@ -190,9 +190,6 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
     Check( MN_READONLY_SOURCEVIEW,      SID_SOURCEVIEW,     rDis );
     Check( MN_READONLY_BROWSE_BACKWARD, SID_BROWSE_BACKWARD,rDis );
     Check( MN_READONLY_BROWSE_FORWARD,  SID_BROWSE_FORWARD, rDis );
-#ifdef _WIN32
-    Check( MN_READONLY_PLUGINOFF,       SID_PLUGINS_ACTIVE, rDis );
-#endif
     Check( MN_READONLY_OPENURL,         SID_OPENDOC,        rDis );
     Check( MN_READONLY_OPENURLNEW,      SID_OPENDOC,        rDis );
 
@@ -314,9 +311,6 @@ void SwReadOnlyPopup::Execute( vcl::Window* pWin, sal_uInt16 nId )
                 break;
             }
         case MN_READONLY_GRAPHICOFF:        nExecId = FN_VIEW_GRAPHIC;    break;
-#ifdef _WIN32
-        case MN_READONLY_PLUGINOFF:         nExecId = SID_PLUGINS_ACTIVE; break;
-#endif
         case MN_READONLY_TOGALLERYLINK:
             SW_MOD()->GetModuleConfig()->SetGrfToGalleryAsLnk( true );
             break;
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 0f3a719..6a4eb3b 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -120,7 +120,6 @@
       <menu:menuitem menu:id=".uno:EditHyperlink"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:LinkDialog"/>
-      <menu:menuitem menu:id=".uno:PlugInsActive"/>
       <menu:menuitem menu:id=".uno:ImageMapDialog"/>
       <menu:menuitem menu:id=".uno:ObjectMenue"/>
       <menu:menuseparator/>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 422ce36..65828e5 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -89,7 +89,6 @@
       <menu:menuitem menu:id=".uno:EditHyperlink"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:LinkDialog"/>
-      <menu:menuitem menu:id=".uno:PlugInsActive"/>
       <menu:menuitem menu:id=".uno:ImageMapDialog"/>
       <menu:menuitem menu:id=".uno:ObjectMenue"/>
       <menu:menuseparator/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index 9c0495e..d3502cb 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -119,7 +119,6 @@
       <menu:menuitem menu:id=".uno:EditHyperlink"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:LinkDialog"/>
-      <menu:menuitem menu:id=".uno:PlugInsActive"/>
       <menu:menuitem menu:id=".uno:ImageMapDialog"/>
       <menu:menuitem menu:id=".uno:ObjectMenue"/>
       <menu:menuseparator/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index d1cb979..37d1d40 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -120,7 +120,6 @@
       <menu:menuitem menu:id=".uno:EditHyperlink"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:LinkDialog"/>
-      <menu:menuitem menu:id=".uno:PlugInsActive"/>
       <menu:menuitem menu:id=".uno:ImageMapDialog"/>
       <menu:menuitem menu:id=".uno:ObjectMenue"/>
       <menu:menuseparator/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index fc9c443..78526e2 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -127,7 +127,6 @@
       </menu:menu>
       <menu:menuitem menu:id=".uno:FieldDialog"/>
       <menu:menuitem menu:id=".uno:LinkDialog"/>
-      <menu:menuitem menu:id=".uno:PlugInsActive"/>
       <menu:menuitem menu:id=".uno:ImageMapDialog"/>
       <menu:menuitem menu:id=".uno:ObjectMenue"/>
       <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index a1bbb15..e24ab30 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -121,7 +121,6 @@
       <menu:menuitem menu:id=".uno:EditHyperlink"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:LinkDialog"/>
-      <menu:menuitem menu:id=".uno:PlugInsActive"/>
       <menu:menuitem menu:id=".uno:ImageMapDialog"/>
       <menu:menuitem menu:id=".uno:ObjectMenue"/>
       <menu:menuseparator/>


More information about the Libreoffice-commits mailing list