diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2017-03-19 17:01:02 +0200 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2017-03-19 17:01:02 +0200 |
commit | 12490e743fadd9e1d509cdaeee67ccb15e024657 (patch) | |
tree | 89fafda4455da0723c223794928bea873ad491dd /vcl | |
parent | 550c6ed03a6d5d56ec23ce0d18d081b03226f539 (diff) |
This can move out of the header as well
Change-Id: I995ad7fb040e11363a70ee2b5cd88e068f06771c
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/CommonSalLayout.hxx | 9 | ||||
-rw-r--r-- | vcl/source/gdi/CommonSalLayout.cxx | 14 |
2 files changed, 12 insertions, 11 deletions
diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx index 17498eccc20a..471ca4d2da02 100644 --- a/vcl/inc/CommonSalLayout.hxx +++ b/vcl/inc/CommonSalLayout.hxx @@ -91,14 +91,5 @@ public: bool IsKashidaPosValid(int nCharPos) const final override; }; -// these must match the values in vcl/source/gdi/VerticalOrientationData.cxx -enum class VerticalOrientation { - Upright = 0, - Rotated = 1, - TransformedUpright = 2, - TransformedRotated = 3 -}; - - #endif // INCLUDED_VCL_INC_COMMONSALLAYOUT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index 07b82dae5302..522a0dc6f5ec 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -302,9 +302,19 @@ namespace vcl { } } }; +} // namespace vcl +namespace { #include "VerticalOrientationData.cxx" + // These must match the values in the file included above. + enum class VerticalOrientation { + Upright = 0, + Rotated = 1, + TransformedUpright = 2, + TransformedRotated = 3 + }; + VerticalOrientation GetVerticalOrientation(sal_UCS4 cCh, const LanguageTag& rTag) { // Override fullwidth colon and semi-colon orientation. Tu is preferred. @@ -333,7 +343,7 @@ namespace vcl { return VerticalOrientation(nRet); } -} // namespace vcl +} // namespace std::shared_ptr<vcl::TextLayoutCache> CommonSalLayout::CreateTextLayoutCache(OUString const& rString) const { @@ -509,7 +519,7 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs) { sal_Int32 nPrevIdx = nIdx; sal_UCS4 aChar = rArgs.mrStr.iterateCodePoints(&nIdx); - VerticalOrientation aVo = vcl::GetVerticalOrientation(aChar, rArgs.maLanguageTag); + VerticalOrientation aVo = GetVerticalOrientation(aChar, rArgs.maLanguageTag); sal_UCS4 aVariationSelector = 0; if (nIdx < nEndRunPos) |