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

[szalaik svn gnome org]

Author: szalaik
Date: Sun Jul 27 08:57:39 2008
New Revision: 13404
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13404&view=rev

Log:
2008-07-29  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/apply
	* patches/dev300/linkwarn-svtools-miscopts-bits.diff-m26.diff
	* patches/dev300/linkwarn-svtools-miscopts-bits.diff
	
	linkwarn-svtools-miscopts-bits.diff does not apply on dev300-m27 
- fixed.



Added:
   trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff-m26.diff
      - copied unchanged from r13401, /trunk/patches/dev300/linkwarn-svtools-miscopts-bits.diff
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	Sun Jul 27 08:57:39 2008
@@ -2440,7 +2440,14 @@
 [ LinkWarningDlg ]
 linkwarn-dlg-in-apps.diff, n#348149, thorsten
 linkwarn-sfx2-disable-cb-persistency.diff, n#348149, thorsten
+
+[ LinkWarningDlg <= dev300-m26]
+linkwarn-svtools-miscopts-bits.diff-m26, n#348149, thorsten
+
+[ LinkWarningDlg > dev300-m26]
 linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten
+
+[ LinkWarningDlg ]
 linkwarn-officecfg-disable-msgbox.diff, n#348149, thorsten
 linkwarn-svx-warning-dlg.diff, n#348149, thorsten
 linkwarn-sd-no-dnd-links.diff, n#348149, thorsten

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	Sun Jul 27 08:57:39 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_USESYSTEMPRINTDIALOG	5
- #define PROPERTYNAME_TRYODMADIALOG	ASCII_STR("TryODMADialog")
- #define PROPERTYHANDLE_TRYODMADIALOG	6
+#define PROPERTYHANDLE_SYMBOLSTYLE			4
+#define PROPERTYNAME_USESYSTEMPRINTDIALOG	ASCII_STR("UseSystemPrintDialog")
+#define PROPERTYHANDLE_USESYSTEMPRINTDIALOG	5
 +#define PROPERTYNAME_SHOWLINKWARNINGDIALOG	ASCII_STR("ShowLinkWarningDialog")
-+#define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
++#define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 6
  
--#define PROPERTYCOUNT						7
-+#define PROPERTYCOUNT						8
+-#define PROPERTYCOUNT						6
++#define PROPERTYCOUNT						7
  
  #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_TRYODMADIALOG
-+        PROPERTYNAME_TRYODMADIALOG,
+-        PROPERTYNAME_USESYSTEMPRINTDIALOG
++        PROPERTYNAME_USESYSTEMPRINTDIALOG,
 +        PROPERTYNAME_SHOWLINKWARNINGDIALOG
  	};