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 /include/vcl/metaact.hxx | |
| 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 'include/vcl/metaact.hxx')
| -rw-r--r-- | include/vcl/metaact.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 569fd64de23d..572a0a2f3be4 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -35,6 +35,7 @@ #include <vcl/gfxlink.hxx> #include <vcl/lineinfo.hxx> #include <vcl/metaactiontypes.hxx> +#include <vcl/outdevstate.hxx> class SvStream; @@ -1562,7 +1563,7 @@ class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction { private: - sal_uInt32 mnLayoutMode; + ComplexTextLayoutMode mnLayoutMode; virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; public: @@ -1575,9 +1576,9 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; - explicit MetaLayoutModeAction( sal_uInt32 nLayoutMode ); + explicit MetaLayoutModeAction( ComplexTextLayoutMode nLayoutMode ); - sal_uInt32 GetLayoutMode() const { return mnLayoutMode; } + ComplexTextLayoutMode GetLayoutMode() const { return mnLayoutMode; } }; class VCL_DLLPUBLIC MetaTextLanguageAction : public MetaAction |