diff options
| author | Yousuf Philips <philipz85@hotmail.com> | 2014-10-20 14:12:10 +0400 |
|---|---|---|
| committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-10-21 13:59:47 +0000 |
| commit | c69b48a42052ff79d192ae08c8226d9454a2338e (patch) | |
| tree | 4d301d668ec4c9bec59852262cf088fd8e9ac436 /sw | |
| parent | 92360e7413daf35d6b3acf2e77cf3c6063c5f11f (diff) | |
fdo#83579 - 'Extrusion On/Off' should be added to Fontwork toolbar
Also hid 'Extrusion On/Off' button in the extrusion toolbar
Change-Id: I768ba62878039a18cad8294046b3ae84d762d91b
Reviewed-on: https://gerrit.libreoffice.org/12046
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Diffstat (limited to 'sw')
10 files changed, 24 insertions, 14 deletions
diff --git a/sw/uiconfig/sglobal/toolbar/extrusionobjectbar.xml b/sw/uiconfig/sglobal/toolbar/extrusionobjectbar.xml index 09e65341e7ab..5f3d07abcc48 100644 --- a/sw/uiconfig/sglobal/toolbar/extrusionobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/extrusionobjectbar.xml @@ -18,7 +18,7 @@ * 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:ExtrusionToggle" toolbar:helpid="10960"/> + <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/> @@ -30,4 +30,4 @@ <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:style="dropdown"/> -</toolbar:toolbar>
\ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml b/sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml index 7f772c549aad..52ff5bc935d3 100644 --- a/sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/fontworkobjectbar.xml @@ -25,4 +25,6 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:style="dropdownonly"/> -</toolbar:toolbar>
\ No newline at end of file + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/> +</toolbar:toolbar> diff --git a/sw/uiconfig/sweb/toolbar/extrusionobjectbar.xml b/sw/uiconfig/sweb/toolbar/extrusionobjectbar.xml index 09e65341e7ab..5f3d07abcc48 100644 --- a/sw/uiconfig/sweb/toolbar/extrusionobjectbar.xml +++ b/sw/uiconfig/sweb/toolbar/extrusionobjectbar.xml @@ -18,7 +18,7 @@ * 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:ExtrusionToggle" toolbar:helpid="10960"/> + <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/> @@ -30,4 +30,4 @@ <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:style="dropdown"/> -</toolbar:toolbar>
\ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml b/sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml index d17268732535..52ff5bc935d3 100644 --- a/sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml +++ b/sw/uiconfig/sweb/toolbar/fontworkobjectbar.xml @@ -25,4 +25,6 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:style="dropdownonly"/> + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/> </toolbar:toolbar> diff --git a/sw/uiconfig/swform/toolbar/extrusionobjectbar.xml b/sw/uiconfig/swform/toolbar/extrusionobjectbar.xml index 09e65341e7ab..5f3d07abcc48 100644 --- a/sw/uiconfig/swform/toolbar/extrusionobjectbar.xml +++ b/sw/uiconfig/swform/toolbar/extrusionobjectbar.xml @@ -18,7 +18,7 @@ * 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:ExtrusionToggle" toolbar:helpid="10960"/> + <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/> @@ -30,4 +30,4 @@ <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:style="dropdown"/> -</toolbar:toolbar>
\ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/swform/toolbar/fontworkobjectbar.xml b/sw/uiconfig/swform/toolbar/fontworkobjectbar.xml index 7f772c549aad..52ff5bc935d3 100644 --- a/sw/uiconfig/swform/toolbar/fontworkobjectbar.xml +++ b/sw/uiconfig/swform/toolbar/fontworkobjectbar.xml @@ -25,4 +25,6 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:style="dropdownonly"/> -</toolbar:toolbar>
\ No newline at end of file + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/> +</toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/extrusionobjectbar.xml b/sw/uiconfig/swriter/toolbar/extrusionobjectbar.xml index 09e65341e7ab..5f3d07abcc48 100644 --- a/sw/uiconfig/swriter/toolbar/extrusionobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/extrusionobjectbar.xml @@ -18,7 +18,7 @@ * 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:ExtrusionToggle" toolbar:helpid="10960"/> + <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/> @@ -30,4 +30,4 @@ <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:style="dropdown"/> -</toolbar:toolbar>
\ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml b/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml index 7f772c549aad..52ff5bc935d3 100644 --- a/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/fontworkobjectbar.xml @@ -25,4 +25,6 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:style="dropdownonly"/> -</toolbar:toolbar>
\ No newline at end of file + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/> +</toolbar:toolbar> diff --git a/sw/uiconfig/swxform/toolbar/extrusionobjectbar.xml b/sw/uiconfig/swxform/toolbar/extrusionobjectbar.xml index 09e65341e7ab..5f3d07abcc48 100644 --- a/sw/uiconfig/swxform/toolbar/extrusionobjectbar.xml +++ b/sw/uiconfig/swxform/toolbar/extrusionobjectbar.xml @@ -18,7 +18,7 @@ * 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:ExtrusionToggle" toolbar:helpid="10960"/> + <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960" toolbar:visible="false"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltDown" toolbar:helpid="10961"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionTiltUp" toolbar:helpid="10962"/> @@ -30,4 +30,4 @@ <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:style="dropdown"/> -</toolbar:toolbar>
\ No newline at end of file +</toolbar:toolbar> diff --git a/sw/uiconfig/swxform/toolbar/fontworkobjectbar.xml b/sw/uiconfig/swxform/toolbar/fontworkobjectbar.xml index 7f772c549aad..52ff5bc935d3 100644 --- a/sw/uiconfig/swxform/toolbar/fontworkobjectbar.xml +++ b/sw/uiconfig/swxform/toolbar/fontworkobjectbar.xml @@ -25,4 +25,6 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FontworkAlignmentFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:FontworkCharacterSpacingFloater" toolbar:style="dropdownonly"/> -</toolbar:toolbar>
\ No newline at end of file + <toolbar:toolbarseparator/> + <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/> +</toolbar:toolbar> |