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

From: jonp svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12519 - in trunk: . patches/dev300
Date: Mon, 12 May 2008 07:57:51 +0100 (BST)
Author: jonp
Date: Mon May 12 06:57:51 2008
New Revision: 12519
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12519&view=rev

Log:
	* patches/dev300/forms-radio-button-group-names.diff: Migrate the GroupName
	  into toolkit, so that dialogs can make use of the GroupName support.


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	Mon May 12 06:57:51 2008
@@ -1,7 +1,10 @@
-diff --git extensions/inc/extensio.hrc extensions/inc/extensio.hrc
-index a0ba129..1e66cc9 100644
---- extensions/inc/extensio.hrc
-+++ extensions/inc/extensio.hrc
+Index: extensions/inc/extensio.hrc
+===================================================================
+RCS file: /cvs/util/extensions/inc/extensio.hrc,v
+retrieving revision 1.34
+diff -u -p -r1.34 extensio.hrc
+--- extensions/inc/extensio.hrc	11 Apr 2008 09:15:58 -0000	1.34
++++ extensions/inc/extensio.hrc	12 May 2008 06:43:27 -0000
 @@ -157,7 +157,7 @@
  
  //-----------------------------------------------------------------------
@@ -11,10 +14,13 @@
  #define HID_PROP_GROUPBOX						(HID_FORMS_START +   2)
  #define HID_PROP_CONTROLSOURCE					(HID_FORMS_START +   3)
  #define HID_PROP_NAME							(HID_FORMS_START +   4)
-diff --git extensions/source/propctrlr/formmetadata.hxx extensions/source/propctrlr/formmetadata.hxx
-index 821889f..42bca46 100644
---- extensions/source/propctrlr/formmetadata.hxx
-+++ extensions/source/propctrlr/formmetadata.hxx
+Index: extensions/source/propctrlr/formmetadata.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/propctrlr/formmetadata.hxx,v
+retrieving revision 1.35
+diff -u -p -r1.35 formmetadata.hxx
+--- extensions/source/propctrlr/formmetadata.hxx	11 Apr 2008 10:58:41 -0000	1.35
++++ extensions/source/propctrlr/formmetadata.hxx	12 May 2008 06:43:27 -0000
 @@ -166,6 +166,7 @@ namespace pcr
  	#define PROPERTY_ID_ALLOWADDITIONS		 20
  	#define PROPERTY_ID_ALLOWEDITS			 21
@@ -23,22 +29,28 @@
  	#define PROPERTY_ID_NAVIGATION			 24
  	#define PROPERTY_ID_CYCLE				 25
  	#define PROPERTY_ID_HIDDEN_VALUE		 26
-diff --git extensions/source/propctrlr/formmetadata.cxx extensions/source/propctrlr/formmetadata.cxx
-index 5d03e44..494d4da 100644
---- extensions/source/propctrlr/formmetadata.cxx
-+++ extensions/source/propctrlr/formmetadata.cxx
+Index: extensions/source/propctrlr/formmetadata.cxx
+===================================================================
+RCS file: /cvs/util/extensions/source/propctrlr/formmetadata.cxx,v
+retrieving revision 1.50
+diff -u -p -r1.50 formmetadata.cxx
+--- extensions/source/propctrlr/formmetadata.cxx	11 Apr 2008 10:58:09 -0000	1.50
++++ extensions/source/propctrlr/formmetadata.cxx	12 May 2008 06:43:27 -0000
 @@ -142,6 +142,7 @@ namespace pcr
          DEF_INFO_2( TITLE,             TITLE,              TITLE,             FORM_VISIBLE, DIALOG_VISIBLE ),
          DEF_INFO_3( LABEL,             LABEL,              LABEL,             FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
          DEF_INFO_2( CONTROLLABEL,      LABELCONTROL,       CONTROLLABEL,      FORM_VISIBLE, COMPOSEABLE ),
-+        DEF_INFO_2( GROUP_NAME,        GROUP_NAME,         GROUP_NAME,        FORM_VISIBLE, COMPOSEABLE ),
++        DEF_INFO_3( GROUP_NAME,        GROUP_NAME,         GROUP_NAME,        FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
          DEF_INFO_2( TEXT,              TEXT,               TEXT,              DIALOG_VISIBLE, COMPOSEABLE ),
          DEF_INFO_3( MAXTEXTLEN,        MAXTEXTLEN,         MAXTEXTLEN,        FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
          DEF_INFO_3( EDITMASK,          EDITMASK,           EDITMASK,          FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
-diff --git extensions/source/propctrlr/formstrings.hxx extensions/source/propctrlr/formstrings.hxx
-index 2aa1751..e1cdf60 100644
---- extensions/source/propctrlr/formstrings.hxx
-+++ extensions/source/propctrlr/formstrings.hxx
+Index: extensions/source/propctrlr/formstrings.hxx
+===================================================================
+RCS file: /cvs/util/extensions/source/propctrlr/formstrings.hxx,v
+retrieving revision 1.39
+diff -u -p -r1.39 formstrings.hxx
+--- extensions/source/propctrlr/formstrings.hxx	11 Apr 2008 11:01:21 -0000	1.39
++++ extensions/source/propctrlr/formstrings.hxx	12 May 2008 06:43:27 -0000
 @@ -50,6 +50,7 @@ namespace pcr
  	PCR_CONSTASCII_STRING( PROPERTY_TABINDEX,				"TabIndex");
  	PCR_CONSTASCII_STRING( PROPERTY_TAG,					"Tag");
@@ -47,10 +59,13 @@
  	PCR_CONSTASCII_STRING( PROPERTY_VALUE,					"Value");
  	PCR_CONSTASCII_STRING( PROPERTY_TEXT,					"Text");
  	PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION,				"NavigationBarMode");
-diff --git extensions/source/propctrlr/formresid.hrc extensions/source/propctrlr/formresid.hrc
-index 7209750..0274ec6 100644
---- extensions/source/propctrlr/formresid.hrc
-+++ extensions/source/propctrlr/formresid.hrc
+Index: extensions/source/propctrlr/formresid.hrc
+===================================================================
+RCS file: /cvs/util/extensions/source/propctrlr/formresid.hrc,v
+retrieving revision 1.37
+diff -u -p -r1.37 formresid.hrc
+--- extensions/source/propctrlr/formresid.hrc	11 Apr 2008 11:00:24 -0000	1.37
++++ extensions/source/propctrlr/formresid.hrc	12 May 2008 06:43:27 -0000
 @@ -147,7 +147,7 @@
  #define RID_STR_TAG							( RID_FORMBROWSER_START + 116 )
  #define RID_STR_HELPTEXT					( RID_FORMBROWSER_START + 117 )
@@ -60,10 +75,13 @@
  #define RID_STR_UNCHECKEDREFVALUE           ( RID_FORMBROWSER_START + 120 )
  #define RID_STR_CURSOR_TYPE					( RID_FORMBROWSER_START + 121 )
      // FREE
-diff --git extensions/source/propctrlr/formres.src extensions/source/propctrlr/formres.src
-index 1cc9b85..69930d7 100644
---- extensions/source/propctrlr/formres.src
-+++ extensions/source/propctrlr/formres.src
+Index: extensions/source/propctrlr/formres.src
+===================================================================
+RCS file: /cvs/util/extensions/source/propctrlr/formres.src,v
+retrieving revision 1.82
+diff -u -p -r1.82 formres.src
+--- extensions/source/propctrlr/formres.src	11 Apr 2008 10:59:33 -0000	1.82
++++ extensions/source/propctrlr/formres.src	12 May 2008 06:43:27 -0000
 @@ -230,6 +230,10 @@ String RID_STR_NAME
  {
  	Text [ en-US ] = "Name" ;
@@ -75,19 +93,25 @@
  String RID_STR_TABINDEX
  {
  	Text [ en-US ] = "Tab order" ;
-diff --git extensions/util/hidother.src extensions/util/hidother.src
-index 033ed67..288ccc3 100644
---- extensions/util/hidother.src
-+++ extensions/util/hidother.src
-@@ -306,3 +306,4 @@ hidspecial HID_CHECK_FOR_UPD_STATUS             { HelpId = HID_CHECK_FOR_UPD_STA
+Index: extensions/util/hidother.src
+===================================================================
+RCS file: /cvs/util/extensions/util/hidother.src,v
+retrieving revision 1.21
+diff -u -p -r1.21 hidother.src
+--- extensions/util/hidother.src	11 Apr 2008 12:12:27 -0000	1.21
++++ extensions/util/hidother.src	12 May 2008 06:43:27 -0000
+@@ -306,3 +306,4 @@ hidspecial HID_CHECK_FOR_UPD_STATUS     
  hidspecial HID_CHECK_FOR_UPD_DESCRIPTION        { HelpId = HID_CHECK_FOR_UPD_DESCRIPTION; }
  hidspecial HID_CHECK_FOR_UPD_CANCEL             { HelpId = HID_CHECK_FOR_UPD_CANCEL; }
  hidspecial HID_PROP_NOLABEL                     { HelpId = HID_PROP_NOLABEL; }
 +hidspecial HID_PROP_GROUP_NAME                  { HelpId = HID_PROP_GROUP_NAME; }
-diff --git forms/source/component/GroupManager.hxx forms/source/component/GroupManager.hxx
-index bc5a059..b139998 100644
---- forms/source/component/GroupManager.hxx
-+++ forms/source/component/GroupManager.hxx
+Index: forms/source/component/GroupManager.hxx
+===================================================================
+RCS file: /cvs/gsl/forms/source/component/GroupManager.hxx,v
+retrieving revision 1.12
+diff -u -p -r1.12 GroupManager.hxx
+--- forms/source/component/GroupManager.hxx	11 Apr 2008 08:15:27 -0000	1.12
++++ forms/source/component/GroupManager.hxx	12 May 2008 06:43:27 -0000
 @@ -220,6 +220,8 @@ public:
  	void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, ::rtl::OUString& Name);
  	void getGroupByName(const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup);
@@ -97,11 +121,14 @@
  };
  
  
-diff --git forms/source/component/GroupManager.cxx forms/source/component/GroupManager.cxx
-index d831a82..f5a9ecb 100644
---- forms/source/component/GroupManager.cxx
-+++ forms/source/component/GroupManager.cxx
-@@ -127,14 +127,13 @@ OGroupComp::OGroupComp(const Reference<XPropertySet>& rxSet, sal_Int32 nInsertPo
+Index: forms/source/component/GroupManager.cxx
+===================================================================
+RCS file: /cvs/gsl/forms/source/component/GroupManager.cxx,v
+retrieving revision 1.18
+diff -u -p -r1.18 GroupManager.cxx
+--- forms/source/component/GroupManager.cxx	11 Apr 2008 08:15:07 -0000	1.18
++++ forms/source/component/GroupManager.cxx	12 May 2008 06:43:27 -0000
+@@ -127,14 +127,13 @@ OGroupComp::OGroupComp(const Reference<X
      ,m_xControlModel(rxSet,UNO_QUERY)
      ,m_nPos( nInsertPos )
      ,m_nTabIndex(0)
@@ -117,7 +144,7 @@
  	}
  }
  
-@@ -321,7 +320,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
+@@ -321,7 +320,8 @@ void OGroupManager::removeFromGroupMap(c
  		aFind->second.RemoveComponent( _xSet );
  
  		// Wenn Anzahl der Gruppenelemente == 1 ist, Gruppe deaktivieren
@@ -127,7 +154,7 @@
  		{
  			OActiveGroups::iterator aActiveFind = ::std::find(
                  m_aActiveGroupMap.begin(),
-@@ -332,7 +332,7 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
+@@ -332,7 +332,7 @@ void OGroupManager::removeFromGroupMap(c
              {
                  // the group is active. Deactivate it if the remaining component
                  // is *no* radio button
@@ -136,7 +163,7 @@
  				    m_aActiveGroupMap.erase( aActiveFind );
              }
  		}
-@@ -341,6 +341,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
+@@ -341,6 +341,8 @@ void OGroupManager::removeFromGroupMap(c
  
  	// Bei Component als PropertyChangeListener abmelden
  	_xSet->removePropertyChangeListener( PROPERTY_NAME, this );
@@ -145,7 +172,7 @@
  	if (hasProperty(PROPERTY_TABINDEX, _xSet))
  		_xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this );
  }
-@@ -351,10 +353,23 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro
+@@ -351,10 +353,23 @@ void SAL_CALL OGroupManager::propertyCha
  
  	// Component aus Gruppe entfernen
  	::rtl::OUString		sGroupName;
@@ -171,7 +198,7 @@
  
  	removeFromGroupMap(sGroupName,xSet);
  
-@@ -437,8 +452,7 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
+@@ -437,8 +452,7 @@ void OGroupManager::InsertElement( const
  	m_pCompGroup->InsertComponent( xSet );
  
  	// Component in Gruppe aufnehmen
@@ -181,7 +208,7 @@
  
  	OGroupArr::iterator aFind = m_aGroupArr.find(sGroupName);
  
-@@ -476,6 +490,8 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
+@@ -476,6 +490,8 @@ void OGroupManager::InsertElement( const
  
  	// Bei Component als PropertyChangeListener anmelden
  	xSet->addPropertyChangeListener( PROPERTY_NAME, this );
@@ -190,7 +217,7 @@
  
      // Tabindex muss nicht jeder unterstuetzen
  	if (hasProperty(PROPERTY_TABINDEX, xSet))
-@@ -492,12 +508,26 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet )
+@@ -492,12 +508,26 @@ void OGroupManager::RemoveElement( const
  		return;
  
  	// Component aus Gruppe entfernen
@@ -219,35 +246,13 @@
  //.........................................................................
  }	// namespace frm
  //.........................................................................
-diff --git forms/source/component/RadioButton.hxx forms/source/component/RadioButton.hxx
-index 4e504e8..95fd509 100644
---- forms/source/component/RadioButton.hxx
-+++ forms/source/component/RadioButton.hxx
-@@ -42,6 +42,9 @@ namespace frm
- //==================================================================
- class ORadioButtonModel		:public OReferenceValueComponent
- {
-+protected:
-+	::rtl::OUString m_sGroupName;
-+
- public:
- 	DECLARE_DEFAULT_LEAF_XTOR( ORadioButtonModel );
- 
-@@ -50,6 +53,10 @@ public:
- 	virtual StringSequence SAL_CALL	getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
- 
- 	// OPropertySetHelper
-+	virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const;
-+	virtual sal_Bool SAL_CALL convertFastPropertyValue(
-+				::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue )
-+				throw (::com::sun::star::lang::IllegalArgumentException);
- 	virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
- 				throw (::com::sun::star::uno::Exception);
- 
-diff --git forms/source/component/RadioButton.cxx forms/source/component/RadioButton.cxx
-index e72e74c..d6a8a90 100644
---- forms/source/component/RadioButton.cxx
-+++ forms/source/component/RadioButton.cxx
+Index: forms/source/component/RadioButton.cxx
+===================================================================
+RCS file: /cvs/gsl/forms/source/component/RadioButton.cxx,v
+retrieving revision 1.22
+diff -u -p -r1.22 RadioButton.cxx
+--- forms/source/component/RadioButton.cxx	11 Apr 2008 08:19:08 -0000	1.22
++++ forms/source/component/RadioButton.cxx	12 May 2008 06:43:27 -0000
 @@ -31,6 +31,7 @@
  // MARKER(update_precomp.py): autogen include statement, do not remove
  #include "precompiled_forms.hxx"
@@ -256,24 +261,20 @@
  #include "property.hxx"
  #ifndef _FRM_PROPERTY_HRC_
  #include "property.hrc"
-@@ -127,6 +128,7 @@ ORadioButtonModel::ORadioButtonModel(const Reference<XMultiServiceFactory>& _rxF
- //------------------------------------------------------------------
- ORadioButtonModel::ORadioButtonModel( const ORadioButtonModel* _pOriginal, const Reference<XMultiServiceFactory>& _rxFactory )
- 	:OReferenceValueComponent( _pOriginal, _rxFactory )
-+	,m_sGroupName( _pOriginal->m_sGroupName )
- {
- 	DBG_CTOR( ORadioButtonModel, NULL );
- }
-@@ -169,7 +171,7 @@ StringSequence SAL_CALL	ORadioButtonModel::getSupportedServiceNames() throw(Runt
+@@ -169,7 +170,11 @@ StringSequence SAL_CALL	ORadioButtonMode
  void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, const Any& rValue)
  {
  	// mein Name
 -	::rtl::OUString sMyName(m_aName);
-+	::rtl::OUString sMyGroup( m_sGroupName.getLength() > 0 ? m_sGroupName : m_aName);
++    ::rtl::OUString sMyGroup;
++    if (hasProperty(PROPERTY_GROUP_NAME, this))
++        this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sMyGroup;
++    if (sMyGroup.getLength() == 0)
++        sMyGroup = m_aName;
  
  	// meine Siblings durchiterieren
  	Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
-@@ -177,8 +179,9 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons
+@@ -177,8 +182,9 @@ void ORadioButtonModel::SetSiblingPropsT
  	{
  		Reference<XPropertySet> xMyProps;
  		query_interface(static_cast<XWeak*>(this), xMyProps);
@@ -285,7 +286,7 @@
  		{
  			Reference<XPropertySet>	xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
  			if (!xSiblingProperties.is())
-@@ -195,34 +198,65 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons
+@@ -195,8 +201,8 @@ void ORadioButtonModel::SetSiblingPropsT
  				continue;
  
  			// das 'zur selben Gruppe gehoeren' wird am Namen festgemacht
@@ -296,56 +297,23 @@
  				xSiblingProperties->setPropertyValue(rPropName, rValue);
  		}
  	}
- }
- 
+@@ -205,24 +211,23 @@ void ORadioButtonModel::SetSiblingPropsT
  //------------------------------------------------------------------------------
--void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw (Exception)
-+void ORadioButtonModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const
+ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw (Exception)
  {
 -	OReferenceValueComponent::setFastPropertyValue_NoBroadcast( nHandle, rValue );
 -
 -	// if the label control changed ...
 -	if (nHandle == PROPERTY_ID_CONTROLLABEL)
 -	{	// ... forward this to our siblings
--		SetSiblingPropsTo(PROPERTY_CONTROLLABEL, rValue);
-+	switch (nHandle)
-+	{
-+		case PROPERTY_ID_GROUP_NAME:
-+			rValue <<= m_sGroupName;
-+			break;
-+		default:
-+			OReferenceValueComponent::getFastPropertyValue(rValue, nHandle);
-+			break;
- 	}
-+}
-+
-+sal_Bool ORadioButtonModel::convertFastPropertyValue(
-+                Any& _rConvertedValue, Any& _rOldValue,
-+                sal_Int32 _nHandle,
-+                const Any& _rValue)
-+        throw (com::sun::star::lang::IllegalArgumentException)
-+{
-+    sal_Bool bModified(sal_False);
-+    switch (_nHandle)
-+    {
-+        case PROPERTY_ID_GROUP_NAME:
-+            bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_sGroupName);
-+            break;
-+        default:
-+            bModified = OReferenceValueComponent::convertFastPropertyValue(_rConvertedValue, _rOldValue, _nHandle, _rValue);
-+            break;
-+    }
-+    return bModified;
-+}
- 
-+void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw (Exception)
-+{
 +	if (nHandle != PROPERTY_ID_GROUP_NAME)
 +		OReferenceValueComponent::setFastPropertyValue_NoBroadcast( nHandle, rValue );
 +	switch (nHandle)
 +	{
 +	case PROPERTY_ID_CONTROLLABEL:
-+		SetSiblingPropsTo(PROPERTY_CONTROLLABEL, rValue);
+ 		SetSiblingPropsTo(PROPERTY_CONTROLLABEL, rValue);
+-	}
+-
 +		break;
  	// wenn sich die ControlSource-Eigenschaft geaendert hat ...
 -	if (nHandle == PROPERTY_ID_CONTROLSOURCE)
@@ -361,12 +329,12 @@
 -	if (nHandle == PROPERTY_ID_NAME)
 -	{
 +	case PROPERTY_ID_GROUP_NAME:
-+		rValue >>= m_sGroupName;
++		setPropertyValue( PROPERTY_GROUP_NAME, rValue );
 +	case PROPERTY_ID_NAME: {
  		// ... muss ich testen, ob ich Siblings mit dem selben Namen habe, damit ich deren ControlSource uebernehmen kann
  		Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
  		if (xIndexAccess.is())
-@@ -248,7 +282,7 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
+@@ -248,7 +253,7 @@ void ORadioButtonModel::setFastPropertyV
  					// nur Radio-Buttons
  					continue;
  
@@ -375,7 +343,7 @@
  				// Control, das zur gleichen Gruppe gehoert ?
  				if (rValue == sName)
  				{
-@@ -257,10 +291,9 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
+@@ -257,10 +262,9 @@ void ORadioButtonModel::setFastPropertyV
  				}
  			}
  		}
@@ -388,7 +356,7 @@
  		sal_Int16 nValue;
  		rValue >>= nValue;
  		if (1 == nValue)
-@@ -271,14 +304,20 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
+@@ -271,14 +275,20 @@ void ORadioButtonModel::setFastPropertyV
  			aZero <<= nValue;
  			SetSiblingPropsTo(PROPERTY_DEFAULTCHECKED, aZero);
  		}
@@ -410,10 +378,13 @@
  	END_DESCRIBE_PROPERTIES();
  }
  
-diff --git forms/source/inc/frm_strings.hxx forms/source/inc/frm_strings.hxx
-index 26e2fa2..7b1677d 100644
---- forms/source/inc/frm_strings.hxx
-+++ forms/source/inc/frm_strings.hxx
+Index: forms/source/inc/frm_strings.hxx
+===================================================================
+RCS file: /cvs/gsl/forms/source/inc/frm_strings.hxx,v
+retrieving revision 1.17
+diff -u -p -r1.17 frm_strings.hxx
+--- forms/source/inc/frm_strings.hxx	11 Apr 2008 08:34:01 -0000	1.17
++++ forms/source/inc/frm_strings.hxx	12 May 2008 06:43:28 -0000
 @@ -100,6 +100,7 @@ namespace frm
      FORMS_CONSTASCII_STRING( PROPERTY_TABINDEX,                 "TabIndex" );
      FORMS_CONSTASCII_STRING( PROPERTY_TAG,                      "Tag" );
@@ -422,10 +393,13 @@
      FORMS_CONSTASCII_STRING( PROPERTY_CLASSID,                  "ClassId" );
      FORMS_CONSTASCII_STRING( PROPERTY_FETCHSIZE,                "FetchSize" );
      FORMS_CONSTASCII_STRING( PROPERTY_VALUE,                    "Value" );
-diff --git forms/source/inc/property.hrc forms/source/inc/property.hrc
-index a1b9317..ec7f25a 100644
---- forms/source/inc/property.hrc
-+++ forms/source/inc/property.hrc
+Index: forms/source/inc/property.hrc
+===================================================================
+RCS file: /cvs/gsl/forms/source/inc/property.hrc,v
+retrieving revision 1.21
+diff -u -p -r1.21 property.hrc
+--- forms/source/inc/property.hrc	11 Apr 2008 08:35:13 -0000	1.21
++++ forms/source/inc/property.hrc	12 May 2008 06:43:28 -0000
 @@ -60,7 +60,7 @@ namespace frm
  #define PROPERTY_ID_ALLOWEDITS          (PROPERTY_ID_START + 16)
  #define PROPERTY_ID_ALLOWDELETIONS      (PROPERTY_ID_START + 17)
@@ -435,11 +409,14 @@
      // free
      // free
      // free
-diff --git xmloff/source/forms/formattributes.hxx xmloff/source/forms/formattributes.hxx
-index d1ebfab..e47255c 100644
---- xmloff/source/forms/formattributes.hxx
-+++ xmloff/source/forms/formattributes.hxx
-@@ -125,6 +125,7 @@ namespace xmloff
+Index: xmloff/source/forms/formattributes.hxx
+===================================================================
+RCS file: /cvs/xml/xmloff/source/forms/formattributes.hxx,v
+retrieving revision 1.14
+diff -u -p -r1.14 formattributes.hxx
+--- xmloff/source/forms/formattributes.hxx	10 Apr 2008 22:03:59 -0000	1.14
++++ xmloff/source/forms/formattributes.hxx	12 May 2008 06:43:28 -0000
+@@ -124,6 +125,7 @@ namespace xmloff
  	#define SCA_MAX_VALUE				0x00000002
  	#define SCA_MIN_VALUE				0x00000004
  	#define SCA_VALIDATION				0x00000008
@@ -447,11 +424,14 @@
  	#define SCA_MULTI_LINE				0x00000020
  	#define SCA_AUTOMATIC_COMPLETION	0x00000080
  	#define SCA_MULTIPLE				0x00000100
-diff --git xmloff/source/forms/formattributes.cxx xmloff/source/forms/formattributes.cxx
-index a27b8ab..27f7b2c 100644
---- xmloff/source/forms/formattributes.cxx
-+++ xmloff/source/forms/formattributes.cxx
-@@ -194,6 +194,7 @@ namespace xmloff
+Index: xmloff/source/forms/formattributes.cxx
+===================================================================
+RCS file: /cvs/xml/xmloff/source/forms/formattributes.cxx,v
+retrieving revision 1.21
+diff -u -p -r1.21 formattributes.cxx
+--- xmloff/source/forms/formattributes.cxx	10 Apr 2008 22:03:42 -0000	1.21
++++ xmloff/source/forms/formattributes.cxx	12 May 2008 06:43:28 -0000
+@@ -193,6 +194,7 @@ namespace xmloff
  			case SCA_MAX_VALUE:				return "max-value";
  			case SCA_MIN_VALUE:				return "min-value";
  			case SCA_VALIDATION:			return "validation";
@@ -459,11 +439,14 @@
  			case SCA_MULTI_LINE:			return "multi-line";
  			case SCA_AUTOMATIC_COMPLETION:	return "auto-complete";
  			case SCA_MULTIPLE: 				return "multiple";
-diff --git xmloff/source/forms/strings.hxx xmloff/source/forms/strings.hxx
-index 59d791d..8634f15 100644
---- xmloff/source/forms/strings.hxx
-+++ xmloff/source/forms/strings.hxx
-@@ -205,6 +205,7 @@ namespace xmloff
+Index: xmloff/source/forms/strings.hxx
+===================================================================
+RCS file: /cvs/xml/xmloff/source/forms/strings.hxx,v
+retrieving revision 1.18
+diff -u -p -r1.18 strings.hxx
+--- xmloff/source/forms/strings.hxx	10 Apr 2008 22:12:05 -0000	1.18
++++ xmloff/source/forms/strings.hxx	12 May 2008 06:43:28 -0000
+@@ -204,6 +205,7 @@ namespace xmloff
      XMLFORM_CONSTASCII_STRING( PROPERTY_VISUAL_EFFECT,      "VisualEffect");
      XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION,     "ImagePosition");
      XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_ALIGN,        "ImageAlign");
@@ -471,10 +454,13 @@
  
      XMLFORM_CONSTASCII_STRING( PROPERTY_BOUND_CELL,		    "BoundCell");
      XMLFORM_CONSTASCII_STRING( PROPERTY_LIST_CELL_RANGE,    "CellRange");
-diff --git xmloff/source/forms/elementexport.cxx xmloff/source/forms/elementexport.cxx
-index 5533745..d0ddb17 100644
---- xmloff/source/forms/elementexport.cxx
-+++ xmloff/source/forms/elementexport.cxx
+Index: xmloff/source/forms/elementexport.cxx
+===================================================================
+RCS file: /cvs/xml/xmloff/source/forms/elementexport.cxx,v
+retrieving revision 1.48
+diff -u -p -r1.48 elementexport.cxx
+--- xmloff/source/forms/elementexport.cxx	10 Apr 2008 22:00:18 -0000	1.48
++++ xmloff/source/forms/elementexport.cxx	12 May 2008 06:43:28 -0000
 @@ -1110,6 +1110,39 @@ namespace xmloff
  		}
  
@@ -524,11 +510,14 @@
  				m_nIncludeDatabase = DA_DATA_FIELD;
  				m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
  				break;
-diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index 4b632d1..a5367d3 100644
---- svx/source/msfilter/msocximex.cxx
-+++ svx/source/msfilter/msocximex.cxx
-@@ -1701,6 +1701,12 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
+Index: svx/source/msfilter/msocximex.cxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/msfilter/msocximex.cxx,v
+retrieving revision 1.37
+diff -u -p -r1.37 msocximex.cxx
+--- svx/source/msfilter/msocximex.cxx	11 Apr 2008 02:06:31 -0000	1.37
++++ svx/source/msfilter/msocximex.cxx	12 May 2008 06:43:29 -0000
+@@ -1701,6 +1701,12 @@ sal_Bool OCX_OptionButton::Import(com::s
      aTmp <<= ::com::sun::star::style::VerticalAlignment_MIDDLE;
      rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp );
  
@@ -541,3 +530,140 @@
  	aFontData.Import(rPropSet);
  	return sal_True;
  }
+diff --git toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/property.hxx
+index f257f5c..3577148 100644
+--- toolkit/inc/toolkit/helper/property.hxx
++++ toolkit/inc/toolkit/helper/property.hxx
+@@ -192,6 +192,7 @@ namespace rtl {
+ #define BASEPROPERTY_NOLABEL               133   // ::rtl::OUString  added for issue79712
+ #define BASEPROPERTY_URL                   134  // ::rtl::OUString
+ #define BASEPROPERTY_VISIBLE               135  // sal_Bool
++#define BASEPROPERTY_GROUPNAME             136  // ::rtl::OUString
+ 
+ // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
+ #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000
+Index: toolkit/source/helper/property.cxx
+===================================================================
+RCS file: /cvs/gsl/toolkit/source/helper/property.cxx,v
+retrieving revision 1.42
+diff -u -p -r1.42 property.cxx
+--- toolkit/source/helper/property.cxx	11 Apr 2008 09:36:59 -0000	1.42
++++ toolkit/source/helper/property.cxx	12 May 2008 06:43:29 -0000
+@@ -179,6 +179,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( 
+             DECL_PROP_3     ( "FormatsSupplier",        FORMATSSUPPLIER,    Reference< ::com::sun::star::util::XNumberFormatsSupplier >, BOUND, MAYBEVOID, TRANSIENT ),
+ 
+             DECL_PROP_2     ( "Graphic",                GRAPHIC,            Reference< ::com::sun::star::graphic::XGraphic >, BOUND, TRANSIENT ),
++            DECL_PROP_2     ( "GroupName",              GROUPNAME,          ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
+             DECL_PROP_2     ( "HelpText",               HELPTEXT,           ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
+             DECL_PROP_2     ( "HelpURL",                HELPURL,            ::rtl::OUString,    BOUND, MAYBEDEFAULT ),
+             DECL_PROP_2     ( "HideInactiveSelection",  HIDEINACTIVESELECTION, bool,            BOUND, MAYBEDEFAULT ),
+Index: toolkit/source/awt/vclxwindows.cxx
+===================================================================
+RCS file: /cvs/gsl/toolkit/source/awt/vclxwindows.cxx,v
+retrieving revision 1.68
+diff -u -p -r1.68 vclxwindows.cxx
+--- toolkit/source/awt/vclxwindows.cxx	11 Apr 2008 09:22:58 -0000	1.68
++++ toolkit/source/awt/vclxwindows.cxx	12 May 2008 06:43:30 -0000
+@@ -1079,6 +1079,7 @@ void VCLXRadioButton::ImplGetPropertyIds
+                      BASEPROPERTY_BACKGROUNDCOLOR,
+                      BASEPROPERTY_ALIGN,
+                      BASEPROPERTY_VERTICALALIGN,
++                     BASEPROPERTY_GROUPNAME,
+                      0);
+     VCLXImageConsumer::ImplGetPropertyIds( rIds );
+ }
+Index: toolkit/source/controls/dialogcontrol.cxx
+===================================================================
+RCS file: /cvs/gsl/toolkit/source/controls/dialogcontrol.cxx,v
+retrieving revision 1.27
+diff -u -p -r1.27 dialogcontrol.cxx
+--- toolkit/source/controls/dialogcontrol.cxx	11 Apr 2008 09:24:40 -0000	1.27
++++ toolkit/source/controls/dialogcontrol.cxx	12 May 2008 06:43:30 -0000
+@@ -142,6 +142,18 @@ namespace
+         return xGraphic;
+     }
+ 
++    static ::rtl::OUString lcl_GetStringProperty( const ::rtl::OUString& sProperty, const Reference< XPropertySet >& xSet )
++    {
++        ::rtl::OUString sValue;
++        Reference< XPropertySetInfo > xPSI;
++        if (xSet.is() && (xPSI = xSet->getPropertySetInfo()).is() && 
++                xPSI->hasPropertyByName( sProperty ) )
++        {
++            xSet->getPropertyValue( sProperty ) >>= sValue;
++        }
++        return sValue;
++    }
++
+ }
+ 
+ // ----------------------------------------------------------------------------
+@@ -925,6 +937,9 @@ void UnoControlDialogModel::implUpdateGr
+ 	sal_Int32	nCurrentGroupStep = -1;					// the step which all controls of the current group belong to
+ 	sal_Bool	bIsRadioButton;							// is it a radio button?
+ 
++    const ::rtl::OUString GROUP_NAME (::rtl::OUString::createFromAscii( "GroupName" ) );
++    ::rtl::OUString sCurGroup;
++
+ #if OSL_DEBUG_LEVEL > 1
+ 	::std::vector< ::rtl::OUString > aCurrentGroupLabels;
+ #endif
+@@ -934,6 +949,7 @@ void UnoControlDialogModel::implUpdateGr
+ 		// we'll need this in every state
+ 		xModelSI = xModelSI.query( *pControlModels );
+ 		bIsRadioButton = xModelSI.is() && xModelSI->supportsService( ::rtl::OUString::createFromAscii( szServiceName2_UnoControlRadioButtonModel ) );
++        Reference< XPropertySet > xCurProps( *pControlModels, UNO_QUERY );
+ 
+ 		switch ( eState )
+ 		{
+@@ -950,6 +966,7 @@ void UnoControlDialogModel::implUpdateGr
+ 				aCurrentGroup = maGroups.begin() + nGroups;
+ 				// and add the (only, til now) member
+ 				aCurrentGroup->push_back( *pControlModels );
++                sCurGroup = lcl_GetStringProperty( GROUP_NAME, xCurProps );
+ 
+ 				// get the step which all controls of this group now have to belong to
+ 				nCurrentGroupStep = lcl_getDialogStep( *pControlModels );
+@@ -972,16 +989,19 @@ void UnoControlDialogModel::implUpdateGr
+ 				{	// no radio button -> the group is done
+ 					aCurrentGroup = maGroups.end();
+ 					eState = eLookingForGroup;
++                    sCurGroup = ::rtl::OUString ();
+ #if OSL_DEBUG_LEVEL > 1
+ 					aCurrentGroupLabels.clear();
+ #endif
+ 					continue;
+ 				}
+ 
+-				// it is a radio button - is it on the proper page?
++				// it is a radio button - is it in the same group?
+ 				const sal_Int32 nThisModelStep = lcl_getDialogStep( *pControlModels );
+-				if	(	( nThisModelStep == nCurrentGroupStep )	// the current button is on the same dialog page
+-					||	( 0 == nThisModelStep )					// the current button appears on all pages
++                ::rtl::OUString sGroupName = lcl_GetStringProperty( GROUP_NAME, xCurProps );
++				if	(  (( nThisModelStep == nCurrentGroupStep )	// the current button is on the same dialog page
++					||	( 0 == nThisModelStep ))				// the current button appears on all pages
++					&& sGroupName == sCurGroup                  // the group name matches
+ 					)
+ 				{
+ 					// -> it belongs to the same group
+@@ -1014,6 +1034,7 @@ void UnoControlDialogModel::implUpdateGr
+ 				aCurrentGroup = maGroups.begin() + nGroups;
+ 				// and add the (only, til now) member
+ 				aCurrentGroup->push_back( *pControlModels );
++                sCurGroup = lcl_GetStringProperty( GROUP_NAME, xCurProps );
+ 
+ 				nCurrentGroupStep = nThisModelStep;
+ 
+diff --git toolkit/source/controls/unocontrolmodel.cxx toolkit/source/controls/unocontrolmodel.cxx
+index 25573a4..8768094 100644
+--- toolkit/source/controls/unocontrolmodel.cxx
++++ toolkit/source/controls/unocontrolmodel.cxx
+@@ -341,6 +341,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
+             case BASEPROPERTY_VISIBLE:
+             case BASEPROPERTY_DECORATION:           aDefault <<= (sal_Bool) sal_True; break;
+ 
++            case BASEPROPERTY_GROUPNAME:
+             case BASEPROPERTY_HELPTEXT:
+             case BASEPROPERTY_HELPURL:
+ 	        case BASEPROPERTY_IMAGEURL:
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]