diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-03 15:37:02 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-10-03 16:55:11 +0200 |
commit | 2b6385a9f58e9f8adfd406e087186eb0cbba700b (patch) | |
tree | 192db26b5fed1c91f3a737ef53e75c9071dddbda /sd | |
parent | 532a4dcba6ec6fe1bd88f3c2db77f05868167886 (diff) |
convert TPB_DISPLAY_NAME constants to scoped enum
Change-Id: I0e4f9ce3392e48fc82c232ba3e6581f3b0d9af9f
Reviewed-on: https://gerrit.libreoffice.org/43083
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/view/drviews1.cxx | 16 | ||||
-rw-r--r-- | sd/source/ui/view/drviewsb.cxx | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 14a873323738..02caf3eaa473 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -1167,22 +1167,22 @@ void DrawViewShell::ResetActualLayer() // Set page bits for modified tab name display - TabBarPageBits nBits = 0; + TabBarPageBits nBits = TabBarPageBits::NONE; SdrPageView* pPV = mpDrawView->GetSdrPageView(); if (pPV) { if (!pPV->IsLayerVisible(aName)) { - nBits |= TPB_DISPLAY_NAME_BLUE; + nBits |= TabBarPageBits::Blue; } if (pPV->IsLayerLocked(aName)) { - nBits |= TPB_DISPLAY_NAME_ITALIC; + nBits |= TabBarPageBits::Italic; } if (!pPV->IsLayerPrintable(aName)) { - nBits |= TPB_DISPLAY_NAME_UNDERLINE; + nBits |= TabBarPageBits::Underline; } } @@ -1200,19 +1200,19 @@ void DrawViewShell::ResetActualLayer() // Set page bits for modified tab name display - TabBarPageBits nBits = 0; + TabBarPageBits nBits = TabBarPageBits::NONE; if (!mpDrawView->GetSdrPageView()->IsLayerVisible(aName)) { - nBits = TPB_DISPLAY_NAME_BLUE; + nBits = TabBarPageBits::Blue; } if (mpDrawView->GetSdrPageView()->IsLayerLocked(aName)) { - nBits |= TPB_DISPLAY_NAME_ITALIC; + nBits |= TabBarPageBits::Italic; } if (!mpDrawView->GetSdrPageView()->IsLayerPrintable(aName)) { - nBits |= TPB_DISPLAY_NAME_UNDERLINE; + nBits |= TabBarPageBits::Underline; } // Save the bits diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 877d30c8d26b..336b43699cb5 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -190,19 +190,19 @@ void DrawViewShell::ModifyLayer ( // Set page bits for modified tab name display - TabBarPageBits nBits = 0; + TabBarPageBits nBits = TabBarPageBits::NONE; if (!bIsVisible) { - nBits = TPB_DISPLAY_NAME_BLUE; + nBits = TabBarPageBits::Blue; } if (bIsLocked) { - nBits |= TPB_DISPLAY_NAME_ITALIC; + nBits |= TabBarPageBits::Italic; } if (!bIsPrintable) { - nBits |= TPB_DISPLAY_NAME_UNDERLINE; + nBits |= TabBarPageBits::Underline; } // Save the bits |