diff options
| author | Noel Grandin <noel@peralex.com> | 2014-08-01 12:34:33 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-20 09:01:26 -0500 |
| commit | 794d5ac4ac0b1dcaac289772ce096a4295d4e15d (patch) | |
| tree | d02d4d13e793b0856c4dd962cf4b8d946942e3c4 /vcl/source/control | |
| parent | 71804294c79136ef43a8f91b5c961e266d32187a (diff) | |
vcl: use enum for complex text layout constants
Since these constants are bitfield flags, we define some methods to make
working with them reasonably type safe.
Move the definitions to outdevstate.hxx, since we need the values there,
and that appears to be the "root most" header file.
Also dump TEXT_LAYOUT_BIDI_LTR constant, since it means the same thing
as TEXT_LAYOUT_DEFAULT (ie. 0), and leaving it in causes people to write
weird code thinking that it's a real flag.
Change-Id: Iddab86cd6c78181ceb8caa48e77e1f5a8e526343
Reviewed-on: https://gerrit.libreoffice.org/10676
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/ctrl.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/control/edit.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index c505afa3d094..8c5ac2e0dd37 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -74,7 +74,7 @@ void Control::EnableRTL( bool bEnable ) { // convenience: for controls also switch layout mode SetLayoutMode( bEnable ? TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT : - TEXT_LAYOUT_BIDI_LTR | TEXT_LAYOUT_TEXTORIGIN_LEFT ); + TEXT_LAYOUT_TEXTORIGIN_LEFT ); StateChanged( STATE_CHANGE_MIRRORING ); OutputDevice::EnableRTL(bEnable); } diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index bf6b283e43ee..b1b903a2e6e3 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2238,7 +2238,7 @@ void Edit::StateChanged( StateChangedType nType ) else if( mbIsSubEdit && !GetParent()->IsRTLEnabled() ) { if ( nType == STATE_CHANGE_MIRRORING ) - SetLayoutMode( TEXT_LAYOUT_BIDI_LTR | TEXT_LAYOUT_TEXTORIGIN_LEFT ); + SetLayoutMode( TEXT_LAYOUT_TEXTORIGIN_LEFT ); } if ( nStyle & WB_RIGHT ) |