diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-07-19 17:31:57 +0300 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-07-25 18:11:09 +0200 |
| commit | 38d688a8766d6c8cef09371569107fc626a3bd71 (patch) | |
| tree | 7bdbd939c1d81cf83a542d8f843925bc4e4a46d6 | |
| parent | 19688fc5268e964288edb07a7f5fe10cb4e1c47b (diff) | |
On recovery from an autosave file use DefaultFilter, seems to fix fdo#34805
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Michael Meeks <michael.meeks@novell.com>
| -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 e61ae11c6bd6..a6e1a7af40bc 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 ) { |