summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2016-11-25 14:00:07 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2017-12-06 20:41:34 -0500
commitafee24b73e379bf7f9e9d2cf647d8686896f9f8a (patch)
tree18840de8ca0c1102279f2c541202be81904c59a1 /include
parent5d65ea5198b204613d564b52282bf678af91d967 (diff)
Kill old Core Text layout engine
Reviewed-on: https://gerrit.libreoffice.org/31232 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Khaled Hosny <khaledhosny@eglug.org> (cherry picked from commit d761d952f460e1943e94c5a7556b3b01d2259666) Change-Id: If80d65899255d8be72f374fbec232d103a08a006
Diffstat (limited to 'include')
-rw-r--r--include/vcl/outdev.hxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 5e71bf1dcab9..1b45b8703bcf 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -142,11 +142,10 @@ enum class SalLayoutFlags
SubstituteDigits = 0x0400,
KashidaJustification = 0x0800,
ForFallback = 0x2000,
- DrawBullet = 0x4000,
};
namespace o3tl
{
- template<> struct typed_flags<SalLayoutFlags> : is_typed_flags<SalLayoutFlags, 0x6f77> {};
+ template<> struct typed_flags<SalLayoutFlags> : is_typed_flags<SalLayoutFlags, 0x2f77> {};
}
typedef std::vector< Rectangle > MetricVector;
@@ -1180,7 +1179,7 @@ private:
SAL_DLLPRIVATE void ImplInitAboveTextLineSize();
- SAL_DLLPRIVATE bool ImplDrawTextDirect( SalLayout&, bool bTextLines, sal_uInt32 flags = 0 );
+ SAL_DLLPRIVATE void ImplDrawTextDirect( SalLayout&, bool bTextLines);
SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& );
SAL_DLLPRIVATE void ImplDrawTextRect( long nBaseX, long nBaseY, long nX, long nY, long nWidth, long nHeight );