diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-07 11:00:20 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-07 11:00:20 +0000 |
| commit | 5781e9a3619db5c9f0be44f2b38bc132ae95874d (patch) | |
| tree | 7d0740926db05b1ed1cd84edf9946a782fb217e3 /sw/source | |
| parent | 1cb43288c06f6f35ef9a856d7872c50a22a32ff7 (diff) | |
INTEGRATION: CWS beppec56index01_DEV300 (1.20.110); FILE MERGED
2008/01/29 09:58:33 fme 1.20.110.2: #i53420# Remove compiler wanings
2007/12/02 18:28:10 beppec56 1.20.110.1: Issue number: #i53420#
Submitted by: beppec56
Reviewed by: beppec56
Index generation: add option to chapter numbering
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/tox/tox.cxx | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index db5ee03618ab..c420f643c370 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -4,9 +4,9 @@ * * $RCSfile: tox.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hr $ $Date: 2007-09-27 09:22:41 $ + * last change: $Author: kz $ $Date: 2008-03-07 12:00:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -737,6 +737,9 @@ String SwFormToken::GetString() const else if(TOKEN_CHAPTER_INFO == eTokenType) { sRet += String::CreateFromInt32( nChapterFormat ); +//add maximum permetted level + sRet += ','; + sRet += String::CreateFromInt32( nOutlineLevel ); } else if(TOKEN_TEXT == eTokenType) { @@ -752,6 +755,14 @@ String SwFormToken::GetString() const else bAppend = FALSE; } + else if(TOKEN_ENTRY_NO == eTokenType) + { + sRet += String::CreateFromInt32( nChapterFormat ); +//add maximum permitted level + sRet += ','; + sRet += String::CreateFromInt32( nOutlineLevel ); + } + if(bAppend) { sRet += '>'; @@ -803,6 +814,14 @@ SwFormToken SwFormTokensHelper::BuildToken( const String & sPattern, switch( eTokenType ) { +//i53420 + case TOKEN_ENTRY_NO: + if( (sTmp = sToken.GetToken( 2, ',' ) ).Len() ) + eRet.nChapterFormat = static_cast<USHORT>(sTmp.ToInt32()); + if( (sTmp = sToken.GetToken( 3, ',' ) ).Len() ) + eRet.nOutlineLevel = static_cast<USHORT>(sTmp.ToInt32()); //the maximum outline level to examine + break; + case TOKEN_TEXT: { xub_StrLen nStartText = sToken.Search( TOX_STYLE_DELIMITER ); @@ -836,6 +855,10 @@ SwFormToken SwFormTokensHelper::BuildToken( const String & sPattern, case TOKEN_CHAPTER_INFO: if( (sTmp = sToken.GetToken( 2, ',' ) ).Len() ) eRet.nChapterFormat = static_cast<USHORT>(sTmp.ToInt32()); //SwChapterFormat; + //i53420 + if( (sTmp = sToken.GetToken( 3, ',' ) ).Len() ) + eRet.nOutlineLevel = static_cast<USHORT>(sTmp.ToInt32()); //the maximum outline level to examine + break; case TOKEN_AUTHORITY: |