From ea733ab5b632109d28bb8f1dc37116340b26229b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 10 Sep 2014 17:53:41 +0200 Subject: Turn SfxItemState into a C++11 scoped enumeration ...to gain further confidence in the claim "that none of the existing code tries to uses combinations of these enum values" (d92602c5b13d0a60439d86c5a033d124178726ca "more fixes for SfxItemState") Change-Id: I987922d945e8738e38adfde83b869adf3ff35b13 Reviewed-on: https://gerrit.libreoffice.org/11384 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann --- .../source/controller/itemsetwrapper/TextLabelItemConverter.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx') diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx index c18247507337..e0e5bbe31c1d 100644 --- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx @@ -95,7 +95,7 @@ bool numberFormatFromItemToPropertySet( OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_VALUE == nWhichId) ? OUString(CHART_UNONAME_NUMFMT) : OUString("PercentageNumberFormat"); sal_uInt16 nSourceWhich = (SID_ATTR_NUMBERFORMAT_VALUE == nWhichId) ? SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE; - if (SFX_ITEM_SET != rItemSet.GetItemState(nSourceWhich)) + if (SfxItemState::SET != rItemSet.GetItemState(nSourceWhich)) return bChanged; uno::Any aValue; @@ -103,7 +103,7 @@ bool numberFormatFromItemToPropertySet( if (!bUseSourceFormat) { SfxItemState aState = rItemSet.GetItemState(nWhichId); - if (aState == SFX_ITEM_SET) + if (aState == SfxItemState::SET) { sal_Int32 nFmt = static_cast( static_cast( @@ -143,7 +143,7 @@ bool useSourceFormatFromItemToPropertySet( OUString aPropertyName = (SID_ATTR_NUMBERFORMAT_SOURCE == nWhichId) ? OUString(CHART_UNONAME_NUMFMT) : OUString("PercentageNumberFormat"); sal_uInt16 nFormatWhich = (SID_ATTR_NUMBERFORMAT_SOURCE == nWhichId) ? SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE; - if (SFX_ITEM_SET != rItemSet.GetItemState(nWhichId)) + if (SfxItemState::SET != rItemSet.GetItemState(nWhichId)) return bChanged; uno::Any aNewValue; @@ -152,7 +152,7 @@ bool useSourceFormatFromItemToPropertySet( if (!bUseSourceFormat) { SfxItemState aState = rItemSet.GetItemState(nFormatWhich); - if (aState == SFX_ITEM_SET) + if (aState == SfxItemState::SET) { sal_Int32 nFormatKey = static_cast( static_cast( -- cgit