summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 11:19:53 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-11-09 11:19:53 +0000
commit0445b35cae38a5bfb5dee26d9ce6ce2d6995818b (patch)
tree1490c5c0ac50577d64d4e553717cb8d9484badb1 /xmloff
parent71c6f1ab887ad0de80acbd50e6431cbebf0f988b (diff)
INTEGRATION: CWS oasisbf1 (1.54.10); FILE MERGED
2004/09/30 07:35:49 mib 1.54.10.1: #i32836#: foot end endote references
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/txtfldi.cxx11
1 files changed, 7 insertions, 4 deletions
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index ef51c19db374..34bbd8aa9d5b 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: txtfldi.cxx,v $
*
- * $Revision: 1.54 $
+ * $Revision: 1.55 $
*
- * last change: $Author: rt $ $Date: 2004-08-20 08:15:29 $
+ * last change: $Author: hr $ $Date: 2004-11-09 12:19:52 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -412,6 +412,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
{ XML_NAMESPACE_TEXT, XML_EDITING_CYCLES, XML_TOK_TEXTFIELD_REVISION },
{ XML_NAMESPACE_TEXT, XML_OUTLINE_LEVEL, XML_TOK_TEXTFIELD_OUTLINE_LEVEL},
{ XML_NAMESPACE_TEXT, XML_ACTIVE, XML_TOK_TEXTFIELD_ACTIVE },
+ { XML_NAMESPACE_TEXT, XML_NOTE_CLASS, XML_TOK_TEXTFIELD_NOTE_CLASS },
{ XML_NAMESPACE_TEXT, XML_REFERENCE_FORMAT,
XML_TOK_TEXTFIELD_REFERENCE_FORMAT },
{ XML_NAMESPACE_TEXT, XML_REF_NAME, XML_TOK_TEXTFIELD_REF_NAME },
@@ -3165,8 +3166,6 @@ void XMLReferenceFieldImportContext::StartElement(
break;
case XML_TOK_TEXT_NOTE_REF:
nSource = ReferenceFieldSource::FOOTNOTE;
-// nSource = ReferenceFieldSource::ENDNOTE;
- OSL_ENSURE( !bTypeOK, "note reference type is not set correctly" );
break;
case XML_TOK_TEXT_SEQUENCE_REF:
nSource = ReferenceFieldSource::SEQUENCE_FIELD;
@@ -3187,6 +3186,10 @@ void XMLReferenceFieldImportContext::ProcessAttribute(
{
switch (nAttrToken)
{
+ case XML_TOK_TEXTFIELD_NOTE_CLASS:
+ if( IsXMLToken( sAttrValue, XML_ENDNOTE ) )
+ nSource = ReferenceFieldSource::ENDNOTE;
+ break;
case XML_TOK_TEXTFIELD_REF_NAME:
sName = sAttrValue;
bNameOK = sal_True;