[ooo-build-commit] 2 commits - patches/dev300 patches/ooxml

[Tor Lillqvist]

 patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff |    9 +++--
 patches/ooxml/writerfilter-module-writer.diff                 |   16 +++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

New commits:
commit c886d569ec4e91f1a7f2c3f30950fd9cba1173f6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 09:10:02 2009 +0300

    Adapt writerfilter-module-writer.diff for dev300-m54
    
    * patches/ooxml/writerfilter-module-writer.diff: Adapt for dev300-m54.

diff --git a/patches/ooxml/writerfilter-module-writer.diff b/patches/ooxml/writerfilter-module-writer.diff
index 9686602..49abb73 100644
--- a/patches/ooxml/writerfilter-module-writer.diff
+++ b/patches/ooxml/writerfilter-module-writer.diff
@@ -1,5 +1,5 @@
---- scp2/source/writer/module_writer.scp        2 Jan 2007 15:31:51 -0000       1.17
-+++ scp2/source/writer/module_writer.scp        12 Jul 2007 13:45:00 -0000
+--- scp2/source/writer/module_writer.scp
++++ scp2/source/writer/module_writer.scp
 @@ -55,6 +55,7 @@
      gid_File_Lib_Wpft,
      gid_File_Lib_Msworks,
@@ -8,12 +8,14 @@
      gid_File_Lib_Wlwp,
      gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
      gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
-@@ -79,6 +80,7 @@
+@@ -79,7 +80,8 @@
+     gid_File_Registry_Spool_Oo_TypeDetection_Writer_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Writer_Filters_Xcu,
      gid_File_Registry_Spool_Oo_TypeDetection_Web_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Web_Filters_Xcu,
      gid_File_Registry_Spool_Oo_TypeDetection_Global_Types_Xcu, gid_File_Registry_Spool_Oo_TypeDetection_Global_Filters_Xcu,
-     gid_File_Tmp_Userinstall_Wrt_Inf,
-+    gid_File_Lib_writerfilter,
-     gid_File_Stw_MediaWikiTemplate,
-     gid_File_Xsl_MediaWiki);
+-    gid_File_Tmp_Userinstall_Wrt_Inf);
++    gid_File_Tmp_Userinstall_Wrt_Inf,
++    gid_File_Lib_writerfilter);
  End
+ 
+ // Module gid_Module_Prg_Wrt_Help
 
commit 1e6fe718bcdd4cca0ff82d6ff3f6c1f3920939c3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 09:06:58 2009 +0300

    Adapt sfx2-pre-and-postprocess-during-save-load.diff
    
    * patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff: Adapt
      for dev300-m54.

diff --git a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
index 6ad7426..815f9b0 100644
--- a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
+++ b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
@@ -1,5 +1,5 @@
---- sfx2/source/doc/objstor.cxx.old	2009-04-06 16:41:54.000000000 +0000
-+++ sfx2/source/doc/objstor.cxx	2009-04-06 16:42:02.000000000 +0000
+--- sfx2/source/doc/objstor.cxx
++++ sfx2/source/doc/objstor.cxx
 @@ -109,6 +109,9 @@
  #include <rtl/logfile.hxx>
  #include <basic/modsizeexceeded.hxx>
@@ -194,7 +194,7 @@
  //-------------------------------------------------------------------------
  
  sal_Bool SfxObjectShell::SaveTo_Impl
-@@ -1622,10 +1786,10 @@ sal_Bool SfxObjectShell::SaveTo_Impl
+@@ -1622,11 +1786,11 @@ sal_Bool SfxObjectShell::SaveTo_Impl
          // transfer data to its destinated location
  		// the medium commits the storage or the stream it is based on
          RegisterTransfer( rMedium );
@@ -202,10 +202,11 @@
  
          if ( bOk && bScriptSignatureIsCopied )
          {
+             AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Script signature check." ) ) );
 +	                bOk = rMedium.Commit();
+ 
  			// if the script signature was copied it should be checked now
  			// usually it should be ok, so no additional actions will be done
- 			// but if for any reasong ( f.e. binshell change ) it is broken it should be removed here
 @@ -1660,7 +1824,6 @@ sal_Bool SfxObjectShell::SaveTo_Impl
  							if ( xTransact.is() )
  								xTransact->commit();