[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 2 commits - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/txtnode/ndtxt.cxx  |    5 ++++-
 sw/source/uibase/inc/wrtsh.hxx    |    2 +-
 sw/source/uibase/uiview/view2.cxx |    2 +-
 sw/source/uibase/wrtsh/move.cxx   |    3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 96695f152b3419db734378b66b09516e52c15b2e
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Apr 9 17:57:42 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Apr 10 11:30:02 2019 +0200

    tdf#124469 sw_redlinehide: fix PDF export of links to sequence fields
    
    Missed one call where the return value must be forwarded.
    
    (regression from 7d481f7ac1971be622520258a4b13ada29282844
     and 943d9be770e550d20ca72274fa5e914d1f61e605)
    
    Change-Id: Ic405b29a1dce982bfdd81eeb5d678ceb79690bfc
    Reviewed-on: https://gerrit.libreoffice.org/70469
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 0017c9b5720ddc4d6327ec06e05c681f08ea6f1d)

diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 9c631d5375d3..c1969b38e80d 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -469,7 +469,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)();
     void GotoOutline( SwOutlineNodes::size_type nIdx );
     bool GotoOutline( const OUString& rName );
     bool GotoRegion( const OUString& rName );
-    void GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType = 0,
+    bool GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType = 0,
         sal_uInt16 nSeqNo = 0 );
     bool GotoNextTOXBase( const OUString* pName = nullptr);
     bool GotoTable( const OUString& rName );
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index cd19b7e83c8b..df03857092b6 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1956,7 +1956,7 @@ bool SwView::JumpToSwMark( const OUString& rMark )
                 {
                     sal_uInt16 nSeqNo = sName.copy( nNoPos + 1 ).toInt32();
                     sName = sName.copy( 0, nNoPos );
-                    m_pWrtShell->GotoRefMark( sName, REF_SEQUENCEFLD, nSeqNo );
+                    bRet = m_pWrtShell->GotoRefMark(sName, REF_SEQUENCEFLD, nSeqNo);
                 }
             }
             else if( sCmp == "text" )
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index 027340954a2e..66baea42726d 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -632,13 +632,14 @@ bool SwWrtShell::GotoRegion( const OUString& rName )
     return bRet;
  }
 
-void SwWrtShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType,
+bool SwWrtShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType,
                                     sal_uInt16 nSeqNo )
 {
     SwPosition aPos = *GetCursor()->GetPoint();
     bool bRet = SwCursorShell::GotoRefMark(rRefMark, nSubType, nSeqNo);
     if (bRet)
         m_aNavigationMgr.addEntry(aPos);
+    return bRet;
 }
 
 bool SwWrtShell::GotoNextTOXBase( const OUString* pName )
commit 12dc419768d99b34a59f7568cab337b5162bf3e5
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Tue Apr 9 17:15:50 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Apr 10 11:29:50 2019 +0200

    tdf#124586 sw_redlinehide: fix crash in SwTextNode::NumRuleChgd()
    
    (regression from c180c9447256588fe5e7991e06642883574760ae)
    
    Change-Id: Ie3c935ee5dd42187ca8ad2b28406b80e63c0d1e3
    Reviewed-on: https://gerrit.libreoffice.org/70467
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 7587e39014c1b6ed505e9c10d9f0f0803fc986ac)

diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 5285c71fc903..eea82d1aa324 100755
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2870,7 +2870,10 @@ void SwTextNode::NumRuleChgd()
         if ( pNumRule && pNumRule != GetNum()->GetNumRule() )
         {
             mpNodeNum->ChangeNumRule( *pNumRule );
-            mpNodeNumRLHidden->ChangeNumRule( *pNumRule );
+            if (mpNodeNumRLHidden)
+            {
+                mpNodeNumRLHidden->ChangeNumRule(*pNumRule);
+            }
         }
     }