[ooo-build-commit] patches/dev300

[Kohei Yoshida]

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

New commits:
commit 46f14ef81bb4f8f14802ea82493bcb1cf1a7e4d9
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Oct 1 00:56:37 2009 -0400

    Fixed build breakage in svx.
    
    * patches/dev300/fit-list-to-size.diff: impDecomposeStretchTextPrimitive
      method no longer returns bool but void.  Changed its client code
      accordingly.

diff --git a/patches/dev300/fit-list-to-size.diff b/patches/dev300/fit-list-to-size.diff
index ad70ee0..fcc0fd7 100644
--- a/patches/dev300/fit-list-to-size.diff
+++ b/patches/dev300/fit-list-to-size.diff
@@ -505,20 +505,14 @@
  					// build new primitive
 --- svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx.old	2009-04-02 11:02:54.000000000 +0000
 +++ svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx	2009-04-06 16:42:18.000000000 +0000
-@@ -305,6 +305,61 @@ namespace drawinglayer
+@@ -305,6 +305,55 @@ namespace drawinglayer
  {
  	namespace primitive2d
  	{
 +		Primitive2DSequence SdrAutoFitTextPrimitive2D::createLocalDecomposition(const geometry::ViewInformation2D& aViewInformation) const
 +		{
 +            Primitive2DSequence aRetval;
-+            const bool bCurrentSpellCheck(getSdrText()->GetObject().impDecomposeAutoFitTextPrimitive(aRetval, *this, aViewInformation));
-+
-+            if(getLastSpellCheck() != bCurrentSpellCheck)
-+            {
-+                // remember last spell check state; this is part of the decomposition source data definition
-+                const_cast< SdrAutoFitTextPrimitive2D* >(this)->setLastSpellCheck(bCurrentSpellCheck);
-+            }
++            getSdrText()->GetObject().impDecomposeAutoFitTextPrimitive(aRetval, *this, aViewInformation);
 +
 +            return encapsulateWithTextHierarchyBlockPrimitive2D(aRetval);
 +		}
@@ -897,7 +891,7 @@
  	rTarget = aConverter.getPrimitive2DSequence();
 +}
 +
-+bool SdrTextObj::impDecomposeAutoFitTextPrimitive(
++void SdrTextObj::impDecomposeAutoFitTextPrimitive(
 +	drawinglayer::primitive2d::Primitive2DSequence& rTarget, 
 +	const drawinglayer::primitive2d::SdrAutoFitTextPrimitive2D& rSdrAutofitTextPrimitive,
 +	const drawinglayer::geometry::ViewInformation2D& aViewInformation) const