ooo-build r15452 - trunk/patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Mar  4 00:55:25 2009
New Revision: 15452
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15452&view=rev

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

moved
	* patches/dev300/fit-list-to-size-m2.diff:
modified
	* patches/dev300/apply:
	* patches/dev300/fit-list-to-size.diff:


Added:
   trunk/patches/dev300/fit-list-to-size-m2.diff
      - copied unchanged from r15445, /trunk/patches/dev300/fit-list-to-size.diff
Modified:
   trunk/patches/dev300/apply
   trunk/patches/dev300/fit-list-to-size.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Mar  4 00:55:25 2009
@@ -2677,10 +2677,17 @@
 # hyperlink issue with numeric slide names in Impress
 sd-update-relative-links.diff, n#355674, i#55224, rodo
 
+[ Fixes < dev300-m42 < ooo310-m3 ]
+# have Impress outline text boxes shrink font automatically when text
+# starts to overflow
+fit-list-to-size-m2.diff, i#94086, thorsten
+
+[ Fixes >= dev300-m42 >= ooo310-m3 ]
 # have Impress outline text boxes shrink font automatically when text
 # starts to overflow
 fit-list-to-size.diff, i#94086, thorsten
 
+[ Fixes ]
 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

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 00:55:25 2009
@@ -102,17 +102,14 @@
  			unsigned								mbHideContour : 1;
  			unsigned								mbBlink : 1;
  			unsigned								mbScroll : 1;
-@@ -77,8 +78,8 @@ namespace drawinglayer
- 				sal_Int32 aTextRightDistance, 
+@@ -81,6 +81,7 @@ namespace drawinglayer
  				sal_Int32 aTextLowerDistance, 
- 				bool bContour, bool bFitToSize, 
--				bool bHideContour, bool bBlink, 
--				bool bScroll);
-+                bool bAutoFit, bool bHideContour, 
-+                bool bBlink, bool bScroll);
- 			bool operator==(const SdrTextAttribute& rCandidate) const;
- 
- 			// data access
+ 				bool bContour, 
+                 bool bFitToSize, 
++                bool bAutoFit,
+ 				bool bHideContour, 
+                 bool bBlink, 
+ 				bool bScroll,
 @@ -86,6 +87,7 @@ namespace drawinglayer
  			bool isContour() const { return mbContour; }
  			bool isFontwork() const { return (XFT_NONE != meFormTextStyle); }
@@ -466,24 +463,16 @@
 index b76d204..42f6900 100644
 --- svx/source/sdr/primitive2d/sdrattributecreator.cxx
 +++ svx/source/sdr/primitive2d/sdrattributecreator.cxx
-@@ -493,7 +493,6 @@ namespace drawinglayer
- 				
- 				if(!bInEditMode)
- 				{
--					const SdrFitToSizeType eFit = rTextObj.GetFitToSize();
- 					const SdrTextAniKind eAniKind(rTextObj.GetTextAniKind());
- 
- 					pRetval = new attribute::SdrTextAttribute(
-@@ -504,7 +503,8 @@ namespace drawinglayer
- 						rTextObj.GetTextRightDistance(),
- 						rTextObj.GetTextLowerDistance(),
- 						((const SdrTextContourFrameItem&)rSet.Get(SDRATTR_TEXT_CONTOURFRAME)).GetValue(),
--						(SDRTEXTFIT_PROPORTIONAL == eFit || SDRTEXTFIT_ALLLINES == eFit),
-+                        rTextObj.IsFitToSize(),
-+                        rTextObj.IsAutoFit(),
- 						((const XFormTextHideFormItem&)rSet.Get(XATTR_FORMTXTHIDEFORM)).GetValue(),
- 						SDRTEXTANI_BLINK == eAniKind, 
- 						SDRTEXTANI_SCROLL == eAniKind || SDRTEXTANI_ALTERNATE == eAniKind || SDRTEXTANI_SLIDE == eAniKind);
+@@ -521,7 +521,8 @@ namespace drawinglayer
+ 				    rTextObj.GetTextRightDistance(),
+ 				    rTextObj.GetTextLowerDistance(),
+ 				    ((const SdrTextContourFrameItem&)rSet.Get(SDRATTR_TEXT_CONTOURFRAME)).GetValue(),
+-				    (SDRTEXTFIT_PROPORTIONAL == eFit || SDRTEXTFIT_ALLLINES == eFit),
++                    rTextObj.IsFitToSize(),
++                    rTextObj.IsAutoFit(),
+ 				    ((const XFormTextHideFormItem&)rSet.Get(XATTR_FORMTXTHIDEFORM)).GetValue(),
+ 				    SDRTEXTANI_BLINK == eAniKind, 
+ 				    SDRTEXTANI_SCROLL == eAniKind || SDRTEXTANI_ALTERNATE == eAniKind || SDRTEXTANI_SLIDE == eAniKind,
 @@ -525,7 +525,7 @@ namespace drawinglayer
  				const XGradient& rGradient = ((XFillFloatTransparenceItem*)pGradientItem)->GetGradientValue();
  				const sal_uInt8 nStartLuminance(rGradient.GetStartColor().GetLuminance());