diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2011-11-29 02:06:57 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2011-11-29 10:07:04 +0900 |
commit | 1aae826501c9a26d40b0827e69d84f680dff6a6b (patch) | |
tree | c229c28414e3289be9c893dba38aee793d298051 /chart2/source/controller | |
parent | 3c795a953ffc36856588cd6b1dc23f7a83ac815d (diff) |
catch by const reference
Diffstat (limited to 'chart2/source/controller')
39 files changed, 91 insertions, 93 deletions
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index b3202ff6d91d..ce1021daef20 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -626,7 +626,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis() xProp->setPropertyValue( C2U( "Show" ), uno::makeAny( sal_False ) ); } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index b54be6b86a27..60a76e1bd43b 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -693,9 +693,8 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyDefault( const ::rtl::OUString& } } } - catch( beans::UnknownPropertyException& ex ) + catch( const beans::UnknownPropertyException& ) { - (void)(ex); aRet = WrappedPropertySet::getPropertyDefault( rPropertyName ); } return aRet; diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 2f1bcfea9276..46bb9a1f416d 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -1631,7 +1631,7 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con xProp->getPropertyValue( m_aOuterName ) >>= nNumberOfLines; bHasDetectableInnerValue = true; } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -1675,7 +1675,7 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con if( nOldValue == nNewValue ) return; } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -1702,7 +1702,7 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con xProp->setPropertyValue( C2U( "NumberOfLines" ), uno::makeAny(nNewValue) ); xTemplate->changeDiagram( xDiagram ); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -1967,7 +1967,7 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con xInnerPropertySet->setPropertyValue( C2U( "RelativeSize" ), Any() ); } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index d7d51aff49f5..4a757df7e4a1 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -168,7 +168,7 @@ Reference< beans::XPropertySet > GridWrapper::getInnerPropertySet() sal_Int32 nSubGridIndex = bSubGrid ? 0 : -1; xRet.set( AxisHelper::getGridProperties( xCooSys , nDimensionIndex, MAIN_AXIS_INDEX, nSubGridIndex ) ); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 21abdf6d4da8..f81f2ebb8046 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -295,7 +295,7 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< ::rtl:: { this->setPropertyValue( aPropertyName, rValueSeq[nN] ); } - catch( beans::UnknownPropertyException& ex ) + catch( const beans::UnknownPropertyException& ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index ade86bf00849..04b78adc921f 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -266,7 +266,7 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< ::rtl::O { this->setPropertyValue( aPropertyName, rValueSeq[nN] ); } - catch( beans::UnknownPropertyException& ex ) + catch( const beans::UnknownPropertyException& ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index f61574a532f6..c08412fe3bb9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -86,7 +86,7 @@ void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, xInnerPropertySet->setPropertyValue( C2U( "RelativePosition" ), Any() ); } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 811faed51339..7dc3da1210ab 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -97,7 +97,7 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R else xInnerPropertySet->setPropertyValue( aRefSizeName, Any() ); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index c3faeebd5261..bd1ed551a6fd 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -115,7 +115,7 @@ void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& r ControllerLockGuard aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); xTemplate->changeDiagram( xDiagram ); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 25b87f92971c..c0f17516a590 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -442,7 +442,7 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol ) bFoundSize = true; } } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } @@ -463,7 +463,7 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol ) } rSymbol.Size = aSize; } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index cea253b23cf7..1dae363fd956 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -317,7 +317,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla { this->setTemplateProperties( xTemplateProps ); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -1195,7 +1195,7 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar { xTemplateProps->getPropertyValue( C2U("NumberOfLines") ) >>= nNumLines; } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 38d619aba554..e0abe6d416a0 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -186,7 +186,7 @@ struct lcl_DataSeriesContainerAppend : public } } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -244,7 +244,7 @@ struct lcl_RolesWithRangeAppend : public } } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -443,7 +443,7 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const } } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -496,7 +496,7 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges( } } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -567,7 +567,7 @@ Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter( ThreeDHelper::setScheme( xDiagram, e3DScheme ); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -595,7 +595,7 @@ Reference< data::XLabeledDataSequence > DialogModel::getCategories() const xResult.set( DiagramHelper::getCategoriesFromDiagram( xDiagram )); } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -660,7 +660,7 @@ void DialogModel::detectArguments( Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY_THROW ), rOutRangeString, aSequenceMapping, rOutUseColumns, rOutFirstCellAsLabel, rOutHasCategories ); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -714,7 +714,7 @@ bool DialogModel::setData( ThreeDHelper::setScheme( xDiagram, e3DScheme ); } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); return false; @@ -811,7 +811,7 @@ void DialogModel::applyInterpretedData( OSL_ASSERT( (*aDestIt).is()); (*aDestIt)->setDataSeries( *aSrcIt ); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index 23d599ea063e..ee0e61d3a740 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -181,7 +181,7 @@ OUString lcl_getDataPointValueText( const Reference< XDataSeries >& xSeries, sal a_Size = aNumberFormatterWrapper.getFormattedString( nNumberFormatKey, fValue, nLabelColor, bColorChanged ); } } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx index a5183943a13a..be7783ca11f7 100644 --- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx @@ -78,7 +78,7 @@ Reference< sheet::XRangeSelection > RangeSelectionHelper::getRangeSelection() if( xDataProvider.is()) m_xRangeSelection.set( xDataProvider->getRangeSelection()); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); @@ -109,7 +109,7 @@ void RangeSelectionHelper::raiseRangeSelectionDocument() } } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -155,7 +155,7 @@ bool RangeSelectionHelper::chooseRange( xRangeSel->startRangeSelection( aArgs ); } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { bResult = false; ASSERT_EXCEPTION( ex ); diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 6dc3c88267ef..ed1f5e858429 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -202,7 +202,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing( { xProps->getPropertyValue( C2U( "DisableDataTableDialog" ) ) >>= m_bDisableDataTableDialog; } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index e8a04873d8c7..4755e0477603 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -133,7 +133,7 @@ void LegendPositionResources::writeToResources( const uno::Reference< frame::XMo } } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -176,7 +176,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen xProp->setPropertyValue( C2U( "RelativePosition" ), uno::Any()); } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 3139349bbcdc..8952f2f9ec3b 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -852,7 +852,7 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent { xProps->getPropertyValue( C2U( "DisableComplexChartTypes" ) ) >>= bDisableComplexChartTypes; } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index b0a66c5b46a0..2deb40595b7a 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -1042,7 +1042,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField ) lcl_UpdateCurrentRange( m_aLB_ROLE, aSelectedRole, aRange ); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { bResult = false; ASSERT_EXCEPTION( ex ); @@ -1060,7 +1060,7 @@ bool DataSourceTabPage::updateModelFromControl( Edit * pField ) if( xModifiable.is() ) xModifiable->setModified( sal_True ); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index 609fb83aaa2b..8359aa2f4362 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -96,7 +96,7 @@ SfxObjectShell * lcl_GetParentObjectShell( const uno::Reference< frame::XModel > } } } - catch( uno::Exception& ) + catch( const uno::Exception& ) { // TODO: error handling } diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index 572a3c6afe0e..4824cc3b57ca 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -161,7 +161,7 @@ SdrObjList* ViewElementListProvider::GetSymbolList() const m_pSymbolList = pSdrObject->GetSubList(); } } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index cb47280a57a4..ec69b4c2aad2 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -295,7 +295,7 @@ void CharacterPropertyItemConverter::FillSpecialItem( rOutItemSet.Put( aItem ); } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -556,7 +556,7 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( } } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index db5a8968568f..27d8b9e2e2d8 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -391,7 +391,7 @@ bool DataPointItemConverter::ApplySpecialItem( bChanged = true; } } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } @@ -426,7 +426,7 @@ bool DataPointItemConverter::ApplySpecialItem( bChanged = true; } } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } @@ -613,7 +613,7 @@ void DataPointItemConverter::FillSpecialItem( GetPropertySet()->getPropertyValue( C2U( "LabelSeparator" ) ) >>= aValue; rOutItemSet.Put( SfxStringItem( nWhichId, aValue )); } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } @@ -630,7 +630,7 @@ void DataPointItemConverter::FillSpecialItem( else if( m_aAvailableLabelPlacements.getLength() ) rOutItemSet.Put( SfxInt32Item( nWhichId, m_aAvailableLabelPlacements[0] )); } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index 5d525b7c40c8..c9d290e04d33 100644 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -68,7 +68,7 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar xErrorBarProp->getPropertyValue( C2U( "PositiveError" )) >>= rOutPosError; xErrorBarProp->getPropertyValue( C2U( "NegativeError" )) >>= rOutNegError; } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -86,7 +86,7 @@ void lcl_getErrorIndicatorValues( xErrorBarProp->getPropertyValue( C2U( "ShowPositiveError" )) >>= rOutShowPosError; xErrorBarProp->getPropertyValue( C2U( "ShowNegativeError" )) >>= rOutShowNegError; } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 374cdc2a4e08..c173ad26b5d3 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -298,7 +298,7 @@ void GraphicPropertyItemConverter::FillSpecialItem( } } } - catch( beans::UnknownPropertyException &ex ) + catch( const beans::UnknownPropertyException &ex ) { ASSERT_EXCEPTION( ex ); } @@ -542,7 +542,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( } } } - catch( beans::UnknownPropertyException &ex ) + catch( const beans::UnknownPropertyException &ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 5885ef4286a0..dae0ad45f13e 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -138,7 +138,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const delete pItem; } } - catch( beans::UnknownPropertyException &ex ) + catch( const beans::UnknownPropertyException &ex ) { delete pItem; (void)ex; @@ -149,9 +149,8 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const " - unknown Property: " )) + aProperty.first, RTL_TEXTENCODING_ASCII_US ).getStr()); } - catch( uno::Exception &ex ) + catch( const uno::Exception &ex ) { - (void)ex; ASSERT_EXCEPTION( ex ); } } @@ -162,7 +161,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const { FillSpecialItem( nWhich, rOutItemSet ); } - catch( uno::Exception &ex ) + catch( const uno::Exception &ex ) { ASSERT_EXCEPTION( ex ); } @@ -212,7 +211,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet ) bItemsChanged = true; } } - catch( beans::UnknownPropertyException &ex ) + catch( const beans::UnknownPropertyException &ex ) { (void)ex; OSL_FAIL( @@ -222,7 +221,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet ) " - unknown Property: " )) + aProperty.first, RTL_TEXTENCODING_ASCII_US).getStr()); } - catch( uno::Exception &ex ) + catch( const uno::Exception &ex ) { (void)ex; OSL_FAIL( ::rtl::OUStringToOString( diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index fff2ddc6eef1..774bad37e398 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -165,7 +165,7 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe bChanged = true; } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index 405b5bff0e27..4b32929dcc68 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -173,7 +173,7 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( } } } - catch( uno::Exception &ex ) + catch( const uno::Exception &ex ) { ASSERT_EXCEPTION( ex ); } @@ -346,7 +346,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf bChanged = true; } } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index c87cd7fa5081..797df1e6b6e1 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -68,7 +68,7 @@ uno::Reference< beans::XPropertySet > lcl_GetYErrorBar( { ( xProp->getPropertyValue( C2U( "ErrorBarY" )) >>= xResult ); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -118,7 +118,7 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar xErrorBarProp->getPropertyValue( C2U( "PositiveError" )) >>= rOutPosError; xErrorBarProp->getPropertyValue( C2U( "NegativeError" )) >>= rOutNegError; } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -136,7 +136,7 @@ void lcl_getErrorIndicatorValues( xErrorBarProp->getPropertyValue( C2U( "ShowPositiveError" )) >>= rOutShowPosError; xErrorBarProp->getPropertyValue( C2U( "ShowNegativeError" )) >>= rOutShowNegError; } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 8faaf758bdcb..31ad274858c6 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -232,7 +232,7 @@ void ChartController::TheModel::tryTermination() m_bOwnership = false; m_bOwnershipIsWellKnown = sal_True; } - catch( util::CloseVetoException& ) + catch( const util::CloseVetoException& ) { //since we have indicated to give up the ownership with paramter true in close call //the one who has thrown the CloseVetoException is the new owner @@ -255,7 +255,7 @@ void ChartController::TheModel::tryTermination() return; } } - catch( uno::Exception& ex) + catch(const uno::Exception& ex) { (void)(ex); // no warning in non-debug builds OSL_FAIL( ( rtl::OString("Termination of model failed: ") @@ -453,7 +453,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTAT m_xLayoutManagerEventBroadcaster->addLayoutManagerEventListener( this ); } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -917,7 +917,7 @@ void ChartController::impl_deleteDrawViewController() xFrameCloseable->close( sal_False /* DeliverOwnership */ ); m_xFrame.clear(); } - catch( util::CloseVetoException & ) + catch( const util::CloseVetoException & ) { // closing was vetoed } diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 99960e91488c..f39852278475 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -148,7 +148,7 @@ void ChartController::executeDispatch_InsertAxes() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -182,7 +182,7 @@ void ChartController::executeDispatch_InsertGrid() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -216,7 +216,7 @@ void ChartController::executeDispatch_InsertTitles() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -266,7 +266,7 @@ void ChartController::executeDispatch_OpenLegendDialog() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -332,7 +332,7 @@ void ChartController::executeDispatch_InsertMenu_DataLabels() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -382,7 +382,7 @@ void ChartController::executeDispatch_InsertMenu_YErrorBars() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -462,7 +462,7 @@ void ChartController::executeDispatch_InsertMenu_Trendlines() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -789,7 +789,7 @@ void ChartController::executeDispatch_InsertAxisTitle() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -811,7 +811,7 @@ void ChartController::executeDispatch_InsertAxis() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -833,7 +833,7 @@ void ChartController::executeDispatch_DeleteAxis() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -855,7 +855,7 @@ void ChartController::executeDispatch_InsertMajorGrid() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -877,7 +877,7 @@ void ChartController::executeDispatch_DeleteMajorGrid() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -901,7 +901,7 @@ void ChartController::executeDispatch_InsertMinorGrid() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -925,7 +925,7 @@ void ChartController::executeDispatch_DeleteMinorGrid() aUndoGuard.commit(); } } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 73828edd3d58..f4dcb0340d04 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -183,7 +183,7 @@ void SAL_CALL ChartController::executeDispatch_PositionAndSize() } delete pDlg; } - catch( uno::Exception& e) + catch(const uno::Exception& e) { delete pDlg; ASSERT_EXCEPTION( e ); diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx index 8f81464dcd0c..4697458d3140 100644 --- a/chart2/source/controller/main/ChartController_Properties.cxx +++ b/chart2/source/controller/main/ChartController_Properties.cxx @@ -818,10 +818,10 @@ bool ChartController::executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl: } } } - catch( util::CloseVetoException& ) + catch( const util::CloseVetoException& ) { } - catch( uno::RuntimeException& ) + catch( const uno::RuntimeException& ) { } return bRet; @@ -842,7 +842,7 @@ void SAL_CALL ChartController::executeDispatch_View3D() if( aDlg.Execute() == RET_OK ) aUndoGuard.commit(); } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 10cfa8320f29..51021eeca84a 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -236,7 +236,7 @@ void ChartController::executeDispatch_NewArrangement() aUndoGuard.commit(); } } - catch( uno::RuntimeException & ex ) + catch( const uno::RuntimeException & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 699a3f385b3f..84fb32e0a606 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -539,7 +539,7 @@ void ChartController::execute_Paint( const Rectangle& rRect ) pDrawViewWrapper->CompleteRedraw(m_pChartWindow, Region(rRect) ); } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -890,7 +890,7 @@ void ChartController::execute_MouseButtonUp( const MouseEvent& rMEvt ) } } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index 80f697c2fd1d..1ded91269376 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -185,7 +185,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT } } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/main/ChartRenderer.cxx b/chart2/source/controller/main/ChartRenderer.cxx index 27b45f482ca8..a6179c13f806 100644 --- a/chart2/source/controller/main/ChartRenderer.cxx +++ b/chart2/source/controller/main/ChartRenderer.cxx @@ -135,7 +135,7 @@ bool ChartRenderer::DoPaint(OutputDevice* pOutDev, const Rectangle& rLogicObject pOutDev->SetMapMode(aOldMapMode); } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 66837aeb02ff..1a37a1ce75ab 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -287,7 +287,7 @@ void ControllerState::update( if( xEqProp.is()) xEqProp->getPropertyValue( C2U("ShowCorrelationCoefficient") ) >>= bHasR2Value; } - catch( uno::RuntimeException& e) + catch(const uno::RuntimeException& e) { ASSERT_EXCEPTION( e ); } @@ -537,7 +537,7 @@ void ControllerCommandDispatch::updateCommandAvailability() { xProps->getPropertyValue( C2U( "DisableDataTableDialog" ) ) >>= bDisableDataTableDialog; } - catch( uno::Exception& e ) + catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index d2ed048d421f..d059c1ab2234 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -509,7 +509,7 @@ void ImplObjectHierarchy::createDataSeriesTree( } } } - catch( uno::Exception & ex ) + catch( const uno::Exception & ex ) { ASSERT_EXCEPTION( ex ); } @@ -538,7 +538,7 @@ void ImplObjectHierarchy::createAdditionalShapesTree( ObjectHierarchy::tChildCon } } } - catch ( uno::Exception& ex ) + catch ( const uno::Exception& ex ) { ASSERT_EXCEPTION( ex ); } diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 06239425903e..5878e4c318d1 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -642,7 +642,7 @@ SdrObject* ShapeController::getFirstAdditionalShape() } } } - catch ( uno::Exception& ex ) + catch ( const uno::Exception& ex ) { ASSERT_EXCEPTION( ex ); } @@ -682,7 +682,7 @@ SdrObject* ShapeController::getLastAdditionalShape() } } } - catch ( uno::Exception& ex ) + catch ( const uno::Exception& ex ) { ASSERT_EXCEPTION( ex ); } |