From f62ba688ca1c22fcdcf7efd811d702e982799882 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 18 Sep 2018 16:21:44 +0200 Subject: sw: rework annoying GetFrameOfModify/getLayoutFrame parameters 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 --- sw/inc/node.hxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sw/inc/node.hxx') diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index f46ea9132c71..43ceb38e724c 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -394,11 +394,10 @@ public: bool GoNext(SwIndex *, sal_uInt16 nMode ) const; bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const; - /// Replacement for good old GetFrame(..): + /// @see GetFrameOfModify SwContentFrame *getLayoutFrame( const SwRootFrame*, - const Point* pDocPos = nullptr, - const SwPosition *pPos = nullptr, - const bool bCalcFrame = true ) const; + const SwPosition *pPos = nullptr, + std::pair const* pViewPosAndCalcFrame = nullptr) const; /** @return the real size of the frame or an empty rectangle if no layout exists. Needed for export filters. */ SwRect FindLayoutRect( const bool bPrtArea = false, -- cgit