summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-09-21 10:37:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-09-21 09:24:55 +0000
commit51c6e9153de507f37d1474b31f557265cb304c06 (patch)
tree6d02d302fbee51a934c9fb8235cf4b410fde5d53 /sc
parent25e4708c1f49986f3f082beb2e940aa2d7fb4d81 (diff)
convert SfxItemPresentation to scoped enum
Change-Id: Ibf605706a9f804ab509ac4f92f5f88fcf3daebc1 Reviewed-on: https://gerrit.libreoffice.org/29131 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/attrib.cxx20
-rw-r--r--sc/source/core/data/docpool.cxx4
2 files changed, 12 insertions, 12 deletions
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index add4cf23c78d..3b8a19c83020 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -295,11 +295,11 @@ bool ScProtectionAttr::GetPresentation
switch ( ePres )
{
- case SFX_ITEM_PRESENTATION_NAMELESS:
+ case SfxItemPresentation::Nameless:
rText = GetValueText();
break;
- case SFX_ITEM_PRESENTATION_COMPLETE:
+ case SfxItemPresentation::Complete:
rText = ScGlobal::GetRscString(STR_PROTECTION)
+ ": "
+ (bProtection ? aStrYes : aStrNo)
@@ -401,11 +401,11 @@ bool ScRangeItem::GetPresentation
switch ( ePres )
{
- case SFX_ITEM_PRESENTATION_COMPLETE:
+ case SfxItemPresentation::Complete:
rText = ScGlobal::GetRscString(STR_AREA) + ": ";
SAL_FALLTHROUGH;
- case SFX_ITEM_PRESENTATION_NAMELESS:
+ case SfxItemPresentation::Nameless:
{
/* Always use OOo:A1 format */
rText += aRange.Format();
@@ -500,7 +500,7 @@ bool ScTableListItem::GetPresentation
{
switch ( ePres )
{
- case SFX_ITEM_PRESENTATION_NAMELESS:
+ case SfxItemPresentation::Nameless:
{
rText = "(";
if ( nCount>0 && pTabArr )
@@ -514,7 +514,7 @@ bool ScTableListItem::GetPresentation
}
return true;
- case SFX_ITEM_PRESENTATION_COMPLETE:
+ case SfxItemPresentation::Complete:
rText.clear();
return false;
@@ -834,7 +834,7 @@ bool ScViewObjectModeItem::GetPresentation
switch ( ePres )
{
- case SFX_ITEM_PRESENTATION_COMPLETE:
+ case SfxItemPresentation::Complete:
switch( Which() )
{
case SID_SCATTR_PAGE_CHARTS:
@@ -852,7 +852,7 @@ bool ScViewObjectModeItem::GetPresentation
default: break;
}
SAL_FALLTHROUGH;
- case SFX_ITEM_PRESENTATION_NAMELESS:
+ case SfxItemPresentation::Nameless:
rText += ScGlobal::GetRscString(STR_VOBJ_MODE_SHOW+GetValue());
return true;
break;
@@ -1000,12 +1000,12 @@ bool ScPageScaleToItem::GetPresentation(
switch( ePres )
{
- case SFX_ITEM_PRESENTATION_NAMELESS:
+ case SfxItemPresentation::Nameless:
rText = aValue;
return true;
break;
- case SFX_ITEM_PRESENTATION_COMPLETE:
+ case SfxItemPresentation::Complete:
rText = aName + " (" + aValue + ")";
return true;
break;
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 6c5021551ae3..e8f07f0e7111 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -762,7 +762,7 @@ static bool lcl_HFPresentation
default:
if ( !pIntl )
pIntl = ScGlobal::GetScIntlWrapper();
- pItem->GetPresentation( SFX_ITEM_PRESENTATION_COMPLETE, eCoreMetric, ePresentationMetric, aText, pIntl );
+ pItem->GetPresentation( SfxItemPresentation::Complete, eCoreMetric, ePresentationMetric, aText, pIntl );
}
@@ -902,7 +902,7 @@ bool ScDocumentPool::GetPresentation(
default:
if ( !pIntl )
pIntl = ScGlobal::GetScIntlWrapper();
- ePresentationRet = rItem.GetPresentation( SFX_ITEM_PRESENTATION_COMPLETE, GetMetric( nW ), ePresentationMetric, rText, pIntl );
+ ePresentationRet = rItem.GetPresentation( SfxItemPresentation::Complete, GetMetric( nW ), ePresentationMetric, rText, pIntl );
break;
}