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

[thorstenb svn gnome org]

Author: thorstenb
Date: Thu Sep 11 21:10:13 2008
New Revision: 13879
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13879&view=rev

Log:
    * patches/dev300/apply:
    * patches/dev300/ppt-continuous-numbering-fix.diff: no longer set
    empty paragraphs in Impress outlines to "no outline", but just
    disable bullet. Makes outline numbering continuous again.



Added:
   trunk/patches/dev300/ppt-continuous-numbering-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Sep 11 21:10:13 2008
@@ -2616,6 +2616,7 @@
 gnome-fpicker-main-thread.diff, i#93366, cmc
 jurt-jnilib-deliver.diff, i#93516, thorsten
 solenv-silent-mac-build.diff, thorsten
+ppt-continuous-numbering-fix.diff, n#411565, thorsten
 
 [ ImpressFontSize ]
 [ Fixes <= dev300-m30 <= ooo300-m3 ]

Added: trunk/patches/dev300/ppt-continuous-numbering-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/ppt-continuous-numbering-fix.diff	Thu Sep 11 21:10:13 2008
@@ -0,0 +1,19 @@
+ svx/source/svdraw/svdfppt.cxx |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+
+diff --git svx/source/svdraw/svdfppt.cxx svx/source/svdraw/svdfppt.cxx
+index f216075..28d7b4e 100644
+--- svx/source/svdraw/svdfppt.cxx
++++ svx/source/svdraw/svdfppt.cxx
+@@ -2518,7 +2518,9 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj*
+ 
+ 				pPreviousParagraph = pPara;
+ 				if ( !aSelection.nStartPos )	// in PPT empty paragraphs never gets a bullet
+-					rOutliner.SetDepth( rOutliner.GetParagraph( nParaIndex ), -1 );
++                    aParagraphAttribs.Put( 
++                        SfxBoolItem( EE_PARA_BULLETSTATE, FALSE), 
++                        EE_PARA_BULLETSTATE );
+ 				aSelection.nStartPos = 0;
+ 				rOutliner.QuickSetAttribs( aParagraphAttribs, aSelection );
+ 				delete[] pParaText;