[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/fit-list-to-size.diff |   51 ++++++-----------------------------
 1 file changed, 9 insertions(+), 42 deletions(-)

New commits:
commit b8aa9473cd552290d3bc6db3a2ac0d88b25a1151
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Oct 5 14:04:11 2009 +0300

    Make fit-list-to-size.diff apply
    
    * patches/dev300/fit-list-to-size.diff: Combine two patches to the
      same source file into one. Drop pointless hunk that changed just
      whitespace, especially as the whitespace in question already was as
      the hunk tried to make it in the upstream source file.

diff --git a/patches/dev300/fit-list-to-size.diff b/patches/dev300/fit-list-to-size.diff
index cb047b2..9a04f56 100644
--- a/patches/dev300/fit-list-to-size.diff
+++ b/patches/dev300/fit-list-to-size.diff
@@ -867,28 +867,12 @@
  	}
  }
  
---- svx/source/svdraw/svdotextdecomposition.cxx.old	2009-04-02 11:03:00.000000000 +0000
-+++ svx/source/svdraw/svdotextdecomposition.cxx	2009-04-06 16:42:18.000000000 +0000
-@@ -927,11 +927,11 @@ bool SdrTextObj::impDecomposeStretchText
- 	basegfx::B2DHomMatrix aNewTransformA;
- 	basegfx::B2DHomMatrix aNewTransformB;
- 
--	// calculate global char stretching scale parameters. Use non-mirrored sizes
--	// to layout without mirroring
--	const double fScaleX(fabs(aScale.getX()) / aOutlinerScale.getX());
--	const double fScaleY(fabs(aScale.getY()) / aOutlinerScale.getY());
--	rOutliner.SetGlobalCharStretching((sal_Int16)FRound(fScaleX * 100.0), (sal_Int16)FRound(fScaleY * 100.0));
-+    // calculate global char stretching scale parameters. Use non-mirrored sizes
-+    // to layout without mirroring. Scale anisotrophically
-+    const double fScaleX(fabs(aScale.getX()) / aOutlinerScale.getX());
-+    const double fScaleY(fabs(aScale.getY()) / aOutlinerScale.getY());
-+    rOutliner.SetGlobalCharStretching((sal_Int16)FRound(fScaleX * 100.0), (sal_Int16)FRound(fScaleY * 100.0));
- 
- 	// 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,5 +956,134 @@ bool SdrTextObj::impDecomposeStretchText
+--- svx/source/svdraw/svdotextdecomposition.cxx
++++ svx/source/svdraw/svdotextdecomposition.cxx
+@@ -956,6 +956,137 @@ bool SdrTextObj::impDecomposeStretchText
+     rOutliner.setVisualizedPage(0);
  
- 	rTarget = aConverter.getPrimitive2DSequence();
+     rTarget = aConverter.getPrimitive2DSequence();
 +}
 +
 +void SdrTextObj::impDecomposeAutoFitTextPrimitive(
@@ -1008,9 +992,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();
@@ -1020,8 +1006,7 @@
 +	rTarget = aConverter.getPrimitive2DSequence();
  }
  
- //////////////////////////////////////////////////////////////////////////////
-
+ void SdrTextObj::impDecomposeBlockTextPrimitive(
 --- svx/source/svdraw/svdotxat.cxx.old	2009-04-02 11:03:00.000000000 +0000
 +++ svx/source/svdraw/svdotxat.cxx	2009-04-06 16:42:18.000000000 +0000
 @@ -82,8 +82,7 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidt
@@ -1128,24 +1113,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