diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-07-23 10:13:53 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-07-23 10:13:53 +0000 |
| commit | 5b11bb9357b22a0d38457f16745f7ce8a2d86d77 (patch) | |
| tree | a8fb68521a2f43cc04c8ba70ca3e044ea2bc867a /svtools/source/misc | |
| parent | 9980c09cdc879d39657c217c0acbe837d8b1d240 (diff) | |
INTEGRATION: CWS fwklhf01 (1.24.4); FILE MERGED
2004/06/28 13:31:45 as 1.24.4.2: RESYNC: (1.24-1.25); FILE MERGED
resolve resync conflicts
2004/06/18 11:03:17 as 1.24.4.1: #115305# dont hide runtime exceptions
Diffstat (limited to 'svtools/source/misc')
| -rw-r--r-- | svtools/source/misc/imagemgr.cxx | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 6bd32173e556..fe16b782595c 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: imagemgr.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: hjs $ $Date: 2004-06-25 16:46:15 $ + * last change: $Author: hr $ $Date: 2004-07-23 11:13:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -331,6 +331,10 @@ String GetImageExtensionByFactory_Impl( const String& rURL ) } } } + catch( const ::com::sun::star::uno::RuntimeException& ) + { + throw; // dont hide it! + } catch( const ::com::sun::star::uno::Exception& ) { // type detection failed -> no extension @@ -390,6 +394,10 @@ sal_Bool GetVolumeProperties_Impl( ::ucb::Content& rContent, svtools::VolumeInfo ( rContent.getPropertyValue( ASCII_STRING("IsFloppy") ) >>= rVolumeInfo.m_bIsFloppy ) && ( rContent.getPropertyValue( ASCII_STRING("IsCompactDisc") ) >>= rVolumeInfo.m_bIsCompactDisc ) ); } + catch( const ::com::sun::star::uno::RuntimeException& ) + { + throw; // dont hide it! + } catch( const ::com::sun::star::uno::Exception& ) { // type detection failed -> no extension @@ -417,6 +425,10 @@ USHORT GetFolderImageId_Impl( const String& rURL ) nRet = IMG_FIXEDDEV; } } + catch( const ::com::sun::star::uno::RuntimeException& ) + { + throw; // dont hide it! + } catch( const ::com::sun::star::uno::Exception& ) { // ... @@ -556,6 +568,10 @@ USHORT GetFolderDescriptionId_Impl( const String& rURL ) nRet = STR_DESCRIPTION_LOCALE_VOLUME; } } + catch( const ::com::sun::star::uno::RuntimeException& ) + { + throw; // dont hide it! + } catch( const ::com::sun::star::uno::Exception& ) { // ... |