mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This can move out of the header as well

Browse Source 
Change-Id: I995ad7fb040e11363a70ee2b5cd88e068f06771c
This commit is contained in:
Khaled Hosny 2017-03-19 17:01:02 +02:00
parent 550c6ed03a
commit 12490e743f
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vcl/inc/CommonSalLayout.hxx
View File

@ -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: */

14
vcl/source/gdi/CommonSalLayout.cxx
View File

@ -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)