summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/outlnvsh.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-24 16:05:55 +0200
committerNoel Grandin <noel@peralex.com>2015-03-25 08:56:14 +0200
commitabf60c4a0fd111985891e2faa30a1e32799fdf9c (patch)
treeb83b66c7457b8e221a01dfe3808adc918c41e6b9 /sd/source/ui/view/outlnvsh.cxx
parent6cb56b551bc1e30a887d8a333d70567cad23aa9e (diff)
convert EE_CNTRL constants to enum class
there were a couple of lines in SC and SW where the code was using a EV_CNTRL constant. I switched it to used the same-valued constant from EE_CNTRL Change-Id: I027183cc3b6e700bf365d48833e37eddc9b50f04
Diffstat (limited to 'sd/source/ui/view/outlnvsh.cxx')
-rw-r--r--sd/source/ui/view/outlnvsh.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index bc7ec61bc3a8..24df4ce1107b 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -785,9 +785,9 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
else
{
// Enable color view?
- sal_uLong nCntrl = rOutl.GetControlWord();
+ EEControlBits nCntrl = rOutl.GetControlWord();
bool bNoColor = false;
- if (nCntrl & EE_CNTRL_NOCOLORS)
+ if (nCntrl & EEControlBits::NOCOLORS)
bNoColor = true;
rSet.Put( SfxBoolItem( SID_COLORVIEW, bNoColor ) );
@@ -1231,12 +1231,12 @@ void OutlineViewShell::ReadFrameViewData(FrameView* pView)
rOutl.SetFlatMode( pView->IsNoAttribs() );
- sal_uLong nCntrl = rOutl.GetControlWord();
+ EEControlBits nCntrl = rOutl.GetControlWord();
if ( pView->IsNoColors() )
- rOutl.SetControlWord(nCntrl | EE_CNTRL_NOCOLORS);
+ rOutl.SetControlWord(nCntrl | EEControlBits::NOCOLORS);
else
- rOutl.SetControlWord(nCntrl & ~EE_CNTRL_NOCOLORS);
+ rOutl.SetControlWord(nCntrl & ~EEControlBits::NOCOLORS);
sal_uInt16 nPage = mpFrameView->GetSelectedPage();
pLastPage = GetDoc()->GetSdPage( nPage, PK_STANDARD );
@@ -1250,9 +1250,9 @@ void OutlineViewShell::WriteFrameViewData()
{
::Outliner& rOutl = pOlView->GetOutliner();
- sal_uLong nCntrl = rOutl.GetControlWord();
+ EEControlBits nCntrl = rOutl.GetControlWord();
bool bNoColor = false;
- if (nCntrl & EE_CNTRL_NOCOLORS)
+ if (nCntrl & EEControlBits::NOCOLORS)
bNoColor = true;
mpFrameView->SetNoColors(bNoColor);
mpFrameView->SetNoAttribs( rOutl.IsFlatMode() );