[Libreoffice-commits] core.git: 3 commits - dictionaries sw/source

[Libreoffice Gerrit user]

 dictionaries                     |    2 +-
 sw/source/core/crsr/crstrvl.cxx  |    8 ++++----
 sw/source/core/fields/expfld.cxx |    1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit dfdb7f9fcffe0b8594359c22277b64c7b6cdfd4c
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Mar 6 18:38:37 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu Mar 7 11:28:54 2019 +0100

    tdf#123637 sw_redlinehide: fix iteration in SwCursorShell::GotoNextOutline()
    
    If nStartPos == size() and !bUseFirst.
    
    (regression from d0e9cc832d19b622532f01580d9cf78ee0b215db)
    
    Change-Id: I571d24ec5e9d4f2780e7c6d5c8cee09baeaffcc1
    Reviewed-on: https://gerrit.libreoffice.org/68821
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index f99e4a7c2978..41f4cbe9f669 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1033,13 +1033,13 @@ bool SwCursorShell::GotoNextOutline()
 
     do
     {
-        if (nPos == rNds.GetOutLineNds().size())
+        if (!bUseFirst)
         {
-            nPos = 0;
+            ++nPos;
         }
-        else if (!bUseFirst)
+        if (rNds.GetOutLineNds().size() <= nPos)
         {
-            ++nPos;
+            nPos = 0;
         }
 
         if (bUseFirst)
commit ac7de9a54d67e4e4f3bacedb68a4cff6cc6e9af0
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Mar 6 17:11:25 2019 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Thu Mar 7 11:28:42 2019 +0100

    sw_redlinehide: fix SwGetExpField ODF import
    
    After import, SwGetExpField are empty if ShowRedlineChanges=false
    because the content from the document is lost in SwGetExpField::Copy().
    
    Example is ooo26330-3.sxw, which then asserts once fields are updated,
    but that is a different problem.
    
    (regression from 57f358f1ac4f3e05fcdf54326388ba8a19f0f2b3)
    
    Change-Id: I1bf939d69e599919c3a5c5631091ca0a0074d139
    Reviewed-on: https://gerrit.libreoffice.org/68820
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 228f4cb762ad..6db9140996b2 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -331,6 +331,7 @@ std::unique_ptr<SwField> SwGetExpField::Copy() const
     pTmp->m_fValueRLHidden = m_fValueRLHidden;
     pTmp->SwValueField::SetValue(GetValue());
     pTmp->m_sExpand       = m_sExpand;
+    pTmp->m_sExpandRLHidden = m_sExpandRLHidden;
     pTmp->m_bIsInBodyText  = m_bIsInBodyText;
     pTmp->SetAutomaticLanguage(IsAutomaticLanguage());
     if( m_bLateInitialization )
commit 0c78c85b92dc0d10e56cf62d0a23e293f9912ce3
Author:     Lior Kaplan <kaplanlior at gmail.com>
AuthorDate: Sun Dec 30 00:07:47 2018 +0200
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Thu Mar 7 11:28:24 2019 +0100

    Update git submodules
    
    * Update dictionaries from branch 'master'
      - Replace : with # in comments lines
    
        Change-Id: I1bcd51d4dab501a051dd6bebe98380299390fc3b
        Reviewed-on: https://gerrit.libreoffice.org/67282
        Reviewed-by: Andras Timar <andras.timar at collabora.com>
        Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/dictionaries b/dictionaries
index c5a06ed0bf1d..a9c644453756 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit c5a06ed0bf1d10fcbc160e590d01ebc22271ba23
+Subproject commit a9c644453756b5b3d2eaba8c715fcbc775626565