connectivity/source/drivers/file/FResultSet.cxx | 3 +- connectivity/source/drivers/odbc/OPreparedStatement.cxx | 5 +--- connectivity/source/drivers/odbc/OStatement.cxx | 20 ++++++++-------- connectivity/source/inc/file/FResultSet.hxx | 3 +- connectivity/source/inc/odbc/OPreparedStatement.hxx | 3 +- connectivity/source/inc/odbc/OStatement.hxx | 11 ++++---- include/tools/rcid.h | 2 - include/vcl/fixed.hxx | 4 --- rsc/inc/rscdb.hxx | 1 rsc/source/parser/rscicpx.cxx | 20 ---------------- rsc/source/parser/rscinit.cxx | 4 --- vcl/source/control/fixed.cxx | 12 --------- 12 files changed, 25 insertions(+), 63 deletions(-)
New commits: commit 6a6d83ace33789de951f8655be0108f70108660e Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jul 2 09:33:29 2014 +0100 coverity#706374 Uncaught exception Change-Id: Ie17e29e6893c6f69f176d77fab9dcb6a90cb432b diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 390f2c3..2855ddf 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -196,8 +196,8 @@ void SAL_CALL OStatement::clearBatch( ) throw(SQLException, RuntimeException, s } - -void OStatement_Base::reset() throw (SQLException) +void OStatement_Base::reset() + throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 511b8db..16b9317 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -103,7 +103,7 @@ namespace connectivity virtual void setResultSetType(sal_Int32 _par0) ; virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; - void reset () throw( ::com::sun::star::sdbc::SQLException); + void reset() throw (css::sdbc::SQLException, css::uno::RuntimeException); void clearMyResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException); void setWarning (const ::com::sun::star::sdbc::SQLWarning &ex) throw (css::sdbc::SQLException, css::uno::RuntimeException); commit 7501ee9d9daf69915385d2ea2c9f54be9bdd78b1 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jul 2 09:32:39 2014 +0100 coverity#706373 Uncaught exception Change-Id: Iee4774dffd43be3fc3eacbcc81f150706625fcad diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 1398efa..390f2c3 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -217,9 +217,8 @@ void OStatement_Base::reset() throw (SQLException) // clearMyResultSet // If a ResultSet was created for this Statement, close it - - -void OStatement_Base::clearMyResultSet () throw (SQLException) +void OStatement_Base::clearMyResultSet() + throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 8cfc760..511b8db 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -104,7 +104,7 @@ namespace connectivity virtual void setUsingBookmarks(sal_Bool _bUseBookmark) ; void reset () throw( ::com::sun::star::sdbc::SQLException); - void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException); + void clearMyResultSet() throw (css::sdbc::SQLException, css::uno::RuntimeException); void setWarning (const ::com::sun::star::sdbc::SQLWarning &ex) throw (css::sdbc::SQLException, css::uno::RuntimeException); bool lockIfNecessary (const OUString& sql) throw( ::com::sun::star::sdbc::SQLException); commit 051a8f9577fb133a4356d94965cc76a7a287c2e4 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jul 2 09:31:43 2014 +0100 coverity#706371 Uncaught exception Change-Id: I2019711112b1acb336b3002faca312c658f28671 diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 3e1f829..1398efa 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -310,9 +310,8 @@ void OStatement_Base::setWarning (const SQLWarning &ex) // getColumnCount // Return the number of columns in the ResultSet - - -sal_Int32 OStatement_Base::getColumnCount () throw( SQLException) +sal_Int32 OStatement_Base::getColumnCount() + throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 3270e66..8cfc760 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -108,7 +108,7 @@ namespace connectivity void setWarning (const ::com::sun::star::sdbc::SQLWarning &ex) throw (css::sdbc::SQLException, css::uno::RuntimeException); bool lockIfNecessary (const OUString& sql) throw( ::com::sun::star::sdbc::SQLException); - sal_Int32 getColumnCount () throw( ::com::sun::star::sdbc::SQLException); + sal_Int32 getColumnCount() throw (css::sdbc::SQLException, css::uno::RuntimeException); // getResultSet commit b26ccfa08014ec9226aecdc9bfa9f1355ce660eb Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jul 2 09:30:43 2014 +0100 coverity#706368 Uncaught exception Change-Id: Ia8988be31ed4dc4843bd6c2573ec14efa3af6397 diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index f1bcd6f..3e1f829 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -235,7 +235,8 @@ void OStatement_Base::clearMyResultSet () throw (SQLException) m_xResultSet.clear(); } -SQLLEN OStatement_Base::getRowCount () throw( SQLException) +SQLLEN OStatement_Base::getRowCount() + throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index bef5685..3270e66 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -122,7 +122,7 @@ namespace connectivity */ virtual OResultSet* createResulSet(); - SQLLEN getRowCount () throw( ::com::sun::star::sdbc::SQLException); + SQLLEN getRowCount() throw (css::sdbc::SQLException, css::uno::RuntimeException); void disposeResultSet(); commit c12e8e6435fa6b9351b9e9dc2521a872af53930c Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jul 2 09:29:28 2014 +0100 coverity#706367 Uncaught exception Change-Id: I5c17c94956a44dab13935dca41e812ebd196203a diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index 246c057..f1bcd6f 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -296,7 +296,8 @@ bool OStatement_Base::lockIfNecessary (const OUString& sql) throw( SQLException) // Sets the warning -void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException) +void OStatement_Base::setWarning (const SQLWarning &ex) + throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 5299382..bef5685 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -105,7 +105,8 @@ namespace connectivity void reset () throw( ::com::sun::star::sdbc::SQLException); void clearMyResultSet () throw( ::com::sun::star::sdbc::SQLException); - void setWarning (const ::com::sun::star::sdbc::SQLWarning &ex) throw( ::com::sun::star::sdbc::SQLException); + void setWarning (const ::com::sun::star::sdbc::SQLWarning &ex) + throw (css::sdbc::SQLException, css::uno::RuntimeException); bool lockIfNecessary (const OUString& sql) throw( ::com::sun::star::sdbc::SQLException); sal_Int32 getColumnCount () throw( ::com::sun::star::sdbc::SQLException); commit 067738943acaa97aa2a920167f9713630819553b Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jul 2 09:28:02 2014 +0100 coverity#706364 Uncaught exception Change-Id: I75cd82d55d8bdf2f111cd0a91f056e1956ddad02 diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index ba402bb..686c40f 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -769,9 +769,8 @@ SQLLEN* OPreparedStatement::getLengthBuf (sal_Int32 index) // putParamData // Puts parameter data from a previously bound input stream. The // input stream was bound using SQL_LEN_DATA_AT_EXEC. - - -void OPreparedStatement::putParamData (sal_Int32 index) throw(SQLException) +void OPreparedStatement::putParamData (sal_Int32 index) + throw (SQLException, RuntimeException) { // Sanity check the parameter index if ((index < 1) || diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index 3f22983..7f3aded 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -72,7 +72,8 @@ namespace connectivity bool m_bPrepared; void FreeParams(); - void putParamData (sal_Int32 index) throw(::com::sun::star::sdbc::SQLException); + void putParamData (sal_Int32 index) + throw (css::sdbc::SQLException, css::uno::RuntimeException); void setStream (sal_Int32 ParameterIndex,const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream>& x, SQLLEN length,sal_Int32 SQLtype) throw(::com::sun::star::sdbc::SQLException); SQLLEN* getLengthBuf (sal_Int32 index); commit 287ad2adeb288ecff47fdae63dab3ee04eb7bd1c Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jul 2 09:24:06 2014 +0100 coverity#706308 Uncaught exception Change-Id: I852e701bd62929c1a7303b86286b8cbe66cdfc1f diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 832dddc..14fa331 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -208,7 +208,8 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ return 0; // Never reached } -const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException) +const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex) + throw (css::sdbc::SQLException, css::uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 6fcf9fc..36a6711 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -148,7 +148,8 @@ namespace connectivity inline bool isCount() const { return m_bIsCount; } void checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException); - const ORowSetValue& getValue(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException); + const ORowSetValue& getValue(sal_Int32 columnIndex) + throw (css::sdbc::SQLException, css::uno::RuntimeException); void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // clear insert row void clearInsertRow(); commit 045598331adb3b1a4f20dca992a09b7472e7362f Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jul 2 08:46:55 2014 +0100 callcatcher: rsc loaded fixedbitmap is no more Change-Id: Ie111d9ed3534eb8892400d638eac4b38b3904646 diff --git a/include/tools/rcid.h b/include/tools/rcid.h index aef56b4..ab66fd1 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -81,7 +81,7 @@ #define RSC_MULTILISTBOX (RSC_NOTYPE + 0x56) #define RSC_TEXT (RSC_NOTYPE + 0x57) #define RSC_FIXEDLINE (RSC_NOTYPE + 0x58) -#define RSC_FIXEDBITMAP (RSC_NOTYPE + 0x59) + #define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a) #define RSC_GROUPBOX (RSC_NOTYPE + 0x5c) #define RSC_SCROLLBAR (RSC_NOTYPE + 0x5d) diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index c6e2c45..33a6632 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -124,10 +124,7 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; }; - // - FixedBitmap - - - class VCL_DLLPUBLIC FixedBitmap : public Control { private: @@ -146,7 +143,6 @@ protected: public: explicit FixedBitmap( Window* pParent, WinBits nStyle = 0 ); - explicit FixedBitmap( Window* pParent, const ResId& ); virtual ~FixedBitmap(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 7414bae..6468708 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -188,7 +188,6 @@ class RscTypCont RscTop * InitClassMultiListBox( RscTop * pSuper ); RscTop * InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ); RscTop * InitClassFixedText( RscTop * pSuper ); - RscTop * InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitmap ); RscTop * InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage ); RscTop * InitClassRadioButton( RscTop * pSuper ); RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index b49e2a9..067047b 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -750,26 +750,6 @@ RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper ) return pClassFixedText; } -RscTop * RscTypCont::InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitmap ) -{ - Atom nId; - RscTop * pClassFixedBitmap; - - // Klasse anlegen - nId = pHS->getID( "FixedBitmap" ); - pClassFixedBitmap = new RscClass( nId, RSC_FIXEDBITMAP, pSuper ); - pClassFixedBitmap->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassFixedBitmap ); - - INS_WINBIT(pClassFixedBitmap,Scale) - - // Variablen anlegen - nId = aNmTb.Put( "Fixed", VARNAME ); - pClassFixedBitmap->SetVariable( nId, pClassBitmap, 0, 0, RSC_FIXEDBITMAP_BITMAP ); - - return pClassFixedBitmap; -} - RscTop * RscTypCont::InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 9a67f1d..0ff5e24 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -91,7 +91,6 @@ void RscTypCont::Init() RscTop * pClassMultiListBox; RscTop * pClassComboBox; RscTop * pClassFixedText; - RscTop * pClassFixedBitmap; RscTop * pClassFixedImage; RscTop * pClassGroupBox; RscTop * pClassKeyCode; @@ -460,9 +459,6 @@ void RscTypCont::Init() pClassFixedText = InitClassFixedText( pClassControl ); pRoot->Insert( pClassFixedText ); - pClassFixedBitmap = InitClassFixedBitmap( pClassControl, pClassBitmap ); - pRoot->Insert( pClassFixedBitmap ); - pClassFixedImage = InitClassFixedImage( pClassControl, pClassImage ); pRoot->Insert( pClassFixedImage ); diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index 404fb04..3b50a3c 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -761,18 +761,6 @@ FixedBitmap::FixedBitmap( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -FixedBitmap::FixedBitmap( Window* pParent, const ResId& rResId ) : - Control( WINDOW_FIXEDBITMAP ) -{ - rResId.SetRT( RSC_FIXEDBITMAP ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - FixedBitmap::~FixedBitmap() { }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits