[Libreoffice-commits] core.git: 9 commits - editeng/source include/vbahelper sc/source sd/source ucb/source vbahelper/source
Caolán McNamara
caolanm at redhat.com
Thu Apr 24 09:17:14 PDT 2014
editeng/source/editeng/editdoc.cxx | 10 +++--
editeng/source/editeng/impedit3.cxx | 6 ++-
include/vbahelper/vbahelper.hxx | 3 +
sc/source/core/data/fillinfo.cxx | 2 -
sd/source/core/drawdoc3.cxx | 14 +++----
ucb/source/ucp/webdav-neon/DAVException.hxx | 2 -
ucb/source/ucp/webdav-neon/DAVSession.hxx | 41 ++++++++++----------
ucb/source/ucp/webdav-neon/NeonSession.cxx | 48 ++++++++++++------------
ucb/source/ucp/webdav-neon/NeonSession.hxx | 48 ++++++++++++------------
ucb/source/ucp/webdav-neon/webdavcontent.cxx | 4 +-
ucb/source/ucp/webdav-neon/webdavcontent.hxx | 4 +-
vbahelper/source/vbahelper/vbahelper.cxx | 4 +-
vbahelper/source/vbahelper/vbapictureformat.cxx | 3 +
vbahelper/source/vbahelper/vbapictureformat.hxx | 3 +
14 files changed, 101 insertions(+), 91 deletions(-)
New commits:
commit f756fb84a1629d455ccbd7af1f3975ac307fb957
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 17:10:12 2014 +0100
Resolves: fdo#60040 crash after undoing master page application
regression since 839cb94a2bd9dfadb6a7e11a97f0540a78f79b6b
Change-Id: Ie7068ecd1655ecae169948dc1e08330dc4200bf9
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index d423352..5621826 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1414,7 +1414,6 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
SdPage& rOldNotesMaster = (SdPage&)pNotes->TRG_GetMasterPage();
SdPage* pMaster = NULL;
SdPage* pNotesMaster = NULL;
- SdPage* pPage = NULL;
OUString aOldPageLayoutName(pSelectedPage->GetLayoutName());
OUString aOldLayoutName(aOldPageLayoutName);
sal_Int32 nIndex = aOldLayoutName.indexOf( SD_LT_SEPARATOR );
@@ -1714,7 +1713,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
{
for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++)
{
- pPage = (SdPage*) GetPage(nPage);
+ SdPage* pPage = (SdPage*) GetPage(nPage);
OUString aTest = pPage->GetLayoutName();
if (aTest == aOldPageLayoutName)
{
@@ -1731,20 +1730,21 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
for (std::vector<SdPage*>::iterator pIter = aPageList.begin(); pIter != aPageList.end(); ++pIter)
{
- AutoLayout eAutoLayout = (*pIter)->GetAutoLayout();
+ SdPage* pPage = *pIter;
+ AutoLayout eAutoLayout = pPage->GetAutoLayout();
if( bUndo )
{
SdPresentationLayoutUndoAction * pPLUndoAction =
new SdPresentationLayoutUndoAction
(this,
- ( pPage && pPage->IsMasterPage() ) ? aLayoutName : aOldLayoutName,
+ pPage->IsMasterPage() ? aLayoutName : aOldLayoutName,
aLayoutName,
eAutoLayout, eAutoLayout, false, *pIter);
pUndoMgr->AddUndoAction(pPLUndoAction);
}
- (*pIter)->SetPresentationLayout(aLayoutName);
- (*pIter)->SetAutoLayout(eAutoLayout);
+ pPage->SetPresentationLayout(aLayoutName);
+ pPage->SetAutoLayout(eAutoLayout);
}
// Adapt new master pages
@@ -1847,7 +1847,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
{
for (sal_uInt16 nPage = 1; nPage < GetPageCount(); nPage++)
{
- pPage = (SdPage*) GetPage(nPage);
+ SdPage* pPage = (SdPage*) GetPage(nPage);
if (pPage->GetLayoutName() == aOldPageLayoutName)
{
aPageList.push_back(pPage);
commit 2e67b2c1c38d3afa56e070241f529fa003c6f8b7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 16:05:12 2014 +0100
coverity#735793 Explicit null dereferenced
Change-Id: If2c4821466783908a6ac2bec3dc7a913e744fccb
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 650d28b..f30f8ab 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -1108,7 +1108,7 @@ void ScDocument::FillInfo(
if( pTLBR )
rArray.SetCellStyleTLBR( nFirstCol, nFirstRow, svx::frame::Style( pTLBR->GetLine(), fRowScale ) );
- if( rInfo.mpBLTRLine )
+ if( pBLTR )
rArray.SetCellStyleBLTR( nFirstCol, nFirstRow, svx::frame::Style( pBLTR->GetLine(), fRowScale ) );
}
}
commit 223c8a870f728e94ed6d3c6ac9589ac0a24a146e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 15:27:40 2014 +0100
coverity#735746 Explicit null dereferenced
Change-Id: I39bbb4ef3ce85a72fe8ddcb582de09c61c8138bb
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 2eeaeba..61b4a36 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -546,11 +546,15 @@ ExtraPortionInfo::~ExtraPortionInfo()
void ExtraPortionInfo::SaveOrgDXArray( const sal_Int32* pDXArray, sal_Int32 nLen )
{
delete[] pOrgDXArray;
- pOrgDXArray = new sal_Int32[nLen];
- memcpy( pOrgDXArray, pDXArray, nLen*sizeof(sal_Int32) );
+ if (pDXArray)
+ {
+ pOrgDXArray = new sal_Int32[nLen];
+ memcpy( pOrgDXArray, pDXArray, nLen*sizeof(sal_Int32) );
+ }
+ else
+ pOrgDXArray = NULL;
}
-
ParaPortion::ParaPortion( ContentNode* pN )
{
commit fcb21dee9b223d8e48860d43865b7887c1473f79
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 15:25:20 2014 +0100
coverity#735746 Explicit null dereferenced
Change-Id: I62c329a8d2ad50293870a3ff38866cf516551338
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 81026b4..bf25c26 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4542,9 +4542,11 @@ void ImpEditEngine::ImplExpandCompressedPortions( EditLine* pLine, ParaPortion*
DBG_ASSERT( nTxtPortionStart >= pLine->GetStart(), "Portion doesn't belong to the line!!!" );
sal_Int32* pDXArray = NULL;
if (!pLine->GetCharPosArray().empty())
+ {
pDXArray = &pLine->GetCharPosArray()[0]+( nTxtPortionStart-pLine->GetStart() );
- if ( pTP->GetExtraInfos()->pOrgDXArray )
- memcpy( pDXArray, pTP->GetExtraInfos()->pOrgDXArray, (pTP->GetLen()-1)*sizeof(sal_Int32) );
+ if ( pTP->GetExtraInfos()->pOrgDXArray )
+ memcpy( pDXArray, pTP->GetExtraInfos()->pOrgDXArray, (pTP->GetLen()-1)*sizeof(sal_Int32) );
+ }
ImplCalcAsianCompression( pParaPortion->GetNode(), pTP, nTxtPortionStart, pDXArray, (sal_uInt16)nCompressPercent, true );
}
}
commit c803bd811c6d2e64173d353106f850f6308e5bb7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 14:25:59 2014 +0100
coverity#983996 Uncaught exception
Change-Id: I8cf0764543ce29ca2f80be193d325cffdd12d02f
diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx
index 95ca28f..4cc0aa7 100644
--- a/ucb/source/ucp/webdav-neon/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx
@@ -34,7 +34,6 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
-#include "DAVException.hxx"
#include "DAVProperties.hxx"
#include "DAVResource.hxx"
#include "DAVSessionFactory.hxx"
@@ -80,7 +79,7 @@ public:
virtual void OPTIONS( const OUString & inPath,
DAVCapabilities & outCapabilities,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
// allprop & named
virtual void PROPFIND( const OUString & inPath,
@@ -88,43 +87,43 @@ public:
const std::vector< OUString > & inPropertyNames,
std::vector< DAVResource > & ioResources,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
// propnames
virtual void PROPFIND( const OUString & inPath,
const Depth inDepth,
std::vector< DAVResourceInfo > & ioResInfo,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void PROPPATCH( const OUString & inPath,
const std::vector< ProppatchValue > & inValues,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void HEAD( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
GET( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void GET( const OUString & inPath,
com::sun::star::uno::Reference<
com::sun::star::io::XOutputStream >& o,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
GET( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void
GET( const OUString & inPath,
@@ -132,13 +131,13 @@ public:
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void PUT( const OUString & inPath,
const com::sun::star::uno::Reference<
com::sun::star::io::XInputStream >& s,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
POST( const OUString & inPath,
@@ -147,7 +146,7 @@ public:
const com::sun::star::uno::Reference<
com::sun::star::io::XInputStream > & inInputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) = 0;
+ throw ( std::exception ) = 0;
virtual void POST( const OUString & inPath,
const OUString & rContentType,
@@ -157,46 +156,46 @@ public:
com::sun::star::uno::Reference<
com::sun::star::io::XOutputStream > & oOutputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) = 0;
+ throw ( std::exception ) = 0;
virtual void MKCOL( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void COPY( const OUString & inSource,
const OUString & inDestination,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverwrite = false )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void MOVE( const OUString & inSource,
const OUString & inDestination,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverwrite = false )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void DESTROY( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
// set new lock.
virtual void LOCK( const OUString & inPath,
com::sun::star::ucb::Lock & inLock,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) = 0;
+ throw ( std::exception ) = 0;
// refresh existing lock.
virtual sal_Int64 LOCK( const OUString & inPath,
sal_Int64 nTimeout,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) = 0;
+ throw ( std::exception ) = 0;
virtual void UNLOCK( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) = 0;
+ throw ( std::exception ) = 0;
virtual void abort()
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
protected:
rtl::Reference< DAVSessionFactory > m_xFactory;
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 42f476d..e481d6a 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -589,7 +589,7 @@ NeonSession::NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFa
const OUString& inUri,
const uno::Sequence< beans::NamedValue >& rFlags,
const ucbhelper::InternetProxyDecider & rProxyDecider )
- throw ( DAVException )
+ throw ( std::exception )
: DAVSession( rSessionFactory )
, m_nProxyPort( 0 )
, m_aFlags( rFlags )
@@ -617,7 +617,7 @@ NeonSession::~NeonSession( )
}
void NeonSession::Init( const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
m_aEnv = rEnv;
@@ -625,7 +625,7 @@ void NeonSession::Init( const DAVRequestEnvironment & rEnv )
}
void NeonSession::Init()
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -826,7 +826,7 @@ sal_Bool NeonSession::UsesProxy()
void NeonSession::OPTIONS( const OUString & inPath,
DAVCapabilities & outCapabilities,
const DAVRequestEnvironment & rEnv )
- throw( DAVException )
+ throw( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -852,7 +852,7 @@ void NeonSession::PROPFIND( const OUString & inPath,
const std::vector< OUString > & inPropNames,
std::vector< DAVResource > & ioResources,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -874,7 +874,7 @@ void NeonSession::PROPFIND( const OUString & inPath,
const Depth inDepth,
std::vector< DAVResourceInfo > & ioResInfo,
const DAVRequestEnvironment & rEnv )
- throw( DAVException )
+ throw( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -894,7 +894,7 @@ void NeonSession::PROPFIND( const OUString & inPath,
void NeonSession::PROPPATCH( const OUString & inPath,
const std::vector< ProppatchValue > & inValues,
const DAVRequestEnvironment & rEnv )
- throw( DAVException )
+ throw( std::exception )
{
/* @@@ Which standard live properties can be set by the client?
This is a known WebDAV RFC issue ( verified: 04/10/2001 )
@@ -1023,7 +1023,7 @@ void NeonSession::HEAD( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw( DAVException )
+ throw( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1042,7 +1042,7 @@ void NeonSession::HEAD( const OUString & inPath,
uno::Reference< io::XInputStream >
NeonSession::GET( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1065,7 +1065,7 @@ NeonSession::GET( const OUString & inPath,
void NeonSession::GET( const OUString & inPath,
uno::Reference< io::XOutputStream > & ioOutputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1087,7 +1087,7 @@ NeonSession::GET( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1115,7 +1115,7 @@ void NeonSession::GET( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1138,7 +1138,7 @@ void NeonSession::GET( const OUString & inPath,
void NeonSession::PUT( const OUString & inPath,
const uno::Reference< io::XInputStream > & inInputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1164,7 +1164,7 @@ NeonSession::POST( const OUString & inPath,
const OUString & rReferer,
const uno::Reference< io::XInputStream > & inInputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1197,7 +1197,7 @@ void NeonSession::POST( const OUString & inPath,
const uno::Reference< io::XInputStream > & inInputStream,
uno::Reference< io::XOutputStream > & oOutputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1223,7 +1223,7 @@ void NeonSession::POST( const OUString & inPath,
void NeonSession::MKCOL( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1240,7 +1240,7 @@ void NeonSession::COPY( const OUString & inSourceURL,
const OUString & inDestinationURL,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverWrite )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1266,7 +1266,7 @@ void NeonSession::MOVE( const OUString & inSourceURL,
const OUString & inDestinationURL,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverWrite )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1288,7 +1288,7 @@ void NeonSession::MOVE( const OUString & inSourceURL,
void NeonSession::DESTROY( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1334,7 +1334,7 @@ namespace
void NeonSession::LOCK( const OUString & inPath,
ucb::Lock & rLock,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1427,7 +1427,7 @@ void NeonSession::LOCK( const OUString & inPath,
sal_Int64 NeonSession::LOCK( const OUString & inPath,
sal_Int64 nTimeout,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1493,7 +1493,7 @@ bool NeonSession::LOCK( NeonLock * pLock,
void NeonSession::UNLOCK( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1545,7 +1545,7 @@ bool NeonSession::UNLOCK( NeonLock * pLock )
}
void NeonSession::abort()
- throw ( DAVException )
+ throw ( std::exception )
{
SAL_INFO("ucb.ucp.webdav", "neon commands cannot be aborted");
}
@@ -1654,7 +1654,7 @@ bool NeonSession::removeExpiredLocktoken( const OUString & inURL,
void NeonSession::HandleError( int nError,
const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
m_aEnv = DAVRequestEnvironment();
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index 905b002..9d9fc0f 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -75,7 +75,7 @@ public:
const OUString& inUri,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags,
const ucbhelper::InternetProxyDecider & rProxyDecider )
- throw ( DAVException );
+ throw ( std::exception );
// DAVSession methods
virtual sal_Bool CanUse( const OUString & inPath,
@@ -90,7 +90,7 @@ public:
OPTIONS( const OUString & inPath,
DAVCapabilities & outCapabilities,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
// allprop & named
virtual void
@@ -99,7 +99,7 @@ public:
const std::vector< OUString > & inPropNames,
std::vector< DAVResource > & ioResources,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
// propnames
virtual void
@@ -107,39 +107,39 @@ public:
const Depth inDepth,
std::vector< DAVResourceInfo >& ioResInfo,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
PROPPATCH( const OUString & inPath,
const std::vector< ProppatchValue > & inValues,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
HEAD( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
GET( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
GET( const OUString & inPath,
com::sun::star::uno::Reference<
com::sun::star::io::XOutputStream > & ioOutputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
GET( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
GET( const OUString & inPath,
@@ -148,14 +148,14 @@ public:
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
PUT( const OUString & inPath,
const com::sun::star::uno::Reference<
com::sun::star::io::XInputStream > & inInputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
POST( const OUString & inPath,
@@ -164,7 +164,7 @@ public:
const com::sun::star::uno::Reference<
com::sun::star::io::XInputStream > & inInputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
POST( const OUString & inPath,
@@ -175,50 +175,50 @@ public:
com::sun::star::uno::Reference<
com::sun::star::io::XOutputStream > & oOutputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
MKCOL( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
COPY( const OUString & inSourceURL,
const OUString & inDestinationURL,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverWrite )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
MOVE( const OUString & inSourceURL,
const OUString & inDestinationURL,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverWrite )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void DESTROY( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
// set new lock.
virtual void LOCK( const OUString & inURL,
com::sun::star::ucb::Lock & inLock,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
// refresh existing lock.
virtual sal_Int64 LOCK( const OUString & inURL,
sal_Int64 nTimeout,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void UNLOCK( const OUString & inURL,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
// helpers
virtual void abort()
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
const OUString & getHostName() const { return m_aHostName; }
@@ -233,16 +233,16 @@ private:
friend class NeonLockStore;
void Init( void )
- throw ( DAVException );
+ throw ( std::exception );
void Init( const DAVRequestEnvironment & rEnv )
- throw ( DAVException );
+ throw ( std::exception );
// ret: true => retry request.
void HandleError( int nError,
const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException );
+ throw ( std::exception );
const ucbhelper::InternetProxyServer & getProxySettings() const;
commit 98eb9834147e5f5c5d074d9fcacf973c3d5758ab
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 14:13:54 2014 +0100
coverity#983998 Uncaught exception
Change-Id: I620d8e68fab107d51056a4814b4cde420a2f2a5f
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index f6cf875..d8a26fa 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -1230,7 +1230,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
uno::Reference< sdbc::XRow > Content::getPropertyValues(
const uno::Sequence< beans::Property >& rProperties,
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
- throw ( uno::Exception )
+ throw ( uno::Exception, std::exception )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
std::auto_ptr< ContentProperties > xProps;
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 01e30d1..7cc1bfe 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -113,7 +113,7 @@ private:
::com::sun::star::beans::Property >& rProperties,
const ::com::sun::star::uno::Reference<
::com::sun::star::ucb::XCommandEnvironment >& xEnv )
- throw ( ::com::sun::star::uno::Exception );
+ throw ( ::com::sun::star::uno::Exception, std::exception );
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
setPropertyValues( const ::com::sun::star::uno::Sequence<
commit a1b7a11fae3e2992d13a8768882b8a928ea46112
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 14:06:04 2014 +0100
coverity#989726 Uncaught exception
Change-Id: I6c2e02904ad314b0b6f6b27581b06b8bd1f18f75
diff --git a/ucb/source/ucp/webdav-neon/DAVException.hxx b/ucb/source/ucp/webdav-neon/DAVException.hxx
index efdbbf6..6a5dc85 100644
--- a/ucb/source/ucp/webdav-neon/DAVException.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVException.hxx
@@ -103,7 +103,7 @@ const sal_uInt16 SC_INSUFFICIENT_STORAGE = 507;
-class DAVException
+class DAVException : std::exception
{
public:
enum ExceptionCode {
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index 2ff4dd6..f6cf875 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -3178,7 +3178,7 @@ Content::ResourceType Content::getResourceType(
const uno::Reference< ucb::XCommandEnvironment >& xEnv,
const std::auto_ptr< DAVResourceAccess > & rResAccess,
bool * networkAccessAllowed)
- throw ( uno::Exception )
+ throw ( uno::Exception, std::exception )
{
{
osl::MutexGuard g(m_aMutex);
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 791fcb0..01e30d1 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -146,7 +146,7 @@ private:
::com::sun::star::ucb::XCommandEnvironment >& xEnv,
const std::auto_ptr< DAVResourceAccess > & rResAccess,
bool * networkAccessAllowed = 0)
- throw ( ::com::sun::star::uno::Exception );
+ throw ( ::com::sun::star::uno::Exception, std::exception );
SAL_WNODEPRECATED_DECLARATIONS_POP
// Command "open"
commit 833067c8701bb2b8210ad58bf540e13373300988
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 11:48:33 2014 +0100
coverity#707469 Uncaught exception
Change-Id: I93bb55b339dcc6a177d7403760703a895cebc805
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index 1a403b9..e40357d 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -158,7 +158,8 @@ class VBAHELPER_DLLPUBLIC ShapeHelper
protected:
css::uno::Reference< css::drawing::XShape > xShape;
public:
- ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException );
+ ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape)
+ throw (css::script::BasicErrorException, css::uno::RuntimeException);
double getHeight() const;
void setHeight(double _fheight) throw ( css::script::BasicErrorException );
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index c22f1f1..c24bec4 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -1004,7 +1004,9 @@ void ConcreteXShapeGeometryAttributes::setWidth( double nWidth)
}
-ShapeHelper::ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape) throw (css::script::BasicErrorException ) : xShape( _xShape )
+ShapeHelper::ShapeHelper( const css::uno::Reference< css::drawing::XShape >& _xShape)
+ throw (css::script::BasicErrorException, css::uno::RuntimeException)
+ : xShape( _xShape )
{
if( !xShape.is() )
throw css::uno::RuntimeException( "No valid shape for helper" , css::uno::Reference< css::uno::XInterface >() );
commit 76e998d7ddaf70ded9a4da4d9988884afb74b1e5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 11:15:09 2014 +0100
coverity#707474 Uncaught exception
Change-Id: I42b3dd934f7aadd2cd7d71e7e22242b504af8825
diff --git a/vbahelper/source/vbahelper/vbapictureformat.cxx b/vbahelper/source/vbahelper/vbapictureformat.cxx
index 4e2d863..9ec4ba1 100644
--- a/vbahelper/source/vbahelper/vbapictureformat.cxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.cxx
@@ -24,7 +24,8 @@ using namespace com::sun::star;
ScVbaPictureFormat::ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext,
uno::Reference< drawing::XShape > xShape )
- throw( lang::IllegalArgumentException ) : ScVbaPictureFormat_BASE( xParent, xContext ), m_xShape( xShape )
+ throw (lang::IllegalArgumentException, uno::RuntimeException)
+ : ScVbaPictureFormat_BASE( xParent, xContext ), m_xShape( xShape )
{
m_xPropertySet.set( m_xShape, uno::UNO_QUERY_THROW );
}
diff --git a/vbahelper/source/vbahelper/vbapictureformat.hxx b/vbahelper/source/vbahelper/vbapictureformat.hxx
index f591f7c..87408a9 100644
--- a/vbahelper/source/vbahelper/vbapictureformat.hxx
+++ b/vbahelper/source/vbahelper/vbapictureformat.hxx
@@ -37,7 +37,8 @@ protected:
private:
void checkParameterRangeInDouble( double nRange, double nMin, double nMax ) throw (css::uno::RuntimeException);
public:
- ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::drawing::XShape > xShape ) throw( css::lang::IllegalArgumentException );
+ ScVbaPictureFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::drawing::XShape > xShape )
+ throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
// Attributes
virtual double SAL_CALL getBrightness() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
More information about the Libreoffice-commits
mailing list