[Libreoffice-commits] core.git: 11 commits - dbaccess/source framework/inc framework/source include/comphelper reportdesign/source sfx2/source svx/source sw/source writerperfect/source xmlsecurity/source
Caolán McNamara
caolanm at redhat.com
Fri May 23 00:55:07 PDT 2014
dbaccess/source/ui/inc/TableController.hxx | 2 +-
dbaccess/source/ui/tabledesign/TableController.cxx | 2 +-
framework/inc/uielement/progressbarwrapper.hxx | 8 ++++----
framework/source/uielement/progressbarwrapper.cxx | 8 ++++----
include/comphelper/propmultiplex.hxx | 3 ++-
reportdesign/source/ui/inc/SectionWindow.hxx | 3 ++-
reportdesign/source/ui/report/SectionWindow.cxx | 3 ++-
sfx2/source/doc/objxtor.cxx | 9 ++++++++-
svx/source/dialog/langbox.cxx | 7 +++++--
sw/source/core/txtnode/ndtxt.cxx | 2 +-
writerperfect/source/writer/WordPerfectImportFilter.cxx | 2 +-
writerperfect/source/writer/WordPerfectImportFilter.hxx | 2 +-
xmlsecurity/source/component/documentdigitalsignatures.cxx | 2 +-
xmlsecurity/source/component/documentdigitalsignatures.hxx | 2 +-
14 files changed, 34 insertions(+), 21 deletions(-)
New commits:
commit 131d553864d52b21d1198806484b67a82e1b2f52
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 22 21:12:52 2014 +0100
coverity#704940 Unchecked dynamic_cast
Change-Id: I53662b9d48ae44c21c9cc79bda01487d87e8dfdd
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 386e4c5..5b42a20 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4474,7 +4474,7 @@ namespace {
{
const SfxBoolItem* pIsCountedInListItem =
dynamic_cast<const SfxBoolItem*>(pItem);
- if ( pIsCountedInListItem->GetValue() !=
+ if ( pIsCountedInListItem && pIsCountedInListItem->GetValue() !=
mrTxtNode.IsCountedInList() )
{
mbUpdateListCount = true;
commit f1b030949b6b8841f414354aa668dc9a96f1d5d3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 22 21:10:27 2014 +0100
coverity#1215310 Uncaught exception
Change-Id: I8d9663f8dedda8e7006e7ac6545cb15188a1ec2d
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 42f0bb0..c431918 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -199,7 +199,7 @@ bool DocumentDigitalSignatures::ImplViewSignatures(
bool DocumentDigitalSignatures::ImplViewSignatures(
const Reference< css::embed::XStorage >& rxStorage, const Reference< css::io::XStream >& xSignStream,
- DocumentSignatureMode eMode, bool bReadOnly ) throw (RuntimeException)
+ DocumentSignatureMode eMode, bool bReadOnly ) throw (RuntimeException, std::exception)
{
bool bChanges = false;
DigitalSignaturesDialog aSignaturesDialog(
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.hxx b/xmlsecurity/source/component/documentdigitalsignatures.hxx
index cdcdffc..b1a5b5e 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.hxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.hxx
@@ -50,7 +50,7 @@ private:
//Indicates if the document already contains a document signature
bool m_bHasDocumentSignature;
- bool ImplViewSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (::com::sun::star::uno::RuntimeException);
+ bool ImplViewSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (css::uno::RuntimeException, std::exception);
bool ImplViewSignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignStream, DocumentSignatureMode eMode, bool bReadOnly ) throw (::com::sun::star::uno::RuntimeException);
com::sun::star::uno::Sequence< ::com::sun::star::security::DocumentSignatureInformation > ImplVerifySignatures( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& rxStorage, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xSignStream, DocumentSignatureMode eMode ) throw (::com::sun::star::uno::RuntimeException);
commit c320dc7fe54e423f005147e0573f6f887ced70ea
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 22 21:09:21 2014 +0100
coverity#1215311 Uncaught exception
Change-Id: Ic000d3a3920dddb8cc8585bb31127d14cfc35eb7
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx
index ee0aad2..e70eef6 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx
@@ -86,7 +86,7 @@ static bool handleEmbeddedWPGImage(const WPXBinaryData &input, WPXBinaryData &ou
}
bool SAL_CALL WordPerfectImportFilter::importImpl( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
-throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
sal_Int32 nLength = aDescriptor.getLength();
const PropertyValue *pValue = aDescriptor.getConstArray();
diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx
index 0e9369b..8a1a661 100644
--- a/writerperfect/source/writer/WordPerfectImportFilter.hxx
+++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx
@@ -42,7 +42,7 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
bool SAL_CALL importImpl( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException, std::exception);
public:
WordPerfectImportFilter( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rxContext )
commit a97cd4dd3bf43847363fe646fb2eb5a34d0d07a0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 22 21:07:21 2014 +0100
coverity#1215312 Uncaught exception
Change-Id: I844561cc6f858b6aed55caaf0d92529486cb486e
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index 3278a79..bf1ee72 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -58,7 +58,7 @@ namespace dbaui
void reSyncRows();
void assignTable(); // set the table if a name is given
void loadData();
- bool checkColumns(bool _bNew) throw(::com::sun::star::sdbc::SQLException); // check if we have double column names
+ bool checkColumns(bool _bNew) throw(css::sdbc::SQLException, std::exception); // check if we have double column names
OUString createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxTables,const OUString& _rDefault);
void appendColumns(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& _rxColSup, bool _bNew, bool _bKeyColumns = false);
void appendPrimaryKey(::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XKeysSupplier>& _rxSup, bool _bNew);
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index e27c91a..27d3757 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -919,7 +919,7 @@ Reference<XNameAccess> OTableController::getKeyColumns() const
return getPrimaryKeyColumns_throw(m_xTable);
}
-bool OTableController::checkColumns(bool _bNew) throw(::com::sun::star::sdbc::SQLException)
+bool OTableController::checkColumns(bool _bNew) throw(css::sdbc::SQLException, std::exception)
{
bool bOk = true;
bool bFoundPKey = false;
commit 787d41c26d80b01b63c4f65003891f46116bbc29
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 22 21:03:48 2014 +0100
coverity#1215313 Uncaught exception
Change-Id: I22cd98a35c6c638e3476d54b742762d8a2dfa7fa
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index a543ac6..7fa8732 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -51,7 +51,8 @@ namespace comphelper
: m_pAdapter(NULL), m_rMutex(_rMutex) { }
virtual ~OPropertyChangeListener();
- virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) = 0;
+ virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent)
+ throw (css::uno::RuntimeException, std::exception) = 0;
virtual void _disposing(const ::com::sun::star::lang::EventObject& _rSource)
throw( ::com::sun::star::uno::RuntimeException, std::exception);
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 14f1a6b..0fd8c2c 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -91,7 +91,8 @@ namespace rptui
virtual void Resize() SAL_OVERRIDE;
protected:
- virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent)
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
public:
OSectionWindow( OViewsWindow* _pParent
,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index c0b6c53..2fd6bdd8 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -112,7 +112,8 @@ OSectionWindow::~OSectionWindow()
}
}
-void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
+void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
const uno::Reference< report::XSection > xSection(_rEvent.Source,uno::UNO_QUERY);
commit 93dd12a160f2d64c06921d413f092494e52f283a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 22 21:00:10 2014 +0100
coverity#1215382 Uncaught exception
and hopefully a gadzillion more, but I've said that before :-(
Change-Id: I2e36485ae2ce831fdf250464b254d42f5bc55fe3
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index b0b2347..fabd427 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -842,7 +842,14 @@ void SfxObjectShell::InitBasicManager_Impl()
*/
#ifndef DISABLE_SCRIPTING
DBG_ASSERT( !pImp->bBasicInitialized && !pImp->pBasicManager->isValid(), "Lokaler BasicManager bereits vorhanden");
- pImp->pBasicManager->reset( BasicManagerRepository::getDocumentBasicManager( GetModel() ) );
+ try
+ {
+ pImp->pBasicManager->reset( BasicManagerRepository::getDocumentBasicManager( GetModel() ) );
+ }
+ catch (const css::ucb::ContentCreationException& e)
+ {
+ SAL_WARN("sfx.doc", "caught exception " << e.Message);
+ }
DBG_ASSERT( pImp->pBasicManager->isValid(), "SfxObjectShell::InitBasicManager_Impl: did not get a BasicManager!" );
pImp->bBasicInitialized = true;
#endif
commit 4cf56e058488ce7c24f992f1e5125676b7064ede
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 22 20:51:57 2014 +0100
coverity#1215383 Uncaught exception
Change-Id: I568ba1a942acd622611fb53210e303147b77601f
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index f421308..15fec13 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -48,7 +48,7 @@ class ProgressBarWrapper : public UIElementWrapperBase
// wrapped methods of ::com::sun::star::task::XStatusIndicator
void start( const OUString& Text, ::sal_Int32 Range ) throw (css::uno::RuntimeException, std::exception);
- void end() throw (::com::sun::star::uno::RuntimeException);
+ void end() throw (css::uno::RuntimeException, std::exception);
void setText( const OUString& Text ) throw (css::uno::RuntimeException, std::exception);
void setValue( ::sal_Int32 Value ) throw (css::uno::RuntimeException, std::exception);
void reset() throw (::com::sun::star::uno::RuntimeException);
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index e8948f6..2b2bfaa 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -124,7 +124,7 @@ void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range )
}
void ProgressBarWrapper::end()
-throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
uno::Reference< awt::XWindow > xWindow;
commit 6cda7d5793cf079a652cf31fc07f44797a1bd22e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 22 20:51:18 2014 +0100
coverity#1215384 Uncaught exception
Change-Id: I833b8b9532c61f666755ed5e92135da3aeb55f27
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index 6f41841..f421308 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -49,7 +49,7 @@ class ProgressBarWrapper : public UIElementWrapperBase
// wrapped methods of ::com::sun::star::task::XStatusIndicator
void start( const OUString& Text, ::sal_Int32 Range ) throw (css::uno::RuntimeException, std::exception);
void end() throw (::com::sun::star::uno::RuntimeException);
- void setText( const OUString& Text ) throw (::com::sun::star::uno::RuntimeException);
+ void setText( const OUString& Text ) throw (css::uno::RuntimeException, std::exception);
void setValue( ::sal_Int32 Value ) throw (css::uno::RuntimeException, std::exception);
void reset() throw (::com::sun::star::uno::RuntimeException);
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index f6ff595..e8948f6 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -153,7 +153,7 @@ throw (uno::RuntimeException)
}
void ProgressBarWrapper::setText( const OUString& Text )
-throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
uno::Reference< awt::XWindow > xWindow;
sal_Int32 nValue( 0 );
commit fab0e8b40d32d17e5f79f4abbcf33caa610ff70f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 22 20:50:31 2014 +0100
coverity#1215385 Uncaught exception
Change-Id: I765dd9bab26e3736c6b18a291cfd108342644e8e
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index 2cf32fe..6f41841 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -50,7 +50,7 @@ class ProgressBarWrapper : public UIElementWrapperBase
void start( const OUString& Text, ::sal_Int32 Range ) throw (css::uno::RuntimeException, std::exception);
void end() throw (::com::sun::star::uno::RuntimeException);
void setText( const OUString& Text ) throw (::com::sun::star::uno::RuntimeException);
- void setValue( ::sal_Int32 Value ) throw (::com::sun::star::uno::RuntimeException);
+ void setValue( ::sal_Int32 Value ) throw (css::uno::RuntimeException, std::exception);
void reset() throw (::com::sun::star::uno::RuntimeException);
// UNO interfaces
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index e39246f..f6ff595 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -191,7 +191,7 @@ throw (uno::RuntimeException)
}
void ProgressBarWrapper::setValue( ::sal_Int32 nValue )
-throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
uno::Reference< awt::XWindow > xWindow;
OUString aText;
commit 3166336e535c15578bc91a00b0a96d72d676c8a4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 22 20:49:43 2014 +0100
coverity#1215386 Uncaught exception
Change-Id: I2eb374a9209cf4bbf9e2b533ec2522bc1efe6468
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index 6487548..2cf32fe 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -47,7 +47,7 @@ class ProgressBarWrapper : public UIElementWrapperBase
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > getStatusBar() const;
// wrapped methods of ::com::sun::star::task::XStatusIndicator
- void start( const OUString& Text, ::sal_Int32 Range ) throw (::com::sun::star::uno::RuntimeException);
+ void start( const OUString& Text, ::sal_Int32 Range ) throw (css::uno::RuntimeException, std::exception);
void end() throw (::com::sun::star::uno::RuntimeException);
void setText( const OUString& Text ) throw (::com::sun::star::uno::RuntimeException);
void setValue( ::sal_Int32 Value ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx
index 8e211d5..e39246f 100644
--- a/framework/source/uielement/progressbarwrapper.cxx
+++ b/framework/source/uielement/progressbarwrapper.cxx
@@ -84,7 +84,7 @@ uno::Reference< awt::XWindow > ProgressBarWrapper::getStatusBar() const
// wrapped methods of ::com::sun::star::task::XStatusIndicator
void ProgressBarWrapper::start( const OUString& Text, ::sal_Int32 Range )
-throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
uno::Reference< awt::XWindow > xWindow;
sal_Int32 nValue( 0 );
commit c8646d9e0083c0cacb61c9eff02704a4f18bb5c7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 22 20:46:19 2014 +0100
coverity#1215400 Uninitialized scalar field
Change-Id: Ie82c16d7d7b3f4fed09bed1d6adec32d5d3934e5
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 028e33d..4d9b3dd 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -136,8 +136,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageComboBox(Window
SvxLanguageBoxBase::SvxLanguageBoxBase( bool bCheck )
- : m_pSpellUsedLang( NULL )
- , m_bWithCheckmark( bCheck )
+ : m_pSpellUsedLang(NULL)
+ , m_nLangList(LANG_LIST_EMPTY)
+ , m_bHasLangNone(false)
+ , m_bLangNoneIsLangAll(false)
+ , m_bWithCheckmark(bCheck)
{
}
More information about the Libreoffice-commits
mailing list