svn commit: r1605689 [2/2] - in /openoffice/trunk/main: sfx2/inc/sfx2/objsh.hxx sw/inc/docsh.hxx sw/source/ui/app/docsh.cxx sw/source/ui/app/docsh2.cxx sw/source/ui/app/docshini.cxx sw/source/ui/app/docst.cxx sw/source/ui/app/docstyle.cxx

[orw]

Modified: openoffice/trunk/main/sw/source/ui/app/docstyle.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/docstyle.cxx?rev=1605689&r1=1605688&r2=1605689&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/docstyle.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/docstyle.cxx Thu Jun 26 08:03:24 2014
@@ -1267,11 +1267,10 @@ void SwDocStyleSheet::SetItemSet( const 
                                if( pColl != &pColl->GetNextTxtFmtColl() )
                                        pCColl->SetNextTxtFmtColl( 
pColl->GetNextTxtFmtColl() );
 
-                               //pCColl->SetOutlineLevel( 
pColl->GetOutlineLevel() );//#outline level,zhaojianwei
                                if( 
pColl->IsAssignedToListLevelOfOutlineStyle())
                                        
pCColl->AssignToListLevelOfOutlineStyle(pColl->GetAssignedOutlineStyleLevel());
                                else
-                                       
pCColl->DeleteAssignmentToListLevelOfOutlineStyle();//<--end,zhaojianwei
+                                       
pCColl->DeleteAssignmentToListLevelOfOutlineStyle();