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

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Thu Jun 26 12:15:05 2008
New Revision: 12968
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12968&view=rev

Log:
2008-06-26  Jan Holesovsky  <kendy suse cz>

        * patches/dev300/novell-win32-odma.diff: Fix options dialog so that
          'Printing sets "document modified" status' does not cover 'Use
          OpenOffice.org dialogs'.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/novell-win32-odma.diff

Modified: trunk/patches/dev300/novell-win32-odma.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-odma.diff	(original)
+++ trunk/patches/dev300/novell-win32-odma.diff	Thu Jun 26 12:15:05 2008
@@ -2269,10 +2269,18 @@
 dummy line to avoid confusing diff-mode
 --- svx/source/dialog/optgdlg.hrc
 +++ svx/source/dialog/optgdlg.hrc
-@@ -64,6 +64,7 @@
- #define ROW9					(ROW8+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
- #define ROW10					(ROW9+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
- #define ROW11					(ROW10+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+@@ -64,10 +64,11 @@
+ #define ROW5                    (ROW4+RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE)
+ #define ROW6                    (ROW5+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
+ #define ROW7					(ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+-#define ROW8					(ROW7+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+-#define ROW9					(ROW8+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+-#define ROW10					(ROW9+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+-#define ROW11					(ROW10+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
++#define ROW8					(ROW7+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
++#define ROW9					(ROW8+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
++#define ROW10					(ROW9+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
++#define ROW11					(ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
 +#define ROW12					(ROW11+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
  
  #define DIFF(v1,v2)						(v2-v1)
@@ -2329,7 +2337,7 @@
 +		aODMADlgCB.Hide();
 +		// rearrange the following controls
 +		Point aNewPos = aDocStatusFL.GetPosPixel();
-+		long nDelta = aNewPos.Y() - aFileDlgFL.GetPosPixel().Y();
++		long nDelta = aNewPos.Y() - aODMADlgCB.GetPosPixel().Y();
 +
 +		Window* pWins[] =
 +		{