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

[Petr Mladek]

 patches/dev300/apply                                    |    4 ---
 patches/dev300/writer-default-as-optimal-page-wrap.diff |   20 ----------------
 2 files changed, 24 deletions(-)

New commits:
commit 919d213221e04a0a52651c3b9304ef74e4c46530
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Apr 27 15:56:24 2011 +0200

    pushed writer-default-as-optimal-page-wrap.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 41f114d..41b572b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -337,10 +337,6 @@ novell-win32-xp-fpicker-detail.diff, bnc#620924
 win32-prebuilt-writingaids-zip.diff
 win32-prebuilt-writingaids-zip-scp2.diff
 
-[ DefaultSettings ]
-# Optimal Page Wrap should be default for graphics insertion (X#59831)
-writer-default-as-optimal-page-wrap.diff, i#38108, jody
-
 [ LinuxOnly ]
 # search <ooo-home>/share/template/common for language independent templates
 # will not push it upstream because it will be replaced by upcomming kendy's work
diff --git a/patches/dev300/writer-default-as-optimal-page-wrap.diff b/patches/dev300/writer-default-as-optimal-page-wrap.diff
deleted file mode 100644
index ad085a1..0000000
--- a/patches/dev300/writer-default-as-optimal-page-wrap.diff
+++ /dev/null
@@ -1,20 +0,0 @@
----
- sw/source/core/doc/poolfmt.cxx |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git sw/source/core/doc/poolfmt.cxx sw/source/core/doc/poolfmt.cxx
-index 78bd3d5..0824ac5 100644
---- sw/source/core/doc/poolfmt.cxx
-+++ sw/source/core/doc/poolfmt.cxx
-@@ -1326,7 +1326,7 @@ SwFmt* SwDoc::GetFmtFromPool( USHORT nId )
-             aSet.Put( SwFmtAnchor( FLY_AT_PARA ));
-             aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
-             aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
--            aSet.Put( SwFmtSurround( SURROUND_NONE ));
-+            aSet.Put( SwFmtSurround( SURROUND_IDEAL ));
-         }
-         break;
-     case RES_POOLFRM_FORMEL:
--- 
-1.7.0.1
-