From 229abf40ac4ee551063cdefabede3c9b31146e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 3 Jun 2014 16:51:48 +0100
Subject: [PATCH] coverity#1219794 Uncaught exception

Change-Id: Icc9e5faf9ef15840c359b7766112278094d52dea
---
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx     | 9 ---------
 framework/inc/uiconfiguration/imagemanager.hxx    | 5 ++++-
 framework/source/uiconfiguration/imagemanager.cxx | 5 +++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index b156470efcd4..f241969f605b 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -206,8 +206,6 @@ namespace dbaui
 
     void IndexFieldsControl::Init(const Sequence< OUString >& _rAvailableFields)
     {
-        fprintf(stderr, " _rAvailableFields len is %d\n",  _rAvailableFields.getLength());
-
         RemoveColumns();
 
         // for the width: both columns together should be somewhat smaller than the whole window (without the scrollbar)
@@ -237,9 +235,6 @@ namespace dbaui
             m_pSortingCell->InsertEntry(m_sAscendingText);
             m_pSortingCell->InsertEntry(m_sDescendingText);
             m_pSortingCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_SORTORDER );
-            m_pSortingCell->Show();
-
-            fprintf(stderr, "created m_pSortingCell %p\n", m_pSortingCell);
 
             nFieldNameWidth -= nSortOrderColumnWidth;
         }
@@ -258,11 +253,7 @@ namespace dbaui
         const OUString* pFields = _rAvailableFields.getConstArray();
         const OUString* pFieldsEnd = pFields + _rAvailableFields.getLength();
         for (;pFields < pFieldsEnd; ++pFields)
-        {
-            fprintf(stderr, "foo is %s\n", OUStringToOString(*pFields, RTL_TEXTENCODING_UTF8).getStr());
             m_pFieldNameCell->InsertEntry(*pFields);
-        }
-        m_pFieldNameCell->Show();
     }
 
     CellController* IndexFieldsControl::GetController(long _nRow, sal_uInt16 _nColumnId)
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 9ad1c4531498..1a1883988589 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -84,7 +84,10 @@ namespace framework
             virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
             // XImageManager
-            virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+            virtual void SAL_CALL reset()
+                throw (css::lang::IllegalAccessException,
+                       css::uno::RuntimeException,
+                       std::exception) SAL_OVERRIDE;
             virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllImageNames( ::sal_Int16 nImageType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
             virtual sal_Bool SAL_CALL hasImage( ::sal_Int16 nImageType, const OUString& aCommandURL ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
             virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > > SAL_CALL getImages( ::sal_Int16 nImageType, const ::com::sun::star::uno::Sequence< OUString >& aCommandURLSequence ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 60770cbbe5ad..20cac0ff8d2a 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -102,9 +102,10 @@ void SAL_CALL ImageManager::initialize( const Sequence< Any >& aArguments ) thro
 
 // XImageManager
 void SAL_CALL ImageManager::reset()
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::lang::IllegalAccessException,
+           css::uno::RuntimeException,
+           std::exception)
 {
-
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
     m_pImpl->reset();
 }