[Libreoffice-commits] core.git: sd/source
Caolán McNamara
caolanm at redhat.com
Tue Nov 8 09:31:42 UTC 2016
sd/source/ui/unoidl/unoobj.cxx | 5 ++---
sd/source/ui/unoidl/unoobj.hxx | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit bca707d0ec55c35e048405b05c9e283cf6b97239
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 8 09:21:11 2016 +0000
coverity#1394269 Uncaught exception
and
coverity#1394270 Uncaught exception
Change-Id: I91e62c595ed923e44eea4c4fa1ac77444e34a9d9
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 93c6ca0..83db0e6 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -894,7 +894,7 @@ bool SdXShape::IsPresObj() const
/** checks if this presentation object is empty
*/
-bool SdXShape::IsEmptyPresObj() const throw()
+bool SdXShape::IsEmptyPresObj() const
{
SdrObject* pObj = mpShape->GetSdrObject();
if( (pObj != nullptr) && pObj->IsEmptyPresObj() )
@@ -934,12 +934,11 @@ OUString SdXShape::GetPlaceholderText() const
return OUString();
return pPage->GetPresObjText( pPage->GetPresObjKind(pObj) );
- }
+}
/** sets/reset the empty status of a presentation object
*/
void SdXShape::SetEmptyPresObj(bool bEmpty)
- throw (css::uno::RuntimeException, std::exception)
{
// only possible if this actually *is* a presentation object
if( !IsPresObj() )
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index 947d11d..a465de1 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -55,9 +55,8 @@ private:
bool IsPresObj() const
throw (std::exception);
- bool IsEmptyPresObj() const throw();
- void SetEmptyPresObj(bool bEmpty)
- throw (css::uno::RuntimeException, std::exception);
+ bool IsEmptyPresObj() const;
+ void SetEmptyPresObj(bool bEmpty);
bool IsMasterDepend() const throw();
void SetMasterDepend( bool bDepend ) throw();
More information about the Libreoffice-commits
mailing list