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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Jan 28 04:56:20 2009
New Revision: 15196
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15196&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/default-autotext-and-form-name-m39.diff:
	* patches/dev300/default-autotext-and-form-name.diff:
	* patches/dev300/apply: adjusted for dev300-m40.


Added:
   trunk/patches/dev300/default-autotext-and-form-name-m39.diff
      - copied unchanged from r15189, /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	Wed Jan 28 04:56:20 2009
@@ -1972,7 +1972,10 @@
 [ VBAObjects < dev300-m38 ]
 default-autotext-and-form-name-m37.diff, n#353687, i#85358
 
-[ VBAObjects >= dev300-m38 ]
+[ VBAObjects >= dev300-m38 <= dev300-m39 ]
+default-autotext-and-form-name-m39.diff, n#353687, i#85358
+
+[ VBAObjects > dev300-m39 ]
 default-autotext-and-form-name.diff, n#353687, i#85358
 
 [ VBAObjects ]

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	Wed Jan 28 04:56:20 2009
@@ -1,29 +1,29 @@
 diff --git sc/inc/globstr.hrc sc/inc/globstr.hrc
-index 27876d9..dac3f7a 100644
+index 893e909..fbf7540 100644
 --- sc/inc/globstr.hrc
 +++ sc/inc/globstr.hrc
-@@ -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
+@@ -574,7 +574,23 @@
+ #define STR_STYLE_FAMILY_CELL       433
+ #define STR_STYLE_FAMILY_PAGE       434
+ 
+-#define STR_COUNT                   435
++#define STR_SHAPE_AUTOSHAPE         435
++#define STR_SHAPE_RECTANGLE         436
++#define STR_SHAPE_LINE              437
++#define STR_SHAPE_OVAL              438
++#define STR_SHAPE_TEXTBOX           439
 +                                       
-+#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_FORM_BUTTON             440
++#define STR_FORM_CHECKBOX           441
++#define STR_FORM_OPTIONBUTTON       442
++#define STR_FORM_LABEL              443
++#define STR_FORM_LISTBOX            444
++#define STR_FORM_GROUPBOX           445
++#define STR_FORM_DROPDOWN           446
++#define STR_FORM_SPINNER            447
++#define STR_FORM_SCROLLBAR          448
 +                                       
-+#define STR_COUNT                   447
++#define STR_COUNT                   449
  
  #endif
  
@@ -73,22 +73,22 @@
  
  XclImpObjectManager::~XclImpObjectManager()
 diff --git sc/source/filter/excel/xlescher.cxx sc/source/filter/excel/xlescher.cxx
-index e66f60d..5076ad2 100644
+index bea2ed1..2ea8f84 100644
 --- sc/source/filter/excel/xlescher.cxx
 +++ sc/source/filter/excel/xlescher.cxx
 @@ -38,6 +38,7 @@
  #include "document.hxx"
  #include "xistream.hxx"
- #include "xestream.hxx"
+ #include "xlescher.hxx"
 +#include "globstr.hrc"
  
  using ::rtl::OUString;
  using ::com::sun::star::uno::Reference;
 diff --git sc/source/ui/src/globstr.src sc/source/ui/src/globstr.src
-index b2360f2..5d94238 100644
+index 4aa90ca..6912e7a 100644
 --- sc/source/ui/src/globstr.src
 +++ sc/source/ui/src/globstr.src
-@@ -1721,5 +1721,76 @@ Resource RID_GLOBSTR
+@@ -1721,6 +1721,77 @@ Resource RID_GLOBSTR
      {
          Text [ en-US ] = "Unknown User";
      };
@@ -163,5 +163,6 @@
 +        Text [ en-US ] = "Scroll Bar";
 +    };
 +
- };
- 
+     String STR_STYLE_FAMILY_CELL
+     {
+         Text [ en-US ] = "Cell Styles";