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

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Jul  7 15:28:46 2008
New Revision: 13088
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13088&view=rev

Log:
	* patches/dev300/apply:
	* fit-list-to-size-ui.diff:
	* fit-list-to-size-style-defaults.diff: reassigned fit-to-shape
	checkbox in the text attr dialog to do ppt-like autofit, changed
	style sheet defaults, such that new outlines have autofit on.



Added:
   trunk/patches/dev300/fit-list-to-size-style-defaults.diff
   trunk/patches/dev300/fit-list-to-size-ui.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul  7 15:28:46 2008
@@ -2271,6 +2271,8 @@
 # have Impress outline text boxes shrink font automatically when text
 # starts to overflow
 fit-list-to-size.diff, thorsten
+fit-list-to-size-ui.diff, thorsten
+fit-list-to-size-style-defaults.diff, thorsten
 
 # apply this patch if you need to disable vcl grabbing your mouse -
 # after applying the patch, set SAL_NO_MOUSEGRABS in your env

Added: trunk/patches/dev300/fit-list-to-size-style-defaults.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/fit-list-to-size-style-defaults.diff	Mon Jul  7 15:28:46 2008
@@ -0,0 +1,13 @@
+diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
+index 883456e..26517f5 100644
+--- sd/source/core/stlpool.cxx
++++ sd/source/core/stlpool.cxx
+@@ -280,6 +280,8 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const String& rLayoutName, sal_Bo
+                 rSet.Put( SvxColorItem( Color(COL_AUTO), EE_CHAR_COLOR) );
+ 				rSet.Put( XLineStyleItem(XLINE_NONE) );
+ 				rSet.Put( XFillStyleItem(XFILL_NONE) );
++				rSet.Put( SdrTextFitToSizeTypeItem(SDRTEXTFIT_AUTOFIT) );
++                rSet.Put( SdrTextAutoGrowHeightItem(FALSE) );
+ 				// #i16874# enable kerning by default but only for new documents
+ 				rSet.Put( SvxAutoKernItem( TRUE, EE_CHAR_PAIRKERNING ) );
+ 

Added: trunk/patches/dev300/fit-list-to-size-ui.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/fit-list-to-size-ui.diff	Mon Jul  7 15:28:46 2008
@@ -0,0 +1,13 @@
+diff --git a/svx/source/dialog/textattr.cxx b/svx/source/dialog/textattr.cxx
+index b4b1114..dd8f405 100644
+--- svx/source/dialog/textattr.cxx
++++ svx/source/dialog/textattr.cxx
+@@ -460,7 +460,7 @@ BOOL SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
+             default: ; //prevent warning
+ 				DBG_ERROR( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" );
+ 			case STATE_NOCHECK: eFTS = SDRTEXTFIT_NONE; break;
+-			case STATE_CHECK: eFTS = SDRTEXTFIT_PROPORTIONAL; break;
++			case STATE_CHECK: eFTS = SDRTEXTFIT_AUTOFIT; break;
+ 		}
+ 		rAttrs.Put( SdrTextFitToSizeTypeItem( eFTS ) );
+ 	}