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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Dec 30 03:20:43 2008
New Revision: 14968
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14968&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/fit-list-to-size-m37.diff:
	* patches/dev300/fit-list-to-size.diff:
	* patches/dev300/apply: adjusted for dev300-m38.  In dev300-m38 
	EE_CNTRL_NOREDLINES is no longer defined, and each 
	SdrTextObj::implDecomposeFoo() appears to just return false.

	Thorsten, please review this change.



Added:
   trunk/patches/dev300/fit-list-to-size-m37.diff   (props changed)
      - copied unchanged from r14967, /trunk/patches/dev300/fit-list-to-size.diff
Modified:
   trunk/ChangeLog
   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	Tue Dec 30 03:20:43 2008
@@ -2652,9 +2652,16 @@
 # hyperlink issue with numeric slide names in Impress
 sd-update-relative-links.diff, n#355674, i#55224, rodo
 
+[ Fixes < dev300-m38 ]
+# have Impress outline text boxes shrink font automatically when text
+# starts to overflow
+fit-list-to-size-m37.diff, i#94086, thorsten
+
+[ Fixes >= dev300-m38 ]
 # have Impress outline text boxes shrink font automatically when text
 # starts to overflow
 fit-list-to-size.diff, i#94086, thorsten
+
 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	Tue Dec 30 03:20:43 2008
@@ -908,7 +908,7 @@
  	// mirroring. We are now in aAnchorTextRange sizes. When mirroring in X and Y,
  	// move the null point which was top left to bottom right.
 @@ -902,6 +902,136 @@ bool SdrTextObj::impDecomposeStretchTextPrimitive(
-     return (rOutliner.GetControlWord() & EE_CNTRL_NOREDLINES);
+     return false;
  }
  
 +bool SdrTextObj::impDecomposeAutoFitTextPrimitive(
@@ -1038,7 +1038,7 @@
 +    rOutliner.SetControlWord(nOriginalControlWord);
 +
 +	rTarget = aConverter.getPrimitive2DSequence();
-+    return (rOutliner.GetControlWord() & EE_CNTRL_NOREDLINES);
++    return false;
 +}
 +
  //////////////////////////////////////////////////////////////////////////////