INTEGRATION: CWS odfmetadata (1.141.2); FILE MERGED

2008/06/25 10:00:20 mst 1.141.2.2: RESYNC: (1.141-1.142); FILE MERGED
2008/06/19 17:02:37 mst 1.141.2.1: #i90620#: interface change: xmloff
- xmloff/inc/xmlnmspe.hxx:
  + add namespace RDFA
- xmloff/source/core/nmspmap.cxx:
  + SvXMLNamespaceMap::GetQNameByKey(): handle the built-in XML namespace
- xmloff/inc/xmloff/xmltoken.hxx, xmloff/source/core/xmltoken.cxx:
  + new namespaces: XML_N_XML, XML_N_RDFA
  + new token: XML_META_FIELD
- xmloff/inc/xmloff/xmlimp.hxx, xmloff/source/core/xmlimp.cxx,:
  + new methods GetStreamPath(), SetXmlId()
  + SvXMLImport::_InitCtor():
    add implicit namespace declaration for built-in "xml" prefix
- xmloff/inc/xmloff/xmlexp.hxx, xmloff/source/core/xmlexp.cxx:
  + new methods GetStreamPath(), AddAttributeXmlId()
  + SvXMLExport::_InitCtor(): add namespace declaration for RDFA
- xmloff/inc/xmloff/txtimp.hxx, xmloff/source/text/txtimp.cxx:
  + XMLTextPElemTokens: add tokens: XML_TOK_TEXT_META, XML_TOK_TEXT_META_FIELD
  + XMLTextPAttrTokens: add token XML_TOK_TEXT_P_XMLID
  + XMLTextListBlockAttrTokens: add token XML_TOK_TEXT_LIST_BLOCK_XMLID
  + InsertBookmarkStartRange(): add parameter XmlId
  + FindAndRemoveBookmarkStartRange(): add parameter XmlId

1 files changed, 15 insertions, 6 deletions

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 829bfb5a93..f1d5e24ad2 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: txtimp.cxx,v $
- * $Revision: 1.142 $
+ * $Revision: 1.143 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -317,6 +317,10 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] =
     // draw fields
     { XML_NAMESPACE_TEXT, XML_MEASURE,	XML_TOK_TEXT_MEASURE },
 
+    // RDF metadata
+    { XML_NAMESPACE_TEXT, XML_META,         XML_TOK_TEXT_META },
+    { XML_NAMESPACE_TEXT, XML_META_FIELD,   XML_TOK_TEXT_META_FIELD },
+
     // redlining (aka change tracking)
     { XML_NAMESPACE_TEXT, XML_CHANGE_START, XML_TOK_TEXTP_CHANGE_START },
     { XML_NAMESPACE_TEXT, XML_CHANGE_END  , XML_TOK_TEXTP_CHANGE_END },
@@ -332,6 +336,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPElemTokenMap[] =
 
 static __FAR_DATA SvXMLTokenMapEntry aTextPAttrTokenMap[] =
 {
+    { XML_NAMESPACE_XML , XML_ID,			XML_TOK_TEXT_P_XMLID },
     { XML_NAMESPACE_TEXT, XML_STYLE_NAME,	XML_TOK_TEXT_P_STYLE_NAME },
     { XML_NAMESPACE_TEXT, XML_COND_STYLE_NAME,
                                             XML_TOK_TEXT_P_COND_STYLE_NAME },
@@ -345,6 +350,7 @@ static __FAR_DATA SvXMLTokenMapEntry aTextPAttrTokenMap[] =
 
 static __FAR_DATA SvXMLTokenMapEntry aTextListBlockAttrTokenMap[] =
 {
+    { XML_NAMESPACE_XML , XML_ID,			XML_TOK_TEXT_LIST_BLOCK_XMLID },
     { XML_NAMESPACE_TEXT, XML_STYLE_NAME,
             XML_TOK_TEXT_LIST_BLOCK_STYLE_NAME },
     { XML_NAMESPACE_TEXT, XML_CONTINUE_NUMBERING,
@@ -2115,18 +2121,21 @@ SvI18NMap& XMLTextImportHelper::GetRenameMap()
 
 void XMLTextImportHelper::InsertBookmarkStartRange(
     const OUString sName,
-    const Reference<XTextRange> & rRange)
+    const Reference<XTextRange> & rRange,
+    const OUString& i_rXmlId)
 {
-    aBookmarkStartRanges[sName].set(rRange);
+    aBookmarkStartRanges[sName] = std::make_pair(rRange, i_rXmlId);
 }
 
 sal_Bool XMLTextImportHelper::FindAndRemoveBookmarkStartRange(
-    Reference<XTextRange> & rRange,
-    const OUString sName)
+    const OUString sName,
+    Reference<XTextRange> & o_rRange,
+    OUString& o_rXmlId)
 {
     if (aBookmarkStartRanges.count(sName))
     {
-        rRange.set(aBookmarkStartRanges[sName]);
+        o_rRange.set(aBookmarkStartRanges[sName].first);
+        o_rXmlId = aBookmarkStartRanges[sName].second;
         aBookmarkStartRanges.erase(sName);
         return sal_True;
     }