diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-20 14:46:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-05-22 06:33:12 +0000 |
| commit | 83eb114394879cbfd073322a51c47d02553c1fcf (patch) | |
| tree | 5cd7d277ffc175fc7e6fd66140cb280caf1b0451 /svtools/source/control | |
| parent | e929194317a7debb1c5467282230cbbabe61a710 (diff) | |
convert constants in include/vcl/settings.hxx to scoped enums
Change-Id: I2a110c017f13eca6ddbd70ef3ed195d24adef0a3
Reviewed-on: https://gerrit.libreoffice.org/15828
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svtools/source/control')
| -rw-r--r-- | svtools/source/control/fmtfield.cxx | 8 | ||||
| -rw-r--r-- | svtools/source/control/valueset.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 720b2044565d..93b997a8664b 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -383,8 +383,8 @@ void FormattedField::SetTextFormatted(const OUString& rStr) aNewSel.Max() = nNewLen; if (!nCurrentLen) { // there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options - sal_uLong nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); - if (nSelOptions & SELECTION_OPTION_SHOWFIRST) + SelectionOptions nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); + if (nSelOptions & SelectionOptions::ShowFirst) { // selection should be from right to left -> swap min and max aNewSel.Min() = aNewSel.Max(); aNewSel.Max() = 0; @@ -499,8 +499,8 @@ void FormattedField::ImplSetTextImpl(const OUString& rNew, Selection* pNewSel) aSel.Max() = nNewLen; if (!nCurrentLen) { // there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options - sal_uLong nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); - if (nSelOptions & SELECTION_OPTION_SHOWFIRST) + SelectionOptions nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); + if (nSelOptions & SelectionOptions::ShowFirst) { // selection should be from right to left -> swap min and max aSel.Min() = aSel.Max(); aSel.Max() = 0; diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index c0c8446189bc..49e784aa7a0c 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -980,7 +980,7 @@ void ValueSet::ImplDraw(vcl::RenderContext& rRenderContext) Size aWinSize = rRenderContext.GetOutputSizePixel(); Point aPos1(NAME_LINE_OFF_X, mnTextOffset + NAME_LINE_OFF_Y); Point aPos2(aWinSize.Width() - (NAME_LINE_OFF_X * 2), mnTextOffset + NAME_LINE_OFF_Y); - if (!(rStyleSettings.GetOptions() & STYLE_OPTION_MONO)) + if (!(rStyleSettings.GetOptions() & StyleSettingsOptions::Mono)) { rRenderContext.SetLineColor(rStyleSettings.GetShadowColor()); rRenderContext.DrawLine(aPos1, aPos2); |