diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 16:35:52 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-07-31 16:35:52 +0000 |
| commit | 3b0266f8b79ac39a92a661477ceea7101870b476 (patch) | |
| tree | 6b6ce4413ed9501544388b7c87f37ed319d040ae | |
| parent | a759e3e557f2fa523dad1e2e765c308c6cd2389c (diff) | |
INTEGRATION: CWS swqbf102 (1.61.10); FILE MERGED
2007/07/25 13:07:14 od 1.61.10.1: #i73509# class <XMLParaContext>
- introduce new member <mbOutlineLevelAttrFound>, set it, when
corresponding attribute is found and pass it to
<XMLTextImportHelper::SetStyleAndAttrs(..)>, if needed.
| -rw-r--r-- | xmloff/source/text/txtparai.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 4ea25a546bb0..87cd8ca36c3f 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -4,9 +4,9 @@ * * $RCSfile: txtparai.cxx,v $ * - * $Revision: 1.61 $ + * $Revision: 1.62 $ * - * last change: $Author: rt $ $Date: 2007-07-09 07:54:03 $ + * last change: $Author: hr $ $Date: 2007-07-31 17:35:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1581,6 +1581,9 @@ XMLParaContext::XMLParaContext( xStart( rImport.GetTextImport()->GetCursorAsRange()->getStart() ), nOutlineLevel( IsXMLToken( rLName, XML_H ) ? 1 : -1 ), pHints( 0 ), + // --> OD 2007-07-25 #i73509# + mbOutlineLevelAttrFound( sal_False ), + // <-- bIgnoreLeadingSpace( sal_True ), bHeading( bHead ), bIsListHeader( false ), @@ -1623,6 +1626,9 @@ XMLParaContext::XMLParaContext( nTmp = 127; nOutlineLevel = (sal_Int8)nTmp; } + // --> OD 2007-07-25 #i73509# + mbOutlineLevelAttrFound = sal_True; + // <-- } break; case XML_TOK_TEXT_P_IS_LIST_HEADER: @@ -1699,7 +1705,9 @@ XMLParaContext::~XMLParaContext() sStyleName = xTxtImport->sCellParaStyleDefault; // set style and hard attributes at the previous paragraph - sStyleName = xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor, sStyleName, sal_True, bHeading ? nOutlineLevel : -1 ); + // --> OD 2007-07-25 #i73509# - add paramter <mbOutlineLevelAttrFound> + sStyleName = xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor, sStyleName, sal_True, mbOutlineLevelAttrFound, bHeading ? nOutlineLevel : -1 ); + // <-- // handle list style header if (bHeading && (bIsListHeader || bIsRestart)) |