coverity#1219801 Uncaught exception

Change-Id: I372c1891e41510c24daf256d00f3ca98e8a374a9

4 files changed, 17 insertions, 3 deletions

diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index f241969f605b..b156470efcd4 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -206,6 +206,8 @@ 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)
@@ -235,6 +237,9 @@ 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;
         }
@@ -253,7 +258,11 @@ 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/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index 5afe454847b1..0775d1deac7f 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -72,7 +72,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/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 1047878f2d2a..d9979c6fead9 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -100,7 +100,9 @@ void SAL_CALL ModuleImageManager::initialize( const Sequence< Any >& aArguments
 
 // XImageManager
 void SAL_CALL ModuleImageManager::reset()
-throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::lang::IllegalAccessException,
+           css::uno::RuntimeException,
+           std::exception)
 {
     m_pImpl->reset();
 }
diff --git a/offapi/com/sun/star/ui/XImageManager.idl b/offapi/com/sun/star/ui/XImageManager.idl
index cad89a16f01f..73eef679d759 100644
--- a/offapi/com/sun/star/ui/XImageManager.idl
+++ b/offapi/com/sun/star/ui/XImageManager.idl
@@ -49,7 +49,7 @@ interface XImageManager
         This means that all user images of the instance will be removed.
         </p>
     */
-    void reset();
+    void reset() raises ( com::sun::star::lang::IllegalArgumentException );
 
     /** retrieves the list of command URLs which have images associated.