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

[tml svn gnome org]

Author: tml
Date: Fri Nov 28 14:25:31 2008
New Revision: 14645
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14645&view=rev

Log:
2008-11-28  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply
	* patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
	* patches/dev300/sfx2-pre-and-postprocess-during-save-load-m35.diff:
	Differentiate for m35 vs. m36 and later.



Added:
   trunk/patches/dev300/sfx2-pre-and-postprocess-during-save-load-m35.diff
      - copied unchanged from r14630, /trunk/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Nov 28 14:25:31 2008
@@ -1753,9 +1753,15 @@
 
 vba-fix-docmodule-import-crash.diff, n#447560
 
-[ Features ]
+[ Features < dev300-m36 ]
+# Pre- and postprocessing capabilities for loading and saving.
+sfx2-pre-and-postprocess-during-save-load-m35.diff, i#71939, florian
+
+[ Features >= dev300-m36 ]
 # Pre- and postprocessing capabilities for loading and saving.
 sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian
+
+[ Features ]
 sfx2-pre-and-postprocess-crash-fix.diff, n#270544, rodo
 # hack to ignore writerfilter if odf-converter is present
 odf-converter-ignore-writerfilter.diff, n#348471, jholesov

Modified: trunk/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
==============================================================================
--- trunk/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff	(original)
+++ trunk/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff	Fri Nov 28 14:25:31 2008
@@ -5,17 +5,16 @@
 diff -u -r1.181 objstor.cxx
 --- sfx2/source/doc/objstor.cxx	4 Aug 2006 14:23:30 -0000	1.181
 +++ sfx2/source/doc/objstor.cxx	12 Feb 2007 17:16:29 -0000
-@@ -200,6 +203,10 @@
- #include <svtools/embedhlp.hxx>
+@@ -200,6 +203,9 @@
  #include <rtl/logfile.hxx>
  #include <basic/modsizeexceeded.hxx>
+ #include <osl/file.hxx>
 +#include <com/sun/star/util/XMacroExpander.hpp>
-+#include <osl/file.hxx>
 +#include <osl/process.h>
 +#include <osl/thread.hxx>
  
- #include "app.hxx"
- #include "objsh.hxx"
+ #include <sfx2/signaturestate.hxx>
+ #include <sfx2/app.hxx>
 @@ -245,6 +252,126 @@
  
  namespace css = ::com::sun::star;