[Libreoffice-commits] core.git: 5 commits - connectivity/source svtools/source sw/source
Caolán McNamara
caolanm at redhat.com
Thu Apr 17 10:34:09 PDT 2014
connectivity/source/drivers/flat/EConnection.cxx | 3 ++-
connectivity/source/inc/flat/EConnection.hxx | 2 +-
svtools/source/control/roadmap.cxx | 10 +++-------
sw/source/core/doc/doctxm.cxx | 4 ++--
sw/source/core/uibase/app/docstyle.cxx | 2 +-
5 files changed, 9 insertions(+), 12 deletions(-)
New commits:
commit 3716833635926fa59372a8274decfebd4dc498e9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 17 17:47:32 2014 +0100
coverity#1202903 Uncaught exception
Change-Id: I2872cf32d9cd3d28a70d02365e2169da5f79ad7b
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index 03bb821..5f55159 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -60,7 +60,7 @@ IMPLEMENT_SERVICE_INFO(OFlatConnection, "com.sun.star.sdbc.drivers.flat.Connecti
void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
- throw(css::sdbc::SQLException, css::uno::RuntimeException)
+ throw(css::sdbc::SQLException, css::uno::RuntimeException, css::uno::DeploymentException)
{
osl_atomic_increment( &m_refCount );
diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index ac5f451..1c64858 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -40,7 +40,7 @@ namespace connectivity
OFlatConnection(ODriver* _pDriver);
virtual ~OFlatConnection();
- virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
+ virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw(css::sdbc::SQLException, css::uno::RuntimeException, css::uno::DeploymentException) SAL_OVERRIDE;
// own methods
inline bool isHeaderLine() const { return m_bHeaderLine; }
commit 5a2d9fffad710b13bceb02e7c3b3f563b935a8bc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 17 17:46:28 2014 +0100
coverity#706314 Uncaught exception
Change-Id: Ib723848550c910f94db2b1c5bc16e5f886e03bed
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index 3f39820..03bb821 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -59,7 +59,8 @@ OFlatConnection::~OFlatConnection()
IMPLEMENT_SERVICE_INFO(OFlatConnection, "com.sun.star.sdbc.drivers.flat.Connection", "com.sun.star.sdbc.Connection")
-void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException)
+void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
+ throw(css::sdbc::SQLException, css::uno::RuntimeException)
{
osl_atomic_increment( &m_refCount );
diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index 6b7fa29..ac5f451 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -40,7 +40,7 @@ namespace connectivity
OFlatConnection(ODriver* _pDriver);
virtual ~OFlatConnection();
- virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException) SAL_OVERRIDE;
+ virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw(css::sdbc::SQLException, css::uno::RuntimeException) SAL_OVERRIDE;
// own methods
inline bool isHeaderLine() const { return m_bHeaderLine; }
commit fdd716991a40d805027520cc345d6334426ff312
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 17 17:42:55 2014 +0100
coverity#1202787 Unchecked dynamic_cast
Change-Id: I16d9ae0f87157eaac2653ae76e5522a888b88f2b
diff --git a/sw/source/core/uibase/app/docstyle.cxx b/sw/source/core/uibase/app/docstyle.cxx
index db739ce..d2b14a8 100644
--- a/sw/source/core/uibase/app/docstyle.cxx
+++ b/sw/source/core/uibase/app/docstyle.cxx
@@ -550,7 +550,7 @@ void SwDocStyleSheet::SetHidden( bool bValue )
if( bChg )
{
// calling pPool->First() here would be quite slow...
- dynamic_cast<SwDocStyleSheetPool*>(pPool)->InvalidateIterator(); // internal list has to be updated
+ dynamic_cast<SwDocStyleSheetPool&>(*pPool).InvalidateIterator(); // internal list has to be updated
pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
SwEditShell* pSh = rDoc.GetEditShell();
if( pSh )
commit 44fd49d6ff6064a543eb7b39e9d45b50a7af00e6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 17 17:41:54 2014 +0100
coverity#1202788 Unchecked dynamic_cast
Change-Id: Ia768f7ebedfbf8650159db9eb86e107994c22374
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index e33ddc8..6df64fd9 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -1282,10 +1282,10 @@ void SwTOXBaseSection::UpdateSequence( const SwTxtNode* pOwnChapterNode )
( !IsFromChapter() ||
::lcl_FindChapterNode( rTxtNode, 0 ) == pOwnChapterNode ) )
{
- const SwSetExpField* pSeqField = dynamic_cast< const SwSetExpField* >( pFmtFld->GetField() );
+ const SwSetExpField& rSeqField = dynamic_cast<const SwSetExpField&>(*(pFmtFld->GetField()));
OUString sName = GetSequenceName();
sName += OUString( cSequenceMarkSeparator );
- sName += OUString::number( pSeqField->GetSeqNumber() );
+ sName += OUString::number( rSeqField.GetSeqNumber() );
SwTOXPara * pNew = new SwTOXPara( rTxtNode, nsSwTOXElement::TOX_SEQUENCE, 1, sName );
// set indexes if the number or the reference text are to be displayed
if( GetCaptionDisplay() == CAPTION_TEXT )
commit 516a22afa5240d6a31a2b221cf1adda543178e7d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 17 17:21:22 2014 +0100
coverity#704807 Dereference after null check
Change-Id: Ifbfdbc016cde790a2027a0036294b3be9e37a85c
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index aeef0ff..cccb3cd 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -725,14 +725,10 @@ namespace svt
void RoadmapItem::ImplUpdateIndex( const ItemIndex _nIndex )
{
- if ( mpDescription )
- mpDescription->SetIndex( _nIndex );
+ mpDescription->SetIndex( _nIndex );
- if ( mpID )
- {
- OUString aIDText = OUString::number( _nIndex + 1 ) + ".";
- mpID->SetText( aIDText );
- }
+ OUString aIDText = OUString::number( _nIndex + 1 ) + ".";
+ mpID->SetText( aIDText );
// update the geometry of both controls
ImplUpdatePosSize();
More information about the Libreoffice-commits
mailing list