[Libreoffice-commits] core.git: 6 commits - ucb/source vcl/unx xmlsecurity/source
Caolán McNamara
caolanm at redhat.com
Thu Apr 24 02:37:41 PDT 2014
ucb/source/ucp/file/shell.cxx | 19 +++++-----------
vcl/unx/generic/dtrans/X11_selection.cxx | 3 +-
vcl/unx/generic/dtrans/X11_selection.hxx | 3 +-
xmlsecurity/source/helper/documentsignaturehelper.cxx | 2 -
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx | 11 +++++----
xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx | 10 +++++---
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx | 3 +-
xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx | 5 ++--
8 files changed, 29 insertions(+), 27 deletions(-)
New commits:
commit d9bf242a7d57025aecf6e7117ac9626f6a293a1e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 09:14:00 2014 +0100
coverity#984006 Uncaught exception
Change-Id: I0aae5a1dfab6a5f0439905a03b13f83be84a8746
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index cf84aa4..24836bb 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -3775,7 +3775,8 @@ void SelectionManager::shutdown() throw()
m_xDropTransferable.clear();
}
-sal_Bool SelectionManager::handleEvent( const Any& event ) throw(std::exception)
+sal_Bool SelectionManager::handleEvent(const Any& event)
+ throw (css::uno::RuntimeException, std::exception)
{
Sequence< sal_Int8 > aSeq;
if( (event >>= aSeq) )
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index 2bfc632..1b64428 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -472,7 +472,8 @@ namespace x11 {
virtual void SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE;
// XEventHandler
- virtual sal_Bool SAL_CALL handleEvent( const Any& event ) throw(std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL handleEvent(const Any& event)
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XDragSource
virtual sal_Bool SAL_CALL isDragImageSupported() throw(std::exception) SAL_OVERRIDE;
commit 946c7b03f48b2eb873a3c4958b2ae47ea424c89a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 09:11:31 2014 +0100
coverity#707484 Uncaught exception
Change-Id: I1881add525365feaf25ce61b2be027f6ea1bcce7
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 2ec4f03..41d0bab 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -102,7 +102,7 @@ void ImplFillElementList(
pNames[n], rtl_UriCharClassRelSegment,
rtl_UriEncodeStrict, RTL_TEXTENCODING_UTF8);
if (sEncName.isEmpty() && !pNames[n].isEmpty())
- throw css::uno::Exception("Failed to encode element name of XStorage", 0);
+ throw css::uno::RuntimeException("Failed to encode element name of XStorage", 0);
if ( rxStore->isStreamElement( pNames[n] ) )
{
commit a089a4e27a2b0e739ec86f8d3bf83a395ac0eaed
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 09:09:40 2014 +0100
coverity#707488 Uncaught exception
Change-Id: I568de20d26cff7742529a93f5a86b10ee2ac630c
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index 7d42350..75fb4ee 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -193,8 +193,10 @@ Reference< XXMLEncryptionTemplate >
SAL_CALL XMLEncryption_NssImpl :: decrypt(
const Reference< XXMLEncryptionTemplate >& aTemplate ,
const Reference< XXMLSecurityContext >& aSecurityCtx
-) throw( com::sun::star::xml::crypto::XMLEncryptionException ,
- com::sun::star::uno::SecurityException, std::exception) {
+) throw (com::sun::star::xml::crypto::XMLEncryptionException ,
+ com::sun::star::uno::SecurityException,
+ com::sun::star::uno::RuntimeException, std::exception)
+{
xmlSecKeysMngrPtr pMngr = NULL ;
xmlSecEncCtxPtr pEncCtx = NULL ;
xmlNodePtr pEncryptedData = NULL ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
index 036a725..be575fd 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
@@ -57,8 +57,9 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper2<
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSecurityContext >& aContext
- ) throw( com::sun::star::xml::crypto::XMLEncryptionException ,
- com::sun::star::uno::SecurityException, std::exception) SAL_OVERRIDE ;
+ ) throw (com::sun::star::xml::crypto::XMLEncryptionException ,
+ com::sun::star::uno::SecurityException,
+ com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
//Methods from XServiceInfo
virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ;
commit f4a760025bede298ae33e01f785fb7b439ec9812
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 09:08:24 2014 +0100
coverity#707489 Uncaught exception
Change-Id: Ia15d9c6761b1b7990586b766a4f8c385c04edc0a
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
index aaa6f27..7d42350 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx
@@ -54,8 +54,9 @@ Reference< XXMLEncryptionTemplate >
SAL_CALL XMLEncryption_NssImpl :: encrypt(
const Reference< XXMLEncryptionTemplate >& aTemplate ,
const Reference< XSecurityEnvironment >& aEnvironment
-) throw( com::sun::star::xml::crypto::XMLEncryptionException,
- com::sun::star::uno::SecurityException, std::exception )
+) throw (com::sun::star::xml::crypto::XMLEncryptionException,
+ com::sun::star::uno::SecurityException,
+ com::sun::star::uno::RuntimeException, std::exception)
{
xmlSecKeysMngrPtr pMngr = NULL ;
xmlSecEncCtxPtr pEncCtx = NULL ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
index 9f2e8ad..036a725 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx
@@ -50,8 +50,9 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper2<
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aEnvironment)
// ) throw( ::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
- throw ( com::sun::star::xml::crypto::XMLEncryptionException ,
- com::sun::star::uno::SecurityException, std::exception) SAL_OVERRIDE;
+ throw (com::sun::star::xml::crypto::XMLEncryptionException ,
+ com::sun::star::uno::SecurityException,
+ com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate > SAL_CALL decrypt(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate >& aTemplate ,
commit 8821c0698c2af9870cce6c280d58cfcdfd7af0d2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 24 09:06:49 2014 +0100
coverity#707490 Uncaught exception
Change-Id: I8aeff7a5e3513d316202d40b953435238c1bf714
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
index afb09f3..82211dc 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx
@@ -59,7 +59,8 @@ SAL_CALL XMLSignature_NssImpl :: generate(
const Reference< XXMLSignatureTemplate >& aTemplate ,
const Reference< XSecurityEnvironment >& aEnvironment
) throw( com::sun::star::xml::crypto::XMLSignatureException,
- com::sun::star::uno::SecurityException, std::exception )
+ com::sun::star::uno::SecurityException,
+ com::sun::star::uno::RuntimeException, std::exception )
{
xmlSecKeysMngrPtr pMngr = NULL ;
xmlSecDSigCtxPtr pDsigCtx = NULL ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
index 944c341..cca3709 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx
@@ -49,8 +49,9 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper2<
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate > SAL_CALL generate(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment >& aEnvironment
- ) throw( com::sun::star::xml::crypto::XMLSignatureException,
- com::sun::star::uno::SecurityException, std::exception) SAL_OVERRIDE ;
+ ) throw (com::sun::star::xml::crypto::XMLSignatureException,
+ com::sun::star::uno::SecurityException,
+ com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate > SAL_CALL validate(
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XXMLSignatureTemplate >& aTemplate ,
commit 490ae91796c9292e2f42859ef63a3fcc93bae916
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 23 19:29:47 2014 +0100
coverity#708563 Uninitialized scalar field
Change-Id: Iacca1f92f9a8a6bd3b016775c5e59209995bb741
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 878c91f..906278e 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -107,27 +107,20 @@ shell::UnqPathData& shell::UnqPathData::operator=( UnqPathData& a )
shell::UnqPathData::~UnqPathData()
{
- if( properties )
- delete properties;
- if( notifier )
- delete notifier;
+ delete properties;
+ delete notifier;
}
-
-
-
-
-
-
-
-
shell::MyProperty::MyProperty( const OUString& __PropertyName )
: PropertyName( __PropertyName )
+ , Handle(-1)
+ , isNative(false)
+ , State(beans::PropertyState_AMBIGUOUS_VALUE)
+ , Attributes(0)
{
// empty
}
-
shell::MyProperty::MyProperty( const sal_Bool& __isNative,
const OUString& __PropertyName,
const sal_Int32& __Handle,
More information about the Libreoffice-commits
mailing list