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

[tml svn gnome org]

Author: tml
Date: Tue May 13 22:17:07 2008
New Revision: 12537
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12537&view=rev

Log:
2008-05-14  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply: Move novell-win32-odma.diff from
	NovellOnlyWin32 to Features because other patches affect the same
	parts of some files, so we don't want it to be
	platform-specific. The relevant parts of novell-win32-odma.diff
	should add appropriately conditionalized code anyway.
	
	* patches/dev300/linkwarn-svtools-miscopts-bits.diff: Adapt to
	novell-win32-odma.diff being applied earlier.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue May 13 22:17:07 2008
@@ -2005,10 +2005,8 @@
 # disable automatic spellchecking by default
 reduced-disable-auto-spellcheck.diff
 
-[ NovellOnlyWin32 ]
-SectionOwner => tml
-
-novell-win32-odma.diff, i#6885, i#32741
+[ Features ]
+novell-win32-odma.diff, i#6885, i#32741, tml
 
 
 [ VOSremoval ]

Modified: trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff
==============================================================================
--- trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff	(original)
+++ trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff	Tue May 13 22:17:07 2008
@@ -14,14 +14,14 @@
 --- svtools/source/config/miscopt.cxx	2008-04-10 22:00:01.000000000 +0200
 +++ svtools/source/config/miscopt.cxx	2008-05-07 10:29:57.000000000 +0200
 @@ -85,8 +85,10 @@
- #define PROPERTYHANDLE_SYMBOLSTYLE			4
- #define PROPERTYNAME_USESYSTEMPRINTDIALOG	ASCII_STR("UseSystemPrintDialog")
  #define PROPERTYHANDLE_USESYSTEMPRINTDIALOG	5
+ #define PROPERTYNAME_TRYODMADIALOG	ASCII_STR("TryODMADialog")
+ #define PROPERTYHANDLE_TRYODMADIALOG	6
 +#define PROPERTYNAME_SHOWLINKWARNINGDIALOG	ASCII_STR("ShowLinkWarningDialog")
 +#define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 6
  
--#define PROPERTYCOUNT						6
-+#define PROPERTYCOUNT						7
+-#define PROPERTYCOUNT						7
++#define PROPERTYCOUNT						8
  
  #define VCL_TOOLBOX_STYLE_FLAT				((USHORT)0x0004) // from <vcl/toolbox.hxx>
  
@@ -105,11 +105,11 @@
  	}
  	// Set properties in configuration.
 @@ -661,7 +700,8 @@
-         PROPERTYNAME_TOOLBOXSTYLE,
          PROPERTYNAME_USESYSTEMFILEDIALOG,
          PROPERTYNAME_SYMBOLSTYLE,
--        PROPERTYNAME_USESYSTEMPRINTDIALOG
-+        PROPERTYNAME_USESYSTEMPRINTDIALOG,
+         PROPERTYNAME_USESYSTEMPRINTDIALOG,
+-        PROPERTYNAME_TRYODMADIALOG
++        PROPERTYNAME_TRYODMADIALOG,
 +        PROPERTYNAME_SHOWLINKWARNINGDIALOG
  	};