From 80fcc2da523bfae04094b105e67493f9d7679f8f Mon Sep 17 00:00:00 2001
From: Michael Stahl <mst@openoffice.org>
Date: Mon, 19 Apr 2010 18:27:16 +0200
Subject: sw33bf03: #i110691#: import/export xml:id and
 {anim,draw,form,text}:id:  in ODF 1.2, the ID attributes on many elements are
 deprecated, and must  be used only in conjunction with xml:id.  new method
 SvXMLExport::AddAttributeIdLegacy() should fix the export.

---
 xmloff/source/chart/SchXMLExport.cxx           | 21 ++++++++++++++-------
 xmloff/source/chart/SchXMLParagraphContext.cxx | 18 ++++++++++++++----
 2 files changed, 28 insertions(+), 11 deletions(-)

(limited to 'xmloff/source/chart')

diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index f7cf82abe974..43ab0b458ab5 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -44,9 +44,7 @@
 #include <tools/globname.hxx>
 #include <sot/clsids.hxx>
 
-#ifndef _SVTOOLS_NMSPMAP_HXX
 #include <xmloff/nmspmap.hxx>
-#endif
 #include "xmlnmspe.hxx"
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/families.hxx>
@@ -1536,8 +1534,11 @@ void SchXMLExportHelper::exportTable()
             // to allow a correct re-association when copying via clipboard
             if( !bHasOwnData && aFirstRowRangeIter != aFirstRowRangeEndIter )
             {
-                if( (*aFirstRowRangeIter).getLength())
-                    mrExport.AddAttribute( XML_NAMESPACE_TEXT, XML_ID, *aFirstRowRangeIter );
+                if ((*aFirstRowRangeIter).getLength())
+                {
+                    mrExport.AddAttributeIdLegacy(XML_NAMESPACE_TEXT,
+                        *aFirstRowRangeIter);
+                }
                 ++aFirstRowRangeIter;
             }
             exportText( *aIt );
@@ -1561,7 +1562,10 @@ void SchXMLExportHelper::exportTable()
                     // write the original range name as id into the local table
                     // to allow a correct re-association when copying via clipboard
                     if( !bHasOwnData && aFirstColumnRangeIter != aFirstColumnRangeEndIter )
-                        mrExport.AddAttribute( XML_NAMESPACE_TEXT, XML_ID, *aFirstColumnRangeIter++ );
+                    {
+                        mrExport.AddAttributeIdLegacy(XML_NAMESPACE_TEXT,
+                            *aFirstColumnRangeIter++);
+                    }
                     exportText( *aFirstColIt );
                     ++aFirstColIt;
                 }
@@ -1579,8 +1583,11 @@ void SchXMLExportHelper::exportTable()
                 if( ( !bHasOwnData && aDataRangeIter != aDataRangeEndIter ) &&
                     ( mbRowSourceColumns || (aInnerIt == aColIt->begin())) )
                 {
-                    if( (*aDataRangeIter).getLength())
-                        mrExport.AddAttribute( XML_NAMESPACE_TEXT, XML_ID, *aDataRangeIter );
+                    if ((*aDataRangeIter).getLength())
+                    {
+                        mrExport.AddAttributeIdLegacy(XML_NAMESPACE_TEXT,
+                            *aDataRangeIter);
+                    }
                     ++aDataRangeIter;
                 }
                 exportText( msString, false ); // do not convert tabs and lfs
diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx
index 1d8a4e16bb8c..9e19c02437b8 100644
--- a/xmloff/source/chart/SchXMLParagraphContext.cxx
+++ b/xmloff/source/chart/SchXMLParagraphContext.cxx
@@ -63,6 +63,7 @@ void SchXMLParagraphContext::StartElement( const uno::Reference< xml::sax::XAttr
     {
         sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0;
         rtl::OUString aValue;
+        bool bHaveXmlId( false );
 
         for( sal_Int16 i = 0; i < nAttrCount; i++ )
         {
@@ -70,11 +71,20 @@ void SchXMLParagraphContext::StartElement( const uno::Reference< xml::sax::XAttr
             rtl::OUString aLocalName;
             USHORT nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName );
 
-            if( nPrefix == XML_NAMESPACE_TEXT &&
-                IsXMLToken( aLocalName, XML_ID ) )
+            if (IsXMLToken(aLocalName, XML_ID))
             {
-                (*mpId) = xAttrList->getValueByIndex( i );
-                break;   // we only need this attribute
+                if (nPrefix == XML_NAMESPACE_XML)
+                {
+                    (*mpId) = xAttrList->getValueByIndex( i );
+                    bHaveXmlId = true;
+                }
+                if (nPrefix == XML_NAMESPACE_TEXT)
+                {   // text:id shall be ignored if xml:id exists
+                    if (!bHaveXmlId)
+                    {
+                        (*mpId) = xAttrList->getValueByIndex( i );
+                    }
+                }
             }
         }
     }
-- 
cgit