[Libreoffice-commits] core.git: 34 commits - basic/source chart2/source cui/source desktop/source editeng/source filter/source include/editeng reportdesign/source sc/source sd/source sw/inc sw/source vcl/source
Caolán McNamara
caolanm at redhat.com
Wed May 28 05:50:21 PDT 2014
basic/source/classes/propacc.cxx | 2
basic/source/classes/sbunoobj.cxx | 16 +
chart2/source/controller/main/ChartController.hxx | 3
chart2/source/controller/main/ChartController_Window.cxx | 5
chart2/source/inc/OPropertySet.hxx | 3
chart2/source/model/inc/DataSeries.hxx | 3
chart2/source/model/main/Axis.cxx | 2
chart2/source/model/main/Axis.hxx | 3
chart2/source/model/main/DataSeries.cxx | 3
chart2/source/model/main/FormattedString.cxx | 2
chart2/source/model/main/FormattedString.hxx | 3
chart2/source/tools/RegressionEquation.cxx | 2
chart2/source/tools/RegressionEquation.hxx | 3
cui/source/dialogs/cuigrfflt.cxx | 2
desktop/source/app/app.cxx | 10 -
editeng/source/uno/unonrule.cxx | 3
editeng/source/uno/unotext.cxx | 3
filter/source/flash/swfwriter1.cxx | 8
include/editeng/unonrule.hxx | 3
include/editeng/unotext.hxx | 3
reportdesign/source/core/inc/ReportDrawPage.hxx | 3
reportdesign/source/core/sdr/ReportDrawPage.cxx | 3
sc/source/ui/formdlg/formula.cxx | 4
sd/source/ui/framework/module/ModuleController.cxx | 13 -
sd/source/ui/inc/framework/ModuleController.hxx | 2
sw/inc/unoframe.hxx | 2
sw/source/core/doc/doclay.cxx | 2
sw/source/core/layout/wsfrm.cxx | 5
sw/source/core/unocore/unochart.cxx | 6
sw/source/core/unocore/unodraw.cxx | 2
sw/source/core/unocore/unoframe.cxx | 64 ++----
sw/source/core/unocore/unotbl.cxx | 139 +++++++--------
sw/source/filter/xml/xmltexti.cxx | 10 -
vcl/source/gdi/gdimtf.cxx | 6
34 files changed, 168 insertions(+), 175 deletions(-)
New commits:
commit a0a724d57c0a763a0127b81e87765b94eb8c7da2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 13:17:30 2014 +0100
coverity#707105 Uncaught exception
Change-Id: Ice8f9633a9dddd492ce8c5d1d88961ecbed59216
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 8269c73..72d2e98 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -91,21 +91,15 @@ Sequence<OUString> SAL_CALL ModuleController_getSupportedServiceNames (void)
return Sequence<OUString>(&sServiceName, 1);
}
-
-
-
//===== ModuleController ======================================================
-
Reference<XModuleController> ModuleController::CreateInstance (
const Reference<XComponentContext>& rxContext)
{
return new ModuleController(rxContext);
}
-
-
-
-ModuleController::ModuleController (const Reference<XComponentContext>& rxContext) throw()
+ModuleController::ModuleController (const Reference<XComponentContext>& rxContext)
+ throw (std::exception)
: ModuleControllerInterfaceBase(MutexOwner::maMutex),
mxController(),
mpResourceToFactoryMap(new ResourceToFactoryMap()),
@@ -115,9 +109,6 @@ ModuleController::ModuleController (const Reference<XComponentContext>& rxContex
LoadFactories(rxContext);
}
-
-
-
ModuleController::~ModuleController (void) throw()
{
}
diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx
index 50c7cb7..3eb7843 100644
--- a/sd/source/ui/inc/framework/ModuleController.hxx
+++ b/sd/source/ui/inc/framework/ModuleController.hxx
@@ -100,7 +100,7 @@ private:
ModuleController (
const css::uno::Reference<css::uno::XComponentContext>& rxContext)
- throw();
+ throw (std::exception);
ModuleController (void); // Not implemented.
ModuleController (const ModuleController&); // Not implemented.
virtual ~ModuleController (void) throw();
commit abe5aaa7269ff0c2105346ac44d05342d5be3be7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 13:08:21 2014 +0100
coverity#706505 Uncaught exception
Change-Id: Ia00361fb1d86223a7ed65f0be295b291183e3ad6
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 971b55b..affe4f8 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -170,7 +170,8 @@ Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( )
return aSeq;
}
-Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sal_Int32 nIndex) const throw()
+Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal_Int32 nIndex) const
+ throw (RuntimeException)
{
// NumberingRule aRule;
const SvxNumberFormat& rFmt = maRule.GetLevel((sal_uInt16) nIndex);
diff --git a/include/editeng/unonrule.hxx b/include/editeng/unonrule.hxx
index 88d57e7..f600b6a 100644
--- a/include/editeng/unonrule.hxx
+++ b/include/editeng/unonrule.hxx
@@ -72,7 +72,8 @@ public:
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// internal
- com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getNumberingRuleByIndex( sal_Int32 nIndex) const throw();
+ com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> getNumberingRuleByIndex( sal_Int32 nIndex) const
+ throw (css::uno::RuntimeException);
void setNumberingRuleByIndex( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rProperties, sal_Int32 nIndex) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException );
static sal_Int16 Compare( const com::sun::star::uno::Any& rAny1, const com::sun::star::uno::Any& rAny2 );
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 9000c9c..03b2d0e 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -270,7 +270,8 @@ protected:
virtual void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException );
void SetEditSource( SvxEditSource* _pEditSource ) throw();
- virtual void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, com::sun::star::uno::Any& rAny, const SfxItemSet& rSet ) throw(::com::sun::star::beans::UnknownPropertyException );
+ virtual void getPropertyValue( const SfxItemPropertySimpleEntry* pMap, com::sun::star::uno::Any& rAny, const SfxItemSet& rSet )
+ throw(css::beans::UnknownPropertyException, css::uno::RuntimeException);
virtual void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const com::sun::star::uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException );
SvxUnoTextRangeBase( const SvxItemPropertySet* _pSet ) throw();
diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx
index 11c25e9..98270cf 100644
--- a/reportdesign/source/core/inc/ReportDrawPage.hxx
+++ b/reportdesign/source/core/inc/ReportDrawPage.hxx
@@ -31,7 +31,8 @@ namespace reportdesign
OReportDrawPage(const OReportDrawPage&);
void operator =(const OReportDrawPage&);
protected:
- virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape )throw (std::exception) SAL_OVERRIDE;
+ virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const throw (std::exception) SAL_OVERRIDE;
public:
OReportDrawPage(SdrPage* pPage,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection);
diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index ecedb9f..a96d18b 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -46,7 +46,8 @@ OReportDrawPage::OReportDrawPage(SdrPage* _pPage
{
}
-SdrObject* OReportDrawPage::_CreateSdrObject( const uno::Reference< drawing::XShape > & xDescr ) throw (std::exception)
+SdrObject* OReportDrawPage::_CreateSdrObject(const uno::Reference< drawing::XShape > & xDescr)
+ throw (uno::RuntimeException, std::exception)
{
uno::Reference< report::XReportComponent> xReportComponent(xDescr,uno::UNO_QUERY);
if ( xReportComponent.is() )
commit ddaaeec1b16544d588244461cce3a27e4027c604
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 13:05:13 2014 +0100
coverity#706506 Uncaught exception
Change-Id: I60f0a08029ef4599403c9853a55fff25cdf3f0bc
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 1242f8f..594c4f8 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -638,7 +638,8 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& Propert
throw beans::UnknownPropertyException();
}
-void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, uno::Any& rAny, const SfxItemSet& rSet ) throw( beans::UnknownPropertyException )
+void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, uno::Any& rAny, const SfxItemSet& rSet )
+ throw (beans::UnknownPropertyException, uno::RuntimeException)
{
switch( pMap->nWID )
{
commit 57517bbf45ef9dc16a7e17f6c9350a9f9f367014
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:58:49 2014 +0100
coverity#706267 Uncaught exception
Change-Id: I3a63546d0797c98c1720f0987293404ec760aeac
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index bbf2f3f..8bc63a9 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -204,7 +204,7 @@ uno::Reference< util::XCloneable > SAL_CALL RegressionEquation::createClone()
// ____ OPropertySet ____
uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const
- throw(beans::UnknownPropertyException)
+ throw (beans::UnknownPropertyException, uno::RuntimeException)
{
const tPropertyValueMap& rStaticDefaults = *StaticRegressionEquationDefaults::get();
tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx
index de2b4d2..0fe9798 100644
--- a/chart2/source/tools/RegressionEquation.hxx
+++ b/chart2/source/tools/RegressionEquation.hxx
@@ -85,7 +85,8 @@ protected:
// ____ OPropertySet ____
virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
- throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE;
+ throw (css::beans::UnknownPropertyException,
+ css::uno::RuntimeException) SAL_OVERRIDE;
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
commit f730b62e26455e00f44ac59cb12a89388958e088
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:53:23 2014 +0100
coverity#706265 Uncaught exception
Change-Id: I85c77236cd0a3cd791902a3978ea4e13606cea6c
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index 95b709f..21e0a9d 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -210,7 +210,7 @@ Sequence< OUString > FormattedString::getSupportedServiceNames_Static()
// ____ OPropertySet ____
uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const
- throw(beans::UnknownPropertyException)
+ throw (beans::UnknownPropertyException, uno::RuntimeException)
{
const tPropertyValueMap& rStaticDefaults = *StaticFormattedStringDefaults::get();
tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 20adb06..b62c82c 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -88,7 +88,8 @@ protected:
// ____ OPropertySet ____
virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
- throw(css::beans::UnknownPropertyException) SAL_OVERRIDE;
+ throw (css::beans::UnknownPropertyException,
+ css::uno::RuntimeException) SAL_OVERRIDE;
// ____ OPropertySet ____
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
commit 008998decc5891b7e2e05a53678ef0a11ced9470
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:47:53 2014 +0100
coverity#706264 Uncaught exception
Change-Id: Ia197a0de24a282bbfcbfc80ee283f530ac12c287
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index 214567b..22878fc 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -112,7 +112,8 @@ protected:
// ____ OPropertySet ____
virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
- throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE;
+ throw (css::beans::UnknownPropertyException,
+ css::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast
( sal_Int32 nHandle,
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 65dba5e..f97f310 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -243,7 +243,8 @@ Sequence< OUString > DataSeries::getSupportedServiceNames_Static()
// ____ OPropertySet ____
uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const
- throw(beans::UnknownPropertyException)
+ throw (beans::UnknownPropertyException,
+ uno::RuntimeException)
{
const tPropertyValueMap& rStaticDefaults = StaticDataSeriesDefaults::get();
tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
commit f2829946263fffa830af06c32c1027e9b0962907
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:42:06 2014 +0100
coverity#706261 Uncaught exception
Change-Id: Ife4d1e828cc2b52c54e425ec7af533ebdacd0f1e
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 960a40c..9fbe441 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -66,7 +66,8 @@ protected:
may throw an UnknownPropertyException.
*/
virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
- throw(::com::sun::star::beans::UnknownPropertyException) = 0;
+ throw (css::beans::UnknownPropertyException,
+ css::uno::RuntimeException) = 0;
/** The InfoHelper table contains all property names and types of
this object.
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index c3c1e65..151e658 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -591,7 +591,7 @@ void Axis::fireModifyEvent()
// ____ OPropertySet ____
uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const
- throw(beans::UnknownPropertyException)
+ throw (beans::UnknownPropertyException, uno::RuntimeException)
{
const tPropertyValueMap& rStaticDefaults = *StaticAxisDefaults::get();
tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) );
diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx
index e2e2016..e414789 100644
--- a/chart2/source/model/main/Axis.hxx
+++ b/chart2/source/model/main/Axis.hxx
@@ -77,7 +77,8 @@ protected:
// ____ OPropertySet ____
virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
- throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE;
+ throw (css::beans::UnknownPropertyException,
+ css::uno::RuntimeException) SAL_OVERRIDE;
// ____ OPropertySet ____
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
commit c4415f16fbb68ddd09c61ce3fcdf2c72b0da76a7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:32:48 2014 +0100
coverity#706260 Uncaught exception
Change-Id: Ieef198f6aab05928bf3b77097466eb7ac728481f
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index 485a2b7..41bc763 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -215,7 +215,8 @@ public:
// ::com::sun::star::view::XSelectionSupplier (optional interface)
virtual sal_Bool SAL_CALL
select( const ::com::sun::star::uno::Any& rSelection )
- throw ( com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE;
+ throw (css::lang::IllegalArgumentException,
+ css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any SAL_CALL
getSelection() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index b9b8459..a05c685 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1618,9 +1618,8 @@ bool ChartController::requestQuickHelp(
}
// XSelectionSupplier (optional interface)
- sal_Bool SAL_CALL ChartController
-::select( const uno::Any& rSelection )
- throw( lang::IllegalArgumentException, std::exception )
+sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
+ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
bool bSuccess = false;
commit 3d046b753dbdd3623cfaab132c5ada03e15bf8be
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:29:20 2014 +0100
coverity#706235 Uncaught exception
Change-Id: I06321ca2b686207a1d9bd698461aedf84daf31e1
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 5402a92..b5611fa 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4339,7 +4339,7 @@ public:
// XInvocation
virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue )
- throw( UnknownPropertyException, std::exception ) SAL_OVERRIDE;
+ throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE;
virtual Any SAL_CALL getValue( const OUString& rProperty )
throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(std::exception) SAL_OVERRIDE;
@@ -4371,7 +4371,8 @@ Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospecti
return Reference< XIntrospectionAccess >();
}
-void SAL_CALL ModuleInvocationProxy::setValue( const OUString& rProperty, const Any& rValue ) throw( UnknownPropertyException, std::exception )
+void SAL_CALL ModuleInvocationProxy::setValue(const OUString& rProperty, const Any& rValue)
+ throw (UnknownPropertyException, RuntimeException, std::exception)
{
if( !m_bProxyIsClassModuleObject )
throw UnknownPropertyException();
commit 9986fe77f46d8ca034aa2bfd78a2454d906bacc8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:27:43 2014 +0100
coverity#706234 Uncaught exception
Change-Id: I7542008369ed3433cd8bfce7702f036148195516
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 3c27424..5402a92 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4341,7 +4341,7 @@ public:
virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue )
throw( UnknownPropertyException, std::exception ) SAL_OVERRIDE;
virtual Any SAL_CALL getValue( const OUString& rProperty )
- throw( UnknownPropertyException, std::exception ) SAL_OVERRIDE;
+ throw (UnknownPropertyException, RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(std::exception) SAL_OVERRIDE;
@@ -4409,7 +4409,8 @@ void SAL_CALL ModuleInvocationProxy::setValue( const OUString& rProperty, const
}
-Any SAL_CALL ModuleInvocationProxy::getValue( const OUString& rProperty ) throw( UnknownPropertyException, std::exception )
+Any SAL_CALL ModuleInvocationProxy::getValue(const OUString& rProperty)
+ throw (UnknownPropertyException, RuntimeException, std::exception)
{
if( !m_bProxyIsClassModuleObject )
{
commit cf16d4eb9d52af9a17bcb0ccd1738998e64147bd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:25:38 2014 +0100
coverity#706232 Uncaught exception
Change-Id: I07e13af4f4578d5d6823b6d10aa9c37d04ecc395
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index d1b52ba..3c27424 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4349,7 +4349,8 @@ public:
const Sequence< Any >& rParams,
Sequence< sal_Int16 >& rOutParamIndex,
Sequence< Any >& rOutParam )
- throw( CannotConvertException, InvocationTargetException, std::exception ) SAL_OVERRIDE;
+ throw (CannotConvertException, InvocationTargetException,
+ RuntimeException, std::exception ) SAL_OVERRIDE;
// XComponent
virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) SAL_OVERRIDE;
@@ -4450,7 +4451,8 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction,
const Sequence< Any >& rParams,
Sequence< sal_Int16 >&,
Sequence< Any >& )
- throw( CannotConvertException, InvocationTargetException, std::exception )
+ throw (CannotConvertException, InvocationTargetException,
+ RuntimeException, std::exception)
{
SolarMutexGuard guard;
commit 1b4856158617f574665cd5e147be105520adaa75
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:20:55 2014 +0100
coverity#706231 Uncaught exception
Change-Id: I1f1acb91a97ff7c9fb50ad36eca7b91d361a1276
diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 913237c..dbcec4c 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -177,7 +177,7 @@ void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPrope
::com::sun::star::uno::RuntimeException, std::exception)
{
if ( !m_aPropVals.empty() )
- throw PropertyExistException();
+ throw IllegalArgumentException();
const PropertyValue *pPropVals = rPropertyValues.getConstArray();
for (sal_Int32 n = 0; n < rPropertyValues.getLength(); ++n)
commit d1c950a2b1fbf49de396a1847619b4546bdf50a9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:16:21 2014 +0100
coverity#705055 Unchecked dynamic_cast
Change-Id: I84456e587897fd56626a823ef99f15db227f894f
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 7107023..cebb19c 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2605,8 +2605,8 @@ sal_uLong GDIMetaFile::GetChecksum() const
case META_CLIPREGION_ACTION :
{
- MetaClipRegionAction* pAct = dynamic_cast< MetaClipRegionAction* >(pAction);
- const Region& rRegion = pAct->GetRegion();
+ MetaClipRegionAction& rAct = dynamic_cast<MetaClipRegionAction&>(*pAction);
+ const Region& rRegion = rAct.GetRegion();
if(rRegion.HasPolyPolygonOrB2DPolyPolygon())
{
@@ -2657,7 +2657,7 @@ sal_uLong GDIMetaFile::GetChecksum() const
}
}
- sal_uInt8 tmp = (sal_uInt8)pAct->IsClipping();
+ sal_uInt8 tmp = (sal_uInt8)rAct.IsClipping();
nCrc = rtl_crc32(nCrc, &tmp, 1);
}
else
commit e5431ed4835b47a1c61756167acd748cd5b2bf2e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:13:01 2014 +0100
coverity#704980 Unchecked dynamic_cast
Change-Id: I2947a46228515dec7d826c9b3d36c15921874022
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index c49da96..061f430 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1591,8 +1591,8 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt& rTableFmt, const SwTableCursor*
}
pUnoCrsr->Add(&aCrsrDepend);
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- pTblCrsr->MakeBoxSels();
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ rTblCrsr.MakeBoxSels();
}
SwXTextTableCursor::~SwXTextTableCursor()
commit 992b7de08505a6a4e04fbd9cb9ddf1f6d1510707
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:12:21 2014 +0100
coverity#704979 Unchecked dynamic_cast
Change-Id: Ied5d4e524becf3d23a21abab8511aaab8a237bf7
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 5897aa1..c49da96 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1584,10 +1584,10 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt& rTableFmt, const SwTableCursor*
*pUnoCrsr->GetMark() = *pTableSelection->GetMark();
}
const SwSelBoxes& rBoxes = pTableSelection->GetSelectedBoxes();
- SwTableCursor* pTableCrsr = dynamic_cast<SwTableCursor*>(pUnoCrsr);
+ SwTableCursor& rTableCrsr = dynamic_cast<SwTableCursor&>(*pUnoCrsr);
for (size_t i = 0; i < rBoxes.size(); i++)
{
- pTableCrsr->InsertBox( *rBoxes[i] );
+ rTableCrsr.InsertBox( *rBoxes[i] );
}
pUnoCrsr->Add(&aCrsrDepend);
commit e23806fb815f7e419bb04de11dcb5707c4120eaa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:11:40 2014 +0100
coverity#704978 Unchecked dynamic_cast
Change-Id: I800d861dcc7f7265356ef426a54fce14d0765a19
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index a17cd9d..5897aa1 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1568,8 +1568,8 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt* pFmt, SwTableBox* pBox) :
SwUnoCrsr* pUnoCrsr = pDoc->CreateUnoCrsr(aPos, true);
pUnoCrsr->Move( fnMoveForward, fnGoNode );
pUnoCrsr->Add(&aCrsrDepend);
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- pTblCrsr->MakeBoxSels();
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ rTblCrsr.MakeBoxSels();
}
SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt& rTableFmt, const SwTableCursor* pTableSelection) :
commit bc9fa3198bae6ac05adbbb1537ead8bf34e8d51a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:08:42 2014 +0100
coverity#704955
Change-Id: I86c41b9751520ce88bc780eaef8b4f561b9d5135
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index bc8dfd4..8479853 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1452,7 +1452,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
aValue >>= sTitle;
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject(rFlyFmt);
- pFlyFmt->GetDoc()->SetFlyFrmTitle(rFlyFmt, sTitle);
+ rFlyFmt.GetDoc()->SetFlyFrmTitle(rFlyFmt, sTitle);
}
// New attribute Description
else if( FN_UNO_DESCRIPTION == pEntry->nWID )
@@ -1462,7 +1462,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
aValue >>= sDescription;
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject(rFlyFmt);
- pFlyFmt->GetDoc()->SetFlyFrmDescription(rFlyFmt, sDescription);
+ rFlyFmt.GetDoc()->SetFlyFrmDescription(rFlyFmt, sDescription);
}
else if(FN_UNO_FRAME_STYLE_NAME == pEntry->nWID)
{
@@ -2536,7 +2536,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject(rFlyFmt);
- pFlyFmt->GetDoc()->SetFlyFrmTitle(rFlyFmt, aEmptyOUStr);
+ rFlyFmt.GetDoc()->SetFlyFrmTitle(rFlyFmt, aEmptyOUStr);
}
// New attribute Description
else if( FN_UNO_DESCRIPTION == pEntry->nWID )
@@ -2544,7 +2544,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
// assure that <SdrObject> instance exists.
GetOrCreateSdrObject(rFlyFmt);
- pFlyFmt->GetDoc()->SetFlyFrmDescription(rFlyFmt, aEmptyOUStr);
+ rFlyFmt.GetDoc()->SetFlyFrmDescription(rFlyFmt, aEmptyOUStr);
}
else
{
commit d0b9fe795a9589517c813d94efc950d348c1f9a6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:07:56 2014 +0100
coverity#704962 Unchecked dynamic_cast
Change-Id: I6960b09ef68a9755469c42715f5ccd25ac3d3896
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index e683f38..a17cd9d 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3906,8 +3906,8 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
// remove actions to enable box selection
UnoActionRemoveContext aRemoveContext(pDoc);
}
- SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pTblCrsr);
- pCrsr->MakeBoxSels();
+ SwUnoTableCrsr& rCrsr = dynamic_cast<SwUnoTableCrsr&>(*pTblCrsr);
+ rCrsr.MakeBoxSels();
switch(pEntry->nWID )
{
case FN_UNO_TABLE_CELL_BACKGROUND:
@@ -3944,7 +3944,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
aBoxInfo.SetValid(nValid, true);
aSet.Put(aBoxInfo);
- pDoc->GetTabBorders(*pCrsr, aSet);
+ pDoc->GetTabBorders(rCrsr, aSet);
aSet.Put(aBoxInfo);
SvxBoxItem aBoxItem((const SvxBoxItem&)aSet.Get(RES_BOX));
@@ -3957,7 +3957,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
{
SfxUInt32Item aNumberFormat(RES_BOXATR_FORMAT);
((SfxPoolItem&)aNumberFormat).PutValue(aValue, 0);
- pDoc->SetBoxAttr( *pCrsr, aNumberFormat);
+ pDoc->SetBoxAttr(rCrsr, aNumberFormat);
}
break;
case FN_UNO_RANGE_ROW_LABEL:
@@ -3983,15 +3983,15 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, const uno::An
default:
{
SfxItemSet aItemSet( pDoc->GetAttrPool(), pEntry->nWID, pEntry->nWID );
- SwUnoCursorHelper::GetCrsrAttr(pCrsr->GetSelRing(),
+ SwUnoCursorHelper::GetCrsrAttr(rCrsr.GetSelRing(),
aItemSet);
if (!SwUnoCursorHelper::SetCursorPropertyValue(
- *pEntry, aValue, pCrsr->GetSelRing(), aItemSet))
+ *pEntry, aValue, rCrsr.GetSelRing(), aItemSet))
{
m_pPropSet->setPropertyValue(*pEntry, aValue, aItemSet);
}
- SwUnoCursorHelper::SetCrsrAttr(pCrsr->GetSelRing(),
+ SwUnoCursorHelper::SetCrsrAttr(rCrsr.GetSelRing(),
aItemSet, nsSetAttrMode::SETATTR_DEFAULT, true);
}
}
commit 551b054ba96d8474534654696e1864fef7b74420
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:06:59 2014 +0100
coverity#704963 Unchecked dynamic_cast
Change-Id: I0dc06f1ffe3a9dfc64cc35ea3c46a237505fe4e8
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 9a4b928..e683f38 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -4642,10 +4642,10 @@ void SAL_CALL SwXCellRange::sort(const uno::Sequence< beans::PropertyValue >& rD
if(pFmt &&
SwUnoCursorHelper::ConvertSortProperties(rDescriptor, aSortOpt))
{
- SwUnoTableCrsr* pTableCrsr = dynamic_cast<SwUnoTableCrsr*>(pTblCrsr);
- pTableCrsr->MakeBoxSels();
+ SwUnoTableCrsr& rTableCrsr = dynamic_cast<SwUnoTableCrsr&>(*pTblCrsr);
+ rTableCrsr.MakeBoxSels();
UnoActionContext aContext( pFmt->GetDoc() );
- pFmt->GetDoc()->SortTbl(pTableCrsr->GetSelectedBoxes(), aSortOpt);
+ pFmt->GetDoc()->SortTbl(rTableCrsr.GetSelectedBoxes(), aSortOpt);
}
}
commit bf75e3be014991f218b647161f7e07348604e310
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:06:17 2014 +0100
coverity#704964 Unchecked dynamic_cast
Change-Id: I787a476dd9f31db7b266f50a9b376b4cf1f49271
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 9f3e75f..9a4b928 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3385,15 +3385,15 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName)
pUnoCrsr->GetPoint()->nNode = *pLastNd;
pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- pCrsr->MakeBoxSels();
+ SwUnoTableCrsr& rCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ rCrsr.MakeBoxSels();
SfxItemSet aSet(pDoc->GetAttrPool(),
RES_BOX, RES_BOX,
SID_ATTR_BORDER_INNER, SID_ATTR_BORDER_INNER,
0);
aSet.Put(SvxBoxInfoItem( SID_ATTR_BORDER_INNER ));
- pDoc->GetTabBorders(*pCrsr, aSet);
+ pDoc->GetTabBorders(rCrsr, aSet);
const SvxBoxInfoItem& rBoxInfoItem =
(const SvxBoxInfoItem&)aSet.Get(SID_ATTR_BORDER_INNER);
const SvxBoxItem& rBox = (const SvxBoxItem&)aSet.Get(RES_BOX);
commit 8fb16ceaf9cb04d390aa67b3d876037eba47f78a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:05:30 2014 +0100
WaE: -Werror=maybe-uninitialized
Change-Id: I8dfbc461b7cfa0da941964cae2b82cdde3f564b2
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 2b122ec..c020b0f 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1191,7 +1191,7 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
}
else if (pEntry->nWID == FN_TEXT_BOX)
{
- bool bValue;
+ bool bValue(false);
aValue >>= bValue;
if (bValue)
SwTextBoxHelper::create(pFmt);
commit 4e2ece8848466aa5a2327c236b1c840e95ebacdf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:05:02 2014 +0100
coverity#704965 Unchecked dynamic_cast
Change-Id: Iadb4615ac582fa9ef815cab399476ed330838173
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index ba49b46..9f3e75f 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -3185,8 +3185,8 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
pUnoCrsr->SetMark();
pUnoCrsr->GetPoint()->nNode = *pBRBox->GetSttNd();
pUnoCrsr->Move( fnMoveForward, fnGoNode );
- SwUnoTableCrsr* pCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- pCrsr->MakeBoxSels();
+ SwUnoTableCrsr& rCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ rCrsr.MakeBoxSels();
SfxItemSet aSet(pDoc->GetAttrPool(),
RES_BOX, RES_BOX,
@@ -3220,7 +3220,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, const uno::An
aSet.Put(aBox);
aSet.Put(aBoxInfo);
- pDoc->SetTabBorders(*pCrsr, aSet);
+ pDoc->SetTabBorders(rCrsr, aSet);
delete pUnoCrsr;
}
break;
commit 4d95f608b54e8ecd838fbafd035b7ce5596a797d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:04:06 2014 +0100
coverity#704966 Unchecked dynamic_cast
Change-Id: I3a3601c3a13641aea4523438c1e0ee9898b021a0
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index bcb9689..ba49b46 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1746,22 +1746,22 @@ sal_Bool SwXTextTableCursor::mergeRange()
// hier muessen die Actions aufgehoben werden
UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
}
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- pTblCrsr->MakeBoxSels();
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ rTblCrsr.MakeBoxSels();
{
UnoActionContext aContext(pUnoCrsr->GetDoc());
- bRet = TBLMERGE_OK == pTblCrsr->GetDoc()->MergeTbl(*pTblCrsr);
+ bRet = TBLMERGE_OK == rTblCrsr.GetDoc()->MergeTbl(rTblCrsr);
if(bRet)
{
- size_t nCount = pTblCrsr->GetSelectedBoxesCount();
+ size_t nCount = rTblCrsr.GetSelectedBoxesCount();
while (nCount--)
{
- pTblCrsr->DeleteBox(nCount);
+ rTblCrsr.DeleteBox(nCount);
}
}
}
- pTblCrsr->MakeBoxSels();
+ rTblCrsr.MakeBoxSels();
}
return bRet;
}
commit 4259f9b381381454f77adf9934d0b439078e4551
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:03:10 2014 +0100
coverity#704967 Unchecked dynamic_cast
Change-Id: I2aa69b8876dce21c362d54053072cc0cfcd3dc8d
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 625d500..bcb9689 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1780,14 +1780,14 @@ sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal)
// hier muessen die Actions aufgehoben werden
UnoActionRemoveContext aRemoveContext(pUnoCrsr->GetDoc());
}
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- pTblCrsr->MakeBoxSels();
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ rTblCrsr.MakeBoxSels();
{
UnoActionContext aContext(pUnoCrsr->GetDoc());
- bRet = pTblCrsr->GetDoc()->SplitTbl(
- pTblCrsr->GetSelectedBoxes(), !Horizontal, Count);
+ bRet = rTblCrsr.GetDoc()->SplitTbl(
+ rTblCrsr.GetSelectedBoxes(), !Horizontal, Count);
}
- pTblCrsr->MakeBoxSels();
+ rTblCrsr.MakeBoxSels();
}
return bRet;
}
commit bfbcdc9ceb1244181140d177900282e10203cac9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:01:56 2014 +0100
coverity#704970 Unchecked dynamic_cast
Change-Id: I0faff03dfd40764ac644862dc3bb69082ed3b144
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index b9deaa4..625d500 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1878,18 +1878,18 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
SwStartNode* pSttNode = pUnoCrsr->GetNode()->StartOfSectionNode();
const SwTableNode* pTblNode = pSttNode->FindTableNode();
lcl_FormatTable((SwFrmFmt*)pTblNode->GetTable().GetFrmFmt());
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap().getByName(rPropertyName);
if(pEntry)
{
- pTblCrsr->MakeBoxSels();
+ rTblCrsr.MakeBoxSels();
switch(pEntry->nWID )
{
case FN_UNO_TABLE_CELL_BACKGROUND:
{
SvxBrushItem aBrush( RES_BACKGROUND );
- if(pTblCrsr->GetDoc()->GetBoxAttr( *pUnoCrsr, aBrush ))
+ if (rTblCrsr.GetDoc()->GetBoxAttr( *pUnoCrsr, aBrush ))
aBrush.QueryValue(aRet, pEntry->nMemberId);
}
@@ -1910,12 +1910,12 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
break;
default:
{
- SfxItemSet aSet(pTblCrsr->GetDoc()->GetAttrPool(),
+ SfxItemSet aSet(rTblCrsr.GetDoc()->GetAttrPool(),
RES_CHRATR_BEGIN, RES_FRMATR_END -1,
RES_UNKNOWNATR_CONTAINER, RES_UNKNOWNATR_CONTAINER,
0L);
// erstmal die Attribute des Cursors
- SwUnoCursorHelper::GetCrsrAttr(pTblCrsr->GetSelRing(),
+ SwUnoCursorHelper::GetCrsrAttr(rTblCrsr.GetSelRing(),
aSet);
m_pPropSet->getPropertyValue(*pEntry, aSet, aRet);
}
commit 16190d6ef0a881b678baf00fd4c8a5cc4310594c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 12:00:18 2014 +0100
coverity#704971 Unchecked dynamic_cast
Change-Id: Ic5983001ea739fc04c15c0852b6693c9cc9bfabd
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index d3a4eaa..b9deaa4 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1813,14 +1813,14 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const u
SwStartNode* pSttNode = pUnoCrsr->GetNode()->StartOfSectionNode();
const SwTableNode* pTblNode = pSttNode->FindTableNode();
lcl_FormatTable((SwFrmFmt*)pTblNode->GetTable().GetFrmFmt());
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
const SfxItemPropertySimpleEntry* pEntry =
m_pPropSet->getPropertyMap().getByName(rPropertyName);
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
throw beans::PropertyVetoException("Property is read-only: " + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
- pTblCrsr->MakeBoxSels();
+ rTblCrsr.MakeBoxSels();
SwDoc* pDoc = pUnoCrsr->GetDoc();
switch(pEntry->nWID )
{
@@ -1846,15 +1846,15 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, const u
default:
{
SfxItemSet aItemSet( pDoc->GetAttrPool(), pEntry->nWID, pEntry->nWID );
- SwUnoCursorHelper::GetCrsrAttr(pTblCrsr->GetSelRing(),
+ SwUnoCursorHelper::GetCrsrAttr(rTblCrsr.GetSelRing(),
aItemSet);
if (!SwUnoCursorHelper::SetCursorPropertyValue(
- *pEntry, aValue, pTblCrsr->GetSelRing(), aItemSet))
+ *pEntry, aValue, rTblCrsr.GetSelRing(), aItemSet))
{
m_pPropSet->setPropertyValue(*pEntry, aValue, aItemSet);
}
- SwUnoCursorHelper::SetCrsrAttr(pTblCrsr->GetSelRing(),
+ SwUnoCursorHelper::SetCrsrAttr(rTblCrsr.GetSelRing(),
aItemSet, nsSetAttrMode::SETATTR_DEFAULT, true);
}
}
commit 82f0254632198fc2302afbec30468138f224c980
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 11:59:16 2014 +0100
coverity#704972 Unchecked dynamic_cast
Change-Id: I8a3a93b9440992b8107aef6b1f4b204b0399fae1
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index b1f28c8..d3a4eaa 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -618,16 +618,15 @@ static void lcl_FormatTable(SwFrmFmt* pTblFmt)
}
}
-static void lcl_CrsrSelect(SwPaM* pCrsr, bool bExpand)
+static void lcl_CrsrSelect(SwPaM& rCrsr, bool bExpand)
{
if(bExpand)
{
- if(!pCrsr->HasMark())
- pCrsr->SetMark();
+ if(!rCrsr.HasMark())
+ rCrsr.SetMark();
}
- else if(pCrsr->HasMark())
- pCrsr->DeleteMark();
-
+ else if(rCrsr.HasMark())
+ rCrsr.DeleteMark();
}
static void lcl_GetTblSeparators(uno::Any& rRet, SwTable* pTable, SwTableBox* pBox, bool bRow)
@@ -1648,9 +1647,9 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& sCellName, sal_Bool
SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr)
{
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
- bRet = pTblCrsr->GotoTblBox(sCellName);
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ lcl_CrsrSelect(rTblCrsr, Expand);
+ bRet = rTblCrsr.GotoTblBox(sCellName);
}
return bRet;
}
@@ -1662,9 +1661,9 @@ sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool Expand) throw( uno
SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr)
{
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
- bRet = pTblCrsr->Left( Count,CRSR_SKIP_CHARS, false, false);
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ lcl_CrsrSelect(rTblCrsr, Expand);
+ bRet = rTblCrsr.Left(Count, CRSR_SKIP_CHARS, false, false);
}
return bRet;
}
@@ -1676,9 +1675,9 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool Expand) throw( un
SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr)
{
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
- bRet = pTblCrsr->Right( Count, CRSR_SKIP_CHARS, false, false);
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ lcl_CrsrSelect(rTblCrsr, Expand);
+ bRet = rTblCrsr.Right(Count, CRSR_SKIP_CHARS, false, false);
}
return bRet;
}
@@ -1690,9 +1689,9 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( uno::
SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr)
{
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
- bRet = pTblCrsr->UpDown(true, Count, 0, 0);
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ lcl_CrsrSelect(rTblCrsr, Expand);
+ bRet = rTblCrsr.UpDown(true, Count, 0, 0);
}
return bRet;
}
@@ -1704,9 +1703,9 @@ sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool Expand) throw( uno
SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr)
{
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
- bRet = pTblCrsr->UpDown(false, Count, 0, 0);
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ lcl_CrsrSelect(rTblCrsr, Expand);
+ bRet = rTblCrsr.UpDown(false, Count, 0, 0);
}
return bRet;
}
@@ -1717,9 +1716,9 @@ void SwXTextTableCursor::gotoStart(sal_Bool Expand) throw( uno::RuntimeException
SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr)
{
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
- pTblCrsr->MoveTable(fnTableCurr, fnTableStart);
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ lcl_CrsrSelect(rTblCrsr, Expand);
+ rTblCrsr.MoveTable(fnTableCurr, fnTableStart);
}
}
@@ -1729,9 +1728,9 @@ void SwXTextTableCursor::gotoEnd(sal_Bool Expand) throw( uno::RuntimeException,
SwUnoCrsr* pUnoCrsr = GetCrsr();
if(pUnoCrsr)
{
- SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
- lcl_CrsrSelect( pTblCrsr, Expand );
- pTblCrsr->MoveTable(fnTableCurr, fnTableEnd);
+ SwUnoTableCrsr& rTblCrsr = dynamic_cast<SwUnoTableCrsr&>(*pUnoCrsr);
+ lcl_CrsrSelect(rTblCrsr, Expand);
+ rTblCrsr.MoveTable(fnTableCurr, fnTableEnd);
}
}
commit 29d1781fa047631210e6f9251ee0ad10f0beb009
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 11:50:47 2014 +0100
coverity#704955 Unchecked dynamic_cast
and coverity#704956
and coverity#704957
Change-Id: I6df06c3b20440659788b12a1f73dcdd68dcbe5b5
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 7f28bd0..0d9c761 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -151,7 +151,7 @@ public:
void ResetDescriptor();
//copy text from a given source PaM
void SetSelection(SwPaM& rCopySource);
- static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject( SwFlyFrmFmt *pFmt );
+ static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrmFmt &rFmt);
};
typedef cppu::WeakImplHelper3
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index f679b93..1541be2 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -380,7 +380,7 @@ SwFrmFmt *SwDoc::CopyLayoutFmt(
SwFlyFrmFmt *pFormat = MakeFlyFrmFmt( rSource.GetName(), pDest );
pDest = pFormat;
- SwXFrame::GetOrCreateSdrObject(pFormat);
+ SwXFrame::GetOrCreateSdrObject(*pFormat);
}
else
pDest = MakeDrawFrmFmt( OUString(), pDest );
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 44aa2c2..bc8dfd4 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1286,22 +1286,22 @@ void SwXFrame::SetSelection(SwPaM& rCopySource)
*m_pCopySource->GetMark() = *rCopySource.End();
}
-SdrObject *SwXFrame::GetOrCreateSdrObject( SwFlyFrmFmt *pFmt )
+SdrObject *SwXFrame::GetOrCreateSdrObject(SwFlyFrmFmt &rFmt)
{
- SdrObject* pObject = pFmt->FindSdrObject();
+ SdrObject* pObject = rFmt.FindSdrObject();
if( !pObject )
{
- SwDoc *pDoc = pFmt->GetDoc();
+ SwDoc *pDoc = rFmt.GetDoc();
// #i52858# - method name changed
SdrModel *pDrawModel = pDoc->GetOrCreateDrawModel();
SwFlyDrawContact* pContactObject
- = new SwFlyDrawContact( pFmt, pDrawModel );
+ = new SwFlyDrawContact( &rFmt, pDrawModel );
pObject = pContactObject->GetMaster();
- const :: SwFmtSurround& rSurround = pFmt->GetSurround();
+ const :: SwFmtSurround& rSurround = rFmt.GetSurround();
pObject->SetLayer(
( SURROUND_THROUGHT == rSurround.GetSurround() &&
- !pFmt->GetOpaque().GetValue() ) ? pDoc->GetHellId()
+ !rFmt.GetOpaque().GetValue() ) ? pDoc->GetHellId()
: pDoc->GetHeavenId() );
pDrawModel->GetPage(0)->InsertObject( pObject );
@@ -1447,26 +1447,22 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
// New attribute Title
else if( FN_UNO_TITLE == pEntry->nWID )
{
- SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
- OSL_ENSURE( pFmt,
- "unexpected type of <pFmt> --> crash" );
+ SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
OUString sTitle;
aValue >>= sTitle;
// assure that <SdrObject> instance exists.
- GetOrCreateSdrObject( pFlyFmt );
- pFlyFmt->GetDoc()->SetFlyFrmTitle( *(pFlyFmt), sTitle );
+ GetOrCreateSdrObject(rFlyFmt);
+ pFlyFmt->GetDoc()->SetFlyFrmTitle(rFlyFmt, sTitle);
}
// New attribute Description
else if( FN_UNO_DESCRIPTION == pEntry->nWID )
{
- SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
- OSL_ENSURE( pFmt,
- "unexpected type of <pFmt> --> crash" );
+ SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
OUString sDescription;
aValue >>= sDescription;
// assure that <SdrObject> instance exists.
- GetOrCreateSdrObject( pFlyFmt );
- pFlyFmt->GetDoc()->SetFlyFrmDescription( *(pFlyFmt), sDescription );
+ GetOrCreateSdrObject(rFlyFmt);
+ pFlyFmt->GetDoc()->SetFlyFrmDescription(rFlyFmt, sDescription);
}
else if(FN_UNO_FRAME_STYLE_NAME == pEntry->nWID)
{
@@ -1681,7 +1677,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
if( nZOrder >= 0)
{
SdrObject* pObject =
- GetOrCreateSdrObject( (SwFlyFrmFmt*)pFmt );
+ GetOrCreateSdrObject( (SwFlyFrmFmt&)*pFmt );
SdrModel *pDrawModel = pDoc->GetDrawModel();
pDrawModel->GetPage(0)->
SetObjectOrdNum(pObject->GetOrdNum(), nZOrder);
@@ -2088,22 +2084,18 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
// }
else if( FN_UNO_TITLE == pEntry->nWID )
{
- SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
- OSL_ENSURE( pFmt,
- "unexpected type of <pFmt> --> crash" );
+ SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
// assure that <SdrObject> instance exists.
- GetOrCreateSdrObject( pFlyFmt );
- aAny <<= OUString(pFlyFmt->GetObjTitle());
+ GetOrCreateSdrObject(rFlyFmt);
+ aAny <<= OUString(rFlyFmt.GetObjTitle());
}
// New attribute Description
else if( FN_UNO_DESCRIPTION == pEntry->nWID )
{
- SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
- OSL_ENSURE( pFmt,
- "unexpected type of <pFmt> --> crash" );
+ SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
// assure that <SdrObject> instance exists.
- GetOrCreateSdrObject( pFlyFmt );
- aAny <<= OUString(pFlyFmt->GetObjDescription());
+ GetOrCreateSdrObject(rFlyFmt);
+ aAny <<= OUString(rFlyFmt.GetObjDescription());
}
else if(eType == FLYCNTTYPE_GRF &&
(rPropertyName == UNO_NAME_ACTUAL_SIZE))
@@ -2541,22 +2533,18 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
// New attribute Title
else if( FN_UNO_TITLE == pEntry->nWID )
{
- SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
- OSL_ENSURE( pFmt,
- "unexpected type of <pFmt> --> crash" );
+ SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
// assure that <SdrObject> instance exists.
- GetOrCreateSdrObject( pFlyFmt );
- pFlyFmt->GetDoc()->SetFlyFrmTitle( *(pFlyFmt), aEmptyOUStr );
+ GetOrCreateSdrObject(rFlyFmt);
+ pFlyFmt->GetDoc()->SetFlyFrmTitle(rFlyFmt, aEmptyOUStr);
}
// New attribute Description
else if( FN_UNO_DESCRIPTION == pEntry->nWID )
{
- SwFlyFrmFmt* pFlyFmt = dynamic_cast<SwFlyFrmFmt*>(pFmt);
- OSL_ENSURE( pFmt,
- "unexpected type of <pFmt> --> crash" );
+ SwFlyFrmFmt& rFlyFmt = dynamic_cast<SwFlyFrmFmt&>(*pFmt);
// assure that <SdrObject> instance exists.
- GetOrCreateSdrObject( pFlyFmt );
- pFlyFmt->GetDoc()->SetFlyFrmDescription( *(pFlyFmt), aEmptyOUStr );
+ GetOrCreateSdrObject(rFlyFmt);
+ pFlyFmt->GetDoc()->SetFlyFrmDescription(rFlyFmt, aEmptyOUStr);
}
else
{
@@ -3038,7 +3026,7 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
}
}
if( pFmt && pDoc->GetDrawModel() )
- GetOrCreateSdrObject( pFmt );
+ GetOrCreateSdrObject(*pFmt);
const ::uno::Any* pOrder;
if( pProps->GetProperty(FN_UNO_Z_ORDER, 0, pOrder) )
setPropertyValue(UNO_NAME_Z_ORDER, *pOrder);
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 8f91b79..e367b35 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -358,7 +358,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
xPropSet = pXFrame;
if( pDoc->GetDrawModel() )
- SwXFrame::GetOrCreateSdrObject(
+ SwXFrame::GetOrCreateSdrObject(*
static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order
if( !rTblName.isEmpty() )
{
@@ -596,7 +596,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
xPropSet = pXFrame;
if( pDoc->GetDrawModel() )
- SwXFrame::GetOrCreateSdrObject(
+ SwXFrame::GetOrCreateSdrObject(*
static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order
}
}
@@ -653,7 +653,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
xPropSet = pXFrame;
if( pDoc->GetDrawModel() )
- SwXFrame::GetOrCreateSdrObject(
+ SwXFrame::GetOrCreateSdrObject(*
static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order
return xPropSet;
@@ -726,7 +726,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertPlugin(
SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
xPropSet = pXFrame;
if( pDoc->GetDrawModel() )
- SwXFrame::GetOrCreateSdrObject(
+ SwXFrame::GetOrCreateSdrObject(*
static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order
}
}
@@ -877,7 +877,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
SwXFrame *pXFrame = SwXFrames::GetObject( *pFrmFmt, FLYCNTTYPE_OLE );
xPropSet = pXFrame;
if( pDoc->GetDrawModel() )
- SwXFrame::GetOrCreateSdrObject(
+ SwXFrame::GetOrCreateSdrObject(*
static_cast<SwFlyFrmFmt*>( pXFrame->GetFrmFmt() ) ); // req for z-order
}
}
commit 0ffc74d67364ff85310791a660f9d32a796bcf9d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 11:45:19 2014 +0100
coverity#704952 Unchecked dynamic_cast
Change-Id: If49ed05f54a9c89107d3a2836386c111966d0f54
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index aa9af3b..c96ba75b 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2635,10 +2635,9 @@ the last cell they can be added.
bool SwChartDataSequence::ExtendTo( bool bExtendCol,
sal_Int32 nFirstNew, sal_Int32 nCount )
{
- bool bChanged = false;
-
SwUnoTableCrsr* pUnoTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pTblCrsr);
- //pUnoTblCrsr->MakeBoxSels();
+ if (!pUnoTblCrsr)
+ return false;
const SwStartNode *pStartNd = 0;
const SwTableBox *pStartBox = 0;
@@ -2665,6 +2664,7 @@ bool SwChartDataSequence::ExtendTo( bool bExtendCol,
SwRangeDescriptor aDesc;
FillRangeDescriptor( aDesc, aCellRange );
+ bool bChanged = false;
OUString aNewStartCell;
OUString aNewEndCell;
if (bExtendCol && aDesc.nBottom + 1 == nFirstNew)
commit fb58002b5922561591096ecfc0c96b0313eb7792
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 11:43:29 2014 +0100
coverity#704924 Unchecked dynamic_cast
Change-Id: Ib8ca2a400947a4085238c3e0936636fbe134a023
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 7e765e3..ef638a8 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -3459,9 +3459,10 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs,
(Frm().*fnRect->fnGetHeight)();
(Frm().*fnRect->fnAddBottom)( nDiff );
// #i68520#
- if ( dynamic_cast<SwFlyFrm*>(this) )
+ SwFlyFrm *pFlyFrm = dynamic_cast<SwFlyFrm*>(this);
+ if (pFlyFrm)
{
- dynamic_cast<SwFlyFrm*>(this)->InvalidateObjRectWithSpaces();
+ pFlyFrm->InvalidateObjRectWithSpaces();
}
(this->*fnRect->fnSetYMargins)( nTop, nBorder - nTop );
ChgLowersProp( aOldSz );
commit cf5851d039490d78288292389b8afd0b7f9959c3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 11:41:45 2014 +0100
coverity#704704 Unchecked dynamic_cast
Change-Id: Iea6ee88d61e9f9c8396fe4aa0481a92001d7dcb8
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 7c8c444..cb9f3df 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -542,8 +542,8 @@ void ScFormulaDlg::setDispatcherLock( bool bLock )
void ScFormulaDlg::setReferenceInput(const formula::FormEditData* _pData)
{
ScModule* pScMod = SC_MOD();
- ScFormEditData* pData = const_cast<ScFormEditData*>(dynamic_cast<const ScFormEditData*>(_pData));
- pScMod->SetRefInputHdl(pData->GetInputHandler());
+ ScFormEditData& rData = const_cast<ScFormEditData&>(dynamic_cast<const ScFormEditData&>(*_pData));
+ pScMod->SetRefInputHdl(rData.GetInputHandler());
}
void ScFormulaDlg::deleteFormData()
{
commit 898197327d0497cd624629ecd17339fc3d999098
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 11:37:29 2014 +0100
coverity#704475 Division or modulo by float zero
and coverity#704477
and coverity#704479
and coverity#704480
Change-Id: I505d499b39a37bdba33e13917aaf1519f0624bcf
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 89e5e97..aedd9bf 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -940,8 +940,8 @@ void Writer::Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Si
Size szDestPixel = mpVDev->LogicToPixel(srcSize, aTWIPSMode);
- double pixXScale = static_cast<double>(szDestPixel.Width()) / originalPixelRect.GetWidth();
- double pixYScale = static_cast<double>(szDestPixel.Height()) / originalPixelRect.GetHeight();
+ double pixXScale = originalPixelRect.GetWidth() ? static_cast<double>(szDestPixel.Width()) / originalPixelRect.GetWidth() : 1.0;
+ double pixYScale = originalPixelRect.GetHeight() ? static_cast<double>(szDestPixel.Height()) / originalPixelRect.GetHeight() : 1.0;
// AS: If the image has been scaled down, then scale down the quality
// that we use for JPEG compression.
@@ -1272,8 +1272,8 @@ bool Writer::Impl_writeFilling( SvtGraphicFill& rFilling )
aMatrix.set(2, 2, 1.0);
// scale bitmap
- double XScale = (double)aNewRect.GetWidth()/aOldRect.GetWidth();
- double YScale = (double)aNewRect.GetHeight()/aOldRect.GetHeight();
+ double XScale = aOldRect.GetWidth() ? (double)aNewRect.GetWidth()/aOldRect.GetWidth() : 1.0;
+ double YScale = aOldRect.GetHeight() ? (double)aNewRect.GetHeight()/aOldRect.GetHeight() : 1.0;
aMatrix.scale( XScale, YScale );
commit af142a08d66db0d89a726dc9b6b99c52cc2c3c03
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 09:31:23 2014 +0100
coverity#703943 Unchecked return value
Change-Id: Ief79d090988c2178980724c7a7835f01457a8019
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index bb14e03..290312d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2157,11 +2157,10 @@ void Desktop::PreloadConfigurationData()
}
// preload user interface element factories
- Sequence< Sequence< css::beans::PropertyValue > > aSeqSeqPropValue;
Reference< XUIElementFactoryManager > xUIElementFactory = theUIElementFactoryManager::get( xContext );
try
{
- aSeqSeqPropValue = xUIElementFactory->getRegisteredFactories();
+ xUIElementFactory->getRegisteredFactories();
}
catch ( const ::com::sun::star::uno::Exception& )
{
@@ -2174,7 +2173,7 @@ void Desktop::PreloadConfigurationData()
css::frame::thePopupMenuControllerFactory::get( xContext );
try
{
- xPopupMenuControllerFactory->hasController(
+ (void)xPopupMenuControllerFactory->hasController(
OUString( ".uno:CharFontName" ),
OUString() );
}
@@ -2183,7 +2182,6 @@ void Desktop::PreloadConfigurationData()
}
// preload filter configuration
- Sequence< OUString > aSeq;
xNameAccess = Reference< XNameAccess >(
xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.FilterFactory", xContext),
UNO_QUERY );
@@ -2191,7 +2189,7 @@ void Desktop::PreloadConfigurationData()
{
try
{
- aSeq = xNameAccess->getElementNames();
+ xNameAccess->getElementNames();
}
catch ( const ::com::sun::star::uno::Exception& )
{
@@ -2206,7 +2204,7 @@ void Desktop::PreloadConfigurationData()
{
try
{
- aSeq = xNameAccess->getElementNames();
+ xNameAccess->getElementNames();
}
catch ( const ::com::sun::star::uno::Exception& )
{
commit bbb598aeff2fb552beb2251f8de9333aae79f0ad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 28 09:25:38 2014 +0100
coverity#703935 Unchecked return value
Change-Id: I9300af5f9c2c430d0e67bfb8e16478db6be65477
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 53da9da..4c8b79f 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -234,7 +234,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
if( aBmpEx.Filter( BMP_FILTER_MOSAIC, &aParam ) )
{
if( IsEnhanceEdges() )
- aBmpEx.Filter( BMP_FILTER_SHARPEN );
+ (void)aBmpEx.Filter( BMP_FILTER_SHARPEN );
aRet = aBmpEx;
}
More information about the Libreoffice-commits
mailing list