From 64b4e680a5af6677b4d8e5106fe02964fb305e4c Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 25 Jan 2010 09:56:57 +0100 Subject: autorecovery: do not remove SalvagedFile from DBDoc's args if it still carries information --- dbaccess/source/core/dataaccess/ModelImpl.cxx | 5 ++++- dbaccess/source/core/dataaccess/databasedocument.cxx | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 26b078b2f4b0..112da2d19505 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -834,7 +834,10 @@ void ODatabaseModelImpl::attachResource( const ::rtl::OUString& _rURL, const Seq sDocumentURL = sSalvagedFile; } - aMediaDescriptor.remove( "SalvagedFile" ); + if ( sSalvagedFile == _rURL ) + // SalvagedFile doesn't carry any information anymore + aMediaDescriptor.remove( "SalvagedFile" ); + } m_aArgs = stripLoadArguments( aMediaDescriptor ); diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 7a234d2ce646..39afd5bf76b5 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -579,7 +579,7 @@ namespace DocumentGuard aGuard( *this ); // The implementation here is somewhat sloppy, in that it returns whether *any* part of the whole - // database document, including opened sub components, is modified. This is more that what is requested: + // database document, including opened sub components, is modified. This is more than what is requested: // We need to return if the doc itself, or any of the opened sub components, has been modified // since the last call to any of the save* methods, or since the document has been loaded/created. // However, the API definition explicitly allows to be that sloppy ... -- cgit