diff options
| author | Daniel Vogelheim <dvo@openoffice.org> | 2001-01-12 17:27:06 +0000 |
|---|---|---|
| committer | Daniel Vogelheim <dvo@openoffice.org> | 2001-01-12 17:27:06 +0000 |
| commit | 548077da4bbe8998fb5316e8f3963235b76ef284 (patch) | |
| tree | 97691686c05928dd02f3eb01da228788e4b7e214 /xmloff | |
| parent | 7afe2ef785c59c2ef4444b5d7cff399cae3599b4 (diff) | |
- fixed #81985#: caption sequence format in table and illustration indices fixed
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/dtd/text.mod | 6 | ||||
| -rw-r--r-- | xmloff/source/text/XMLIndexTableSourceContext.cxx | 32 |
2 files changed, 21 insertions, 17 deletions
diff --git a/xmloff/dtd/text.mod b/xmloff/dtd/text.mod index 3a2ad7526df1..02909748c895 100644 --- a/xmloff/dtd/text.mod +++ b/xmloff/dtd/text.mod @@ -1,5 +1,5 @@ <!-- - $Id: text.mod,v 1.17 2001-01-03 09:55:08 mib Exp $ + $Id: text.mod,v 1.18 2001-01-12 18:26:52 dvo Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -782,7 +782,7 @@ <!ATTLIST text:illustration-index-source text:caption-sequence-name %string; #IMPLIED> <!ATTLIST text:illustration-index-source text:caption-sequence-format - CDATA #IMPLIED> + (text|category-and-value|caption) "text"> <!ELEMENT text:illustration-index-entry-template ( text:index-entry-page-number | @@ -805,7 +805,7 @@ <!ATTLIST text:table-index-source text:caption-sequence-name %string; #IMPLIED> <!ATTLIST text:table-index-source text:caption-sequence-format - CDATA #IMPLIED> + (text|category-and-value|caption) "text"> <!ELEMENT text:table-index-entry-template ( text:index-entry-page-number | text:index-entry-text | diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx index 6fec26a801d5..491826181d82 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.cxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx @@ -2,9 +2,9 @@ * * $RCSfile: XMLIndexTableSourceContext.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2000-11-21 12:45:19 $ + * last change: $Author: dvo $ $Date: 2001-01-12 18:27:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -162,9 +162,15 @@ XMLIndexTableSourceContext::~XMLIndexTableSourceContext() static SvXMLEnumMapEntry __READONLY_DATA lcl_aReferenceTypeTokenMap[] = { - { sXML_text, ReferenceFieldPart::TEXT }, - { sXML_category_and_value, ReferenceFieldPart::CATEGORY_AND_NUMBER }, - { sXML_caption, ReferenceFieldPart::ONLY_CAPTION }, + + { sXML_text, ReferenceFieldPart::TEXT }, + { sXML_category_and_value, ReferenceFieldPart::CATEGORY_AND_NUMBER }, + { sXML_caption, ReferenceFieldPart::ONLY_CAPTION }, + + // wrong values that previous versions wrote: + { sXML_chapter, ReferenceFieldPart::CATEGORY_AND_NUMBER }, + { sXML_page, ReferenceFieldPart::ONLY_CAPTION }, + { 0, 0 } }; @@ -190,15 +196,13 @@ void XMLIndexTableSourceContext::ProcessAttribute( case XML_TOK_INDEXSOURCE_SEQUENCE_FORMAT: { - // TODO: API problem - -// sal_uInt16 nTmp; -// if (SvXMLUnitConverter::convertEnum(nTmp, rValue, -// lcl_aReferenceTypeTokenMap)) -// { -// nDisplayFormat = nTmp; -// bDisplayFormatOK = sal_True; -// } + sal_uInt16 nTmp; + if (SvXMLUnitConverter::convertEnum(nTmp, rValue, + lcl_aReferenceTypeTokenMap)) + { + nDisplayFormat = nTmp; + bDisplayFormatOK = sal_True; + } break; } |