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

[freuter svn gnome org]

Author: freuter
Date: Tue Sep  2 10:02:37 2008
New Revision: 13757
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13757&view=rev

Log:
n#410982: OOo-3.0 prints an error when saving using the external odf-converter

Modified:
   trunk/ChangeLog
   trunk/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff

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	Tue Sep  2 10:02:37 2008
@@ -224,6 +224,10 @@
  			}
  		}
  
++	if (bOk) { // commit *before* we do the conversion!
++	    bOk = rMedium.Commit();
++	}
++
 +	uno::Reference< embed::XStorage > xNewTmpStorage;
 +	if (bOk) {
 +		String aUserData=pFilter->GetUserData();
@@ -269,10 +273,6 @@
 +		}
 +	}
 +
-+	if (bOk) {
-+	    bOk = rMedium.Commit();
-+	}
-+
 +	if (bOk && xNewTmpStorage.is()) {
 +	    rMedium.SetStorage_Impl(xNewTmpStorage);
 +	}