[Libreoffice-commits] core.git: 3 commits - editeng/source sc/UIConfig_scalc.mk vcl/qt5

[Libreoffice Gerrit user]

 editeng/source/rtf/svxrtf.cxx |   18 +++++++++++++++++-
 sc/UIConfig_scalc.mk          |    1 +
 vcl/qt5/Qt5Widget.cxx         |    1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 8f5de14bece7548f44aafc32d3bb3d9d2211a389
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 8 12:53:05 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Nov 8 18:09:43 2018 +0100

    Resolves: tdf#121200 better ofz#7802 infinite loop fix
    
    Change-Id: I50163d6545782012b177a48a1aded0572499f9af
    Reviewed-on: https://gerrit.libreoffice.org/63097
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 6f8299e0716e..eed91b25158f 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -352,18 +352,34 @@ void SvxRTFParser::ReadStyleTable()
             case RTF_CHRFMT:
             case RTF_BRDRDEF:
             case RTF_TABSTOPDEF:
-
+#ifndef NDEBUG
+                auto nEnteringToken = nToken;
+#endif
+                auto nEnteringIndex = m_nTokenIndex;
+                int nSkippedTokens = 0;
                 if( RTF_SWGDEFS & nToken)
                 {
                     if( RTF_IGNOREFLAG != GetStackPtr( -1 )->nTokenId )
                         break;
                     nToken = SkipToken();
+                    ++nSkippedTokens;
                     if( '{' == GetStackPtr( -1 )->nTokenId )
                     {
                         nToken = SkipToken();
+                        ++nSkippedTokens;
                     }
                 }
                 ReadAttr( nToken, &pStyle->aAttrSet );
+                if (nSkippedTokens && m_nTokenIndex == nEnteringIndex - nSkippedTokens)
+                {
+                    // we called SkipToken to go back one or two, but ReadAttrs
+                    // read nothing, so on next loop of the outer while we
+                    // would end up in the same state again (assert that)
+                    assert(nEnteringToken == GetNextToken());
+                    // and loop endlessly, skip format a token
+                    // instead to avoid that
+                    SkipToken(nSkippedTokens);
+                }
                 break;
             }
             break;
commit f0effa0e891d2bb64df6c5c70088938774db1f76
Author:     Aleksei Nikiforov <darktemplar at basealt.ru>
AuthorDate: Thu Nov 8 15:21:14 2018 +0300
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Thu Nov 8 18:03:32 2018 +0100

    tdf#120784 KDE5: Process "Enter" key from numpad like normal "Enter" key
    
    Change-Id: Id4a721aa30e92a9396f93342cf42d5790207bb89
    Reviewed-on: https://gerrit.libreoffice.org/63095
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index 1055ccd9fb16..9edb7d15f89f 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -262,6 +262,7 @@ static sal_uInt16 GetKeyCode(int keyval)
                 nCode = KEY_PAGEDOWN;
                 break;
             case Qt::Key_Return:
+            case Qt::Key_Enter:
                 nCode = KEY_RETURN;
                 break;
             case Qt::Key_Escape:
commit bc8d99997b8087dad2a7a6c4ce768e532c4e2d56
Author:     andreas kainz <kainz.a at gmail.com>
AuthorDate: Thu Nov 8 14:33:42 2018 +0100
Commit:     andreas_kainz <kainz.a at gmail.com>
CommitDate: Thu Nov 8 17:58:42 2018 +0100

    NB tabbed compact calc: copy files to install dir
    
    Change-Id: Ibe2db53db5bffde38d24e105e87a6739dc6dbe8f
    Reviewed-on: https://gerrit.libreoffice.org/63101
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>
    Tested-by: andreas_kainz <kainz.a at gmail.com>

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index d6aabe949204..96fa2e3c42e0 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -149,6 +149,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
 	sc/uiconfig/scalc/ui/leftheaderdialog \
 	sc/uiconfig/scalc/ui/namerangesdialog \
 	sc/uiconfig/scalc/ui/notebookbar \
+	sw/uiconfig/swriter/ui/notebookbar_compact \
 	sc/uiconfig/scalc/ui/notebookbar_groups \
 	sc/uiconfig/scalc/ui/notebookbar_groupedbar_full \
 	sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact \