ooo-build r14095 - in branches/ooo-build-3-0: . patches/dev300

[jonp svn gnome org]

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

Log:
	* patches/dev300/forms-radio-button-group-names.diff: Fixup so that it
	  applies cleanly.
	* patches/dev300/apply: Move [RadioButtons] group after
	  [TemporaryHacks] so that I can rely on xmloff-field-patch.diff to be
	  applied before forms-radio-button-group-names.diff is applied.


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply
   branches/ooo-build-3-0/patches/dev300/forms-radio-button-group-names.diff

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Fri Sep 26 02:41:29 2008
@@ -523,15 +523,6 @@
 # fixes the realpath buffer size to avoid crash when detecting soffice path
 cppuhelper-findsofficepath-realpath-buffer-size.diff, i#93393, pmladek
 
-[ RadioButtons ]
-# Add a GroupName property to RadioButtons so that RadioButtons don't need to
-# share the same name to be part of the same group.
-forms-radio-button-group-names.diff, n#310052, i#30823, jonp
-# depends on forms-radio-button-group-names.diff,
-xl-import-formradiobutton.diff, noelpwer, i#30823
-# persist the groupname for basic dialogs also
-dialog-groupname-persist.diff, noelpwer, i#30823
-
 [ SELinux ]
 # make OOo work under SELinux
 ooo80816.selinux.bridges.diff, i#80816
@@ -2419,6 +2410,15 @@
 sw-field-patch.diff, flr, n#248354
 xmloff-field-patch.diff, flr, n#248354
 
+[ RadioButtons ]
+# Add a GroupName property to RadioButtons so that RadioButtons don't need to
+# share the same name to be part of the same group.
+forms-radio-button-group-names.diff, n#310052, i#30823, jonp
+# depends on forms-radio-button-group-names.diff,
+xl-import-formradiobutton.diff, noelpwer, i#30823
+# persist the groupname for basic dialogs also
+dialog-groupname-persist.diff, noelpwer, i#30823
+
 [ NovellOnly ]
 #only enable enhanced field work in Novell OOo by default
 officecfg-field-patch.diff, flr, n#248354

Modified: branches/ooo-build-3-0/patches/dev300/forms-radio-button-group-names.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/forms-radio-button-group-names.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/forms-radio-button-group-names.diff	Fri Sep 26 02:41:29 2008
@@ -280,7 +280,7 @@
 @@ -122,6 +123,7 @@ ORadioButtonModel::ORadioButtonModel(con
  	m_nClassId = FormComponentType::RADIOBUTTON;
  	m_aLabelServiceName = FRM_SUN_COMPONENT_GROUPBOX;
- 	initValueProperty( PROPERTY_STATE, PROPERTY_ID_STATE );
+     initValueProperty( PROPERTY_STATE, PROPERTY_ID_STATE );
 +	startAggregatePropertyListening( PROPERTY_GROUP_NAME );
  }
  
@@ -465,13 +465,14 @@
 index cc17d30..c563c50 100644
 --- xmloff/inc/xmlnmspe.hxx
 +++ xmloff/inc/xmlnmspe.hxx
-@@ -95,6 +95,7 @@ XML_OLD_NAMESPACE( META,	6U )
+@@ -93,4 +93,8 @@
+ XML_OLD_NAMESPACE( TABLE,	5U )
+ XML_OLD_NAMESPACE( META,	6U )
  
- // experimental namespaces
- XML_NAMESPACE( FIELD,			100U )
++// experimental namespaces
 +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
@@ -495,7 +496,7 @@
 @@ -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_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 )