editeng/source/uno/unotext.cxx | 3 ++-
include/editeng/unotext.hxx | 4 +++-
include/svx/fmdpage.hxx | 6 ++++--
include/svx/unomaster.hxx | 14 ++++++++++++--
include/svx/unopage.hxx | 10 +++++++---
sd/source/ui/inc/unomodel.hxx | 4 +++-
sd/source/ui/unoidl/unomodel.cxx | 2 +-
sd/source/ui/unoidl/unoobj.cxx | 21 ++++++++++++++++-----
sd/source/ui/unoidl/unoobj.hxx | 23 ++++++++++++++++++-----
sd/source/ui/unoidl/unopage.cxx | 21 ++++++++++++++++-----
sd/source/ui/unoidl/unopage.hxx | 22 +++++++++++++++++-----
svx/source/form/fmdpage.cxx | 6 ++++--
svx/source/table/cell.cxx | 11 ++++++++---
svx/source/table/cell.hxx | 12 +++++++++---
svx/source/unodraw/unopage.cxx | 8 +++++---
vcl/source/gdi/image.cxx | 3 ---
vcl/source/gdi/impimage.cxx | 10 ++++++----
17 files changed, 131 insertions(+), 49 deletions(-)
New commits:
commit 29a95776c3151e679bb8e5224cf4268c36859bbc
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 17:07:09 2014 +0000
initialize mnRefCount members directly in ctors
Change-Id: I7b4ff643eb256519bc47d27f6e0a6a60aaf8768e
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index 4b4b204..2a17f51 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -168,7 +168,6 @@ void Image::ImplInit( const BitmapEx& rBmpEx )
if( !rBmpEx.IsEmpty() )
{
mpImplData = new ImplImage;
- mpImplData->mnRefCount = 1;
if( rBmpEx.GetTransparentType() == TRANSPARENT_NONE )
{
@@ -365,7 +364,6 @@ ImageList::ImageList( const ImageList& rImageList ) :
ImageList::~ImageList()
{
-
if( mpImplData && ( 0 == --mpImplData->mnRefCount ) )
delete mpImplData;
}
@@ -373,7 +371,6 @@ ImageList::~ImageList()
void ImageList::ImplInit( sal_uInt16 nItems, const Size &rSize )
{
mpImplData = new ImplImageList;
- mpImplData->mnRefCount = 1;
mpImplData->maImages.reserve( nItems );
mpImplData->maImageSize = rSize;
}
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index f61a345..7f77d10 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -58,13 +58,14 @@ ImageAryData& ImageAryData::operator=( const ImageAryData&
rData )
}
ImplImageList::ImplImageList()
+ : mnRefCount(1)
{
}
-ImplImageList::ImplImageList( const ImplImageList &aSrc ) :
- maPrefix( aSrc.maPrefix ),
- maImageSize( aSrc.maImageSize ),
- mnRefCount( 1 )
+ImplImageList::ImplImageList( const ImplImageList &aSrc )
+ : maPrefix(aSrc.maPrefix)
+ , maImageSize(aSrc.maImageSize)
+ , mnRefCount(1)
{
maImages.reserve( aSrc.maImages.size() );
for ( ImageAryDataVec::const_iterator aIt = aSrc.maImages.begin(), aEnd =
aSrc.maImages.end(); aIt != aEnd; ++aIt )
@@ -116,6 +117,7 @@ sal_Bool ImplImageData::IsEqual( const ImplImageData& rData
)
}
ImplImage::ImplImage()
+ : mnRefCount(1)
{
}
commit 811e6f674554bc8f4f3c4d43ee9e2f263c8d7e71
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:53:14 2014 +0000
coverity#738003 Uncaught exception
Change-Id: Iddb64e592ae47dd5f22430778b8018fc8c9880c5
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 192f5fa..1e28f16 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1306,7 +1306,8 @@ uno::Any SAL_CALL
SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp
}
// beans::XMultiPropertyStates
-void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault( ) throw
(uno::RuntimeException)
+void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault()
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 02b47d6..99d8572 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -330,7 +330,9 @@ public:
// ::com::sun::star::beans::XMultiPropertyStates
//virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const
::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setAllPropertiesToDefault( ) throw
(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setAllPropertiesToDefault()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL setPropertiesToDefault( const
::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString
>& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 70ff3e9..0fd533e 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -81,7 +81,8 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const
::com::sun::star::uno::Type&
return aTypes;
}
-SdrObject *SvxFmDrawPage::_CreateSdrObject( const
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xDescr
) throw ()
+SdrObject *SvxFmDrawPage::_CreateSdrObject( const
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xDescr )
+ throw (std::exception)
{
OUString aShapeType( xDescr->getShapeType() );
@@ -94,7 +95,8 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const
::com::sun::star::uno::Referen
}
-::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const throw ()
+::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const
+ throw (std::exception)
{
if( FmFormInventor == pObj->GetObjInventor() )
{
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index df3bc3e..4903b0a 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -899,7 +899,9 @@ Sequence< OUString > SAL_CALL
Cell::getSupportedServiceNames( ) throw (RuntimeE
//
-----------------------------------------------------------------------------
-::com::sun::star::awt::Size SAL_CALL Cell::getPreferredSize( ) throw
(RuntimeException)
+::com::sun::star::awt::Size SAL_CALL Cell::getPreferredSize()
+ throw (RuntimeException,
+ std::exception)
{
return getMinimumSize();
}
@@ -1579,7 +1581,8 @@ Any SAL_CALL Cell::getPropertyDefault( const OUString&
aPropertyName ) throw(Unk
// XMultiPropertyStates
//
-----------------------------------------------------------------------------
-void SAL_CALL Cell::setAllPropertiesToDefault( ) throw (RuntimeException)
+void SAL_CALL Cell::setAllPropertiesToDefault()
+ throw (RuntimeException, std::exception)
{
delete mpProperties;
mpProperties = new sdr::properties::CellProperties( static_cast<
SdrTableObj& >( GetObject() ), this );
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index e427878..4e3e04c 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -120,7 +120,9 @@ public:
SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL
getMinimumSize()
throw (::com::sun::star::uno::RuntimeException,
std::exception);
- SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL
getPreferredSize( ) throw (::com::sun::star::uno::RuntimeException);
+ SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL
getPreferredSize()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL
calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw
(::com::sun::star::uno::RuntimeException);
// XMergeableCell
@@ -159,7 +161,9 @@ public:
SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL
getPropertyDefault( const OUString& aPropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
// XMultiPropertyStates
- SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault( ) throw
(::com::sun::star::uno::RuntimeException);
+ SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const
::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const
::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw
(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index a0c6680..5339173 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -233,7 +233,7 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference<
drawing::XShape >& xShape
}
void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape )
- throw( uno::RuntimeException )
+ throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -430,7 +430,8 @@ void SAL_CALL SvxDrawPage::ungroup( const Reference<
drawing::XShapeGroup >& aGr
mpModel->SetChanged();
}
-SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > &
xShape ) throw()
+SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > &
xShape)
+ throw (std::exception)
{
sal_uInt16 nType = 0;
sal_uInt32 nInventor = 0;
@@ -785,7 +786,8 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor(
sal_uInt16 nType, sal_uInt3
return pRet;
}
-Reference< drawing::XShape > SvxDrawPage::_CreateShape( SdrObject *pObj )
const throw()
+Reference< drawing::XShape > SvxDrawPage::_CreateShape( SdrObject *pObj )
const
+ throw (std::exception)
{
Reference< drawing::XShape > xShape(
CreateShapeByTypeAndInventor(pObj->GetObjIdentifier(),
pObj->GetObjInventor(),
commit be921ceb350a2beb6586197f43090e87b8824fd6
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:51:29 2014 +0000
coverity#738003 Uncaught exception
Change-Id: I09a015a590eeb2457963dbb3cfcafd6a714f82c9
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index ed93d90..df3bc3e 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -890,7 +890,9 @@ Sequence< OUString > SAL_CALL
Cell::getSupportedServiceNames( ) throw (RuntimeE
}
// XLayoutConstrains
-::com::sun::star::awt::Size SAL_CALL Cell::getMinimumSize( ) throw
(RuntimeException)
+::com::sun::star::awt::Size SAL_CALL Cell::getMinimumSize()
+ throw (RuntimeException,
+ std::exception)
{
return ::com::sun::star::awt::Size( getMinimumWidth(), getMinimumHeight()
);
}
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 1b26b1c..e427878 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -117,7 +117,9 @@ public:
SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< OUString >
SAL_CALL getSupportedServiceNames( ) throw
(::com::sun::star::uno::RuntimeException);
// XLayoutConstrains
- SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL
getMinimumSize( ) throw (::com::sun::star::uno::RuntimeException);
+ SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL
getMinimumSize()
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL
getPreferredSize( ) throw (::com::sun::star::uno::RuntimeException);
SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL
calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw
(::com::sun::star::uno::RuntimeException);
commit 46a2576c130ce199f71492201980b3adb9a5cc07
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:50:03 2014 +0000
coverity#737846 Uncaught exception
Change-Id: I9257ec4d9ccb7c602a9537230b61be944371d3ad
diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx
index 16d5ed9..9081076 100644
--- a/include/svx/fmdpage.hxx
+++ b/include/svx/fmdpage.hxx
@@ -34,11 +34,13 @@ protected:
// Creating a SdrObject based on a Description. Cann be used by derived
classes to
// support own ::com::sun::star::drawing::Shapes (for example Controls)
- virtual SdrObject *_CreateSdrObject( const
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape
)throw ();
+ virtual SdrObject *_CreateSdrObject( const
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape )
+ throw (std::exception);
// The following method is called when a SvxShape object should be created.
// Derived classes can create a derivation or an object aggregating
SvxShape.
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const
throw ();
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const
+ throw (std::exception);
public:
SvxFmDrawPage( SdrPage* pPage );
diff --git a/include/svx/unomaster.hxx b/include/svx/unomaster.hxx
index 72cc9ed..d0cbb09 100644
--- a/include/svx/unomaster.hxx
+++ b/include/svx/unomaster.hxx
@@ -36,8 +36,18 @@ public:
virtual sal_Bool queryAggregation( const com::sun::star::uno::Type &
rType, com::sun::star::uno::Any& aAny ) = 0;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException) = 0;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException) = 0;
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException) = 0;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::beans::PropertyVetoException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception) = 0;
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception) = 0;
virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(
const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException) = 0;
virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException) = 0;
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 78bc0b4..bf799191 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -91,13 +91,15 @@ class SVX_DLLPUBLIC SvxDrawPage : public
::cppu::WeakAggImplHelper5< ::com::sun:
// Creating a SdrObject using it's Description.
// Can be used by derived classes to support their owen Shapes (e.g.
Controls).
- virtual SdrObject *_CreateSdrObject( const
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape )
throw();
+ virtual SdrObject *_CreateSdrObject( const
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape )
+ throw (std::exception);
static SvxShape* CreateShapeByTypeAndInventor( sal_uInt16 nType,
sal_uInt32 nInventor, SdrObject *pObj = NULL, SvxDrawPage *pPage = NULL,
OUString const & referer = OUString() ) throw();
// The following method is called if a SvxShape object is to be created.
// Derived classes can create a derivation or an SvxShape aggregating
object.
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const
throw();
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const
+ throw (std::exception);
UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage )
@@ -109,7 +111,9 @@ class SVX_DLLPUBLIC SvxDrawPage : public
::cppu::WeakAggImplHelper5< ::com::sun:
// XShapes
virtual void SAL_CALL add( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
throw(::com::sun::star::uno::RuntimeException);
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index d1f11ba..3acd004 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -559,7 +559,12 @@ Reference< beans::XPropertySetInfo > SAL_CALL
SdGenericDrawPage::getPropertySetI
}
void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString&
aPropertyName, const Any& aValue )
- throw(beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
+ throw (beans::UnknownPropertyException,
+ beans::PropertyVetoException,
+ lang::IllegalArgumentException,
+ lang::WrappedTargetException,
+ uno::RuntimeException,
+ std::exception)
{
::SolarMutexGuard aGuard;
@@ -1336,7 +1341,8 @@ void SAL_CALL
SdGenericDrawPage::firePropertiesChangeEvent( const Sequence< OUSt
{
}
-Reference< drawing::XShape > SdGenericDrawPage::_CreateShape( SdrObject *pObj
) const throw()
+Reference< drawing::XShape > SdGenericDrawPage::_CreateShape( SdrObject *pObj
) const
+ throw (std::exception)
{
DBG_ASSERT( GetPage(), "SdGenericDrawPage::_CreateShape(), can't create
shape for disposed page!" );
DBG_ASSERT( pObj, "SdGenericDrawPage::_CreateShape(), invalid call with
pObj == 0!" );
diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx
index 916f816..c6742f6 100644
--- a/sd/source/ui/unoidl/unopage.hxx
+++ b/sd/source/ui/unoidl/unopage.hxx
@@ -108,7 +108,8 @@ public:
throw (std::exception);
// SvxFmDrawPage
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const
throw ();
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const
+ throw (std::exception);
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType )
throw(::com::sun::star::uno::RuntimeException);
@@ -124,7 +125,13 @@ public:
// XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::beans::PropertyVetoException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addPropertyChangeListener( const OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& xListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertyChangeListener( const OUString&
aPropertyName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertyChangeListener >& aListener )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
commit d051a056c96e212b879a53444646a88dae1b8972
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:43:35 2014 +0000
coverity#737840 Uncaught exception
Change-Id: I3e11ac315adbe2f64bfc391234c517472950aeff
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index bde3843..d1f11ba 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -388,7 +388,8 @@ SdXImpressDocument* SdGenericDrawPage::GetModel() const
}
// this is called whenever a SdrObject must be created for a empty api shape
wrapper
-SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference<
drawing::XShape >& xShape ) throw()
+SdrObject * SdGenericDrawPage::_CreateSdrObject( const Reference<
drawing::XShape >& xShape )
+ throw (std::exception)
{
if( NULL == SvxFmDrawPage::mpPage || !xShape.is() )
return NULL;
diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx
index e7ce2b1..916f816 100644
--- a/sd/source/ui/unoidl/unopage.hxx
+++ b/sd/source/ui/unoidl/unopage.hxx
@@ -104,7 +104,8 @@ public:
virtual sal_Int64 SAL_CALL getSomething( const
::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier )
throw(::com::sun::star::uno::RuntimeException);
// this is called whenever a SdrObject must be created for a empty api
shape wrapper
- virtual SdrObject *_CreateSdrObject( const
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape )
throw();
+ virtual SdrObject *_CreateSdrObject( const
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape )
+ throw (std::exception);
// SvxFmDrawPage
virtual ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const
throw ();
commit 70d10669b835b15e20af9fab73451a4eb24758a8
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:42:12 2014 +0000
coverity#737837 Uncaught exception
Change-Id: Ia71f03515ae209619b73aa617c4649cc4de4dfa6
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 244bbf4..bde3843 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -3093,7 +3093,9 @@ void SAL_CALL SdMasterPage::add( const Reference<
drawing::XShape >& xShape ) th
SdGenericDrawPage::add( xShape );
}
-void SAL_CALL SdMasterPage::remove( const Reference< drawing::XShape >& xShape
) throw(uno::RuntimeException)
+void SAL_CALL SdMasterPage::remove( const Reference< drawing::XShape >& xShape
)
+ throw (uno::RuntimeException,
+ std::exception)
{
::SolarMutexGuard aGuard;
diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx
index 967c0f7..e7ce2b1 100644
--- a/sd/source/ui/unoidl/unopage.hxx
+++ b/sd/source/ui/unoidl/unopage.hxx
@@ -266,7 +266,9 @@ public:
// XShapes
virtual void SAL_CALL add( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
};
commit 537deaeac2c707040539f4541b11d92937b3af28
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:41:08 2014 +0000
coverity#737836 Uncaught exception
Change-Id: I533cccc1dab5e8d722209c37f0c05331d5c206a8
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 1aaa1c1..244bbf4 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2448,7 +2448,9 @@ void SAL_CALL SdDrawPage::add( const Reference<
drawing::XShape >& xShape ) thro
SdGenericDrawPage::add( xShape );
}
-void SAL_CALL SdDrawPage::remove( const Reference< drawing::XShape >& xShape )
throw(uno::RuntimeException)
+void SAL_CALL SdDrawPage::remove( const Reference< drawing::XShape >& xShape )
+ throw (uno::RuntimeException,
+ std::exception)
{
::SolarMutexGuard aGuard;
diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx
index 4485e5d..967c0f7 100644
--- a/sd/source/ui/unoidl/unopage.hxx
+++ b/sd/source/ui/unoidl/unopage.hxx
@@ -211,7 +211,9 @@ public:
// XShapes
virtual void SAL_CALL add( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape )
throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
};
/***********************************************************************
commit ec8fc9c7a90739d5af1f2a2829602bacc41505cf
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:39:51 2014 +0000
coverity#737835 Uncaught exception
Change-Id: If5452880070876a4dfc2526b08928fb219a60529
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index fad68ba..c3a3433 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -892,7 +892,8 @@ uno::Sequence< OUString > SAL_CALL
SdXShape::getSupportedServiceNames() throw(::
/** checks if this is a presentation object
*/
-sal_Bool SdXShape::IsPresObj() const throw()
+sal_Bool SdXShape::IsPresObj() const
+ throw (std::exception)
{
SdrObject* pObj = mpShape->GetSdrObject();
if(pObj)
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index 9ef6c3d..521a1c1 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -53,7 +53,8 @@ private:
// Intern
SdAnimationInfo* GetAnimationInfo( sal_Bool bCreate = sal_False ) const
throw (std::exception);
- sal_Bool IsPresObj() const throw();
+ sal_Bool IsPresObj() const
+ throw (std::exception);
void SetPresObj( sal_Bool bPresObj ) throw();
bool IsEmptyPresObj() const throw();
commit f5b2959152b3eead3b427b0d90942d0ae3a205f0
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:38:47 2014 +0000
coverity#737833 Uncaught exception
Change-Id: I71b3022c84a861959ec1c70a7d2f9e94766df250
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 699ce48..fad68ba 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -476,7 +476,8 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString&
aPropertyName, const :
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
- ::com::sun::star::uno::RuntimeException)
+ ::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
@@ -853,7 +854,8 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString&
aPropertyName, const :
}
/** */
-SdAnimationInfo* SdXShape::GetAnimationInfo( sal_Bool bCreate ) const throw()
+SdAnimationInfo* SdXShape::GetAnimationInfo( sal_Bool bCreate ) const
+ throw (std::exception)
{
SdAnimationInfo* pInfo = NULL;
@@ -949,7 +951,7 @@ OUString SdXShape::GetPlaceholderText() const
/** sets/reset the empty status of a presentation object
*/
void SdXShape::SetEmptyPresObj(bool bEmpty)
- throw std::exception()
+ throw (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 e82628c..9ef6c3d 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -51,12 +51,14 @@ private:
::com::sun::star::uno::Any GetStyleSheet() const throw(
::com::sun::star::beans::UnknownPropertyException );
// Intern
- SdAnimationInfo* GetAnimationInfo( sal_Bool bCreate = sal_False ) const
throw();
+ SdAnimationInfo* GetAnimationInfo( sal_Bool bCreate = sal_False ) const
+ throw (std::exception);
sal_Bool IsPresObj() const throw();
void SetPresObj( sal_Bool bPresObj ) throw();
bool IsEmptyPresObj() const throw();
- void SetEmptyPresObj(bool bEmpty) throw (std::exception);
+ void SetEmptyPresObj(bool bEmpty)
+ throw (std::exception);
sal_Bool IsMasterDepend() const throw();
void SetMasterDepend( sal_Bool bDepend ) throw();
commit 7cb5f8b07dbec98285db712b17863b39e7481a5c
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:35:02 2014 +0000
coverity#737831 Uncaught exception
Change-Id: Ie528eb19db50abc475ebc1e9b575e8dfbc5e87c6
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 6822f44..699ce48 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -472,7 +472,11 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const
OUString& aPropertyName )
}
void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const
::com::sun::star::uno::Any& aValue )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::beans::PropertyVetoException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException)
{
SolarMutexGuard aGuard;
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index 41ded55..e82628c 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -56,7 +56,7 @@ private:
void SetPresObj( sal_Bool bPresObj ) throw();
bool IsEmptyPresObj() const throw();
- void SetEmptyPresObj(bool bEmpty) throw std::exception();
+ void SetEmptyPresObj(bool bEmpty) throw (std::exception);
sal_Bool IsMasterDepend() const throw();
void SetMasterDepend( sal_Bool bDepend ) throw();
@@ -87,7 +87,13 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::beans::PropertyVetoException,
+ ::com::sun::star::lang::IllegalArgumentException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
commit 9ee7a875f8571cd60ab5e18df6fc24101cdec688
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:32:02 2014 +0000
coverity#737828 Uncaught exception
Change-Id: I60920fe65102185139438f5bec663480310b96c6
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 0c49a66..6822f44 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -689,7 +689,10 @@ void SAL_CALL SdXShape::setPropertyValue( const OUString&
aPropertyName, const :
}
::com::sun::star::uno::Any SAL_CALL SdXShape::getPropertyValue( const
OUString& PropertyName )
- throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;
diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx
index 12ad6d9..41ded55 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -88,7 +88,11 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName,
const ::com::sun::star::uno::Any& aValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException,
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const
OUString& PropertyName )
+ throw (::com::sun::star::beans::UnknownPropertyException,
+ ::com::sun::star::lang::WrappedTargetException,
+ ::com::sun::star::uno::RuntimeException,
+ std::exception);
//XPropertyState
virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(
const OUString& PropertyName )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
commit 42e1ae627fe303f652f0fd53a33e0513741334be
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:30:42 2014 +0000
coverity#737827 Uncaught exception
Change-Id: Iab21baa94bb2fa3d0de6155e670f198d35de72e9
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 92f939a..0c49a66 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -941,7 +941,8 @@ OUString SdXShape::GetPlaceholderText() const
/** sets/reset the empty status of a presentation object
*/
-void SdXShape::SetEmptyPresObj( bool bEmpty ) throw()
+void SdXShape::SetEmptyPresObj(bool bEmpty)
+ throw 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 41da79f..12ad6d9 100644
--- a/sd/source/ui/unoidl/unoobj.hxx
+++ b/sd/source/ui/unoidl/unoobj.hxx
@@ -56,7 +56,7 @@ private:
void SetPresObj( sal_Bool bPresObj ) throw();
bool IsEmptyPresObj() const throw();
- void SetEmptyPresObj( bool bEmpty ) throw();
+ void SetEmptyPresObj(bool bEmpty) throw std::exception();
sal_Bool IsMasterDepend() const throw();
void SetMasterDepend( sal_Bool bDepend ) throw();
commit 4b86ca090305b7a959033cb3730e2fb7e11985f8
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 13 16:28:36 2014 +0000
coverity#737824 Uncaught exception
Change-Id: Ie8ba13265b436eb3ca548d5ccd2ca28d1e65e035
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
index 515500c..ba33e4d 100644
--- a/sd/source/ui/inc/unomodel.hxx
+++ b/sd/source/ui/inc/unomodel.hxx
@@ -288,7 +288,9 @@ public:
virtual ~SdMasterPagesAccess() throw();
// XDrawPages
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32
nIndex ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32
nIndex )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage >& xPage )
throw(::com::sun::star::uno::RuntimeException);
// XIndexAccess
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 0740bab..c197cc2 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2670,7 +2670,7 @@ sal_Bool SAL_CALL SdMasterPagesAccess::hasElements()
// XDrawPages
uno::Reference< drawing::XDrawPage > SAL_CALL
SdMasterPagesAccess::insertNewByIndex( sal_Int32 nInsertPos )
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
::SolarMutexGuard aGuard;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
