|
 |
ebc4bd |
From 5bf5fb4567096680d417af37744c743f00e26eeb Mon Sep 17 00:00:00 2001
|
|
|
ebc4bd |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
ebc4bd |
Date: Wed, 14 Jan 2015 16:55:02 +0000
|
|
|
ebc4bd |
Subject: [PATCH] Use the same advanced Ellipse and Rectangle shapes in writer
|
|
|
ebc4bd |
as draw
|
|
|
ebc4bd |
|
|
|
ebc4bd |
i.e. reconcile writer with draw/impress wrt.
|
|
|
ebc4bd |
|
|
|
ebc4bd |
commit 0e9faf7a0f8c76b50d9a9354d5fab5d1ad4af821
|
|
|
ebc4bd |
Author: Petr Mladek <pmladek@suse.cz>
|
|
|
ebc4bd |
Date: Fri Apr 22 16:51:58 2011 +0200
|
|
|
ebc4bd |
|
|
|
ebc4bd |
sd-toolbar-advanced-shapes.diff: used advanced Ellipse and Rectangle shapes
|
|
|
ebc4bd |
|
|
|
ebc4bd |
they allow to wrap text according to the shape which is a very nice
|
|
|
ebc4bd |
feature (bnc#171052)
|
|
|
ebc4bd |
|
|
|
ebc4bd |
Change-Id: I0bddfe65030f3515bcb5a30f2886d3ad17a72b0d
|
|
|
ebc4bd |
---
|
|
|
ebc4bd |
sw/uiconfig/sglobal/toolbar/drawbar.xml | 6 +++---
|
|
|
ebc4bd |
sw/uiconfig/swform/toolbar/drawbar.xml | 6 +++---
|
|
|
ebc4bd |
sw/uiconfig/swreport/toolbar/drawbar.xml | 6 +++---
|
|
|
ebc4bd |
sw/uiconfig/swriter/toolbar/drawbar.xml | 6 +++---
|
|
|
ebc4bd |
sw/uiconfig/swxform/toolbar/drawbar.xml | 6 +++---
|
|
|
ebc4bd |
5 files changed, 15 insertions(+), 15 deletions(-)
|
|
|
ebc4bd |
|
|
|
ebc4bd |
diff --git a/sw/uiconfig/sglobal/toolbar/drawbar.xml b/sw/uiconfig/sglobal/toolbar/drawbar.xml
|
|
|
ebc4bd |
index 8731a05..b31c198 100644
|
|
|
ebc4bd |
--- a/sw/uiconfig/sglobal/toolbar/drawbar.xml
|
|
|
ebc4bd |
+++ b/sw/uiconfig/sglobal/toolbar/drawbar.xml
|
|
|
ebc4bd |
@@ -21,8 +21,8 @@
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
|
|
|
ebc4bd |
<toolbar:toolbarseparator/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
|
|
|
ebc4bd |
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
|
|
|
ebc4bd |
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
|
|
|
ebc4bd |
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
|
|
|
ebc4bd |
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
|
|
|
ebc4bd |
@@ -48,4 +48,4 @@
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
|
|
|
ebc4bd |
<toolbar:toolbarseparator/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
|
|
|
ebc4bd |
-</toolbar:toolbar>
|
|
|
ebc4bd |
\ No newline at end of file
|
|
|
ebc4bd |
+</toolbar:toolbar>
|
|
|
ebc4bd |
diff --git a/sw/uiconfig/swform/toolbar/drawbar.xml b/sw/uiconfig/swform/toolbar/drawbar.xml
|
|
|
ebc4bd |
index 8731a05..b31c198 100644
|
|
|
ebc4bd |
--- a/sw/uiconfig/swform/toolbar/drawbar.xml
|
|
|
ebc4bd |
+++ b/sw/uiconfig/swform/toolbar/drawbar.xml
|
|
|
ebc4bd |
@@ -21,8 +21,8 @@
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
|
|
|
ebc4bd |
<toolbar:toolbarseparator/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
|
|
|
ebc4bd |
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
|
|
|
ebc4bd |
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
|
|
|
ebc4bd |
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
|
|
|
ebc4bd |
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
|
|
|
ebc4bd |
@@ -48,4 +48,4 @@
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
|
|
|
ebc4bd |
<toolbar:toolbarseparator/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
|
|
|
ebc4bd |
-</toolbar:toolbar>
|
|
|
ebc4bd |
\ No newline at end of file
|
|
|
ebc4bd |
+</toolbar:toolbar>
|
|
|
ebc4bd |
diff --git a/sw/uiconfig/swreport/toolbar/drawbar.xml b/sw/uiconfig/swreport/toolbar/drawbar.xml
|
|
|
ebc4bd |
index 8731a05..b31c198 100644
|
|
|
ebc4bd |
--- a/sw/uiconfig/swreport/toolbar/drawbar.xml
|
|
|
ebc4bd |
+++ b/sw/uiconfig/swreport/toolbar/drawbar.xml
|
|
|
ebc4bd |
@@ -21,8 +21,8 @@
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
|
|
|
ebc4bd |
<toolbar:toolbarseparator/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
|
|
|
ebc4bd |
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
|
|
|
ebc4bd |
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
|
|
|
ebc4bd |
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
|
|
|
ebc4bd |
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
|
|
|
ebc4bd |
@@ -48,4 +48,4 @@
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
|
|
|
ebc4bd |
<toolbar:toolbarseparator/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
|
|
|
ebc4bd |
-</toolbar:toolbar>
|
|
|
ebc4bd |
\ No newline at end of file
|
|
|
ebc4bd |
+</toolbar:toolbar>
|
|
|
ebc4bd |
diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml
|
|
|
ebc4bd |
index 8731a05..b31c198 100644
|
|
|
ebc4bd |
--- a/sw/uiconfig/swriter/toolbar/drawbar.xml
|
|
|
ebc4bd |
+++ b/sw/uiconfig/swriter/toolbar/drawbar.xml
|
|
|
ebc4bd |
@@ -21,8 +21,8 @@
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
|
|
|
ebc4bd |
<toolbar:toolbarseparator/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
|
|
|
ebc4bd |
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
|
|
|
ebc4bd |
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
|
|
|
ebc4bd |
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
|
|
|
ebc4bd |
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
|
|
|
ebc4bd |
@@ -48,4 +48,4 @@
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
|
|
|
ebc4bd |
<toolbar:toolbarseparator/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
|
|
|
ebc4bd |
-</toolbar:toolbar>
|
|
|
ebc4bd |
\ No newline at end of file
|
|
|
ebc4bd |
+</toolbar:toolbar>
|
|
|
ebc4bd |
diff --git a/sw/uiconfig/swxform/toolbar/drawbar.xml b/sw/uiconfig/swxform/toolbar/drawbar.xml
|
|
|
ebc4bd |
index 8731a05..b31c198 100644
|
|
|
ebc4bd |
--- a/sw/uiconfig/swxform/toolbar/drawbar.xml
|
|
|
ebc4bd |
+++ b/sw/uiconfig/swxform/toolbar/drawbar.xml
|
|
|
ebc4bd |
@@ -21,8 +21,8 @@
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
|
|
|
ebc4bd |
<toolbar:toolbarseparator/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
|
|
|
ebc4bd |
- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
|
|
|
ebc4bd |
- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
|
|
|
ebc4bd |
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
|
|
|
ebc4bd |
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
|
|
|
ebc4bd |
@@ -48,4 +48,4 @@
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
|
|
|
ebc4bd |
<toolbar:toolbarseparator/>
|
|
|
ebc4bd |
<toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
|
|
|
ebc4bd |
-</toolbar:toolbar>
|
|
|
ebc4bd |
\ No newline at end of file
|
|
|
ebc4bd |
+</toolbar:toolbar>
|
|
|
ebc4bd |
--
|
|
|
ebc4bd |
1.9.3
|
|
|
ebc4bd |
|