ooo-build r14094 - in trunk: . patches/dev300

[jonp svn gnome org]

Author: jonp
Date: Fri Sep 26 00:41:48 2008
New Revision: 14094
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14094&view=rev

Log:
	* patches/dev300/forms-radio-button-group-names.diff: Place the radio
	  button group-name attribute into a `formx` namespace, as this
	  attribute has not been (and currently will not be) standardized.
	  Import the group-name attribute when loading existing files.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/forms-radio-button-group-names.diff

Modified: trunk/patches/dev300/forms-radio-button-group-names.diff
==============================================================================
--- trunk/patches/dev300/forms-radio-button-group-names.diff	(original)
+++ trunk/patches/dev300/forms-radio-button-group-names.diff	Fri Sep 26 00:41:48 2008
@@ -461,6 +461,82 @@
      // free
      // free
      // free
+diff --git xmloff/inc/xmlnmspe.hxx xmloff/inc/xmlnmspe.hxx
+index cc17d30..c563c50 100644
+--- xmloff/inc/xmlnmspe.hxx
++++ xmloff/inc/xmlnmspe.hxx
+@@ -95,6 +95,7 @@ XML_OLD_NAMESPACE( META,	6U )
+ 
+ // experimental namespaces
+ XML_NAMESPACE( FIELD,			100U )
++XML_NAMESPACE( FORMX,           101U )      // form interop extensions
+ 
+ 
+ #endif	//  _XMLOFF_XMLNMSPE_HXX
+diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
+index ea7854e..b012bb7 100644
+--- xmloff/inc/xmloff/xmltoken.hxx
++++ xmloff/inc/xmloff/xmltoken.hxx
+@@ -142,6 +142,10 @@ namespace xmloff { namespace token {
+         XML_NP_RDFA,
+         XML_N_RDFA,
+ 
++        // jonp: 2008-09-24 Excel Interop
++        XML_NP_FORMX,
++        XML_N_FORMX,
++
+         // units
+         XML_UNIT_MM,
+         XML_UNIT_M,
+diff --git xmloff/source/core/xmlexp.cxx xmloff/source/core/xmlexp.cxx
+index 1c3f4b1..84559a3 100644
+--- xmloff/source/core/xmlexp.cxx
++++ xmloff/source/core/xmlexp.cxx
+@@ -308,6 +308,7 @@ void SvXMLExport::_InitCtor()
+ 		mpNamespaceMap->Add( GetXMLToken(XML_NP_XSD), GetXMLToken(XML_N_XSD), XML_NAMESPACE_XSD );
+ 		mpNamespaceMap->Add( GetXMLToken(XML_NP_XSI), GetXMLToken(XML_N_XSI), XML_NAMESPACE_XSI );
+ 		mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
++		mpNamespaceMap->Add( GetXMLToken(XML_NP_FORMX), GetXMLToken(XML_N_FORMX), XML_NAMESPACE_FORMX );
+ 	}
+ 	if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
+ 	{
+diff --git xmloff/source/core/xmlimp.cxx xmloff/source/core/xmlimp.cxx
+index bc3f69a..42a4de4 100644
+--- xmloff/source/core/xmlimp.cxx
++++ xmloff/source/core/xmlimp.cxx
+@@ -112,6 +112,7 @@ sal_Char __READONLY_DATA sXML_np__script[] = "_script";
+ sal_Char __READONLY_DATA sXML_np__config[] = "_config";
+ sal_Char __READONLY_DATA sXML_np__db[] = "_db";
+ sal_Char __READONLY_DATA sXML_np__xforms[] = "_xforms";
++sal_Char __READONLY_DATA sXML_np__formx[] = "_formx";
+ sal_Char __READONLY_DATA sXML_np__xsd[] = "_xsd";
+ sal_Char __READONLY_DATA sXML_np__xsi[] = "_xsi";
+ sal_Char __READONLY_DATA sXML_np__field[] = "_field";
+@@ -287,6 +288,9 @@ void SvXMLImport::_InitCtor()
+         mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xforms) ),
+                             GetXMLToken(XML_N_XFORMS_1_0),
+                             XML_NAMESPACE_XFORMS );
++        mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__formx) ),
++                            GetXMLToken( XML_N_FORMX ),
++                            XML_NAMESPACE_FORMX );
+         mpNamespaceMap->Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__xsd) ),
+                             GetXMLToken(XML_N_XSD),
+                             XML_NAMESPACE_XSD );
+diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
+index bed0d4c..651a3d4 100644
+--- xmloff/source/core/xmltoken.cxx
++++ xmloff/source/core/xmltoken.cxx
+@@ -150,6 +150,10 @@ namespace xmloff { namespace token {
+         TOKEN( "rdfa",                      XML_NP_RDFA ),
+         TOKEN( "http://docs.oasis-open.org/opendocument/meta/rdfa#";, XML_N_RDFA ),
+ 
++        // jonp: 2008-09-24 Excel Interop
++        TOKEN( "formx",                           XML_NP_FORMX ),
++        TOKEN( "urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0", XML_N_FORMX ),
++
+         // units
+         TOKEN( "mm",                              XML_UNIT_MM ),
+         TOKEN( "m",                               XML_UNIT_M ),
 Index: xmloff/source/forms/formattributes.hxx
 ===================================================================
 RCS file: /cvs/xml/xmloff/source/forms/formattributes.hxx,v
@@ -491,6 +567,34 @@
  			case SCA_MULTI_LINE:			return "multi-line";
  			case SCA_AUTOMATIC_COMPLETION:	return "auto-complete";
  			case SCA_MULTIPLE: 				return "multiple";
+@@ -215,9 +215,12 @@ namespace xmloff
+ 	}
+ 
+ 	//---------------------------------------------------------------------
+-	sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 /*_nId*/)
++	sal_uInt16 OAttributeMetaData::getSpecialAttributeNamespace(sal_Int32 _nId)
+ 	{
+-		// nothing special here
++        switch( _nId )
++        {
++            case SCA_GROUP_NAME:            return XML_NAMESPACE_FORMX;
++        }
+ 		return XML_NAMESPACE_FORM;
+ 	}
+ 
+diff --git xmloff/source/forms/layerimport.cxx xmloff/source/forms/layerimport.cxx
+index e8d8a26..8f8513c 100644
+--- xmloff/source/forms/layerimport.cxx
++++ xmloff/source/forms/layerimport.cxx
+@@ -97,6 +97,8 @@ namespace xmloff
+ 		m_aAttributeMetaData.addStringProperty(
+ 			OAttributeMetaData::getCommonControlAttributeName(CCA_NAME), PROPERTY_NAME);
+ 		m_aAttributeMetaData.addStringProperty(
++			OAttributeMetaData::getSpecialAttributeName(SCA_GROUP_NAME), PROPERTY_GROUP_NAME);
++		m_aAttributeMetaData.addStringProperty(
+ 			OAttributeMetaData::getCommonControlAttributeName(CCA_IMAGE_DATA), PROPERTY_IMAGEURL);
+ 		m_aAttributeMetaData.addStringProperty(
+ 			OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), PROPERTY_LABEL);
 Index: xmloff/source/forms/strings.hxx
 ===================================================================
 RCS file: /cvs/xml/xmloff/source/forms/strings.hxx,v