CWS-TOOLING: integrate CWS sw32numbf01

2009-09-04 10:01:07 +0200 od  r275780 : #i95907# method <SwWrtShell::NumOfBulletOn(..)>
- adjust indentation of newly created automatic list style
--> due to MRU add actual paragraph indentation to created automatic list style's indentation
2009-09-02 11:57:40 +0200 od  r275703 : #i95907# method <SwTxtMargin::CtorInitTxtMargin(..)>
- correct handling of paragraph indents, when list level indents are applicable.
2009-09-01 16:59:47 +0200 od  r275671 : CWS-TOOLING: rebase CWS sw32numbf01 to trunk@275331 (milestone: DEV300:m56)
2009-08-28 16:42:34 +0200 od  r275540 : #i102458# method <SwFlowFrm::CalcUpperSpace(..)>
- correct handling of leading line spacing
method <GetSpacingValuesOfFrm(..)>
- add output parameter <obIsLineSpacingProportional>
2009-08-27 17:03:07 +0200 od  r275496 : #i101516# method <SwTxtNode::SwTxtNode(..)>
- in case that the paragraph is add to a list, apply paragraph style's assigned
outline style list level as list level, if paragraph has no list level set already.
2009-08-27 15:23:34 +0200 od  r275489 : #i101234# method <SwWrtShell::NumOrBulletOn(..)>
- check before activation of certain list level of outline numbering,
a numbering format is already set. In this only continue the outline numbering.
2009-08-27 14:15:07 +0200 od  r275483 : #i95907# method <SwWrtShell::NumOrBulletOn(..)>
- consider leading tab stops and intentation of paragraph first text line,
when a new list style is created for its application to the selection.
2009-08-26 09:51:39 +0200 od  r275401 : #i86492# Adjust copy of text nodes regarding lists
- copy of part of paragraph in list does not copy list style and list id
- copy of paragraphs in list into another list continues destination list
- copy of paragraphs (at least one not in a list) at empty paragraph following a list
does not continue the destination list.
2009-08-25 10:30:53 +0200 od  r275339 : #i101349# method <XMLTextImportHelper::SetStyleAndAttrs(..)
- assure that list style of automatic paragraph style is applied at paragraph.

1 files changed, 25 insertions, 17 deletions

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index add97d20efda..613a4688389f 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1163,30 +1163,38 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
 
         if (pListBlock || pNumberedParagraph)
         {
-            sal_Bool bSameNumRules = xNewNumRules == xNumRules;
-            if( !bSameNumRules && xNewNumRules.is() && xNumRules.is() )
+            // --> OD 2009-08-24 #i101349#
+            // Assure that list style of automatic paragraph style is applied at paragraph.
+            sal_Bool bApplyNumRules = pStyle && pStyle->IsListStyleSet();
+            if ( !bApplyNumRules )
             {
-                // If the interface pointers are different then this does
-                // not mean that the num rules are different. Further tests
-                // are required then. However, if only one num rule is
-                // set, no tests are required of course.
-                Reference< XNamed > xNewNamed( xNewNumRules, UNO_QUERY );
-                Reference< XNamed > xNamed( xNumRules, UNO_QUERY );
-                if( xNewNamed.is() && xNamed.is() )
+                sal_Bool bSameNumRules = xNewNumRules == xNumRules;
+                if( !bSameNumRules && xNewNumRules.is() && xNumRules.is() )
                 {
-                    bSameNumRules = xNewNamed->getName() == xNamed->getName();
-                }
-                else
-                {
-                    Reference< XAnyCompare > xNumRuleCompare( xNumRules, UNO_QUERY );
-                    if( xNumRuleCompare.is() )
+                    // If the interface pointers are different then this does
+                    // not mean that the num rules are different. Further tests
+                    // are required then. However, if only one num rule is
+                    // set, no tests are required of course.
+                    Reference< XNamed > xNewNamed( xNewNumRules, UNO_QUERY );
+                    Reference< XNamed > xNamed( xNumRules, UNO_QUERY );
+                    if( xNewNamed.is() && xNamed.is() )
                     {
-                        bSameNumRules = (xNumRuleCompare->compare( Any(xNumRules), Any(xNewNumRules) ) == 0);
+                        bSameNumRules = xNewNamed->getName() == xNamed->getName();
+                    }
+                    else
+                    {
+                        Reference< XAnyCompare > xNumRuleCompare( xNumRules, UNO_QUERY );
+                        if( xNumRuleCompare.is() )
+                        {
+                            bSameNumRules = (xNumRuleCompare->compare( Any(xNumRules), Any(xNewNumRules) ) == 0);
+                        }
                     }
                 }
+                bApplyNumRules = !bSameNumRules;
             }
 
-            if( !bSameNumRules )
+            if ( bApplyNumRules )
+            // <--
             {
                 // #102607# This may except when xNewNumRules contains
                 // a Writer-NumRule-Implementation bug gets applied to