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

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Dec 29 20:01:31 2008
New Revision: 14955
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14955&view=rev

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

	* patches/dev300/default-autotext-and-form-name-m37.diff:
	* patches/dev300/default-autotext-and-form-name.diff:
	* patches/dev300/apply: adjusted for dev300-m38; there are several new
	localized strings in globstr.hrc in m38, so I had to increment those 
	IDs.



Added:
   trunk/patches/dev300/default-autotext-and-form-name-m37.diff
      - copied unchanged from r14946, /trunk/patches/dev300/default-autotext-and-form-name.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/default-autotext-and-form-name.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Dec 29 20:01:31 2008
@@ -1747,8 +1747,13 @@
 # Application.Caller
 api-application-caller.diff, n#339941, noelpwer
 
+[ VBAObjects < dev300-m38 ]
+default-autotext-and-form-name-m37.diff, n#353687, i#85358
+
+[ VBAObjects >= dev300-m38 ]
 default-autotext-and-form-name.diff, n#353687, i#85358
 
+[ VBAObjects ]
 # fix --disable-vba build
 oovbaapi-disable-vba.diff
 

Modified: trunk/patches/dev300/default-autotext-and-form-name.diff
==============================================================================
--- trunk/patches/dev300/default-autotext-and-form-name.diff	(original)
+++ trunk/patches/dev300/default-autotext-and-form-name.diff	Mon Dec 29 20:01:31 2008
@@ -1,37 +1,37 @@
 diff --git sc/inc/globstr.hrc sc/inc/globstr.hrc
-index d0c9e8f..b4e6f90 100644
+index 27876d9..dac3f7a 100644
 --- sc/inc/globstr.hrc
 +++ sc/inc/globstr.hrc
-@@ -569,7 +569,23 @@
- #define STR_UNKNOWN_USER            429
- #define STR_LONG_ERR_NULL           430
- 
--#define STR_COUNT                   431
-+#define STR_SHAPE_AUTOSHAPE         431
-+#define STR_SHAPE_RECTANGLE         432
-+#define STR_SHAPE_LINE              433
-+#define STR_SHAPE_OVAL              434
-+#define STR_SHAPE_TEXTBOX           435
-+
-+#define STR_FORM_BUTTON             436
-+#define STR_FORM_CHECKBOX           437
-+#define STR_FORM_OPTIONBUTTON       438
-+#define STR_FORM_LABEL              439
-+#define STR_FORM_LISTBOX            440
-+#define STR_FORM_GROUPBOX           441
-+#define STR_FORM_DROPDOWN           442
-+#define STR_FORM_SPINNER            443
-+#define STR_FORM_SCROLLBAR          444
-+
-+#define STR_COUNT                   445
+@@ -572,7 +572,23 @@
+ #define STR_UNDO_INSERTNOTE			431
+ #define STR_UNDO_DELETENOTE			432
+ 
+-#define STR_COUNT                   433
++#define STR_SHAPE_AUTOSHAPE         433
++#define STR_SHAPE_RECTANGLE         434
++#define STR_SHAPE_LINE              435
++#define STR_SHAPE_OVAL              436
++#define STR_SHAPE_TEXTBOX           437
++                                       
++#define STR_FORM_BUTTON             438
++#define STR_FORM_CHECKBOX           439
++#define STR_FORM_OPTIONBUTTON       440
++#define STR_FORM_LABEL              441
++#define STR_FORM_LISTBOX            442
++#define STR_FORM_GROUPBOX           443
++#define STR_FORM_DROPDOWN           444
++#define STR_FORM_SPINNER            445
++#define STR_FORM_SCROLLBAR          446
++                                       
++#define STR_COUNT                   447
  
  #endif
  
 diff --git sc/source/filter/excel/xiescher.cxx sc/source/filter/excel/xiescher.cxx
-index 2508629..51deb7c 100644
+index dd26d51..edb5419 100644
 --- sc/source/filter/excel/xiescher.cxx
 +++ sc/source/filter/excel/xiescher.cxx
-@@ -3547,27 +3547,27 @@ XclImpObjectManager::XclImpObjectManager( const XclImpRoot& rRoot ) :
+@@ -3600,27 +3600,27 @@ XclImpObjectManager::XclImpObjectManager( const XclImpRoot& rRoot ) :
      XclImpRoot( rRoot )
  {
      maDefObjNames[ EXC_OBJTYPE_GROUP ]          = CREATE_STRING( "Group" );
@@ -85,10 +85,10 @@
  using ::rtl::OUString;
  using ::com::sun::star::uno::Reference;
 diff --git sc/source/ui/src/globstr.src sc/source/ui/src/globstr.src
-index 24664f5..19e48c6 100644
+index b2360f2..5d94238 100644
 --- sc/source/ui/src/globstr.src
 +++ sc/source/ui/src/globstr.src
-@@ -1713,5 +1713,76 @@ Resource RID_GLOBSTR
+@@ -1721,5 +1721,76 @@ Resource RID_GLOBSTR
      {
          Text [ en-US ] = "Unknown User";
      };