svn commit: r1537903 - /openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx

[orw]

Author: orw
Date: Fri Nov  1 11:35:02 2013
New Revision: 1537903

URL: http://svn.apache.org/r1537903
Log:
119959: <SwRTFParser::SetAttrInDoc(..)> - reset list attributes, if needed


Modified:
    openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx

Modified: openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx?rev=1537903&r1=1537902&r2=1537903&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/rtf/swparrtf.cxx Fri Nov  1 11:35:02 
2013
@@ -2290,8 +2290,13 @@ void SwRTFParser::SetAttrInDoc( SvxRTFIt
             SwTxtNode* pTxtNd = pDoc->GetNodes()[ n ]->GetTxtNode();
             if( pTxtNd )
             {
-                pTxtNd->SetAttr(
-                    *GetDfltAttr(RES_PARATR_NUMRULE));
+                pTxtNd->SetAttr( *GetDfltAttr(RES_PARATR_NUMRULE) );
+                // reset all list attributes
+                pTxtNd->ResetAttr( RES_PARATR_LIST_LEVEL );
+                pTxtNd->ResetAttr( RES_PARATR_LIST_ISRESTART );
+                pTxtNd->ResetAttr( RES_PARATR_LIST_RESTARTVALUE );
+                pTxtNd->ResetAttr( RES_PARATR_LIST_ISCOUNTED );
+                pTxtNd->ResetAttr( RES_PARATR_LIST_ID );
             }
         }
     }