#96658# changed bibiliographic-type to bibliography-type

4 files changed, 20 insertions, 14 deletions

diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
index c1c4452805f6..7b7c3b1e5545 100644
--- a/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLIndexBibliographyEntryContext.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: dvo $ $Date: 2001-06-29 21:07:21 $
+ *  last change: $Author: dvo $ $Date: 2002-01-18 11:08:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -141,6 +141,8 @@ const SvXMLEnumMapEntry aBibliographyDataFieldMap[] =
     { XML_ADDRESS,              BibliographyDataField::ADDRESS },
     { XML_ANNOTE,               BibliographyDataField::ANNOTE },
     { XML_AUTHOR,               BibliographyDataField::AUTHOR },
+    { XML_BIBLIOGRAPHY_TYPE,    BibliographyDataField::BIBILIOGRAPHIC_TYPE },
+    // #96658#: also read old documents (bib*i*liographic...)
     { XML_BIBILIOGRAPHIC_TYPE,  BibliographyDataField::BIBILIOGRAPHIC_TYPE },
     { XML_BOOKTITLE,            BibliographyDataField::BOOKTITLE },
     { XML_CHAPTER,              BibliographyDataField::CHAPTER },
diff --git a/xmloff/source/text/XMLSectionExport.cxx b/xmloff/source/text/XMLSectionExport.cxx
index 68d52adcd69a..daa154c2dc34 100644
--- a/xmloff/source/text/XMLSectionExport.cxx
+++ b/xmloff/source/text/XMLSectionExport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLSectionExport.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: dvo $ $Date: 2002-01-09 12:57:21 $
+ *  last change: $Author: dvo $ $Date: 2002-01-18 11:08:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1294,7 +1294,7 @@ SvXMLEnumMapEntry __READONLY_DATA aBibliographyDataFieldMap[] =
     { XML_ADDRESS,              BibliographyDataField::ADDRESS },
     { XML_ANNOTE,               BibliographyDataField::ANNOTE },
     { XML_AUTHOR,               BibliographyDataField::AUTHOR },
-    { XML_BIBILIOGRAPHIC_TYPE,  BibliographyDataField::BIBILIOGRAPHIC_TYPE },
+    { XML_BIBLIOGRAPHY_TYPE,    BibliographyDataField::BIBILIOGRAPHIC_TYPE },
     { XML_BOOKTITLE,            BibliographyDataField::BOOKTITLE },
     { XML_CHAPTER,              BibliographyDataField::CHAPTER },
     { XML_CUSTOM1,              BibliographyDataField::CUSTOM1 },
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 1146f58a3bdf..266c383ac03a 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtflde.cxx,v $
  *
- *  $Revision: 1.41 $
+ *  $Revision: 1.42 $
  *
- *  last change: $Author: dvo $ $Date: 2002-01-11 16:42:22 $
+ *  last change: $Author: dvo $ $Date: 2002-01-18 11:08:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2547,7 +2547,7 @@ void XMLTextFieldExport::ProcessBibliographyData(
                                                 aBibliographyDataTypeMap))
             {
                 rExport.AddAttribute(XML_NAMESPACE_TEXT,
-                                     XML_BIBILIOGRAPHIC_TYPE,
+                                     XML_BIBLIOGRAPHY_TYPE,
                                      sBuf.makeStringAndClear());
             }
             // else: ignore this argument
@@ -3057,7 +3057,7 @@ enum XMLTokenEnum XMLTextFieldExport::MapBibliographyFieldName(OUString sName)
     else if (sName.equalsAsciiL("BibiliographicType",
                                 sizeof("BibiliographicType")-1))
     {
-        eName = XML_BIBILIOGRAPHIC_TYPE;
+        eName = XML_BIBLIOGRAPHY_TYPE;
     }
     else if (sName.equalsAsciiL("Address", sizeof("Address")-1))
     {
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 19b635ee3ab0..ce9483058038 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtfldi.cxx,v $
  *
- *  $Revision: 1.36 $
+ *  $Revision: 1.37 $
  *
- *  last change: $Author: dvo $ $Date: 2002-01-11 16:42:22 $
+ *  last change: $Author: dvo $ $Date: 2002-01-18 11:08:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -3465,8 +3465,10 @@ void XMLBibliographyFieldImportContext::StartElement(
                 MapBibliographyFieldName(sLocalName));
             Any aAny;
 
-            // special treatment for bibliographic type
-            if (IsXMLToken(sLocalName, XML_BIBILIOGRAPHIC_TYPE))
+            // special treatment for bibliography type
+            // biblio vs bibilio: #96658#; also read old documents
+            if (IsXMLToken(sLocalName, XML_BIBILIOGRAPHIC_TYPE) ||
+                IsXMLToken(sLocalName, XML_BIBLIOGRAPHY_TYPE)    )
             {
                 sal_uInt16 nTmp;
                 if (SvXMLUnitConverter::convertEnum(
@@ -3526,8 +3528,10 @@ const sal_Char* XMLBibliographyFieldImportContext::MapBibliographyFieldName(
     {
         pName = "Identifier";
     }
-    else if (IsXMLToken(sName, XML_BIBILIOGRAPHIC_TYPE))
+    else if (IsXMLToken(sName, XML_BIBILIOGRAPHIC_TYPE) ||
+             IsXMLToken(sName, XML_BIBLIOGRAPHY_TYPE)     )
     {
+        // biblio... vs bibilio...: #96658#: also read old documents
         pName = "BibiliographicType";
     }
     else if (IsXMLToken(sName, XML_ADDRESS))