diff options
| author | Muhammet Kara <muhammet.kara@collabora.com> | 2019-02-24 11:55:29 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-03-27 21:44:46 +0100 |
| commit | 1d647aea40abf3fe966866eb7baff108071e672e (patch) | |
| tree | 976a8860df5c2735d959fc318eab01ded1f6cb21 | |
| parent | 8ca55f57c9d0d982356f85e25edec03249ea8cc3 (diff) | |
Temp icons for the redactedexport commands
Just put some links for now for the icons,
and replace the two buttons on the redaction toolbar
with the new redactedexporttoolbox
Change-Id: Ic1df62d56c965869135ceca97bbeb87efd3aaa0d
Reviewed-on: https://gerrit.libreoffice.org/68281
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/69838
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | icon-themes/breeze/links.txt | 9 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 2 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/toolbar/redactedexportbar.xml | 4 | ||||
| -rw-r--r-- | sd/uiconfig/sdraw/toolbar/redactionbar.xml | 3 |
4 files changed, 13 insertions, 5 deletions
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index e562fe12365f..ddf77579b98e 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1722,3 +1722,12 @@ cmd/sc_rowoperations.png cmd/sc_entirerow.png cmd/sc_cellprotection.png cmd/sc_protect.png cmd/lc_cellprotection.png cmd/lc_protect.png + +# Redaction toolbar +cmd/lc_redactedexportblack.png cmd/lc_exportdirecttopdf.png +cmd/sc_redactedexportblack.png cmd/sc_exportdirecttopdf.png +cmd/32/redactedexportblack.png cmd/32/exportdirecttopdf.png + +cmd/lc_redactedexportwhite.png cmd/lc_exportdirecttopdf.png +cmd/sc_redactedexportwhite.png cmd/sc_exportdirecttopdf.png +cmd/32/redactedexportwhite.png cmd/32/exportdirecttopdf.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 8c6daa310c36..260a20b4cd1e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -611,7 +611,7 @@ <value>com.sun.star.comp.framework.SubToolBarController</value> </prop> <prop oor:name="Value"> - <value>redactedexportbar;.uno:ExportDirectToPDF?IsRedactMode:bool=true</value> + <value>redactedexportbar;.uno:RedactedExportBlack</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 06468d459409..727a34ba72d5 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:ExportDirectToPDF?IsRedactMode:bool=true"/> - <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/> + <toolbar:toolbaritem xlink:href=".uno:RedactedExportBlack"/> + <toolbar:toolbaritem xlink:href=".uno:RedactedExportWhite"/> </toolbar:toolbar> diff --git a/sd/uiconfig/sdraw/toolbar/redactionbar.xml b/sd/uiconfig/sdraw/toolbar/redactionbar.xml index bb27cd01acb4..e25e53d4414b 100644 --- a/sd/uiconfig/sdraw/toolbar/redactionbar.xml +++ b/sd/uiconfig/sdraw/toolbar/redactionbar.xml @@ -21,6 +21,5 @@ <toolbar:toolbaritem xlink:href=".uno:Rect?FillTransparence:short=50&FillColor:string=COL_GRAY7&LineStyle:short=0&IsSticky:bool=true&ShapeName:string=RectangleRedactionShape"/> <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled?Transparence:short=50&Color:string=COL_GRAY7&Width:short=500&IsSticky:bool=true&ShapeName:string=FreeformRedactionShape"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:RedactedExportBlack"/> - <toolbar:toolbaritem xlink:href=".uno:RedactedExportWhite"/> + <toolbar:toolbaritem xlink:href=".uno:RedactedExportToolbox"/> </toolbar:toolbar> |