[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - i18npool/source

[László Németh]

 i18npool/source/breakiterator/breakiterator_unicode.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 891652082c4d09cc069f1902ba19e4bd96e8c384
Author: László Németh <nemeth at numbertext.org>
Date:   Tue Jul 1 00:18:13 2014 +0200

    fdo#79372, fdo#56392 fix hyphenation
    
    Change-Id: Iacf84d023d3b4795892bc444299a29bfc663345e
    Reviewed-on: https://gerrit.libreoffice.org/10001
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 126ac7a..5270b1d 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -398,7 +398,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
             uno::Reference< linguistic2::XHyphenatedWord > aHyphenatedWord;
             aHyphenatedWord = hOptions.rHyphenator->hyphenate(Text.copy(wBoundary.startPos,
                         wBoundary.endPos - wBoundary.startPos), rLocale,
-                    (sal_Int16) (hOptions.hyphenIndex - wBoundary.startPos - nStartPosWordEnd), hOptions.aHyphenationOptions);
+                    (sal_Int16) (hOptions.hyphenIndex - wBoundary.startPos - ((hOptions.hyphenIndex == wBoundary.endPos)? nStartPosWordEnd : 0)), hOptions.aHyphenationOptions);
             if (aHyphenatedWord.is()) {
                 lbr.rHyphenatedWord = aHyphenatedWord;
                 if(wBoundary.startPos + aHyphenatedWord->getHyphenationPos() + 1 < nMinBreakPos )