[ooo-build-commit] patches/dev300

[Tor Lillqvist]

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

New commits:
commit 713eaa40b894acd5d806ae60f2c4e89f6734983d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 16:13:16 2009 +0300

    Adapt fit-list-to-size.diff to dev300-m57

diff --git a/patches/dev300/fit-list-to-size.diff b/patches/dev300/fit-list-to-size.diff
index 47665b3..68b1376 100644
--- a/patches/dev300/fit-list-to-size.diff
+++ b/patches/dev300/fit-list-to-size.diff
@@ -125,10 +125,10 @@
 --- svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
 +++ svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
 @@ -52,6 +52,7 @@
- #define PRIMITIVE2D_ID_OVERLAYHELPLINESTRIPEDPRIMITIVE  (PRIMITIVE2D_ID_RANGE_SVX| 19)
  #define PRIMITIVE2D_ID_OVERLAYROLLINGRECTANGLEPRIMITIVE (PRIMITIVE2D_ID_RANGE_SVX| 20)
  #define PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D            (PRIMITIVE2D_ID_RANGE_SVX| 21)
-+#define PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D		(PRIMITIVE2D_ID_RANGE_SVX| 22)
+ #define PRIMITIVE2D_ID_SDROLECONTENTPRIMITIVE2D         (PRIMITIVE2D_ID_RANGE_SVX| 22)
++#define PRIMITIVE2D_ID_SDRAUTOFITTEXTPRIMITIVE2D		(PRIMITIVE2D_ID_RANGE_SVX| 23)
  
  //////////////////////////////////////////////////////////////////////////////
  
@@ -179,13 +179,13 @@
  }}
  
 @@ -259,6 +260,9 @@ protected:
- 	// Flag for allowing text animation. Default is sal_true.
- 	BOOL						mbTextAnimationAllowed : 1;
+     // Flag for allowing text animation. Default is sal_true.
+     BOOL						mbTextAnimationAllowed : 1;
  
 +    // flag for preventing recursive onEditOutlinerStatusEvent calls
 +	BOOL					    mbInDownScale : 1;
 +
- 	SVX_DLLPRIVATE SdrOutliner& ImpGetDrawOutliner() const;
+     SdrOutliner& ImpGetDrawOutliner() const;
  
  private:
 @@ -272,6 +276,8 @@ private: