Re: approval for upload of openoffice.org 1:2.4.1-10

[Rene Engelhard <rene@debian.org>]

Hi,

Rene Engelhard wrote:
> Those important fixes are:
> 
> - fix upgrade problem (WebWizard) - #360575
> - fix hang in calc in some conditions - #499374
> - fix chart crash - http://www.openoffice.org/issues/show_big.cgi?id=90071
> - fix when ran from mailcap (e.g. mutt) - #396276

I'd also like to backport the fix for http://www.openoffice.org/issues/show_bug.cgi=89812 - fixes a crash when pasting html documents into a writer doc..

The diff I would apply (- ChangeLog and apply which are to come) is this:

--- 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 );

Regards,

Rene