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

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14927 - in trunk: . patches/dev300
Date: Thu, 25 Dec 2008 06:09:45 +0000 (UTC)
Author: kyoshida
Date: Thu Dec 25 06:09:44 2008
New Revision: 14927
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14927&view=rev

Log:
2008-12-25  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/forms-radio-button-group-names-m37.diff: this patch 
	only applies against dev300-m37.

	* patches/dev300/forms-radio-button-group-names.diff: adjusted for 
	dev300-m38.

	* patches/dev300/apply: made the above change.


Added:
   trunk/patches/dev300/forms-radio-button-group-names-m37.diff
      - copied unchanged from r14925, /trunk/patches/dev300/forms-radio-button-group-names.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/forms-radio-button-group-names.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Dec 25 06:09:44 2008
@@ -479,10 +479,15 @@
 # import/export form control's visibility
 form-control-visibility-m36.diff, i#88878, jianhua
 
-[ Fixes >= dev300-m37 ]
+[ Fixes == dev300-m37 ]
 # import/export form control's visibility
 form-control-visibility.diff, i#88878, jianhua
 
+[ Fixes > dev300-m37 ]
+# import/export form control's visibility
+#FIXME_m38 form-control-visibility.diff, i#88878, jianhua
+
+
 [ Fixes ]
 # import tooltip for userforms
 import-controls-tooltip.diff, i#90124, noelpwer
@@ -496,10 +501,12 @@
 # FIXME 2008-11-26: the mailmerge.py in dev300-m35 doesn't have any #! line at all!?
 #scripting-mailmerge-python-binary.diff, pmladek
 
+[ Fixes < dev300-m38 ]
 # initialize the default locale in the resource manager
 # for example, it fixes unopkg to do not show random localization
 tools-resmgr-set-defaultlocale.diff, n#399101, i#90820, pmladek
 
+[ Fixes ]
 # Allow some technically illegal pathname components on Win32
 # (directories with trailing spaces or periods) because some SMB
 # servers like Netware (and Samba, if mangled names = No) do serve
@@ -540,9 +547,12 @@
 # share the same name to be part of the same group.
 forms-radio-button-group-names-m36.diff, n#310052, i#30823, jonp
 
-[ RadioButtons > dev300-m36 ]
+[ RadioButtons == dev300-m37 ]
 # 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-m37.diff, n#310052, i#30823, jonp
+
+[ RadioButtons >= dev300-m38 ]
 forms-radio-button-group-names.diff, n#310052, i#30823, jonp
 
 [ RadioButtons ]

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	Thu Dec 25 06:09:44 2008
@@ -1,33 +1,33 @@
 diff --git extensions/inc/extensio.hrc extensions/inc/extensio.hrc
-index 10e21c8..15c2c06 100644
+index fe70aa3..c3dbd20 100644
 --- extensions/inc/extensio.hrc
 +++ extensions/inc/extensio.hrc
-@@ -457,9 +457,10 @@
- #define UID_PROP_DLG_BORDERCOLOR                (HID_FORMS_START + 338)
+@@ -458,9 +458,10 @@
  #define HID_PROP_IMAGEPOSITION                  (HID_FORMS_START + 339)
- #define HID_PROP_NOLABEL                       (HID_FORMS_START + 340)
-+#define HID_PROP_GROUP_NAME                     (HID_FORMS_START + 341)
+ #define HID_PROP_NOLABEL                        (HID_FORMS_START + 340)
+ #define HID_PROP_WRITING_MODE                   (HID_FORMS_START + 341)
++#define HID_PROP_GROUP_NAME                     (HID_FORMS_START + 342)
      // please adjust HID_LAST_FORMS_ID if you add new ids here!
  
--#define HID_LAST_FORMS_ID   HID_PROP_NOLABEL
+-#define HID_LAST_FORMS_ID   HID_PROP_WRITING_MODE
 +#define HID_LAST_FORMS_ID   HID_PROP_GROUP_NAME
  
  #if HID_LAST_FORMS_ID > HID_FORMS_END
      #error id overflow
 diff --git extensions/source/propctrlr/formmetadata.cxx extensions/source/propctrlr/formmetadata.cxx
-index 750c7dc..47467e2 100644
+index ae07c9a..1fe7db6 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 ),
+@@ -143,6 +143,7 @@ namespace pcr
          DEF_INFO_3( LABEL,             LABEL,              LABEL,             FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
          DEF_INFO_2( CONTROLLABEL,      LABELCONTROL,       CONTROLLABEL,      FORM_VISIBLE, COMPOSEABLE ),
+         DEF_INFO_3( WRITING_MODE,      WRITING_MODE,       WRITING_MODE,      FORM_VISIBLE, ENUM, 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/formmetadata.hxx extensions/source/propctrlr/formmetadata.hxx
-index e6e94cc..2773208 100644
+index 8ebacf4..ba9174f 100644
 --- extensions/source/propctrlr/formmetadata.hxx
 +++ extensions/source/propctrlr/formmetadata.hxx
 @@ -166,6 +166,7 @@ namespace pcr
@@ -39,7 +39,7 @@
  	#define PROPERTY_ID_CYCLE				 25
  	#define PROPERTY_ID_HIDDEN_VALUE		 26
 diff --git extensions/source/propctrlr/formres.src extensions/source/propctrlr/formres.src
-index a2634f5..3ee3660 100644
+index a52afa2..21a1288 100644
 --- extensions/source/propctrlr/formres.src
 +++ extensions/source/propctrlr/formres.src
 @@ -230,6 +230,10 @@ String RID_STR_NAME
@@ -54,7 +54,7 @@
  {
  	Text [ en-US ] = "Tab order" ;
 diff --git extensions/source/propctrlr/formresid.hrc extensions/source/propctrlr/formresid.hrc
-index 8bbf6a1..acdb70f 100644
+index a889086..aed2207 100644
 --- extensions/source/propctrlr/formresid.hrc
 +++ extensions/source/propctrlr/formresid.hrc
 @@ -150,7 +150,7 @@
@@ -67,7 +67,7 @@
      // FREE
      // FREE
 diff --git extensions/source/propctrlr/formstrings.hxx extensions/source/propctrlr/formstrings.hxx
-index 1e8a250..45a289a 100644
+index 606184e..fad672d 100644
 --- extensions/source/propctrlr/formstrings.hxx
 +++ extensions/source/propctrlr/formstrings.hxx
 @@ -50,6 +50,7 @@ namespace pcr
@@ -79,14 +79,15 @@
  	PCR_CONSTASCII_STRING( PROPERTY_TEXT,					"Text");
  	PCR_CONSTASCII_STRING( PROPERTY_NAVIGATION,				"NavigationBarMode");
 diff --git extensions/util/hidother.src extensions/util/hidother.src
-index 79b979d..c69fa2c 100644
+index b075f8c..624ae37 100644
 --- extensions/util/hidother.src
 +++ extensions/util/hidother.src
-@@ -307,3 +307,4 @@ hidspecial HID_CHECK_FOR_UPD_DESCRIPTION        { HelpId = HID_CHECK_FOR_UPD_DES
+@@ -307,4 +307,5 @@ hidspecial HID_CHECK_FOR_UPD_DESCRIPTION        { HelpId = HID_CHECK_FOR_UPD_DES
  hidspecial HID_CHECK_FOR_UPD_CANCEL             { HelpId = HID_CHECK_FOR_UPD_CANCEL; }
  hidspecial HID_PROP_NOLABEL                     { HelpId = HID_PROP_NOLABEL; }
  hidspecial HID_PROP_INPUT_REQUIRED              { HelpId = HID_PROP_INPUT_REQUIRED; }
 +hidspecial HID_PROP_GROUP_NAME                  { HelpId = HID_PROP_GROUP_NAME; }
+ hidspecial HID_PROP_WRITING_MODE                { HelpId = HID_PROP_WRITING_MODE; }
 diff --git forms/source/component/GroupManager.cxx forms/source/component/GroupManager.cxx
 index d831a82..f5a9ecb 100644
 --- forms/source/component/GroupManager.cxx
@@ -401,7 +402,7 @@
  
  //==================================================================
 diff --git forms/source/inc/frm_strings.hxx forms/source/inc/frm_strings.hxx
-index ee21a42..df18831 100644
+index 864160f..4b2efb9 100644
 --- forms/source/inc/frm_strings.hxx
 +++ forms/source/inc/frm_strings.hxx
 @@ -100,6 +100,7 @@ namespace frm
@@ -413,15 +414,15 @@
      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 335ce2a..c057846 100644
+index d5e2476..20bdaf7 100644
 --- forms/source/inc/property.hrc
 +++ forms/source/inc/property.hrc
-@@ -61,7 +61,7 @@ namespace frm
- #define PROPERTY_ID_ALLOWDELETIONS      (PROPERTY_ID_START + 17)
- #define PROPERTY_ID_NATIVE_LOOK         (PROPERTY_ID_START + 18)
+@@ -63,7 +63,7 @@ namespace frm
  #define PROPERTY_ID_INPUT_REQUIRED      (PROPERTY_ID_START + 19)
+ #define PROPERTY_ID_WRITING_MODE        (PROPERTY_ID_START + 20)
+ #define PROPERTY_ID_CONTEXT_WRITING_MODE    (PROPERTY_ID_START + 21)
 -    // free
-+#define PROPERTY_ID_GROUP_NAME          (PROPERTY_ID_START + 20)
++#define PROPERTY_ID_GROUP_NAME          (PROPERTY_ID_START + 22)
      // free
      // free
      // free
@@ -470,25 +471,25 @@
  
  //	----------------------------------------------------
 diff --git toolkit/inc/toolkit/helper/property.hxx toolkit/inc/toolkit/helper/property.hxx
-index 325871d..1feb7b8 100644
+index 30a7a89..a342099 100644
 --- toolkit/inc/toolkit/helper/property.hxx
 +++ toolkit/inc/toolkit/helper/property.hxx
-@@ -190,6 +190,7 @@ namespace rtl {
- #define BASEPROPERTY_CUSTOMUNITTEXT                 136  // ::rtl::OUString
+@@ -191,6 +191,7 @@ namespace rtl {
  #define BASEPROPERTY_IMAGE_SCALE_MODE               137
- #define BASEPROPERTY_ENABLEVISIBLE                  138  // sal_Bool
-+#define BASEPROPERTY_GROUPNAME                      139  // ::rtl::OUString
+ #define BASEPROPERTY_WRITING_MODE                   138
+ #define BASEPROPERTY_CONTEXT_WRITING_MODE           139
++#define BASEPROPERTY_GROUPNAME                      140  // ::rtl::OUString
  
  // 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 5909248..99144fe 100644
+index bfa828b..1a0e719 100644
 --- toolkit/source/awt/vclxwindows.cxx
 +++ toolkit/source/awt/vclxwindows.cxx
-@@ -1097,6 +1097,7 @@ void VCLXRadioButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
-                      BASEPROPERTY_BACKGROUNDCOLOR,
-                      BASEPROPERTY_ALIGN,
+@@ -407,6 +407,7 @@ void VCLXButton::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
                       BASEPROPERTY_VERTICALALIGN,
+                      BASEPROPERTY_WRITING_MODE,
+                      BASEPROPERTY_CONTEXT_WRITING_MODE,
 +                     BASEPROPERTY_GROUPNAME,
                       0);
      VCLXImageConsumer::ImplGetPropertyIds( rIds );
@@ -681,11 +682,11 @@
  }
  
 diff --git toolkit/source/controls/unocontrolmodel.cxx toolkit/source/controls/unocontrolmodel.cxx
-index 61e3ea3..e7939a9 100644
+index 4ec35b3..0136e9e 100644
 --- toolkit/source/controls/unocontrolmodel.cxx
 +++ toolkit/source/controls/unocontrolmodel.cxx
-@@ -340,6 +340,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
-             case BASEPROPERTY_ENABLEVISIBLE:
+@@ -347,6 +347,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 )
+             case BASEPROPERTY_PRINTABLE:
              case BASEPROPERTY_DECORATION:           aDefault <<= (sal_Bool) sal_True; break;
  
 +            case BASEPROPERTY_GROUPNAME:
@@ -693,10 +694,10 @@
              case BASEPROPERTY_HELPURL:
  	        case BASEPROPERTY_IMAGEURL:
 diff --git toolkit/source/helper/property.cxx toolkit/source/helper/property.cxx
-index 933a72b..b5d38b5 100644
+index 18956cf..abd26ae 100644
 --- toolkit/source/helper/property.cxx
 +++ toolkit/source/helper/property.cxx
-@@ -179,6 +179,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
+@@ -180,6 +180,7 @@ ImplPropertyInfo* ImplGetPropertyInfos( sal_uInt16& rElementCount )
              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 ),
@@ -717,7 +718,7 @@
  
  #endif	//  _XMLOFF_XMLNMSPE_HXX
 diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
-index 602ad2d..896daa4 100644
+index 11116de..e710a61 100644
 --- xmloff/inc/xmloff/xmltoken.hxx
 +++ xmloff/inc/xmloff/xmltoken.hxx
 @@ -142,6 +142,10 @@ namespace xmloff { namespace token {
@@ -732,10 +733,10 @@
          XML_UNIT_MM,
          XML_UNIT_M,
 diff --git xmloff/source/core/xmlexp.cxx xmloff/source/core/xmlexp.cxx
-index dfb9c97..d2fe699 100644
+index 694df43..1dc010d 100644
 --- xmloff/source/core/xmlexp.cxx
 +++ xmloff/source/core/xmlexp.cxx
-@@ -307,6 +307,7 @@ void SvXMLExport::_InitCtor()
+@@ -314,6 +314,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 );
@@ -766,7 +767,7 @@
                              GetXMLToken(XML_N_XSD),
                              XML_NAMESPACE_XSD );
 diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
-index 620680d..4170532 100644
+index 8d66db2..24faf3d 100644
 --- xmloff/source/core/xmltoken.cxx
 +++ xmloff/source/core/xmltoken.cxx
 @@ -150,6 +150,10 @@ namespace xmloff { namespace token {
@@ -781,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 357b434..cb859fb 100644
+index a2dce99..c01940b 100644
 --- xmloff/source/forms/elementexport.cxx
 +++ xmloff/source/forms/elementexport.cxx
 @@ -1113,6 +1113,39 @@ namespace xmloff
@@ -834,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 4314711..5df31ed 100644
+index 7f312f5..96c7849 100644
 --- xmloff/source/forms/formattributes.cxx
 +++ xmloff/source/forms/formattributes.cxx
-@@ -195,6 +195,7 @@ namespace xmloff
+@@ -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";
@@ -845,7 +846,7 @@
  			case SCA_MULTI_LINE:			return "multi-line";
  			case SCA_AUTOMATIC_COMPLETION:	return "auto-complete";
  			case SCA_MULTIPLE: 				return "multiple";
-@@ -215,9 +216,12 @@ namespace xmloff
+@@ -214,9 +215,12 @@ namespace xmloff
  	}
  
  	//---------------------------------------------------------------------
@@ -861,10 +862,10 @@
  	}
  
 diff --git xmloff/source/forms/formattributes.hxx xmloff/source/forms/formattributes.hxx
-index 50bad1b..ef6e7eb 100644
+index 40f1e6a..3d73bb6 100644
 --- xmloff/source/forms/formattributes.hxx
 +++ xmloff/source/forms/formattributes.hxx
-@@ -126,6 +126,7 @@ namespace xmloff
+@@ -125,6 +125,7 @@ namespace xmloff
  	#define SCA_MAX_VALUE				0x00000002
  	#define SCA_MIN_VALUE				0x00000004
  	#define SCA_VALIDATION				0x00000008
@@ -886,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 5b992ef..b067c7b 100644
+index eac6600..1225a73 100644
 --- xmloff/source/forms/strings.hxx
 +++ xmloff/source/forms/strings.hxx
-@@ -207,6 +207,7 @@ namespace xmloff
+@@ -206,6 +206,7 @@ namespace xmloff
      XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_POSITION,     "ImagePosition");
      XMLFORM_CONSTASCII_STRING( PROPERTY_IMAGE_ALIGN,        "ImageAlign");
      XMLFORM_CONSTASCII_STRING( PROPERTY_SCALE_IMAGE,        "ScaleImage");
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]