[ooo-build-commit] patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                           |    3 ---
 patches/dev300/fit-list-to-size-build-fix.diff |   17 -----------------
 patches/dev300/fit-list-to-size-m58.diff       |   17 +++++++++++++++++
 patches/dev300/fit-list-to-size.diff           |   17 +++++++++++++++++
 4 files changed, 34 insertions(+), 20 deletions(-)

New commits:
commit 07ef8ddfbd922040d7f2c4d0f4c35f7847c3bdc0
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Sat Oct 3 17:34:10 2009 +0200

    Folded fit-list-to-size-build-fix into actual patches
    
    * patches/dev300/apply: fit-list-to-size-build-fix removed
    * patches/dev300/fit-list-to-size-build-fix.diff: rm-ed
    * patches/dev300/fit-list-to-size-m58.diff: added chunk
    * patches/dev300/fit-list-to-size.diff: add chunk

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1611052..981bc6b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2908,9 +2908,6 @@ fit-list-to-size-ui.diff, i#94086, thorsten
 fit-list-to-size-style-defaults.diff, i#94086, thorsten
 fit-list-to-size-popup.diff, i#94086, thorsten
 
-# FIXME: thorsten, please review this and replace it with the right fix.  Thanks!
-fit-list-to-size-build-fix.diff, kohei
-
 [ Fixes ]
 # apply this patch if you need to disable vcl grabbing your mouse -
 # after applying the patch, set SAL_NO_MOUSEGRABS in your env
diff --git a/patches/dev300/fit-list-to-size-build-fix.diff b/patches/dev300/fit-list-to-size-build-fix.diff
deleted file mode 100644
index 981f53f..0000000
--- a/patches/dev300/fit-list-to-size-build-fix.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git svx/source/svdraw/svdotextdecomposition.cxx svx/source/svdraw/svdotextdecomposition.cxx
-index 2cc2385..2905cab 100644
---- svx/source/svdraw/svdotextdecomposition.cxx
-+++ svx/source/svdraw/svdotextdecomposition.cxx
-@@ -1179,9 +1179,11 @@ bool SdrTextObj::impDecomposeAutoFitTextPrimitive(
- 	aNewTransformB.rotate(fRotate);
- 	aNewTransformB.translate(aTranslate.getX(), aTranslate.getY());
- 
-+    basegfx::B2DRange aClipRange;
-+
- 	// now break up text primitives.
- 	impTextBreakupHandler aConverter(rOutliner);
--	aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB);
-+	aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB, aClipRange);
- 
- 	// cleanup outliner
- 	rOutliner.Clear();
diff --git a/patches/dev300/fit-list-to-size-m58.diff b/patches/dev300/fit-list-to-size-m58.diff
index 68b1376..6d4d13d 100644
--- a/patches/dev300/fit-list-to-size-m58.diff
+++ b/patches/dev300/fit-list-to-size-m58.diff
@@ -1135,6 +1135,23 @@
 #  	// Bei TakeTextRect wird u.a. auch der Text in
 #  	// den Outliner gesteckt
 #  	rTextObj.TakeTextRect(rOutliner,aTextRect,FALSE,&aAnchorRect);
+diff --git svx/source/svdraw/svdotextdecomposition.cxx svx/source/svdraw/svdotextdecomposition.cxx
+index 2cc2385..2905cab 100644
+--- svx/source/svdraw/svdotextdecomposition.cxx
++++ svx/source/svdraw/svdotextdecomposition.cxx
+@@ -1179,10 +1179,12 @@ bool SdrTextObj::impDecomposeAutoFitTextPrimitive(
+ 	aNewTransformB.rotate(fRotate);
+ 	aNewTransformB.translate(aTranslate.getX(), aTranslate.getY());
+ 
++    basegfx::B2DRange aClipRange;
++
+ 	// now break up text primitives.
+ 	impTextBreakupHandler aConverter(rOutliner);
+-	aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB);
++	aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB, aClipRange);
+ 
+ 	// cleanup outliner
+ 	rOutliner.Clear();
 --- svx/source/svdraw/svdview.cxx.old	2009-04-02 11:03:00.000000000 +0000
 +++ svx/source/svdraw/svdview.cxx	2009-04-06 16:42:18.000000000 +0000
 @@ -504,8 +504,7 @@ SdrHitKind SdrView::PickAnything(const P
diff --git a/patches/dev300/fit-list-to-size.diff b/patches/dev300/fit-list-to-size.diff
index fcc0fd7..374e392 100644
--- a/patches/dev300/fit-list-to-size.diff
+++ b/patches/dev300/fit-list-to-size.diff
@@ -1128,6 +1128,23 @@
 #  	// Bei TakeTextRect wird u.a. auch der Text in
 #  	// den Outliner gesteckt
 #  	rTextObj.TakeTextRect(rOutliner,aTextRect,FALSE,&aAnchorRect);
+diff --git svx/source/svdraw/svdotextdecomposition.cxx svx/source/svdraw/svdotextdecomposition.cxx
+index 2cc2385..2905cab 100644
+--- svx/source/svdraw/svdotextdecomposition.cxx
++++ svx/source/svdraw/svdotextdecomposition.cxx
+@@ -1179,10 +1179,12 @@ bool SdrTextObj::impDecomposeAutoFitTextPrimitive(
+ 	aNewTransformB.rotate(fRotate);
+ 	aNewTransformB.translate(aTranslate.getX(), aTranslate.getY());
+ 
++    basegfx::B2DRange aClipRange;
++
+ 	// now break up text primitives.
+ 	impTextBreakupHandler aConverter(rOutliner);
+-	aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB);
++	aConverter.decomposeBlockTextPrimitive(aNewTransformA, aNewTransformB, aClipRange);
+ 
+ 	// cleanup outliner
+ 	rOutliner.Clear();
 --- svx/source/svdraw/svdview.cxx.old	2009-04-02 11:03:00.000000000 +0000
 +++ svx/source/svdraw/svdview.cxx	2009-04-06 16:42:18.000000000 +0000
 @@ -504,8 +504,7 @@ SdrHitKind SdrView::PickAnything(const P