ooo-build r15456 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Mar  4 05:53:32 2009
New Revision: 15456
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15456&view=rev

Log:
2009-03-04  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/fit-list-to-size.diff: fixed build breakage.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/fit-list-to-size.diff

Modified: trunk/patches/dev300/fit-list-to-size.diff
==============================================================================
--- trunk/patches/dev300/fit-list-to-size.diff	(original)
+++ trunk/patches/dev300/fit-list-to-size.diff	Wed Mar  4 05:53:32 2009
@@ -119,10 +119,10 @@
  			bool isBlink() const { return mbBlink; }
  			bool isScroll() const { return mbScroll; }
 diff --git svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
-index 78b9210..8432d40 100644
+index ddd308c..7decaf1 100644
 --- svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
 +++ svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
-@@ -251,6 +251,46 @@ namespace drawinglayer
+@@ -265,6 +265,47 @@ namespace drawinglayer
  
  //////////////////////////////////////////////////////////////////////////////
  
@@ -145,6 +145,7 @@
 +		public:
 +			SdrAutoFitTextPrimitive2D(
 +				const SdrText& rSdrText,
++                const OutlinerParaObject& rOutlinerParaObjectPtr,
 +				const ::basegfx::B2DHomMatrix& rTextRangeTransform,
 +                bool bWordWrap);
 +
@@ -483,26 +484,26 @@
  				if(!bCompletelyTransparent)
  				{
 diff --git svx/source/sdr/primitive2d/sdrdecompositiontools.cxx svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
-index 62461df..6b05729 100644
+index 08c2e79..e17609e 100644
 --- svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
 +++ svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
-@@ -267,6 +267,11 @@ namespace drawinglayer
+@@ -269,6 +269,11 @@ namespace drawinglayer
  					// streched text in range
- 					pNew = new SdrStretchTextPrimitive2D(rText.getSdrText(), aAnchorTransform);
+ 					pNew = new SdrStretchTextPrimitive2D(rText.getSdrText(), rText.getOutlinerParaObject(), aAnchorTransform);
  				}
 +				else if(rText.isAutoFit())
 +				{
 +					// isotrophically scaled text in range
-+					pNew = new SdrAutoFitTextPrimitive2D(rText.getSdrText(), aAnchorTransform, bWordWrap);
++					pNew = new SdrAutoFitTextPrimitive2D(rText.getSdrText(), rText.getOutlinerParaObject(), aAnchorTransform, bWordWrap);
 +				}
  				else // text in range
  				{
  					// build new primitive
 diff --git svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
-index 6d406fd..470bfe9 100644
+index 5c98763..3e9c8e2 100644
 --- svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
 +++ svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx
-@@ -304,6 +304,60 @@ namespace drawinglayer
+@@ -305,6 +305,61 @@ namespace drawinglayer
  {
  	namespace primitive2d
  	{
@@ -522,9 +523,10 @@
 +
 +		SdrAutoFitTextPrimitive2D::SdrAutoFitTextPrimitive2D(
 +			const SdrText& rSdrText,
++            const OutlinerParaObject& rParaObj,
 +			const ::basegfx::B2DHomMatrix& rTextRangeTransform,
 +            bool bWordWrap)
-+		:	SdrTextPrimitive2D(rSdrText),
++		:	SdrTextPrimitive2D(rSdrText, rParaObj),
 +			maTextRangeTransform(rTextRangeTransform),
 +            mbWordWrap(bWordWrap)
 +		{
@@ -545,7 +547,7 @@
 +
 +		SdrTextPrimitive2D* SdrAutoFitTextPrimitive2D::createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const
 +		{
-+			return new SdrAutoFitTextPrimitive2D(getSdrText(), rTransform * getTextRangeTransform(), getWordWrap());
++			return new SdrAutoFitTextPrimitive2D(getSdrText(), getOutlinerParaObject(), rTransform * getTextRangeTransform(), getWordWrap());
 +		}
 +
 +		// provide unique ID