[ooo-build-commit] patches/dev300

Kohei Yoshida kohei at kemper.freedesktop.org
Fri Sep 11 11:49:39 PDT 2009


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

New commits:
commit bf0623e1a1ae3e97f790d9b52dabfcf6ab05e0ac
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Sep 11 14:48:23 2009 -0400

    Fixed build breakage in svx, but no guarantee this is the right fix.
    
    Thorsten, please review.
    
    * patches/dev300/apply:
    * patches/dev300/fit-list-to-size-build-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0549a62..f82d629 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2783,6 +2783,9 @@ 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
+
 # apply this patch if you need to disable vcl grabbing your mouse -
 # after applying the patch, set SAL_NO_MOUSEGRABS in your env
 #vcl-disable-mouse-grab.diff
diff --git a/patches/dev300/fit-list-to-size-build-fix.diff b/patches/dev300/fit-list-to-size-build-fix.diff
new file mode 100644
index 0000000..981f53f
--- /dev/null
+++ b/patches/dev300/fit-list-to-size-build-fix.diff
@@ -0,0 +1,17 @@
+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();


More information about the ooo-build-commit mailing list