diff options
Diffstat (limited to 'vcl/source/gdi/impgraph.cxx')
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 30db3e932bb9..794d5ca68a22 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1117,34 +1117,27 @@ bool ImpGraphic::swapInContent(SvStream& rStream) sal_Int32 nType; sal_Int32 nLength; - try - { - rStream.ReadUInt32(nId); + rStream.ReadUInt32(nId); - // check version - if (SWAP_FORMAT_ID != nId) - { - SAL_WARN("vcl", "Incompatible swap file!"); - return false; - } + // check version + if (SWAP_FORMAT_ID != nId) + { + SAL_WARN("vcl", "Incompatible swap file!"); + return false; + } - rStream.ReadInt32(nType); - rStream.ReadInt32(nLength); + rStream.ReadInt32(nType); + rStream.ReadInt32(nLength); - meType = static_cast<GraphicType>(nType); + meType = static_cast<GraphicType>(nType); - if (meType == GraphicType::NONE || meType == GraphicType::Default) - { - return true; - } - else - { - bRet = swapInGraphic(rStream); - } + if (meType == GraphicType::NONE || meType == GraphicType::Default) + { + return true; } - catch (const SvStreamEOFException&) + else { - SAL_WARN("vcl", "EOF"); + bRet = swapInGraphic(rStream); } return bRet; |