diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-15 16:05:58 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-15 16:05:58 +0100 |
| commit | 4df6d71f94b1e2ec365f4e947e3914ca70ce519f (patch) | |
| tree | db9da3b6649efaab473e6cb8651f9de354a6c838 /framework/source/services | |
| parent | 457ca512e9cf9554b4cfcdf5c5d5f9cf3f3857e9 (diff) | |
autorecovery: clarified the role of a doc's URL/Location
as per agreement with MAV, XModel::getURL and XStorable::getLocation both need to return the logical document
URL, even when the document has been recoved from another location.
So, the DocFileLocation of the ModelImpl now is for internal purpose only. Consequently, ModelImpl's API has
been reworked to better differ between the logical and the "loaded-from" URL of the document.
Diffstat (limited to 'framework/source/services')
| -rw-r--r-- | framework/source/services/autorecovery.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 2836e176c5..f1c1856348 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2679,7 +2679,10 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa { ::comphelper::MediaDescriptor lPatchDescriptor(rInfo.Document->getArgs()); lPatchDescriptor[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= rInfo.RealFilter; - rInfo.Document->attachResource(sURL, lPatchDescriptor.getAsConstPropertyValueList()); + rInfo.Document->attachResource(rInfo.Document->getURL(), lPatchDescriptor.getAsConstPropertyValueList()); + // do *not* use sURL here. In case this points to the recovery file, it has already been passed + // to recoverFromFile. Also, passing it here is logically wrong, as attachResource is intended + // to take the logical file URL. } css::uno::Reference< css::util::XModifiable > xModify(rInfo.Document, css::uno::UNO_QUERY); |