commit 6b496d6a0f8b9de38fbf6721796104496d927db3
author Caolán McNamara <caolanm@redhat.com> Thu Jun 21 10:34:32 2018 +0100
committer Caolán McNamara <caolanm@redhat.com> Thu Jun 21 13:23:01 2018 +0200
tree a65bb8a72e84eb1ddb26e2bba10bee2cc2899397
parent 1fd79d7aee815ce0c3facbc4ee15077079d465fd

ofz#9023 Undefined-shift

Change-Id: I167461e51bdc1fd68120a9d482ca7b08205a93f2
Reviewed-on: https://gerrit.libreoffice.org/56226
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

include/vcl/font/Feature.hxx

diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index 0fa8f6d..0ab375e 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -23,7 +23,8 @@ namespace font
{
constexpr sal_uInt32 featureCode(const char sFeature[4])
{
    return sFeature[0] << 24 | sFeature[1] << 16 | sFeature[2] << 8 | sFeature[3] << 0;
    return static_cast<sal_uInt32>(sFeature[0]) << 24U | static_cast<sal_uInt32>(sFeature[1]) << 16U
           | static_cast<sal_uInt32>(sFeature[2]) << 8U | static_cast<sal_uInt32>(sFeature[3]);
}

VCL_DLLPUBLIC OUString featureCodeAsString(sal_uInt32 nFeature);