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

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Jan 29 04:15:35 2009
New Revision: 15233
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15233&view=rev

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

	* patches/dev300/fit-list-to-size-popup-m39.diff:
	* patches/dev300/fit-list-to-size-popup.diff:
	* patches/dev300/apply: fixed a build breakage in sd for dev300-m40.



Added:
   trunk/patches/dev300/fit-list-to-size-popup-m39.diff   (props changed)
      - copied unchanged from r15232, /trunk/patches/dev300/fit-list-to-size-popup.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/fit-list-to-size-popup.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jan 29 04:15:35 2009
@@ -3027,8 +3027,14 @@
 
 fit-list-to-size-ui.diff, i#94086, thorsten
 fit-list-to-size-style-defaults.diff, i#94086, thorsten
+
+[ Fixes <= dev300-m39 ]
+fit-list-to-size-popup-m39.diff, i#94086, thorsten
+
+[ Fixes > dev300-m39 ]
 fit-list-to-size-popup.diff, i#94086, thorsten
 
+[ Fixes ]
 # apply this patch if you need to disable vcl grabbing your mouse -
 # after applying the patch, set SAL_NO_MOUSEGRABS in your env
 #vcl-disable-mouse-grab.diff

Modified: trunk/patches/dev300/fit-list-to-size-popup.diff
==============================================================================
--- trunk/patches/dev300/fit-list-to-size-popup.diff	(original)
+++ trunk/patches/dev300/fit-list-to-size-popup.diff	Thu Jan 29 04:15:35 2009
@@ -152,18 +152,19 @@
  //
  #if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
 diff --git sd/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc
-index 4725971..cffe512 100644
+index d4914a3..8565e1b 100644
 --- sd/source/ui/inc/res_bmp.hrc
 +++ sd/source/ui/inc/res_bmp.hrc
-@@ -296,6 +296,8 @@
+@@ -301,6 +301,9 @@
  
- #define RID_DRAW_TABLE_POPUP				RID_APP_START+91
- #define RID_GRAPHIC_TABLE_POPUP				RID_APP_START+92
-+#define RID_DRAW_OUTLINETEXTOBJ_POPUP		RID_APP_START+93
-+#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP	RID_APP_START+94
+ #define RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP	RID_APP_START+93
  
++#define RID_DRAW_OUTLINETEXTOBJ_POPUP		RID_APP_START+94
++#define RID_GRAPHIC_OUTLINETEXTOBJ_POPUP	RID_APP_START+95
++
  /*
   * Pointer (Mauszeiger)
+  */
 diff --git sd/source/ui/view/drviews2.cxx sd/source/ui/view/drviews2.cxx
 index f55b303..605716f 100644
 --- sd/source/ui/view/drviews2.cxx