tdf#105417 sw hyphenation: avoid infinite loop on zero-length last line

This hang happened when the user executed Tools -> Language ->
Hyphenation -> Hyphenate All.

This problem is visible only if all of these conditions are met:
- a line in a paragraph has a word that already contains a soft-hyphen,
  but not at the position where the automatic hyphenation would insert
  it
- the last line ends with a word that can be hyphenated
- there is a fly frame in the document

In this case it happens during hyphenation that the layout has an
additional empty line at the end (which is removed by the time the
layout finishes), so we hit the case when SwTextFormatter::Hyphenate()
skips the "if( m_pCurr->PrtWidth() && m_pCurr->GetLen() )" block.

Normally hyphenation terminates when it iterates over the portions of the
line and no overrun nor any existing hyphen portion are seen, but in
this case that never happened. Fix the problem by terminating not only
when we reach the end of the portion iteration, but also when the
portion list is non-existing (has zero length).

(cherry picked from commit 1b6fa616087e7415be9dc7113bbd8bf381aadd70)

Conflicts:
	sw/qa/extras/uiwriter/uiwriter.cxx

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

5 files changed, 35 insertions, 2 deletions

diff --git a/sw/qa/extras/uiwriter/data/tdf105417.odt b/sw/qa/extras/uiwriter/data/tdf105417.odt
new file mode 100644
index 000000000000..d594d2a5aed5
--- /dev/null
+++ b/sw/qa/extras/uiwriter/data/tdf105417.odt
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index bbd16708152c..48c1e546fb5f 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -86,10 +86,12 @@
 #include <paratr.hxx>
 #include <drawfont.hxx>
 #include <txtfrm.hxx>
+#include <hyp.hxx>
 #include <editeng/svxenum.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <sfx2/classificationhelper.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <editeng/unolingu.hxx>
 #include <config_features.h>
 
 static const char* DATA_DIRECTORY = "/sw/qa/extras/uiwriter/data/";
@@ -201,6 +203,7 @@ public:
     void testTdf84695NormalChar();
     void testTdf78727();
     void testTdf104814();
+    void testTdf105417();
 
     CPPUNIT_TEST_SUITE(SwUiWriterTest);
     CPPUNIT_TEST(testReplaceForward);
@@ -304,6 +307,7 @@ public:
     CPPUNIT_TEST(testTdf84695NormalChar);
     CPPUNIT_TEST(testTdf78727);
     CPPUNIT_TEST(testTdf104814);
+    CPPUNIT_TEST(testTdf105417);
     CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -3730,6 +3734,29 @@ void SwUiWriterTest::testTdf104814()
         pEditShell->AcceptRedline(0);
 }
 
+void SwUiWriterTest::testTdf105417()
+{
+    SwDoc* pDoc = createDoc("tdf105417.odt");
+    CPPUNIT_ASSERT(pDoc);
+    SwView* pView = pDoc->GetDocShell()->GetView();
+    CPPUNIT_ASSERT(pView);
+    uno::Reference<linguistic2::XHyphenator> xHyphenator = LinguMgr::GetHyphenator();
+    CPPUNIT_ASSERT(xHyphenator.is());
+    // If there are no English hyphenation rules installed, we can't test
+    // hyphenation.
+    if (!xHyphenator->hasLocale(lang::Locale("en", "US", OUString())))
+        return;
+
+    uno::Reference<linguistic2::XLinguProperties> xLinguProperties(LinguMgr::GetLinguPropertySet());
+    // Automatic hyphenation means not opening a dialog, but going ahead
+    // non-interactively.
+    xLinguProperties->setIsHyphAuto(true);
+    SwHyphWrapper aWrap(pView, xHyphenator, /*bStart=*/false, /*bOther=*/true, /*bSelection=*/false);
+    // This never returned, it kept trying to hyphenate the last word
+    // (greenbacks) again and again.
+    aWrap.SpellDocument();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 369a22ae3b03..6b5bd8470648 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -197,6 +197,11 @@ bool SwTextFormatter::Hyphenate( SwInterHyphInfo &rHyphInf )
         if( !pPos )
             nWrdStart = 0;
     }
+    else
+        // In case the whole line is zero-length, that's the same situation as
+        // above when the portion iteration ends without explicitly breaking
+        // from the loop.
+        nWrdStart = 0;
 
     // Das alte LineLayout wird wieder eingestellt ...
     delete m_pCurr;
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index c8881ba301f6..3656662c377e 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -23,10 +23,11 @@
 #include <tools/link.hxx>
 #include <editeng/splwrap.hxx>
 #include <com/sun/star/linguistic2/XHyphenator.hpp>
+#include <swdllapi.h>
 
 class SwView;
 
-class SwHyphWrapper : public SvxSpellWrapper {
+class SW_DLLPUBLIC SwHyphWrapper : public SvxSpellWrapper {
 private:
     SwView* pView;
     sal_uInt16      nPageCount;     // page count for progress view
diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx
index dc2a33cc89ff..3ae1352603df 100644
--- a/sw/source/uibase/lingu/hyp.cxx
+++ b/sw/source/uibase/lingu/hyp.cxx
@@ -119,7 +119,7 @@ SwHyphWrapper::~SwHyphWrapper()
 {
     if( nPageCount )
         ::EndProgress( pView->GetDocShell() );
-    if( bInfoBox )
+    if( bInfoBox && !Application::IsHeadlessModeEnabled() )
         ScopedVclPtrInstance<InfoBox>(&pView->GetEditWin(), SW_RESSTR(STR_HYP_OK))->Execute();
 }