diff options
| author | Philipp Riemer <ruderphilipp@gmail.com> | 2013-09-27 14:40:18 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-02 15:17:07 +0000 |
| commit | 1cd2575ac974e385202e197e40aa8158924e104e (patch) | |
| tree | 71038c6a85d262dcb25e0545f0bfba952fe6be4b /sw/source/ui/app | |
| parent | 5c9258d1bb4d27d9934fdf4c1d789860b4dcea6f (diff) | |
remove zhaojianwei code markers
Conflicts:
sw/source/core/doc/docfmt.cxx
Change-Id: Iddda0d57ae547680634d45aaf8c6deb40855b860
Reviewed-on: https://gerrit.libreoffice.org/6078
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/app')
| -rw-r--r-- | sw/source/ui/app/docsh2.cxx | 7 | ||||
| -rw-r--r-- | sw/source/ui/app/docst.cxx | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 9331b06b2446..f946a07a8e78 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -112,7 +112,7 @@ #include "dialog.hrc" #include "swabstdlg.hxx" -#include <ndtxt.hxx> //#outline level,add by zhaojianwei +#include <ndtxt.hxx> using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::lang; @@ -849,8 +849,8 @@ void SwDocShell::Execute(SfxRequest& rReq) bDone = sal_False; bool bCreateHtml = FN_NEW_HTML_DOC == nWhich; - bool bCreateByOutlineLevel = false; //#outline level,add by zhaojianwei - sal_Int32 nTemplateOutlineLevel = 0 ; //#outline level,add by zhaojianwei + bool bCreateByOutlineLevel = false; + sal_Int32 nTemplateOutlineLevel = 0; String aFileName, aTemplateName; if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich, sal_False, &pItem ) ) @@ -1435,7 +1435,6 @@ sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL, } } if ( bImport ) - // <-- { SwRead pRead = ReadXML; SwReader* pReader = 0; diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index 51d496958580..c6e159037fec 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -75,7 +75,7 @@ #include <list.hxx> -#include <paratr.hxx> //#outline level,add by zhaojianwei +#include <paratr.hxx> extern bool bNoInterrupt; // in mainwn.cxx @@ -637,7 +637,6 @@ sal_uInt16 SwDocShell::Edit( pDStyle->GetCollection()->SetDerivedFrom( pColl ); pDStyle->PresetParent( rParent ); - //#outline level,add by zhaojianwei /*When a new paragraph style is created based on a "to outline style assigned" paragraph style, the outline level attribute and the list style attribute of the new paragraph style have to be set to 0 @@ -648,8 +647,6 @@ sal_uInt16 SwDocShell::Edit( pDStyle->GetCollection()->SetFmtAttr( aItem ); pDStyle->GetCollection()->SetAttrOutlineLevel( 0 ); } - //<-end,zhaojianwei - } else { |