diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-19 17:31:57 +0300 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-07-20 11:58:17 +0200 |
| commit | fbe9310366d44ec3365a9c41589a2e41aa3ebe74 (patch) | |
| tree | cb240b474e667f35a85baa81e0d7cb37ed46fd0a | |
| parent | ec70532aec8b83252672b7e1ad5cdbe4beccd303 (diff) | |
On recovery from an autosave file use DefaultFilter, seems to fix fdo#34805
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
| -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 3420a4f798..100c1d75c7 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2639,7 +2639,10 @@ void AutoRecovery::implts_openOneDoc(const ::rtl::OUString& sURL // put the filter name into the descriptor - we're not going to involve any type detection, so // the document might be lost without the FilterName property - lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.RealFilter; + if ( (rInfo.DocumentState & AutoRecovery::E_TRY_LOAD_ORIGINAL) == AutoRecovery::E_TRY_LOAD_ORIGINAL) + lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.RealFilter; + else + lDescriptor[ ::comphelper::MediaDescriptor::PROP_FILTERNAME() ] <<= rInfo.DefaultFilter; if ( sURL == rInfo.FactoryURL ) { |