Kaydet (Commit) 6e2a0170 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1430057 rework warning code to use nonwarning pattern

Change-Id: I1e41e81a88825a7c91ffb9603eb9d769bd41822a
Reviewed-on: https://gerrit.libreoffice.org/54143Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst a4ca3023
...@@ -263,8 +263,6 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo ...@@ -263,8 +263,6 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo
sal_Int16 nMaxLeading, sal_Int16 nMaxLeading,
const css::beans::PropertyValues& aProperties ) const css::beans::PropertyValues& aProperties )
{ {
int k = 0;
PropertyHelper_Hyphenation& rHelper = GetPropHelper(); PropertyHelper_Hyphenation& rHelper = GetPropHelper();
rHelper.SetTmpPropVals(aProperties); rHelper.SetTmpPropVals(aProperties);
sal_Int16 minTrail = rHelper.GetMinTrailing(); sal_Int16 minTrail = rHelper.GetMinTrailing();
...@@ -276,15 +274,15 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo ...@@ -276,15 +274,15 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo
Reference< XHyphenatedWord > xRes; Reference< XHyphenatedWord > xRes;
k = -1; int k = -1;
for (size_t j = 0; j < mvDicts.size(); j++) for (size_t j = 0; j < mvDicts.size(); ++j)
{ {
if (aLocale == mvDicts[j].aLoc) if (aLocale == mvDicts[j].aLoc)
k = j; k = j;
} }
// if we have a hyphenation dictionary matching this locale // if we have a hyphenation dictionary matching this locale
if (k >= 0) if (k != -1)
{ {
int nHyphenationPos = -1; int nHyphenationPos = -1;
int nHyphenationPosAlt = -1; int nHyphenationPosAlt = -1;
...@@ -520,9 +518,10 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const ...@@ -520,9 +518,10 @@ Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const
} }
int k = -1; int k = -1;
for (size_t j = 0; j < mvDicts.size(); j++) for (size_t j = 0; j < mvDicts.size(); ++j)
{ {
if (aLocale == mvDicts[j].aLoc) k = j; if (aLocale == mvDicts[j].aLoc)
k = j;
} }
// if we have a hyphenation dictionary matching this locale // if we have a hyphenation dictionary matching this locale
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment