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 | c7f9c1f567736d9ab5e1e10f2260bb5d666db063 (patch) | |
| tree | b37bbe5a144a0d68dc8d046325e1e1b82b176a69 /framework | |
| parent | 6b28a5d89dde8d432c63bd28259017fb8987b067 (diff) | |
On recovery from an autosave file use DefaultFilter, seems to fix fdo#34805
Diffstat (limited to 'framework')
| -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 2f8819c7685c..3455daf1c787 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 ) { |