[Libreoffice-commits] .: Branch 'libreoffice-3-4' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                           |    1 
 patches/dev300/sd-toolbar-advanced-shapes.diff |   38 -------------------------
 2 files changed, 39 deletions(-)

New commits:
commit 00177460804bc91d19fb00a689e7b9f089b0840c
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 22 16:55:23 2011 +0200

    pushed sd-toolbar-advanced-shapes.diff into git (bnc#171052)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b01f078..8c04a8c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -167,7 +167,6 @@ speed-sal-fewer-lstats.diff, i#89730, jholesov
 
 [ Fixes ]
 # use basic (advanced) shapes for rectangle/ellipse on draw/impress's toolbars. make shapes wrap words by default, n#171052, rodo
-sd-toolbar-advanced-shapes.diff, n#171052, rodo
 svx-shapes-default-word-wrap-enable.diff, n#171052, rodo
 svx-honour-customshape-capabilities.diff, n#395372, thorsten
 
diff --git a/patches/dev300/sd-toolbar-advanced-shapes.diff b/patches/dev300/sd-toolbar-advanced-shapes.diff
deleted file mode 100644
index c0c445a..0000000
--- a/patches/dev300/sd-toolbar-advanced-shapes.diff
+++ /dev/null
@@ -1,38 +0,0 @@
----
- sd/uiconfig/sdraw/toolbar/toolbar.xml    |    4 ++--
- sd/uiconfig/simpress/toolbar/toolbar.xml |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git sd/uiconfig/sdraw/toolbar/toolbar.xml sd/uiconfig/sdraw/toolbar/toolbar.xml
-index 5ac55e4..aa5d754 100644
---- sd/uiconfig/sdraw/toolbar/toolbar.xml
-+++ sd/uiconfig/sdraw/toolbar/toolbar.xml
-@@ -5,8 +5,8 @@
-  <toolbar:toolbarseparator/>
-  <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="helpid:10102" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:helpid="helpid:27173" toolbar:style="radio" />
-- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="helpid:10104" toolbar:style="radio" />
-- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
-+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:10104" toolbar:style="radio" />
-+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:helpid="helpid:10398" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="helpid:10398" toolbar:style="radio" />
-  <toolbar:toolbarseparator/>
-diff --git sd/uiconfig/simpress/toolbar/toolbar.xml sd/uiconfig/simpress/toolbar/toolbar.xml
-index 62d33c1..25bffb7 100644
---- sd/uiconfig/simpress/toolbar/toolbar.xml
-+++ sd/uiconfig/simpress/toolbar/toolbar.xml
-@@ -5,8 +5,8 @@
-  <toolbar:toolbarseparator/>
-  <toolbar:toolbaritem xlink:href=".uno:Line" toolbar:helpid="helpid:10102" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:LineArrowEnd" toolbar:helpid="helpid:27173" toolbar:style="radio" />
-- <toolbar:toolbaritem xlink:href=".uno:Rect" toolbar:helpid="helpid:10104" toolbar:style="radio" />
-- <toolbar:toolbaritem xlink:href=".uno:Ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
-+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:10104" toolbar:style="radio" />
-+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:10110" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:Text" toolbar:helpid="helpid:10398" toolbar:style="radio" />
-  <toolbar:toolbaritem xlink:href=".uno:VerticalText" toolbar:helpid="helpid:10398" toolbar:style="radio" />
-  <toolbar:toolbarseparator/>
--- 
-1.7.0.1
-