coverity#1215317 Uncaught exception

Change-Id: Idada0fbd80f55f67bd62cb7d31dcc7457e4a18d5

coverity#1215317 Uncaught exception
Change-Id: Idada0fbd80f55f67bd62cb7d31dcc7457e4a18d5
f5d87c02 · Caolán McNamara · Fridrich Štrba · 7a892c82 · f5d87c02
Kaydet (Commit) f5d87c02 authored May 26, 2014 tarafından Caolán McNamara Kaydeden (comit) Fridrich Štrba May 28, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 5 deletions

gallery1.cxx svx/source/gallery2/gallery1.cxx +11 -5

No files found.
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -596,7 +596,7 @@ bool Gallery::RemoveTheme( const OUString& rThemeName )
    return bRet;
 }

-GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry )
+GalleryTheme* Gallery::ImplGetCachedTheme(const GalleryThemeEntry* pThemeEntry)
 {
    GalleryTheme* pTheme = NULL;

@@ -623,12 +623,18 @@ GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry

                if( pIStm )
                {
-                    pTheme = new GalleryTheme( this, (GalleryThemeEntry*) pThemeEntry );
-                    ReadGalleryTheme( *pIStm, *pTheme );
+                    try
+                    {
+                        pTheme = new GalleryTheme( this, (GalleryThemeEntry*) pThemeEntry );
+                        ReadGalleryTheme( *pIStm, *pTheme );

-                    if( pIStm->GetError() )
+                        if( pIStm->GetError() )
+                        {
+                            delete pTheme, pTheme = NULL;
+                        }
+                    }
+                    catch (const css::ucb::ContentCreationException&)
                    {
-                        delete pTheme, pTheme = NULL;
                    }

                    delete pIStm;