GNOME.org
 

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

Author: jonp
Date: Mon May 12 03:23:31 2008
New Revision: 12518
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12518&view=rev

Log:
	* patches/dev300/forms-radio-button-group-names.diff,
	  patches/dev300/xl-import-formradiobutton.diff: Rebase against dev300 so
	  that they apply w/o error.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/forms-radio-button-group-names.diff
   trunk/patches/dev300/xl-import-formradiobutton.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 03:23:31 2008
@@ -1,11 +1,8 @@
-Index: extensions/inc/extensio.hrc
-===================================================================
-RCS file: /cvs/util/extensions/inc/extensio.hrc,v
-retrieving revision 1.33
-diff -u -p -r1.33 extensio.hrc
---- extensions/inc/extensio.hrc	27 Nov 2007 11:51:34 -0000	1.33
-+++ extensions/inc/extensio.hrc	29 Mar 2008 19:39:04 -0000
-@@ -162,7 +162,7 @@
+diff --git extensions/inc/extensio.hrc extensions/inc/extensio.hrc
+index a0ba129..1e66cc9 100644
+--- extensions/inc/extensio.hrc
++++ extensions/inc/extensio.hrc
+@@ -157,7 +157,7 @@
  
  //-----------------------------------------------------------------------
      // FREE
@@ -14,14 +11,11 @@
  #define HID_PROP_GROUPBOX						(HID_FORMS_START +   2)
  #define HID_PROP_CONTROLSOURCE					(HID_FORMS_START +   3)
  #define HID_PROP_NAME							(HID_FORMS_START +   4)
-Index: extensions/source/propctrlr/formmetadata.hxx
-===================================================================
-RCS file: /cvs/util/extensions/source/propctrlr/formmetadata.hxx,v
-retrieving revision 1.34
-diff -u -p -r1.34 formmetadata.hxx
---- extensions/source/propctrlr/formmetadata.hxx	27 Nov 2007 11:52:15 -0000	1.34
-+++ extensions/source/propctrlr/formmetadata.hxx	29 Mar 2008 19:39:04 -0000
-@@ -178,6 +178,7 @@ namespace pcr
+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
+@@ -166,6 +166,7 @@ namespace pcr
  	#define PROPERTY_ID_ALLOWADDITIONS		 20
  	#define PROPERTY_ID_ALLOWEDITS			 21
  	#define PROPERTY_ID_ALLOWDELETIONS		 22
@@ -29,14 +23,11 @@
  	#define PROPERTY_ID_NAVIGATION			 24
  	#define PROPERTY_ID_CYCLE				 25
  	#define PROPERTY_ID_HIDDEN_VALUE		 26
-Index: extensions/source/propctrlr/formmetadata.cxx
-===================================================================
-RCS file: /cvs/util/extensions/source/propctrlr/formmetadata.cxx,v
-retrieving revision 1.47.18.1
-diff -u -p -r1.47.18.1 formmetadata.cxx
---- extensions/source/propctrlr/formmetadata.cxx	11 Jan 2008 08:23:04 -0000	1.47.18.1
-+++ extensions/source/propctrlr/formmetadata.cxx	5 Apr 2008 11:15:13 -0000
-@@ -157,6 +157,7 @@ namespace pcr
+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
+@@ -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 ),
@@ -44,14 +35,11 @@
          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 ),
-Index: extensions/source/propctrlr/formstrings.hxx
-===================================================================
-RCS file: /cvs/util/extensions/source/propctrlr/formstrings.hxx,v
-retrieving revision 1.38
-diff -u -p -r1.38 formstrings.hxx
---- extensions/source/propctrlr/formstrings.hxx	27 Nov 2007 11:53:16 -0000	1.38
-+++ extensions/source/propctrlr/formstrings.hxx	29 Mar 2008 19:39:05 -0000
-@@ -57,6 +57,7 @@ namespace pcr
+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
+@@ -50,6 +50,7 @@ namespace pcr
  	PCR_CONSTASCII_STRING( PROPERTY_TABINDEX,				"TabIndex");
  	PCR_CONSTASCII_STRING( PROPERTY_TAG,					"Tag");
  	PCR_CONSTASCII_STRING( PROPERTY_NAME,					"Name");
@@ -59,14 +47,11 @@
  	PCR_CONSTASCII_STRING( PROPERTY_VALUE,					"Value");
  	PCR_CONSTASCII_STRING( PROPERTY_TEXT,					"Text");
  	PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION,				"NavigationBarMode");
-Index: extensions/source/propctrlr/formresid.hrc
-===================================================================
-RCS file: /cvs/util/extensions/source/propctrlr/formresid.hrc,v
-retrieving revision 1.36
-diff -u -p -r1.36 formresid.hrc
---- extensions/source/propctrlr/formresid.hrc	27 Nov 2007 11:52:56 -0000	1.36
-+++ extensions/source/propctrlr/formresid.hrc	29 Mar 2008 19:39:05 -0000
-@@ -152,7 +152,7 @@
+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
+@@ -147,7 +147,7 @@
  #define RID_STR_TAG							( RID_FORMBROWSER_START + 116 )
  #define RID_STR_HELPTEXT					( RID_FORMBROWSER_START + 117 )
  #define RID_STR_HELPURL						( RID_FORMBROWSER_START + 118 )
@@ -75,14 +60,11 @@
  #define RID_STR_UNCHECKEDREFVALUE           ( RID_FORMBROWSER_START + 120 )
  #define RID_STR_CURSOR_TYPE					( RID_FORMBROWSER_START + 121 )
      // FREE
-Index: extensions/source/propctrlr/formres.src
-===================================================================
-RCS file: /cvs/util/extensions/source/propctrlr/formres.src,v
-retrieving revision 1.81
-diff -u -p -r1.81 formres.src
---- extensions/source/propctrlr/formres.src	27 Nov 2007 11:52:35 -0000	1.81
-+++ extensions/source/propctrlr/formres.src	29 Mar 2008 19:39:05 -0000
-@@ -235,6 +235,10 @@ String RID_STR_NAME
+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
+@@ -230,6 +230,10 @@ String RID_STR_NAME
  {
  	Text [ en-US ] = "Name" ;
  };
@@ -93,26 +75,20 @@
  String RID_STR_TABINDEX
  {
  	Text [ en-US ] = "Tab order" ;
-Index: extensions/util/hidother.src
-===================================================================
-RCS file: /cvs/util/extensions/util/hidother.src,v
-retrieving revision 1.20
-diff -u -p -r1.20 hidother.src
---- extensions/util/hidother.src	27 Nov 2007 11:53:36 -0000	1.20
-+++ extensions/util/hidother.src	5 Apr 2008 11:15:14 -0000
-@@ -311,3 +311,4 @@ hidspecial HID_CHECK_FOR_UPD_STATUS     
+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
  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; }
-Index: forms/source/component/GroupManager.hxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/component/GroupManager.hxx,v
-retrieving revision 1.11
-diff -u -p -r1.11 GroupManager.hxx
---- forms/source/component/GroupManager.hxx	12 Oct 2006 11:12:12 -0000	1.11
-+++ forms/source/component/GroupManager.hxx	5 Apr 2008 11:21:51 -0000
-@@ -248,6 +248,8 @@ public:
+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
+@@ -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);
  	::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > getControlModels();
@@ -121,14 +97,11 @@
  };
  
  
-Index: forms/source/component/GroupManager.cxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/component/GroupManager.cxx,v
-retrieving revision 1.17
-diff -u -p -r1.17 GroupManager.cxx
---- forms/source/component/GroupManager.cxx	16 Sep 2006 23:51:13 -0000	1.17
-+++ forms/source/component/GroupManager.cxx	5 Apr 2008 11:27:06 -0000
-@@ -148,14 +148,13 @@ OGroupComp::OGroupComp(const Reference<X
+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
      ,m_xControlModel(rxSet,UNO_QUERY)
      ,m_nPos( nInsertPos )
      ,m_nTabIndex(0)
@@ -144,7 +117,7 @@
  	}
  }
  
-@@ -342,7 +341,8 @@ void OGroupManager::removeFromGroupMap(c
+@@ -321,7 +320,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
  		aFind->second.RemoveComponent( _xSet );
  
  		// Wenn Anzahl der Gruppenelemente == 1 ist, Gruppe deaktivieren
@@ -154,7 +127,7 @@
  		{
  			OActiveGroups::iterator aActiveFind = ::std::find(
                  m_aActiveGroupMap.begin(),
-@@ -353,7 +353,7 @@ void OGroupManager::removeFromGroupMap(c
+@@ -332,7 +332,7 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
              {
                  // the group is active. Deactivate it if the remaining component
                  // is *no* radio button
@@ -163,7 +136,7 @@
  				    m_aActiveGroupMap.erase( aActiveFind );
              }
  		}
-@@ -362,6 +362,8 @@ void OGroupManager::removeFromGroupMap(c
+@@ -341,6 +341,8 @@ void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const
  
  	// Bei Component als PropertyChangeListener abmelden
  	_xSet->removePropertyChangeListener( PROPERTY_NAME, this );
@@ -172,7 +145,7 @@
  	if (hasProperty(PROPERTY_TABINDEX, _xSet))
  		_xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this );
  }
-@@ -372,10 +374,23 @@ void SAL_CALL OGroupManager::propertyCha
+@@ -351,10 +353,23 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro
  
  	// Component aus Gruppe entfernen
  	::rtl::OUString		sGroupName;
@@ -198,7 +171,7 @@
  
  	removeFromGroupMap(sGroupName,xSet);
  
-@@ -458,8 +473,7 @@ void OGroupManager::InsertElement( const
+@@ -437,8 +452,7 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
  	m_pCompGroup->InsertComponent( xSet );
  
  	// Component in Gruppe aufnehmen
@@ -208,7 +181,7 @@
  
  	OGroupArr::iterator aFind = m_aGroupArr.find(sGroupName);
  
-@@ -497,6 +511,8 @@ void OGroupManager::InsertElement( const
+@@ -476,6 +490,8 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
  
  	// Bei Component als PropertyChangeListener anmelden
  	xSet->addPropertyChangeListener( PROPERTY_NAME, this );
@@ -217,7 +190,7 @@
  
      // Tabindex muss nicht jeder unterstuetzen
  	if (hasProperty(PROPERTY_TABINDEX, xSet))
-@@ -513,12 +529,26 @@ void OGroupManager::RemoveElement( const
+@@ -492,12 +508,26 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet )
  		return;
  
  	// Component aus Gruppe entfernen
@@ -246,14 +219,11 @@
  //.........................................................................
  }	// namespace frm
  //.........................................................................
-Index: forms/source/component/RadioButton.hxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/component/RadioButton.hxx,v
-retrieving revision 1.11
-diff -u -p -r1.11 RadioButton.hxx
---- forms/source/component/RadioButton.hxx	9 Mar 2007 13:31:41 -0000	1.11
-+++ forms/source/component/RadioButton.hxx	29 Mar 2008 19:39:05 -0000
-@@ -49,6 +49,9 @@ 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
  {
@@ -263,7 +233,7 @@
  public:
  	DECLARE_DEFAULT_LEAF_XTOR( ORadioButtonModel );
  
-@@ -57,6 +60,10 @@ public:
+@@ -50,6 +53,10 @@ public:
  	virtual StringSequence SAL_CALL	getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
  
  	// OPropertySetHelper
@@ -274,24 +244,19 @@
  	virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
  				throw (::com::sun::star::uno::Exception);
  
-Index: forms/source/component/RadioButton.cxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/component/RadioButton.cxx,v
-retrieving revision 1.21
-diff -u -p -r1.21 RadioButton.cxx
---- forms/source/component/RadioButton.cxx	9 Mar 2007 13:31:25 -0000	1.21
-+++ forms/source/component/RadioButton.cxx	5 Apr 2008 11:27:06 -0000
-@@ -39,6 +39,9 @@
- #ifndef _FORMS_RADIOBUTTON_HXX_
+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
+@@ -31,6 +31,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_forms.hxx"
  #include "RadioButton.hxx"
- #endif
-+#ifndef _FRM_GROUPMANAGER_HXX_
 +#include "GroupManager.hxx"
-+#endif
- #ifndef _FRM_PROPERTY_HXX_
  #include "property.hxx"
- #endif
-@@ -150,6 +153,7 @@ ORadioButtonModel::ORadioButtonModel(con
+ #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 )
@@ -299,7 +264,7 @@
  {
  	DBG_CTOR( ORadioButtonModel, NULL );
  }
-@@ -192,7 +196,7 @@ StringSequence SAL_CALL	ORadioButtonMode
+@@ -169,7 +171,7 @@ StringSequence SAL_CALL	ORadioButtonModel::getSupportedServiceNames() throw(Runt
  void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, const Any& rValue)
  {
  	// mein Name
@@ -308,7 +273,7 @@
  
  	// meine Siblings durchiterieren
  	Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY);
-@@ -200,8 +204,9 @@ void ORadioButtonModel::SetSiblingPropsT
+@@ -177,8 +179,9 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons
  	{
  		Reference<XPropertySet> xMyProps;
  		query_interface(static_cast<XWeak*>(this), xMyProps);
@@ -320,7 +285,7 @@
  		{
  			Reference<XPropertySet>	xSiblingProperties(*(InterfaceRef*)xIndexAccess->getByIndex(i).getValue(), UNO_QUERY);
  			if (!xSiblingProperties.is())
-@@ -218,34 +223,65 @@ void ORadioButtonModel::SetSiblingPropsT
+@@ -195,34 +198,65 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons
  				continue;
  
  			// das 'zur selben Gruppe gehoeren' wird am Namen festgemacht
@@ -401,7 +366,7 @@
  		// ... 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())
-@@ -271,7 +307,7 @@ void ORadioButtonModel::setFastPropertyV
+@@ -248,7 +282,7 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
  					// nur Radio-Buttons
  					continue;
  
@@ -410,7 +375,7 @@
  				// Control, das zur gleichen Gruppe gehoert ?
  				if (rValue == sName)
  				{
-@@ -280,10 +316,9 @@ void ORadioButtonModel::setFastPropertyV
+@@ -257,10 +291,9 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
  				}
  			}
  		}
@@ -423,7 +388,7 @@
  		sal_Int16 nValue;
  		rValue >>= nValue;
  		if (1 == nValue)
-@@ -294,14 +329,20 @@ void ORadioButtonModel::setFastPropertyV
+@@ -271,14 +304,20 @@ void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
  			aZero <<= nValue;
  			SetSiblingPropsTo(PROPERTY_DEFAULTCHECKED, aZero);
  		}
@@ -445,14 +410,11 @@
  	END_DESCRIBE_PROPERTIES();
  }
  
-Index: forms/source/inc/frm_strings.hxx
-===================================================================
-RCS file: /cvs/gsl/forms/source/inc/frm_strings.hxx,v
-retrieving revision 1.15.14.1
-diff -u -p -r1.15.14.1 frm_strings.hxx
---- forms/source/inc/frm_strings.hxx	18 Jan 2008 15:11:23 -0000	1.15.14.1
-+++ forms/source/inc/frm_strings.hxx	29 Mar 2008 19:39:05 -0000
-@@ -109,6 +109,7 @@ namespace frm
+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
+@@ -100,6 +100,7 @@ namespace frm
      FORMS_CONSTASCII_STRING( PROPERTY_TABINDEX,                 "TabIndex" );
      FORMS_CONSTASCII_STRING( PROPERTY_TAG,                      "Tag" );
      FORMS_CONSTASCII_STRING( PROPERTY_NAME,                     "Name" );
@@ -460,14 +422,11 @@
      FORMS_CONSTASCII_STRING( PROPERTY_CLASSID,                  "ClassId" );
      FORMS_CONSTASCII_STRING( PROPERTY_FETCHSIZE,                "FetchSize" );
      FORMS_CONSTASCII_STRING( PROPERTY_VALUE,                    "Value" );
-Index: forms/source/inc/property.hrc
-===================================================================
-RCS file: /cvs/gsl/forms/source/inc/property.hrc,v
-retrieving revision 1.20
-diff -u -p -r1.20 property.hrc
---- forms/source/inc/property.hrc	31 Jan 2006 18:36:51 -0000	1.20
-+++ forms/source/inc/property.hrc	29 Mar 2008 19:39:05 -0000
-@@ -65,7 +65,7 @@ namespace frm
+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
+@@ -60,7 +60,7 @@ namespace frm
  #define PROPERTY_ID_ALLOWEDITS          (PROPERTY_ID_START + 16)
  #define PROPERTY_ID_ALLOWDELETIONS      (PROPERTY_ID_START + 17)
  #define PROPERTY_ID_NATIVE_LOOK         (PROPERTY_ID_START + 18)
@@ -476,14 +435,11 @@
      // free
      // free
      // free
-Index: xmloff/source/forms/formattributes.hxx
-===================================================================
-RCS file: /cvs/xml/xmloff/source/forms/formattributes.hxx,v
-retrieving revision 1.13
-diff -u -p -r1.13 formattributes.hxx
---- xmloff/source/forms/formattributes.hxx	9 Sep 2005 14:08:11 -0000	1.13
-+++ xmloff/source/forms/formattributes.hxx	5 Apr 2008 11:32:23 -0000
-@@ -137,6 +137,7 @@ namespace xmloff
+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
  	#define SCA_MAX_VALUE				0x00000002
  	#define SCA_MIN_VALUE				0x00000004
  	#define SCA_VALIDATION				0x00000008
@@ -491,14 +447,11 @@
  	#define SCA_MULTI_LINE				0x00000020
  	#define SCA_AUTOMATIC_COMPLETION	0x00000080
  	#define SCA_MULTIPLE				0x00000100
-Index: xmloff/source/forms/formattributes.cxx
-===================================================================
-RCS file: /cvs/xml/xmloff/source/forms/formattributes.cxx,v
-retrieving revision 1.20
-diff -u -p -r1.20 formattributes.cxx
---- xmloff/source/forms/formattributes.cxx	27 Jun 2007 15:14:38 -0000	1.20
-+++ xmloff/source/forms/formattributes.cxx	5 Apr 2008 11:32:23 -0000
-@@ -207,6 +207,7 @@ namespace xmloff
+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
  			case SCA_MAX_VALUE:				return "max-value";
  			case SCA_MIN_VALUE:				return "min-value";
  			case SCA_VALIDATION:			return "validation";
@@ -506,14 +459,11 @@
  			case SCA_MULTI_LINE:			return "multi-line";
  			case SCA_AUTOMATIC_COMPLETION:	return "auto-complete";
  			case SCA_MULTIPLE: 				return "multiple";
-Index: xmloff/source/forms/strings.hxx
-===================================================================
-RCS file: /cvs/xml/xmloff/source/forms/strings.hxx,v
-retrieving revision 1.17
-diff -u -p -r1.17 strings.hxx
---- xmloff/source/forms/strings.hxx	9 Sep 2005 14:16:39 -0000	1.17
-+++ xmloff/source/forms/strings.hxx	5 Apr 2008 11:32:23 -0000
-@@ -213,6 +213,7 @@ namespace xmloff
+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
      XMLFORM_CONSTASCII_STRING( PROPERTY_VISUAL_EFFECT,      "VisualEffect");
      XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION,     "ImagePosition");
      XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_ALIGN,        "ImageAlign");
@@ -521,14 +471,11 @@
  
      XMLFORM_CONSTASCII_STRING( PROPERTY_BOUND_CELL,		    "BoundCell");
      XMLFORM_CONSTASCII_STRING( PROPERTY_LIST_CELL_RANGE,    "CellRange");
-Index: xmloff/source/forms/elementexport.cxx
-===================================================================
-RCS file: /cvs/xml/xmloff/source/forms/elementexport.cxx,v
-retrieving revision 1.46.108.1
-diff -u -p -r1.46.108.1 elementexport.cxx
---- xmloff/source/forms/elementexport.cxx	18 Jan 2008 15:10:42 -0000	1.46.108.1
-+++ xmloff/source/forms/elementexport.cxx	5 Apr 2008 11:32:23 -0000
-@@ -1194,6 +1194,39 @@ namespace xmloff
+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
+@@ -1110,6 +1110,39 @@ namespace xmloff
  		}
  
  		// ----------------------------------
@@ -568,7 +515,7 @@
  		if ((SCA_MIN_VALUE | SCA_MAX_VALUE) & m_nIncludeSpecial)
  		{
  			// need to export the min value and the max value as attributes
-@@ -1653,6 +1686,8 @@ namespace xmloff
+@@ -1569,6 +1602,8 @@ namespace xmloff
  				}
                  if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_IMAGE_POSITION ) )
                      m_nIncludeSpecial |= SCA_IMAGE_POSITION;
@@ -577,14 +524,11 @@
  				m_nIncludeDatabase = DA_DATA_FIELD;
  				m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
  				break;
-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
+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<
      aTmp <<= ::com::sun::star::style::VerticalAlignment_MIDDLE;
      rPropSet->setPropertyValue( WW8_ASCII2STR("VerticalAlign"), aTmp );
  

Modified: trunk/patches/dev300/xl-import-formradiobutton.diff
==============================================================================
--- trunk/patches/dev300/xl-import-formradiobutton.diff	(original)
+++ trunk/patches/dev300/xl-import-formradiobutton.diff	Mon May 12 03:23:31 2008
@@ -1,19 +1,16 @@
-Index: sc/source/filter/excel/xiescher.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/xiescher.cxx,v
-retrieving revision 1.54
-diff -u -p -r1.54 xiescher.cxx
---- sc/source/filter/excel/xiescher.cxx	6 Jul 2007 12:37:20 -0000	1.54
-+++ sc/source/filter/excel/xiescher.cxx	20 Feb 2008 17:21:49 -0000
-@@ -221,6 +221,7 @@
+diff --git sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx
+index 43de9ef..749b1fd 100644
+--- sc/source/filter/excel/xiescher.cxx
++++ sc/source/filter/excel/xiescher.cxx
+@@ -101,6 +101,7 @@
+ #include "xichart.hxx"
  #include "xicontent.hxx"
- #endif
  
 +#include "xlescher.hxx"
  using ::rtl::OUString;
  using ::rtl::OUStringBuffer;
  using ::com::sun::star::uno::Reference;
-@@ -424,7 +425,7 @@ XclImpDrawObjBase::~XclImpDrawObjBase()
+@@ -305,7 +306,7 @@ XclImpDrawObjBase::~XclImpDrawObjBase()
  {
  }
  
@@ -22,7 +19,7 @@
  {
      XclImpDrawObjRef xDrawObj;
  
-@@ -457,7 +458,7 @@ XclImpDrawObjRef XclImpDrawObjBase::Read
+@@ -338,7 +339,7 @@ XclImpDrawObjRef XclImpDrawObjBase::ReadObjCmo( XclImpStream& rStrm )
          case EXC_OBJ_CMO_COMBOBOX:
          case EXC_OBJ_CMO_SPIN:
          case EXC_OBJ_CMO_SCROLLBAR:
@@ -31,7 +28,7 @@
          break;
          case EXC_OBJ_CMO_PICTURE:
              xDrawObj.reset( new XclImpOleObj( rStrm.GetRoot() ) );
-@@ -739,23 +740,31 @@ ScfPropertySet XclImpControlObjHelper::G
+@@ -650,23 +651,31 @@ ScfPropertySet XclImpControlObjHelper::GetControlPropSet() const
      return ScfPropertySet( mxCtrlModel );
  }
  
@@ -66,7 +63,7 @@
  
          NamedValue aValue;
          aValue.Name = CREATE_OUSTRING( SC_UNONAME_BOUNDCELL );
-@@ -792,14 +801,24 @@ void XclImpControlObjHelper::ConvertShee
+@@ -703,14 +712,24 @@ void XclImpControlObjHelper::ConvertSheetLinks( const XclImpRoot& rRoot, SdrObje
              xBindable->setValueBinding( xBinding );
      }
  
@@ -93,7 +90,7 @@
  
          NamedValue aValue;
          aValue.Name = CREATE_OUSTRING( SC_UNONAME_CELLRANGE );
-@@ -824,13 +843,27 @@ void XclImpControlObjHelper::ConvertShee
+@@ -735,13 +754,27 @@ void XclImpControlObjHelper::ConvertSheetLinks( const XclImpRoot& rRoot, SdrObje
          if( xEntrySource.is() )
              xEntrySink->setListEntrySource( xEntrySource );
      }
@@ -122,7 +119,7 @@
      mnState( EXC_OBJ_CBLS_STATE_UNCHECK ),
      mnSelEntry( 0 ),
      mnSelType( EXC_OBJ_LBS_SEL_SIMPLE ),
-@@ -866,6 +899,9 @@ void XclImpTbxControlObj::ReadSubRecord(
+@@ -777,6 +810,9 @@ void XclImpTbxControlObj::ReadSubRecord( XclImpStream& rStrm, sal_uInt16 nSubRec
          case EXC_ID_OBJ_FTGBODATA:
              ReadGboData( rStrm );
          break;
@@ -132,7 +129,7 @@
          default:
              XclImpDrawObjBase::ReadSubRecord( rStrm, nSubRecId, nSubRecSize );
      }
-@@ -904,7 +940,6 @@ void XclImpTbxControlObj::DoProcessSdrOb
+@@ -815,7 +851,6 @@ void XclImpTbxControlObj::DoProcessSdrObj( SdrObject& rSdrObj ) const
  
      namespace AwtVisualEffect = ::com::sun::star::awt::VisualEffect;
      namespace AwtScrollOrient = ::com::sun::star::awt::ScrollBarOrientation;
@@ -140,7 +137,7 @@
  
      // control name, printable, sheet links -----------------------------------
  
-@@ -944,24 +979,29 @@ void XclImpTbxControlObj::DoProcessSdrOb
+@@ -856,24 +891,29 @@ void XclImpTbxControlObj::DoProcessSdrObj( SdrObject& rSdrObj ) const
          case EXC_OBJ_CMO_CHECKBOX:
          case EXC_OBJ_CMO_OPTIONBUTTON:
          {
@@ -186,7 +183,7 @@
          }
          break;
  
-@@ -1111,6 +1151,45 @@ void XclImpTbxControlObj::ReadLbsData( X
+@@ -1023,6 +1063,45 @@ void XclImpTbxControlObj::ReadLbsData( XclImpStream& rStrm )
      }
  }
  
@@ -232,7 +229,7 @@
  void XclImpTbxControlObj::ReadSbs( XclImpStream& rStrm )
  {
      sal_uInt16 nOrient, nStyle;
-@@ -1131,6 +1210,17 @@ void XclImpTbxControlObj::ReadGboData( X
+@@ -1043,6 +1122,17 @@ void XclImpTbxControlObj::ReadGboData( XclImpStream& rStrm )
      mbFlatBorder = ::get_flag( nStyle, EXC_OBJ_GBO_FLAT );
  }
  
@@ -250,7 +247,7 @@
  // ----------------------------------------------------------------------------
  
  XclImpOleObj::XclImpOleObj( const XclImpRoot& rRoot ) :
-@@ -2224,7 +2314,7 @@ void XclImpObjectManager::ReadObj8( XclI
+@@ -2143,7 +2233,7 @@ void XclImpObjectManager::ReadObj8( XclImpStream& rStrm )
              break;
              case EXC_ID_OBJ_FTCMO:
                  DBG_ASSERT( !xDrawObj, "XclImpObjectManager::ReadObj8 - multiple FTCMO subrecords" );
@@ -259,14 +256,11 @@
                  bLoop = xDrawObj.is();
              break;
              default:
-Index: sc/source/filter/inc/xiescher.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/xiescher.hxx,v
-retrieving revision 1.27
-diff -u -p -r1.27 xiescher.hxx
---- sc/source/filter/inc/xiescher.hxx	6 Jul 2007 12:38:40 -0000	1.27
-+++ sc/source/filter/inc/xiescher.hxx	20 Feb 2008 17:21:50 -0000
-@@ -99,7 +99,7 @@ public:
+diff --git sc/source/filter/inc/xiescher.hxx sc/source/filter/inc/xiescher.hxx
+index b66314b..ea8a91b 100644
+--- sc/source/filter/inc/xiescher.hxx
++++ sc/source/filter/inc/xiescher.hxx
+@@ -84,7 +84,7 @@ public:
      virtual             ~XclImpDrawObjBase();
  
      /** Reads the FTCMO subrecord (common object data) in an OBJ record, returns a new object. */
@@ -275,7 +269,7 @@
      /** Reads the contents of the specified subrecord of an OBJ record from stream. */
      virtual void        ReadSubRecord( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize );
      /** Reads the client anchor from an msofbtClientAnchor Escher record. */
-@@ -254,6 +254,9 @@ protected:
+@@ -242,6 +242,9 @@ protected:
      ScfPropertySet      GetControlPropSet() const;
      /** Tries to set a spreadsheet cell link and source range link at the passed form control. */
      void                ConvertSheetLinks( const XclImpRoot& rRoot, SdrObject& rSdrObj ) const;
@@ -285,7 +279,7 @@
  
  private:
      XControlModelRef    mxCtrlModel;    /// Model of the created form control object.
-@@ -268,7 +271,7 @@ private:
+@@ -256,7 +259,7 @@ private:
  class XclImpTbxControlObj : public XclImpDrawingObj, public XclImpControlObjHelper
  {
  public:
@@ -294,7 +288,7 @@
  
      /** Reads the contents of the specified subrecord of an OBJ record from stream. */
      virtual void        ReadSubRecord( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize );
-@@ -295,8 +298,15 @@ private:
+@@ -283,8 +286,15 @@ private:
      void                ReadSbs( XclImpStream& rStrm );
      /** Reads the contents of the ftGboData sub structure in an OBJ record. */
      void                ReadGboData( XclImpStream& rStrm );
@@ -310,14 +304,11 @@
      ScfInt16Vec         maMultiSel;     /// Indexes of all selected entries in a multi selection.
      sal_uInt16          mnState;        /// Checked/unchecked state.
      sal_Int16           mnSelEntry;     /// Index of selected entry (1-based).
-Index: sc/source/filter/inc/xlescher.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/xlescher.hxx,v
-retrieving revision 1.21
-diff -u -p -r1.21 xlescher.hxx
---- sc/source/filter/inc/xlescher.hxx	22 Jan 2007 13:22:23 -0000	1.21
-+++ sc/source/filter/inc/xlescher.hxx	20 Feb 2008 17:21:50 -0000
-@@ -75,6 +75,7 @@ const sal_uInt16 EXC_ID_OBJ_FTCBLS      
+diff --git sc/source/filter/inc/xlescher.hxx sc/source/filter/inc/xlescher.hxx
+index 4750b4a..b80eaae 100644
+--- sc/source/filter/inc/xlescher.hxx
++++ sc/source/filter/inc/xlescher.hxx
+@@ -64,6 +64,7 @@ const sal_uInt16 EXC_ID_OBJ_FTCBLS          = 0x000A;   /// Check box/radio butt
  const sal_uInt16 EXC_ID_OBJ_FTSBS           = 0x000C;   /// Scroll bar data.
  const sal_uInt16 EXC_ID_OBJ_FTSBSFMLA       = 0x000E;   /// Scroll bar/list box/combo box cell link.
  const sal_uInt16 EXC_ID_OBJ_FTGBODATA       = 0x000F;   /// Group box data.
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]