/[packages]/cauldron/libreoffice/current/SOURCES/0001-Use-the-same-advanced-Ellipse-and-Rectangle-shapes-i.patch
ViewVC logotype

Contents of /cauldron/libreoffice/current/SOURCES/0001-Use-the-same-advanced-Ellipse-and-Rectangle-shapes-i.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 812201 - (show annotations) (download)
Sun Jan 25 19:29:15 2015 UTC (8 years, 10 months ago) by tv
File size: 7541 byte(s) 
- sync with FC now they updated to 4.4.0 rc3 too plus:
  o move officehelper.py to pyuno package so it can be imported from python
  o add Provides: libreoffice-headless; packages are depending on it
1 From 5bf5fb4567096680d417af37744c743f00e26eeb Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
3 Date: Wed, 14 Jan 2015 16:55:02 +0000
4 Subject: [PATCH] Use the same advanced Ellipse and Rectangle shapes in writer
5 as draw
6
7 i.e. reconcile writer with draw/impress wrt.
8
9 commit 0e9faf7a0f8c76b50d9a9354d5fab5d1ad4af821
10 Author: Petr Mladek <pmladek@suse.cz>
11 Date: Fri Apr 22 16:51:58 2011 +0200
12
13 sd-toolbar-advanced-shapes.diff: used advanced Ellipse and Rectangle shapes
14
15 they allow to wrap text according to the shape which is a very nice
16 feature (bnc#171052)
17
18 Change-Id: I0bddfe65030f3515bcb5a30f2886d3ad17a72b0d
19 ---
20 sw/uiconfig/sglobal/toolbar/drawbar.xml | 6 +++---
21 sw/uiconfig/swform/toolbar/drawbar.xml | 6 +++---
22 sw/uiconfig/swreport/toolbar/drawbar.xml | 6 +++---
23 sw/uiconfig/swriter/toolbar/drawbar.xml | 6 +++---
24 sw/uiconfig/swxform/toolbar/drawbar.xml | 6 +++---
25 5 files changed, 15 insertions(+), 15 deletions(-)
26
27 diff --git a/sw/uiconfig/sglobal/toolbar/drawbar.xml b/sw/uiconfig/sglobal/toolbar/drawbar.xml
28 index 8731a05..b31c198 100644
29 --- a/sw/uiconfig/sglobal/toolbar/drawbar.xml
30 +++ b/sw/uiconfig/sglobal/toolbar/drawbar.xml
31 @@ -21,8 +21,8 @@
32 <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
33 <toolbar:toolbarseparator/>
34 <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
35 - <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
36 - <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
37 + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
38 + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
39 <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
40 <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
41 <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
42 @@ -48,4 +48,4 @@
43 <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
44 <toolbar:toolbarseparator/>
45 <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
46 -</toolbar:toolbar>
47 \ No newline at end of file
48 +</toolbar:toolbar>
49 diff --git a/sw/uiconfig/swform/toolbar/drawbar.xml b/sw/uiconfig/swform/toolbar/drawbar.xml
50 index 8731a05..b31c198 100644
51 --- a/sw/uiconfig/swform/toolbar/drawbar.xml
52 +++ b/sw/uiconfig/swform/toolbar/drawbar.xml
53 @@ -21,8 +21,8 @@
54 <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
55 <toolbar:toolbarseparator/>
56 <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
57 - <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
58 - <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
59 + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
60 + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
61 <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
62 <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
63 <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
64 @@ -48,4 +48,4 @@
65 <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
66 <toolbar:toolbarseparator/>
67 <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
68 -</toolbar:toolbar>
69 \ No newline at end of file
70 +</toolbar:toolbar>
71 diff --git a/sw/uiconfig/swreport/toolbar/drawbar.xml b/sw/uiconfig/swreport/toolbar/drawbar.xml
72 index 8731a05..b31c198 100644
73 --- a/sw/uiconfig/swreport/toolbar/drawbar.xml
74 +++ b/sw/uiconfig/swreport/toolbar/drawbar.xml
75 @@ -21,8 +21,8 @@
76 <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
77 <toolbar:toolbarseparator/>
78 <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
79 - <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
80 - <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
81 + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
82 + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
83 <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
84 <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
85 <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
86 @@ -48,4 +48,4 @@
87 <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
88 <toolbar:toolbarseparator/>
89 <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
90 -</toolbar:toolbar>
91 \ No newline at end of file
92 +</toolbar:toolbar>
93 diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml
94 index 8731a05..b31c198 100644
95 --- a/sw/uiconfig/swriter/toolbar/drawbar.xml
96 +++ b/sw/uiconfig/swriter/toolbar/drawbar.xml
97 @@ -21,8 +21,8 @@
98 <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
99 <toolbar:toolbarseparator/>
100 <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
101 - <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
102 - <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
103 + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
104 + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
105 <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
106 <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
107 <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
108 @@ -48,4 +48,4 @@
109 <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
110 <toolbar:toolbarseparator/>
111 <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
112 -</toolbar:toolbar>
113 \ No newline at end of file
114 +</toolbar:toolbar>
115 diff --git a/sw/uiconfig/swxform/toolbar/drawbar.xml b/sw/uiconfig/swxform/toolbar/drawbar.xml
116 index 8731a05..b31c198 100644
117 --- a/sw/uiconfig/swxform/toolbar/drawbar.xml
118 +++ b/sw/uiconfig/swxform/toolbar/drawbar.xml
119 @@ -21,8 +21,8 @@
120 <toolbar:toolbaritem xlink:href=".uno:SelectObject" toolbar:helpid="10128"/>
121 <toolbar:toolbarseparator/>
122 <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="10102"/>
123 - <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="10104"/>
124 - <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="10110"/>
125 + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="10104"/>
126 + <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="10110"/>
127 <toolbar:toolbaritem xlink:href=".uno:Polygon_Unfilled" toolbar:visible="false" toolbar:helpid="10395"/>
128 <toolbar:toolbaritem xlink:href=".uno:Bezier_Unfilled" toolbar:visible="false" toolbar:helpid="10397"/>
129 <toolbar:toolbaritem xlink:href=".uno:Freeline_Unfilled" toolbar:helpid="10464"/>
130 @@ -48,4 +48,4 @@
131 <toolbar:toolbaritem xlink:href=".uno:InsertGraphic" toolbar:helpid="10241"/>
132 <toolbar:toolbarseparator/>
133 <toolbar:toolbaritem xlink:href=".uno:ExtrusionToggle" toolbar:helpid="10960"/>
134 -</toolbar:toolbar>
135 \ No newline at end of file
136 +</toolbar:toolbar>
137 --
138 1.9.3
139
  ViewVC Help
Powered by ViewVC 1.1.28