[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - officecfg/registry sd/uiconfig

[Muhammet Kara (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu |    2 +-
 sd/uiconfig/sdraw/toolbar/redactedexportbar.xml                 |    2 +-
 sd/uiconfig/simpress/menubar/menubar.xml                        |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b8dfcb5b4446d93f294efbb9c83a0abc94b0a7ec
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Fri Mar 29 12:46:36 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Mon Jun 17 22:53:31 2019 +0200

    Add RedactDoc to Tools menu of Impress
    
    Now that we have redaction enabled for Impress,
    after commit 33e840896a69a66c44e74beb995d558735fb84ad,
    let's sync the Impress Tools menu with Writer and Calc.
    
    Change-Id: I1aaf29e5ea0ddb07b1f3b6ef98e017904896fcd4
    Reviewed-on: https://gerrit.libreoffice.org/69911
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/74221
    Tested-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 8b99144ada42..64fa2e14aa92 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -602,6 +602,7 @@
             </menu:menu>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
+            <menu:menuitem menu:id=".uno:RedactDoc"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:BmpMask"/>
             <menu:menuitem menu:id=".uno:AVMediaPlayer"/>
commit 76cb464676cc4b82fd243824fb38bbf7288c3a00
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Tue Apr 16 17:43:22 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Mon Jun 17 22:53:14 2019 +0200

    Switch redacted export options
    
    Bring White option to the first place,
    to save toner on print as users tend to
    click on the first option.
    
    Change-Id: Id63c4402f8dc07a83eef69c3dfde3dd086c899b8
    Reviewed-on: https://gerrit.libreoffice.org/70831
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/74220
    Tested-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index cef3aced3fe9..922c2dc29b83 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -625,7 +625,7 @@
           <value>com.sun.star.comp.framework.SubToolBarController</value>
         </prop>
         <prop oor:name="Value">
-          <value>redactedexportbar;.uno:RedactedExportBlack</value>
+          <value>redactedexportbar;.uno:RedactedExportWhite</value>
         </prop>
       </node>
       <node oor:name="LineToolBox" oor:op="replace">
diff --git a/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml b/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml
index 727a34ba72d5..42cc31a59d98 100644
--- a/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/redactedexportbar.xml
@@ -18,6 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <toolbar:toolbaritem xlink:href=".uno:RedactedExportBlack"/>
  <toolbar:toolbaritem xlink:href=".uno:RedactedExportWhite"/>
+ <toolbar:toolbaritem xlink:href=".uno:RedactedExportBlack"/>
 </toolbar:toolbar>