diff options
| -rw-r--r-- | icon-themes/breeze/links.txt | 9 | ||||
| -rw-r--r-- | icon-themes/colibre/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 |
5 files changed, 22 insertions, 5 deletions
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index 89b9dc01835c..4889dd11127a 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1802,3 +1802,12 @@ cmd/lc_macrodialog.png cmd/lc_scriptorganizer.png cmd/lc_donation.png cmd/lc_currencyfield.png cmd/sc_donation.png cmd/sc_currencyfield.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/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 97f55e3d0c63..f20fea8b44f8 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -1811,3 +1811,12 @@ cmd/sc_basicideappear.png cmd/sc_toolsmacroedit.png cmd/lc_donation.png cmd/lc_currencyfield.png cmd/sc_donation.png cmd/sc_currencyfield.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 aced9b2e8e83..cef3aced3fe9 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: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> |