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

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Jul  3 13:47:28 2008
New Revision: 13048
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13048&view=rev

Log:
	* patches/dev300/fit-list-to-size.diff: now with all local changes



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	Thu Jul  3 13:47:28 2008
@@ -1,17 +1,61 @@
- svx/inc/svx/sdtfsitm.hxx         |   26 +++++-----
- svx/inc/svx/svdotext.hxx         |   10 +++-
- svx/source/dialog/textattr.cxx   |    1 
- svx/source/editeng/impedit3.cxx  |    7 ++-
- svx/source/msfilter/msdffimp.cxx |    8 +++
- svx/source/svdraw/svdedxv.cxx    |    4 +-
- svx/source/svdraw/svdotext.cxx   |  100 ++++++++++++++++++++++++++++++--------
- svx/source/svdraw/svdotxat.cxx   |    3 -
- svx/source/svdraw/svdotxed.cxx   |   17 ++++--
- svx/source/svdraw/svdotxtr.cxx   |    9 ---
- svx/source/svdraw/svdtxhdl.cxx   |    3 -
- svx/source/svdraw/svdview.cxx    |    3 -
- 12 files changed, 130 insertions(+), 61 deletions(-)
+ offapi/com/sun/star/drawing/TextFitToSizeType.idl |    7 +
+ sd/sdi/_drvwsh.sdi                                |   12 ---
+ svx/inc/svx/sdtfsitm.hxx                          |   26 +++--
+ svx/inc/svx/svdotext.hxx                          |   10 ++
+ svx/source/dialog/textattr.cxx                    |    1 
+ svx/source/editeng/impedit3.cxx                   |    7 +
+ svx/source/msfilter/msdffimp.cxx                  |    8 +-
+ svx/source/svdraw/svdedxv.cxx                     |    4 -
+ svx/source/svdraw/svdotext.cxx                    |  100 ++++++++++++++++-----
+ svx/source/svdraw/svdotxat.cxx                    |    3 -
+ svx/source/svdraw/svdotxed.cxx                    |   17 ++--
+ svx/source/svdraw/svdotxtr.cxx                    |    9 --
+ svx/source/svdraw/svdtxhdl.cxx                    |    3 -
+ svx/source/svdraw/svdview.cxx                     |    3 -
+ xmloff/source/draw/sdpropls.cxx                   |    4 -
+ 15 files changed, 136 insertions(+), 78 deletions(-)
 
+diff --git a/offapi/com/sun/star/drawing/TextFitToSizeType.idl b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
+index 68557cc..6692ca5 100644
+--- offapi/com/sun/star/drawing/TextFitToSizeType.idl
++++ offapi/com/sun/star/drawing/TextFitToSizeType.idl
+@@ -63,9 +63,10 @@ published enum TextFitToSizeType
+  
+ 	//------------------------------------------------------------------------- 
+ 
+-	/** if the shape is scaled, the font attributes are scaled and hard set
+-		on the text */
+-	RESIZEATTR 
++	/** if the shape is scaled, the font is scaled isotrophically to
++		fit the avaiable space. Auto line-breaks will keep working
++   */
++	AUTOFIT 
+  
+ }; 
+  
+diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
+index d23bae2..7d5292c 100644
+--- sd/sdi/_drvwsh.sdi
++++ sd/sdi/_drvwsh.sdi
+@@ -28,18 +28,6 @@
+  *
+  ************************************************************************/
+ 
+-enum SdrFitToSizeType
+-{
+-    SDRTEXTFIT_NONE ,
+-    SDRTEXTFIT_PROPORTIONAL ,
+-    SDRTEXTFIT_ALLLINES ,
+-    SDRTEXTFIT_RESIZEATTR
+-}
+-item UINT32 SvxObjectItem ;
+-item BOOL SdrShadowItem ;
+-item SdrFitToSizeType SdrTextFitToSizeTypeItem ;
+-
+-
+ interface DrawView
+ {
+ 	SID_JUMPTOMARK // ole : no, status : ?
 diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx
 index 6a583eb..abaf580 100644
 --- svx/inc/svx/sdtfsitm.hxx
@@ -521,3 +565,18 @@
  				if (bFitToSize) {
  					Fraction aX(aTextRect.GetWidth()-1,aAnchor.GetWidth()-1);
  					Fraction aY(aTextRect.GetHeight()-1,aAnchor.GetHeight()-1);
+diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
+index 4e050a4..0859b9c 100644
+--- xmloff/source/draw/sdpropls.cxx
++++ xmloff/source/draw/sdpropls.cxx
+@@ -621,8 +621,8 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] =
+ {
+ 	{ XML_FALSE,		drawing::TextFitToSizeType_NONE },
+ 	{ XML_TRUE, 		drawing::TextFitToSizeType_PROPORTIONAL },
+-	{ XML_TRUE,	    	drawing::TextFitToSizeType_ALLLINES },
+-	{ XML_TRUE,		    drawing::TextFitToSizeType_RESIZEATTR },
++	{ XML_ALL,	    	drawing::TextFitToSizeType_ALLLINES },
++	{ XML_SHRINK_TO_FIT,drawing::TextFitToSizeType_AUTOFIT },
+ 	{ XML_TOKEN_INVALID, 0 }
+ };
+