Kaydet (Commit) 0445b35c authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

INTEGRATION: CWS oasisbf1 (1.54.10); FILE MERGED

2004/09/30 07:35:49 mib 1.54.10.1: #i32836#: foot end endote references
üst 71c6f1ab
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
* *
* $RCSfile: txtfldi.cxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
...@@ -412,6 +412,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] = ...@@ -412,6 +412,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextFieldAttrTokenMap[] =
{ XML_NAMESPACE_TEXT, XML_EDITING_CYCLES, XML_TOK_TEXTFIELD_REVISION }, { 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_OUTLINE_LEVEL, XML_TOK_TEXTFIELD_OUTLINE_LEVEL},
{ XML_NAMESPACE_TEXT, XML_ACTIVE, XML_TOK_TEXTFIELD_ACTIVE }, { 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_NAMESPACE_TEXT, XML_REFERENCE_FORMAT,
XML_TOK_TEXTFIELD_REFERENCE_FORMAT }, XML_TOK_TEXTFIELD_REFERENCE_FORMAT },
{ XML_NAMESPACE_TEXT, XML_REF_NAME, XML_TOK_TEXTFIELD_REF_NAME }, { XML_NAMESPACE_TEXT, XML_REF_NAME, XML_TOK_TEXTFIELD_REF_NAME },
...@@ -3165,8 +3166,6 @@ void XMLReferenceFieldImportContext::StartElement( ...@@ -3165,8 +3166,6 @@ void XMLReferenceFieldImportContext::StartElement(
break; break;
case XML_TOK_TEXT_NOTE_REF: case XML_TOK_TEXT_NOTE_REF:
nSource = ReferenceFieldSource::FOOTNOTE; nSource = ReferenceFieldSource::FOOTNOTE;
// nSource = ReferenceFieldSource::ENDNOTE;
OSL_ENSURE( !bTypeOK, "note reference type is not set correctly" );
break; break;
case XML_TOK_TEXT_SEQUENCE_REF: case XML_TOK_TEXT_SEQUENCE_REF:
nSource = ReferenceFieldSource::SEQUENCE_FIELD; nSource = ReferenceFieldSource::SEQUENCE_FIELD;
...@@ -3187,6 +3186,10 @@ void XMLReferenceFieldImportContext::ProcessAttribute( ...@@ -3187,6 +3186,10 @@ void XMLReferenceFieldImportContext::ProcessAttribute(
{ {
switch (nAttrToken) switch (nAttrToken)
{ {
case XML_TOK_TEXTFIELD_NOTE_CLASS:
if( IsXMLToken( sAttrValue, XML_ENDNOTE ) )
nSource = ReferenceFieldSource::ENDNOTE;
break;
case XML_TOK_TEXTFIELD_REF_NAME: case XML_TOK_TEXTFIELD_REF_NAME:
sName = sAttrValue; sName = sAttrValue;
bNameOK = sal_True; bNameOK = sal_True;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment