framework/inc/uiconfiguration/imagemanager.hxx | 5 ++++-
framework/inc/uiconfiguration/moduleimagemanager.hxx | 5 ++++-
framework/source/uiconfiguration/imagemanager.cxx | 5 +++--
framework/source/uiconfiguration/moduleimagemanager.cxx | 4 +++-
offapi/com/sun/star/ui/XImageManager.idl | 2 +-
pyuno/source/module/pyuno_callable.cxx | 2 +-
pyuno/source/module/pyuno_runtime.cxx | 4 ++--
7 files changed, 18 insertions(+), 9 deletions(-)
New commits:
commit 86598a4e185007958117d2fbf1a2200c7b982808
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 17:08:49 2014 +0100
coverity#982753 Dereference null return value
Change-Id: I011a600a27c801dca32734e680ea5a13dfebdfe3
diff --git a/pyuno/source/module/pyuno_callable.cxx
b/pyuno/source/module/pyuno_callable.cxx
index f91aa75..22b8cd1 100644
--- a/pyuno/source/module/pyuno_callable.cxx
+++ b/pyuno/source/module/pyuno_callable.cxx
@@ -115,7 +115,7 @@ PyObject* PyUNO_callable_call(
PyRef temp = runtime.any2PyObject (ret_value);
if( aOutParam.getLength() )
{
- PyRef return_list( PyTuple_New (1+aOutParam.getLength()),
SAL_NO_ACQUIRE );
+ PyRef return_list( PyTuple_New (1+aOutParam.getLength()),
SAL_NO_ACQUIRE, NOT_NULL );
PyTuple_SetItem (return_list.get(), 0, temp.getAcquired());
// initialize with defaults in case of exceptions
commit 2ca70c3b5c1959c4aa052dbfae1db25a379b0579
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 17:08:06 2014 +0100
coverity#982755 Dereference null return value
Change-Id: I652b308d087c1ee9fff95f81297b079e3f816e07
diff --git a/pyuno/source/module/pyuno_runtime.cxx
b/pyuno/source/module/pyuno_runtime.cxx
index a4b81fc..cb2ba90 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -156,7 +156,7 @@ static void getRuntimeImpl( PyRef & globalDict, PyRef
&runtimeImpl )
static PyRef importUnoModule( ) throw ( RuntimeException )
{
// import the uno module
- PyRef module( PyImport_ImportModule( "uno" ), SAL_NO_ACQUIRE );
+ PyRef module( PyImport_ImportModule( "uno" ), SAL_NO_ACQUIRE, NOT_NULL );
if( PyErr_Occurred() )
{
PyRef excType, excValue, excTraceback;
commit b75b626ee52b7dec91f48271aa58d66b27604e51
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 17:07:18 2014 +0100
coverity#982756 Dereference null return value
Change-Id: Ia29c6167df0ce061fae88d81bef9a98ca37fcce3
diff --git a/pyuno/source/module/pyuno_runtime.cxx
b/pyuno/source/module/pyuno_runtime.cxx
index 5ef20df..a4b81fc 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -524,7 +524,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
Reference< XTypeConverter > tc = getImpl()->cargo->xTypeConverter;
Reference< XSingleServiceFactory > ssf =
getImpl()->cargo->xInvocation;
tc->convertTo (a, ::getCppuType (&s)) >>= s;
- PyRef tuple( PyTuple_New (s.getLength()), SAL_NO_ACQUIRE);
+ PyRef tuple( PyTuple_New (s.getLength()), SAL_NO_ACQUIRE,
NOT_NULL);
int i=0;
try
{
commit 229abf40ac4ee551063cdefabede3c9b31146e07
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 16:51:48 2014 +0100
coverity#1219794 Uncaught exception
Change-Id: Icc9e5faf9ef15840c359b7766112278094d52dea
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index b156470..f241969 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 9ad1c45..1a18839 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 60770cb..20cac0f 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();
}
commit 0301abbbc33c794fccd4e84f75b6de4c296f957c
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Jun 3 16:49:15 2014 +0100
coverity#1219801 Uncaught exception
Change-Id: I372c1891e41510c24daf256d00f3ca98e8a374a9
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index f241969..b156470 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 5afe454..0775d1d 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 1047878..d9979c6 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 cad89a1..73eef67 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.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
