[ooo-build-commit] patches/dev300

[Petr Mladek]

 patches/dev300/fit-list-to-size-m58.diff |   23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

New commits:
commit 36bf236fa61ba68046b264a47057104b33336724
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Oct 5 14:18:50 2009 +0200

    Fix fit-list-to-size-m58.diff to apply
    
    * patches/dev300/fit-list-to-size-m58.diff: merge two hunks to make
      the "patch --dry-run" test happy

diff --git a/patches/dev300/fit-list-to-size-m58.diff b/patches/dev300/fit-list-to-size-m58.diff
index 6d4d13d..eac86e1 100644
--- a/patches/dev300/fit-list-to-size-m58.diff
+++ b/patches/dev300/fit-list-to-size-m58.diff
@@ -892,7 +892,7 @@
  
  	// mirroring. We are now in aAnchorTextRange sizes. When mirroring in X and Y,
  	// move the null point which was top left to bottom right.
-@@ -956,6 +956,136 @@ bool SdrTextObj::impDecomposeStretchText
+@@ -956,6 +956,138 @@ bool SdrTextObj::impDecomposeStretchText
  
  	rTarget = aConverter.getPrimitive2DSequence();
      return false;
@@ -1015,9 +1015,11 @@
 +	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();
@@ -1135,23 +1137,6 @@
 #  	// 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