diff options
author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-19 17:31:57 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-19 17:31:57 +0300 |
commit | 6c397dfce4f7afddb55329b738388ab4eb16b7f8 (patch) | |
tree | c54742bab15ec454a4fb607fe859cf2b7aa2266b | |
parent | b2ac2f2ad169ddc49a893a2c41937862a9101348 (diff) |
On recovery from an autosave file use DefaultFilter, seems to fix fdo#34805
-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 ec60d13584..d280aac6b4 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -2661,7 +2661,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 ) { |