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

[Petr Mladek]

 patches/dev300/apply                                    |    2 --
 patches/dev300/svx-shapes-default-word-wrap-enable.diff |   11 -----------
 2 files changed, 13 deletions(-)

New commits:
commit 33e3b5da5f1bfe47ba6d9ffcd9e6430603cf16ca
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 22 17:10:14 2011 +0200

    pushed svx-shapes-default-word-wrap-enable.diff into git (bnc#171052)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8c04a8c..ca9dc3e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -166,8 +166,6 @@ speed-sal-fewer-lstats.diff, i#89730, jholesov
 #FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
 
 [ Fixes ]
-# use basic (advanced) shapes for rectangle/ellipse on draw/impress's toolbars. make shapes wrap words by default, n#171052, rodo
-svx-shapes-default-word-wrap-enable.diff, n#171052, rodo
 svx-honour-customshape-capabilities.diff, n#395372, thorsten
 
 # Fix for n#113235
diff --git a/patches/dev300/svx-shapes-default-word-wrap-enable.diff b/patches/dev300/svx-shapes-default-word-wrap-enable.diff
deleted file mode 100644
index 7825419..0000000
--- a/patches/dev300/svx-shapes-default-word-wrap-enable.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- svx/source/svdraw/svdattr.cxx
-+++ svx/source/svdraw/svdattr.cxx
-@@ -149,7 +149,7 @@ SdrItemPool::SdrItemPool(
-     mppLocalPoolDefaults[SDRATTR_CUSTOMSHAPE_ADJUSTMENT -SDRATTR_START]=new SdrCustomShapeAdjustmentItem;
-     mppLocalPoolDefaults[SDRATTR_XMLATTRIBUTES -SDRATTR_START]=new SvXMLAttrContainerItem( SDRATTR_XMLATTRIBUTES );
-     mppLocalPoolDefaults[SDRATTR_TEXT_USEFIXEDCELLHEIGHT -SDRATTR_START]=new SdrTextFixedCellHeightItem;
--    mppLocalPoolDefaults[SDRATTR_TEXT_WORDWRAP		   -SDRATTR_START]=new SdrTextWordWrapItem;
-+    mppLocalPoolDefaults[SDRATTR_TEXT_WORDWRAP		   -SDRATTR_START]=new SdrTextWordWrapItem( sal_False );
-     mppLocalPoolDefaults[SDRATTR_TEXT_AUTOGROWSIZE	   -SDRATTR_START]=new SdrTextAutoGrowSizeItem;
-     mppLocalPoolDefaults[SDRATTR_EDGEKIND         -SDRATTR_START]=new SdrEdgeKindItem;
-     mppLocalPoolDefaults[SDRATTR_EDGENODE1HORZDIST-SDRATTR_START]=new SdrEdgeNode1HorzDistItem(nDefEdgeDist);