diff options
Diffstat (limited to 'sw/source/core/fields/chpfld.cxx')
| -rw-r--r-- | sw/source/core/fields/chpfld.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx index a4f04e30367a..8bf00d8b14b2 100644 --- a/sw/source/core/fields/chpfld.cxx +++ b/sw/source/core/fields/chpfld.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,11 +32,11 @@ #include <com/sun/star/text/ChapterFormat.hpp> #include <doc.hxx> -#include <frame.hxx> // SwChapterFieldType::ChangeExpansion() -#include <pam.hxx> // fuer GetBodyTxtNode +#include <frame.hxx> // SwChapterFieldType::ChangeExpansion() +#include <pam.hxx> // fuer GetBodyTxtNode #include <ndtxt.hxx> #include <chpfld.hxx> -#include <expfld.hxx> // fuer GetBodyTxtNode +#include <expfld.hxx> // fuer GetBodyTxtNode #include <unofldmid.h> #include <numrule.hxx> @@ -74,7 +74,7 @@ String SwChapterField::Expand() const String sStr( sNumber ); switch( GetFormat() ) { - case CF_TITLE: sStr = sTitle; break; + case CF_TITLE: sStr = sTitle; break; case CF_NUMBER: case CF_NUM_TITLE: sStr.Insert( sPre, 0 ); @@ -83,7 +83,7 @@ String SwChapterField::Expand() const sStr += sTitle; break; - case CF_NUM_NOPREPST_TITLE: sStr += sTitle; break; + case CF_NUM_NOPREPST_TITLE: sStr += sTitle; break; } return sStr; } @@ -156,12 +156,12 @@ void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum) // --> OD 2008-04-02 #refactorlists# // nLevel = GetRealLevel( pONd->GetTxtColl()-> // GetOutlineLevel() ); - // OSL_ENSURE( pONd->GetOutlineLevel() >= 0 && pONd->GetOutlineLevel() < MAXLEVEL, //#outline level,zhaojianwei + // OSL_ENSURE( pONd->GetOutlineLevel() >= 0 && pONd->GetOutlineLevel() < MAXLEVEL, //#outline level,zhaojianwei // "<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect -> please inform OD." ); //nLevel = static_cast<BYTE>(pONd->GetOutlineLevel()); OSL_ENSURE( pONd->GetAttrOutlineLevel() >= 0 && pONd->GetAttrOutlineLevel() <= MAXLEVEL, "<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect -> please inform OD." ); - nLevel = static_cast<BYTE>(pONd->GetAttrOutlineLevel()); //<-end,zhaojianwei + nLevel = static_cast<BYTE>(pONd->GetAttrOutlineLevel()); //<-end,zhaojianwei // <-- if( nPrevLvl < nLevel ) @@ -241,7 +241,7 @@ bool SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const sal_Int16 nRet; switch( GetFormat() ) { - case CF_NUMBER: nRet = text::ChapterFormat::NUMBER; break; + case CF_NUMBER: nRet = text::ChapterFormat::NUMBER; break; case CF_TITLE: nRet = text::ChapterFormat::NAME; break; case CF_NUMBER_NOPREPST: nRet = text::ChapterFormat::DIGIT; @@ -250,7 +250,7 @@ bool SwChapterField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const nRet = text::ChapterFormat::NO_PREFIX_SUFFIX; break; case CF_NUM_TITLE: - default: nRet = text::ChapterFormat::NAME_NUMBER; + default: nRet = text::ChapterFormat::NAME_NUMBER; } rAny <<= nRet; } @@ -286,7 +286,7 @@ bool SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId ) rAny >>= nVal; switch( nVal ) { - case text::ChapterFormat::NAME: SetFormat(CF_TITLE); break; + case text::ChapterFormat::NAME: SetFormat(CF_TITLE); break; case text::ChapterFormat::NUMBER: SetFormat(CF_NUMBER); break; case text::ChapterFormat::NO_PREFIX_SUFFIX: SetFormat(CF_NUM_NOPREPST_TITLE); @@ -295,7 +295,7 @@ bool SwChapterField::PutValue( const uno::Any& rAny, USHORT nWhichId ) SetFormat(CF_NUMBER_NOPREPST); break; //case text::ChapterFormat::NAME_NUMBER: - default: SetFormat(CF_NUM_TITLE); + default: SetFormat(CF_NUM_TITLE); } } break; |