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

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Jul 10 12:31:23 2008
New Revision: 13146
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13146&view=rev

Log:
	* patches/dev300/fit-list-to-size.diff:
	Adapted binfilter to changed API as well.



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 10 12:31:23 2008
@@ -1,24 +1,38 @@
- offapi/com/sun/star/drawing/TextFitToSizeType.idl |    7 +
- offapi/util/makefile.mk                           |    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/editobj2.hxx                   |   10 ++
- svx/source/editeng/impedit3.cxx                   |    7 +
- svx/source/editeng/impedit4.cxx                   |    6 +
- svx/source/outliner/outliner.cxx                  |    5 +
- svx/source/svdraw/svdedxv.cxx                     |    4 -
- svx/source/svdraw/svdfppt.cxx                     |   12 ++-
- 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 -
- 19 files changed, 160 insertions(+), 86 deletions(-)
+ .../bf_xmloff/source/draw/xmloff_sdpropls.cxx      |    2 
+ offapi/com/sun/star/drawing/TextFitToSizeType.idl  |    7 +
+ offapi/util/makefile.mk                            |    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/editobj2.hxx                    |   10 ++
+ svx/source/editeng/impedit3.cxx                    |    7 +
+ svx/source/editeng/impedit4.cxx                    |    6 +
+ svx/source/outliner/outliner.cxx                   |    5 +
+ svx/source/svdraw/svdedxv.cxx                      |    4 -
+ svx/source/svdraw/svdfppt.cxx                      |   12 ++
+ 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 -
+ 20 files changed, 161 insertions(+), 87 deletions(-)
 
+diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
+index 0b6589a..166e5cd 100644
+--- binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
++++ binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
+@@ -678,7 +678,7 @@ 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_TRUE,		    drawing::TextFitToSizeType_AUTOFIT },
+ 	{ XML_TOKEN_INVALID, 0 }
+ };
+ 
 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