diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2009-01-23 13:41:50 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2009-01-23 13:41:50 +0000 |
| commit | be010f292bdf4e3004b131909506266becfe8ac5 (patch) | |
| tree | df85bc8cfad26422b04d1579b1c7337ebc00a350 /sw/source/core/doc/dbgoutsw.cxx | |
| parent | 27e0f7160d603f6a0c6e225f029b7e2b1fc2ff6b (diff) | |
#i10000# Remove merge conflict (thanks to kendy for finding this and providing a patch).
Diffstat (limited to 'sw/source/core/doc/dbgoutsw.cxx')
| -rw-r--r-- | sw/source/core/doc/dbgoutsw.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index e81383f0d6d5..0e995f8cbe23 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -574,14 +574,9 @@ String lcl_dbg_out(const SwNode & rNode) 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) |