ooo-build r14232 - in branches/debian-2-4-1: . patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Oct  7 10:50:19 2008
New Revision: 14232
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14232&view=rev

Log:
2008-10-07  Rene Engelhard  <rene debian org>

        * patches/src680/i89812.diff: backport fix for issue 89812


Added:
   branches/debian-2-4-1/patches/src680/i89812.diff
Modified:
   branches/debian-2-4-1/ChangeLog
   branches/debian-2-4-1/patches/src680/apply

Modified: branches/debian-2-4-1/patches/src680/apply
==============================================================================
--- branches/debian-2-4-1/patches/src680/apply	(original)
+++ branches/debian-2-4-1/patches/src680/apply	Tue Oct  7 10:50:19 2008
@@ -325,7 +325,9 @@
 
 cws-cmcfixes47-sw.diff, i#90306
 
+[ CWSBackports < ooo300-m18 ]
 cws-chart28.diff, i#90071
+i89812.diff
 
 [ CWSBackports < ooh680-m17 ]
 

Added: branches/debian-2-4-1/patches/src680/i89812.diff
==============================================================================
--- (empty file)
+++ branches/debian-2-4-1/patches/src680/i89812.diff	Tue Oct  7 10:50:19 2008
@@ -0,0 +1,27 @@
+Index: htmlnum.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/filter/html/htmlnum.cxx,v
+retrieving revision 1.27
+retrieving revision 1.27.8.1
+diff -u -u -r1.27 -r1.27.8.1
+--- sw/source/filter/html/htmlnum.cxx	13 Jun 2008 10:41:03 -0000	1.27
++++ sw/source/filter/html/htmlnum.cxx	26 Jun 2008 13:39:00 -0000	1.27.8.1
+@@ -359,6 +359,18 @@
+ 			if( !aPropInfo.bRightMargin )
+ 				aItemSet.ClearItem( RES_LR_SPACE );
+ 
++            // --> OD 2008-06-26 #i89812#
++            // Perform change to list style before calling <DoPositioning(..)>,
++            // because <DoPositioning(..)> may open a new context and thus may
++            // clear the <SwHTMLNumRuleInfo> instance hold by local variable <rInfo>.
++            if( bChangeNumFmt )
++            {
++                rInfo.GetNumRule()->Set( nLevel, aNumFmt );
++                pDoc->ChgNumRuleFmts( *rInfo.GetNumRule() );
++                bChangeNumFmt = sal_False;
++            }
++            // <--
++
+ 			DoPositioning( aItemSet, aPropInfo, pCntxt );
+ 
+ 			InsertAttrs( aItemSet, aPropInfo, pCntxt );