diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 07:34:38 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-07-13 07:34:38 +0000 |
| commit | cfb5e7c23a7d04e75cd721691c52ea455623027a (patch) | |
| tree | a0390b58da1e189d34e45dd86583fac1e5f4ae37 /xmloff/source/text/XMLLineNumberingImportContext.cxx | |
| parent | 3268f56a84cec559bb5409d8255b0fb23e7eba4e (diff) | |
INTEGRATION: CWS oasis (1.8.276); FILE MERGED
2004/05/24 12:43:43 mib 1.8.276.2: - #i20153#: some attributes renamed
2004/05/07 12:00:05 mib 1.8.276.1: - #i20153#: encode/decode style names (ooo2oasis missing)
Diffstat (limited to 'xmloff/source/text/XMLLineNumberingImportContext.cxx')
| -rw-r--r-- | xmloff/source/text/XMLLineNumberingImportContext.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx index 7aa7b04f25a7..4fb3dea41a3c 100644 --- a/xmloff/source/text/XMLLineNumberingImportContext.cxx +++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLLineNumberingImportContext.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: dvo $ $Date: 2001-06-29 21:07:22 $ + * last change: $Author: rt $ $Date: 2004-07-13 08:34:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -174,8 +174,8 @@ static SvXMLTokenMapEntry aLineNumberingTokenMap[] = XML_TOK_LINENUMBERING_NUMBER_LINES }, { XML_NAMESPACE_TEXT, XML_COUNT_EMPTY_LINES, XML_TOK_LINENUMBERING_COUNT_EMPTY_LINES }, - { XML_NAMESPACE_TEXT, XML_COUNT_IN_FLOATING_FRAMES, - XML_TOK_LINENUMBERING_COUNT_IN_FLOATING_FRAMES }, + { XML_NAMESPACE_TEXT, XML_COUNT_IN_TEXT_BOXES, + XML_TOK_LINENUMBERING_COUNT_IN_TEXT_BOXES }, { XML_NAMESPACE_TEXT, XML_RESTART_ON_PAGE, XML_TOK_LINENUMBERING_RESTART_NUMBERING }, { XML_NAMESPACE_TEXT, XML_OFFSET, XML_TOK_LINENUMBERING_OFFSET }, @@ -240,7 +240,7 @@ void XMLLineNumberingImportContext::ProcessAttribute( } break; - case XML_TOK_LINENUMBERING_COUNT_IN_FLOATING_FRAMES: + case XML_TOK_LINENUMBERING_COUNT_IN_TEXT_BOXES: if (SvXMLUnitConverter::convertBool(bTmp, sValue)) { bCountInFloatingFrames = bTmp; @@ -311,7 +311,8 @@ void XMLLineNumberingImportContext::CreateAndInsert( if ( GetImport().GetStyles()->FindStyleChildContext( XML_STYLE_FAMILY_TEXT_TEXT, sStyleName ) != NULL ) { - aAny <<= sStyleName; + aAny <<= GetImport().GetStyleDisplayName( + XML_STYLE_FAMILY_TEXT_TEXT, sStyleName ); xLineNumbering->setPropertyValue(sCharStyleName, aAny); } |