summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2019-04-09 17:57:42 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2019-04-10 10:17:06 +0200
commit0017c9b5720ddc4d6327ec06e05c681f08ea6f1d (patch)
treee2fe6d1b45f72291b11b1b6e31ed32c3f2d78d17
parent7587e39014c1b6ed505e9c10d9f0f0803fc986ac (diff)
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@cib.de>
-rw-r--r--sw/source/uibase/inc/wrtsh.hxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx2
-rw-r--r--sw/source/uibase/wrtsh/move.cxx3
3 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 7d01662075bc..f474046de4be 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -472,7 +472,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 df6e2d037d8b..eebc6eee42d1 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1975,7 +1975,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 46c96bc9a6e8..8b15c5e9dff7 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -629,13 +629,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 )