diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-09-18 16:21:44 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-09-19 10:08:55 +0200 |
| commit | f62ba688ca1c22fcdcf7efd811d702e982799882 (patch) | |
| tree | b0b58daa34da816da3376864d43fe5bd50a441b9 /sw/source/core/crsr/trvlfnfl.cxx | |
| parent | sw_redlinehide_2: replace SW_REDLINEHIDE with ExperimentalMode config (diff) | |
| download | core-private/mst/sw_redlinehide_2.tar.gz core-private/mst/sw_redlinehide_2.zip | |
sw: rework annoying GetFrameOfModify/getLayoutFrame parameters
private/mst/sw_redlinehide_2
The bCalcFrame is only evaluated if a pPoint is given; this is
surprising and should be more visible in the interface, so people don't
go on a goose chase to find places that may do formatting in
inappropriate places.
So put these parameters into a pair instead, which doesn't have
particularly good ergonomics in C++, particularly since compilers
warn about taking the address of a temporary object...
Change-Id: I101c6eeb5bd6baf83c2bd9a6cb91ccaa04036cc3
Diffstat (limited to 'sw/source/core/crsr/trvlfnfl.cxx')
| -rw-r--r-- | sw/source/core/crsr/trvlfnfl.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx index 1c579e2b3569..359e63319d53 100644 --- a/sw/source/core/crsr/trvlfnfl.cxx +++ b/sw/source/core/crsr/trvlfnfl.cxx @@ -94,8 +94,9 @@ bool SwCursorShell::GotoFootnoteText() GetCursor_()->GetPoint()->nNode.GetNode().GetTextNode() : nullptr; if( pTextNd ) { - const SwFrame *pFrame = pTextNd->getLayoutFrame( GetLayout(), &GetCursor_()->GetSttPos(), - GetCursor_()->Start() ); + std::pair<Point, bool> const tmp(GetCursor_()->GetSttPos(), true); + const SwFrame *pFrame = pTextNd->getLayoutFrame( GetLayout(), + GetCursor_()->Start(), &tmp); const SwFootnoteBossFrame* pFootnoteBoss; bool bSkip = pFrame && pFrame->IsInFootnote(); while( pFrame && nullptr != ( pFootnoteBoss = pFrame->FindFootnoteBossFrame() ) ) |