ooo-build r14900 - in branches/ooo-build-3-0-1: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Dec 19 15:33:06 2008
New Revision: 14900
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14900&view=rev

Log:
update zoom-combobox.diff for m14


Added:
   branches/ooo-build-3-0-1/patches/dev300/zoom-combobox-m13.diff
      - copied unchanged from r14895, /branches/ooo-build-3-0-1/patches/dev300/zoom-combobox.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply
   branches/ooo-build-3-0-1/patches/dev300/zoom-combobox.diff

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Fri Dec 19 15:33:06 2008
@@ -595,12 +595,19 @@
 sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
 
 
-[ CalcFixes ]
+[ CalcFixes < ooo300-m14 ]
+# Replace usability numb Zoom dialog with a Combo Box
+# FIXME: this conflicts with Sun's duplication of this work,
+# eg. print preview
+zoom-combobox-m13.diff, michael
+
+[ CalcFixes >= ooo300-m14 ]
 # Replace usability numb Zoom dialog with a Combo Box
 # FIXME: this conflicts with Sun's duplication of this work,
 # eg. print preview
 zoom-combobox.diff, michael
 
+[ CalcFixes ]
 # make some symbols from sc visible when compiling with gcc4, necessary since m121
 gcc4-visibility-sc.diff, i#53261, pmladek
 # Fix for b.x.c 62193

Modified: branches/ooo-build-3-0-1/patches/dev300/zoom-combobox.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/zoom-combobox.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/zoom-combobox.diff	Fri Dec 19 15:33:06 2008
@@ -30,7 +30,7 @@
 @@ -807,6 +807,8 @@
  
  #define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW         (HID_SVX_EXT0_START + 207)
- 
+ #define HID_SPLDLG_BUTTON_IGNORERULE                (HID_SVX_EXT0_START + 208)
 +#define HID_ZOOM_COMBOBOX                           (HID_SVX_EXT0_START + 189)
 +
  // please adjust ACT_SVX_HID_END2 below if you add entries here!
@@ -40,7 +40,7 @@
  #error Resource-Ueberlauf in #line, #file
  #endif
  
--#define ACT_SVX_HID_END2    HID_NUMBERFORMAT_WND_NUMBER_PREVIEW
+-#define ACT_SVX_HID_END2    HID_SPLDLG_BUTTON_IGNORERULE
 +#define ACT_SVX_HID_END2    HID_ZOOM_COMBOBOX
  #if ACT_SVX_HID_END2 > HID_SVX_EXT0_END
  #error resource overrun in #line, #file