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

[noelpwer svn gnome org]

Author: noelpwer
Date: Tue Jan  6 18:04:56 2009
New Revision: 15005
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15005&view=rev

Log:
2009-01-06  Noel Power <noel power novell com>

        * patches/dev300/forms-radio-button-group-names.diff: GROUPNAME
        * property seemed to move to Button, no idea how 


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	Tue Jan  6 18:04:56 2009
@@ -427,7 +427,7 @@
      // free
      // free
 diff --git svx/source/msfilter/msocximex.cxx svx/source/msfilter/msocximex.cxx
-index c278bc9..bb2338f 100644
+index fab7d46..37b720b 100644
 --- svx/source/msfilter/msocximex.cxx
 +++ svx/source/msfilter/msocximex.cxx
 @@ -1709,6 +1709,12 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
@@ -471,11 +471,10 @@
  
  //	----------------------------------------------------
 diff --git toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/property.hxx
-index 30a7a89..a342099 100644
+index 238b412..2835f10 100644
 --- toolkit/inc/toolkit/helper/property.hxx
 +++ toolkit/inc/toolkit/helper/property.hxx
-@@ -191,7 +191,8 @@ namespace rtl {
- #define BASEPROPERTY_IMAGE_SCALE_MODE               137
+@@ -192,6 +192,7 @@ namespace rtl {
  #define BASEPROPERTY_WRITING_MODE                   138
  #define BASEPROPERTY_CONTEXT_WRITING_MODE           139
  #define BASEPROPERTY_ENABLEVISIBLE                  140  // sal_Bool
@@ -484,10 +483,10 @@
  // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
  #define BASEPROPERTY_FONTDESCRIPTORPART_START			1000
 diff --git toolkit/source/awt/vclxwindows.cxx toolkit/source/awt/vclxwindows.cxx
-index bfa828b..1a0e719 100644
+index bfa828b..206280b 100644
 --- toolkit/source/awt/vclxwindows.cxx
 +++ toolkit/source/awt/vclxwindows.cxx
-@@ -407,6 +407,7 @@ void VCLXButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+@@ -1105,6 +1105,7 @@ void VCLXRadioButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
                       BASEPROPERTY_VERTICALALIGN,
                       BASEPROPERTY_WRITING_MODE,
                       BASEPROPERTY_CONTEXT_WRITING_MODE,
@@ -683,11 +682,11 @@
  }
  
 diff --git toolkit/source/controls/unocontrolmodel.cxx toolkit/source/controls/unocontrolmodel.cxx
-index 4ec35b3..0136e9e 100644
+index 33e7b7b..453be84 100644
 --- toolkit/source/controls/unocontrolmodel.cxx
 +++ toolkit/source/controls/unocontrolmodel.cxx
-@@ -347,6 +347,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
-             case BASEPROPERTY_PRINTABLE:
+@@ -348,6 +348,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
+             case BASEPROPERTY_ENABLEVISIBLE:
              case BASEPROPERTY_DECORATION:           aDefault <<= (sal_Bool) sal_True; break;
  
 +            case BASEPROPERTY_GROUPNAME:
@@ -695,7 +694,7 @@
              case BASEPROPERTY_HELPURL:
  	        case BASEPROPERTY_IMAGEURL:
 diff --git toolkit/source/helper/property.cxx toolkit/source/helper/property.cxx
-index 18956cf..abd26ae 100644
+index 0a26448..13102ff 100644
 --- toolkit/source/helper/property.cxx
 +++ toolkit/source/helper/property.cxx
 @@ -180,6 +180,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
@@ -783,7 +782,7 @@
          TOKEN( "mm",                              XML_UNIT_MM ),
          TOKEN( "m",                               XML_UNIT_M ),
 diff --git xmloff/source/forms/elementexport.cxx xmloff/source/forms/elementexport.cxx
-index a2dce99..c01940b 100644
+index 357b434..cb859fb 100644
 --- xmloff/source/forms/elementexport.cxx
 +++ xmloff/source/forms/elementexport.cxx
 @@ -1113,6 +1113,39 @@ namespace xmloff
@@ -836,10 +835,10 @@
  				m_nIncludeEvents = EA_CONTROL_EVENTS | EA_ON_CHANGE;
  				break;
 diff --git xmloff/source/forms/formattributes.cxx xmloff/source/forms/formattributes.cxx
-index 7f312f5..96c7849 100644
+index 4314711..5df31ed 100644
 --- xmloff/source/forms/formattributes.cxx
 +++ xmloff/source/forms/formattributes.cxx
-@@ -194,6 +194,7 @@ namespace xmloff
+@@ -195,6 +195,7 @@ namespace xmloff
  			case SCA_MAX_VALUE:				return "max-value";
  			case SCA_MIN_VALUE:				return "min-value";
  			case SCA_VALIDATION:			return "validation";
@@ -847,7 +846,7 @@
  			case SCA_MULTI_LINE:			return "multi-line";
  			case SCA_AUTOMATIC_COMPLETION:	return "auto-complete";
  			case SCA_MULTIPLE: 				return "multiple";
-@@ -214,9 +215,12 @@ namespace xmloff
+@@ -215,9 +216,12 @@ namespace xmloff
  	}
  
  	//---------------------------------------------------------------------
@@ -863,10 +862,10 @@
  	}
  
 diff --git xmloff/source/forms/formattributes.hxx xmloff/source/forms/formattributes.hxx
-index 40f1e6a..3d73bb6 100644
+index 50bad1b..ef6e7eb 100644
 --- xmloff/source/forms/formattributes.hxx
 +++ xmloff/source/forms/formattributes.hxx
-@@ -125,6 +125,7 @@ namespace xmloff
+@@ -126,6 +126,7 @@ namespace xmloff
  	#define SCA_MAX_VALUE				0x00000002
  	#define SCA_MIN_VALUE				0x00000004
  	#define SCA_VALIDATION				0x00000008
@@ -888,10 +887,10 @@
  		m_aAttributeMetaData.addStringProperty(
  			OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL), PROPERTY_LABEL);
 diff --git xmloff/source/forms/strings.hxx xmloff/source/forms/strings.hxx
-index eac6600..1225a73 100644
+index 5b992ef..b067c7b 100644
 --- xmloff/source/forms/strings.hxx
 +++ xmloff/source/forms/strings.hxx
-@@ -206,6 +206,7 @@ namespace xmloff
+@@ -207,6 +207,7 @@ namespace xmloff
      XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION,     "ImagePosition");
      XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_ALIGN,        "ImageAlign");
      XMLFORM_CONSTASCII_STRING( PROPERTY_SCALE_IMAGE,        "ScaleImage");