ooo-build r12074 - in trunk: . patches/src680

[jonp svn gnome org]

Author: jonp
Date: Tue Apr  1 14:37:17 2008
New Revision: 12074
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12074&view=rev

Log:
	* patches/src680/apply: Remove radiobutton-group-hack.diff.
	* patches/src680/radiobutton-group-hack.diff: Remove; move the useful bits
	  into patches/src680/forms-radio-button-group-names.diff.
	* patches/src680/forms-radio-button-groupnames.diff: Add support for
	  importing the OLE OCX GroupName property.  Fixes #n310052.


Removed:
   trunk/patches/src680/radiobutton-group-hack.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply
   trunk/patches/src680/forms-radio-button-group-names.diff

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Apr  1 14:37:17 2008
@@ -1435,10 +1435,6 @@
 
 [ VBAUntested ]
 SectionOwner => noelpwer
-# start LCL hacks
-# incomplete solution ( works for import of ocx radio buttons only )
-radiobutton-group-hack.diff, n#359937, jonp
-# end LCL hacks
 basic-source-classes-eventatt-cxx.diff, #no-upstream
 #ditto
 # null patch below was removed because it causes 

Modified: trunk/patches/src680/forms-radio-button-group-names.diff
==============================================================================
--- trunk/patches/src680/forms-radio-button-group-names.diff	(original)
+++ trunk/patches/src680/forms-radio-button-group-names.diff	Tue Apr  1 14:37:17 2008
@@ -452,3 +452,23 @@
      // free
      // free
      // free
+Index: svx/source/msfilter/msocximex.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/msfilter/msocximex.cxx,v
+retrieving revision 1.35
+diff -u -p -r1.35 msocximex.cxx
+--- svx/source/msfilter/msocximex.cxx	27 Sep 2007 13:02:19 -0000	1.35
++++ svx/source/msfilter/msocximex.cxx	1 Apr 2008 12:53:10 -0000
+@@ -1763,6 +1763,12 @@ sal_Bool OCX_OptionButton::Import(com::s
+     aTmp <<= ::com::sun::star::style::VerticalAlignment_MIDDLE;
+     rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp );
+ 
++    if ( pGroupName )
++    {
++        aTmp <<= lclCreateOUString( pGroupName, nGroupNameLen );
++        rPropSet->setPropertyValue( WW8_ASCII2STR("GroupName"), aTmp);
++    }
++
+ 	aFontData.Import(rPropSet);
+ 	return sal_True;
+ }