Commits

Anonymous committed ad52832

#i10000# Remove merge conflict (thanks to kendy for finding this and providing a patch).

Comments (0)

Files changed (1)

sw/source/core/doc/dbgoutsw.cxx

             aTmpStr += String("<tbl/>", RTL_TEXTENCODING_ASCII_US);
 
         aTmpStr += String("<outlinelevel>", RTL_TEXTENCODING_ASCII_US);
-<<<<<<< .working
-        //aTmpStr += String::CreateFromInt32(pTxtNode->GetOutlineLevel());//#outline level,zhaojianwei
-        aTmpStr += String::CreateFromInt32(pTxtNode->GetAttrOutlineLevel()-1);//<-end,zhaojianwei
-=======
-        aTmpStr += String::CreateFromInt32(pTxtNode->GetOutlineLevel());
+        aTmpStr += String::CreateFromInt32(pTxtNode->GetAttrOutlineLevel()-1);
         aTmpStr += String("</outlinelevel>", RTL_TEXTENCODING_ASCII_US);
 
->>>>>>> .merge-right.r264324
 		const SwNumRule * pNumRule = pTxtNode->GetNumRule();
 
 		if (pNumRule != NULL)