ooo-build r14171 - in branches/ooo-build-3-0: . patches/dev300

[thorstenb svn gnome org]

Author: thorstenb
Date: Wed Oct  1 14:22:23 2008
New Revision: 14171
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14171&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. Taken
    from trunk, upstream does exactly the same for 3.1



Added:
   branches/ooo-build-3-0/patches/dev300/ppt-continuous-numbering-fix.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Oct  1 14:22:23 2008
@@ -2657,6 +2657,7 @@
 svtools-update-ole.diff, n#411855, thorsten
 vcl-logical-bmp-size.diff, i#92902, thorsten
 sdext-presenterview-thread-suicide.diff, n#425072, thorsten
+ppt-continuous-numbering-fix.diff, n#411565, thorsten
 vcl-fix-screen-number.diff, n#426521, i#93986, thorsten
 vcl-fix-gtk-fullscreen-crash.diff, i#93805, dtardon
 timely-canvas-disposing.diff, i#94007, thorsten

Added: branches/ooo-build-3-0/patches/dev300/ppt-continuous-numbering-fix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/ppt-continuous-numbering-fix.diff	Wed Oct  1 14:22:23 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;