diff options
Diffstat (limited to 'sw/source/ui/uno/swdetect.cxx')
| -rw-r--r-- | sw/source/ui/uno/swdetect.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index 4304b67bb6d3..c37e9fcfe22e 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -86,12 +86,19 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor if ( pInStrm->remainingSize() == 0 ) return OUString(); - SotStorageRef aStorage = new SotStorage ( pInStrm, false ); - if ( !aStorage->GetError() ) + try { - bIsDetected = aStorage->IsContained( "WordDocument" ); - if ( bIsDetected && aTypeName.startsWith( "writer_MS_Word_97" ) ) - bIsDetected = ( aStorage->IsContained("0Table") || aStorage->IsContained("1Table") ); + SotStorageRef aStorage = new SotStorage ( pInStrm, false ); + if ( !aStorage->GetError() ) + { + bIsDetected = aStorage->IsContained( "WordDocument" ); + if ( bIsDetected && aTypeName.startsWith( "writer_MS_Word_97" ) ) + bIsDetected = ( aStorage->IsContained("0Table") || aStorage->IsContained("1Table") ); + } + } + catch (...) + { + bIsDetected = false; } } |