[Libreoffice-commits] core.git: 2 commits - framework/source officecfg/registry

[Maxim Monastirsky]

 framework/source/uielement/popuptoolbarcontroller.cxx           |    9 ----
 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |   22 ++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)

New commits:
commit a3a1c50d6495860327e8cf9db869c466aa054d22
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sat Apr 9 23:29:43 2016 +0300

    SaveToolbarController: Blacklist in Basic IDE too
    
    Save as/to remote don't work there. Still would be
    nice to have the modified state icon change there too,
    but that's for a future investigation.
    
    Change-Id: Id119a40c39f9c69738b1e61e23ffe3424276229e

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index cb81fa5..0f7d229 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1140,6 +1140,17 @@
           <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
         </prop>
       </node>
+      <node oor:name="SimpleSaveInBasicIDE" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:Save</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.script.BasicIDE</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
+        </prop>
+      </node>
       <node oor:name="FreezePanesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:FreezePanes</value>
commit e58b8075983330737642c68bd7e67071efecd906
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Tue Apr 5 00:47:03 2016 +0300

    SaveToolbarController: Blacklist RelationDesign in officecfg
    
    Change-Id: I8aa14bb76a26aa12771000b393bee37d26ba85e7

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 23c81d7..e497705 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -371,21 +371,14 @@ void SaveToolbarController::initialize( const css::uno::Sequence< css::uno::Any
 {
     PopupMenuToolbarController::initialize( aArguments );
 
-    bool bRelationDesignModule = m_sModuleName.endsWith( "RelationDesign" );
-
     ToolBox* pToolBox = nullptr;
     sal_uInt16 nId = 0;
-    if ( getToolboxId( nId, &pToolBox )
-        && ( bRelationDesignModule || pToolBox->GetItemCommand( nId ) != m_aCommandURL ) )
+    if ( getToolboxId( nId, &pToolBox ) && pToolBox->GetItemCommand( nId ) != m_aCommandURL )
     {
         m_bSplitButton = false;
         pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) & ~ ToolBoxItemBits::DROPDOWN );
     }
 
-    if ( bRelationDesignModule )
-        // No modified icon there, just disable the button if there's nothing to save.
-        return;
-
     css::uno::Reference< css::frame::XController > xController( m_xFrame->getController(), css::uno::UNO_QUERY );
     if ( xController.is() )
         m_xModifiable.set( xController->getModel(), css::uno::UNO_QUERY );
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 6de8c28..cb81fa5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1129,6 +1129,17 @@
           <value>com.sun.star.comp.framework.SaveToolbarController</value>
         </prop>
       </node>
+      <node oor:name="SimpleSaveInRelationDesign" oor:op="replace">
+        <prop oor:name="Command">
+          <value>.uno:Save</value>
+        </prop>
+        <prop oor:name="Module">
+          <value>com.sun.star.sdb.RelationDesign</value>
+        </prop>
+        <prop oor:name="Controller">
+          <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
+        </prop>
+      </node>
       <node oor:name="FreezePanesToolbarController" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:FreezePanes</value>