[ooo-build-commit] patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                 |    8 ++++++--
 patches/dev300/fit-list-to-size.diff |   14 +++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 7cfa4c59eb0c32f573d84f40724ce4806cece746
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Fri Sep 4 16:30:30 2009 +0200

    More tweaking to make svx build
    
    * patches/dev300/apply: temp disable of a calc patch depending on
      ooxml03 changes
    * patches/dev300/fit-list-to-size.diff: adapted to upstream changes

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c5eb35d..d3d23d5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2357,6 +2357,8 @@ wmf-pattern-brush.diff, n#232232, rodo
 toolkit-layout-gcc-4.3.2-hack.diff, pmladek
 
 # These merge with the layoutdialogs2 cws
+# FIXME: 2009-09-03: disabling default, partial layout patches break
+# the build. --thb
 #layout-disable-experimental.diff
 
 layout-accessibility-dispose-only-once.diff, n#500267, janneke
@@ -3124,8 +3126,10 @@ calc-xls-hyperlink-single-quote-fix.diff, n#521447, kohei
 # calc-xls-import-array-size.diff, kohei
 
 # draw an animated dashed border around copied ranges.
-calc-copy-range-animated-border-sc.diff, kohei
-calc-copy-range-animated-border-svx.diff, kohei
+# FIXME: 2009-09-03: enable again when ooxml03 is upstream, needs the
+# svx/svxdllapi.h include in scheduler.hxx. --thb
+#calc-copy-range-animated-border-sc.diff, kohei
+#calc-copy-range-animated-border-svx.diff, kohei
 
 # decode unicode in external file URIs when displaying formulas.
 calc-external-ref-decode-unicode-uri.diff, i#103918, kohei
diff --git a/patches/dev300/fit-list-to-size.diff b/patches/dev300/fit-list-to-size.diff
index 2e66521..47665b3 100644
--- a/patches/dev300/fit-list-to-size.diff
+++ b/patches/dev300/fit-list-to-size.diff
@@ -96,7 +96,7 @@
 +
 +		public:
 +			SdrAutoFitTextPrimitive2D(
-+				const SdrText& rSdrText,
++				const SdrText* pSdrText,
 +                const OutlinerParaObject& rOutlinerParaObjectPtr,
 +				const ::basegfx::B2DHomMatrix& rTextRangeTransform,
 +                bool bWordWrap);
@@ -498,7 +498,7 @@
 +				else if(rText.isAutoFit())
 +				{
 +					// isotrophically scaled text in range
-+					pNew = new SdrAutoFitTextPrimitive2D(rText.getSdrText(), rText.getOutlinerParaObject(), aAnchorTransform, bWordWrap);
++					pNew = new SdrAutoFitTextPrimitive2D(&rText.getSdrText(), rText.getOutlinerParaObject(), aAnchorTransform, bWordWrap);
 +				}
  				else // text in range
  				{
@@ -512,7 +512,7 @@
 +		Primitive2DSequence SdrAutoFitTextPrimitive2D::createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const
 +		{
 +            Primitive2DSequence aRetval;
-+            const bool bCurrentSpellCheck(getSdrText().GetObject().impDecomposeAutoFitTextPrimitive(aRetval, *this, aViewInformation));
++            const bool bCurrentSpellCheck(getSdrText()->GetObject().impDecomposeAutoFitTextPrimitive(aRetval, *this, aViewInformation));
 +
 +            if(getLastSpellCheck() != bCurrentSpellCheck)
 +            {
@@ -524,11 +524,11 @@
 +		}
 +
 +		SdrAutoFitTextPrimitive2D::SdrAutoFitTextPrimitive2D(
-+			const SdrText& rSdrText,
++			const SdrText* pSdrText,
 +            const OutlinerParaObject& rParaObj,
 +			const ::basegfx::B2DHomMatrix& rTextRangeTransform,
 +            bool bWordWrap)
-+		:	SdrTextPrimitive2D(rSdrText, rParaObj),
++		:	SdrTextPrimitive2D(pSdrText, rParaObj),
 +			maTextRangeTransform(rTextRangeTransform),
 +            mbWordWrap(bWordWrap)
 +		{
@@ -913,7 +913,7 @@
 +	aAnchorTextRange.expand(aTranslate + aScale);
 +
 +	// prepare outliner
-+	const SfxItemSet& rTextItemSet = rSdrAutofitTextPrimitive.getSdrText().GetItemSet();
++	const SfxItemSet& rTextItemSet = rSdrAutofitTextPrimitive.getSdrText()->GetItemSet();
 +	SdrOutliner& rOutliner = ImpGetDrawOutliner();
 +	SdrTextVertAdjust eVAdj = GetTextVerticalAdjust(rTextItemSet);
 +	SdrTextHorzAdjust eHAdj = GetTextHorizontalAdjust(rTextItemSet);
@@ -930,7 +930,7 @@
 +	// add one to rage sizes to get back to the old Rectangle and outliner measurements
 +	const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1L));
 +	const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 1L));
-+	const OutlinerParaObject* pOutlinerParaObject = rSdrAutofitTextPrimitive.getSdrText().GetOutlinerParaObject();
++	const OutlinerParaObject* pOutlinerParaObject = rSdrAutofitTextPrimitive.getSdrText()->GetOutlinerParaObject();
 +	OSL_ENSURE(pOutlinerParaObject, "impDecomposeBlockTextPrimitive used with no OutlinerParaObject (!)");
 +	const bool bVerticalWritintg(pOutlinerParaObject->IsVertical());
 +	const Size aAnchorTextSize(Size(nAnchorTextWidth, nAnchorTextHeight));