diff options
author | Noel Grandin <noel@peralex.com> | 2016-05-18 11:56:40 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-25 09:12:04 +0000 |
commit | 233df63c540f4431ae67693021309ccb66b8f764 (patch) | |
tree | 1672c18d8448e2472993e0f3066ee0c4c5914fe5 /sc/source/core/data/fillinfo.cxx | |
parent | dc24a1d86c2bb3232c734b1a9d098f7331f47f99 (diff) |
Convert SC_MF to scoped enum
Change-Id: I3089006b502e33710bfb2564f051ebf2892ad08a
Reviewed-on: https://gerrit.libreoffice.org/25085
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/source/core/data/fillinfo.cxx')
-rw-r--r-- | sc/source/core/data/fillinfo.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index c50f0ede5378..8cd7534ade82 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -82,10 +82,10 @@ static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, } else { - sal_uInt16 nOverlap = static_cast<const ScMergeFlagAttr*>(pDoc->GetAttr( + ScMF nOverlap = static_cast<const ScMergeFlagAttr*>(pDoc->GetAttr( rStartX, rStartY, nTab, ATTR_MERGE_FLAG ))->GetValue(); - bHOver = ((nOverlap & SC_MF_HOR) != 0); - bVOver = ((nOverlap & SC_MF_VER) != 0); + bHOver = bool(nOverlap & ScMF::Hor); + bVOver = bool(nOverlap & ScMF::Ver); } } @@ -105,9 +105,9 @@ static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, } else { - sal_uInt16 nOverlap = static_cast<const ScMergeFlagAttr*>(pDoc->GetAttr( + ScMF nOverlap = static_cast<const ScMergeFlagAttr*>(pDoc->GetAttr( rStartX, rStartY, nTab, ATTR_MERGE_FLAG ))->GetValue(); - bVOver = ((nOverlap & SC_MF_VER) != 0); + bVOver = bool(nOverlap & ScMF::Ver); } } @@ -534,15 +534,15 @@ void ScDocument::FillInfo( const ScMergeAttr* pMergeAttr = static_cast<const ScMergeAttr*>( &pPattern->GetItem(ATTR_MERGE)); bool bMerged = ( pMergeAttr != pDefMerge && *pMergeAttr != *pDefMerge ); - sal_uInt16 nOverlap = static_cast<const ScMergeFlagAttr*>( &pPattern->GetItemSet(). + ScMF nOverlap = static_cast<const ScMergeFlagAttr*>( &pPattern->GetItemSet(). Get(ATTR_MERGE_FLAG))->GetValue(); - bool bHOverlapped = ((nOverlap & SC_MF_HOR) != 0); - bool bVOverlapped = ((nOverlap & SC_MF_VER) != 0); - bool bAutoFilter = ((nOverlap & SC_MF_AUTO) != 0); - bool bPivotButton = ((nOverlap & SC_MF_BUTTON) != 0); - bool bScenario = ((nOverlap & SC_MF_SCENARIO) != 0); - bool bPivotPopupButton = ((nOverlap & SC_MF_BUTTON_POPUP) != 0); - bool bFilterActive = ((nOverlap & SC_MF_HIDDEN_MEMBER) != 0); + bool bHOverlapped(nOverlap & ScMF::Hor); + bool bVOverlapped(nOverlap & ScMF::Ver); + bool bAutoFilter(nOverlap & ScMF::Auto); + bool bPivotButton(nOverlap & ScMF::Button); + bool bScenario(nOverlap & ScMF::Scenario); + bool bPivotPopupButton(nOverlap & ScMF::ButtonPopup); + bool bFilterActive(nOverlap & ScMF::HiddenMember); if (bMerged||bHOverlapped||bVOverlapped) bAnyMerged = true; // internal |