sw/source/core/layout/flyincnt.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit 510da828b267ab575b0ef5d0fafc1cb42ad31712 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Sat Jul 20 14:41:09 2019 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Sat Jul 20 19:01:13 2019 +0200 cid#1401328 Uncaught exception Change-Id: I4eab3d40bc1d8e8bea05c3aba2de0ab39ca107e4 Reviewed-on: https://gerrit.libreoffice.org/76006 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx index 77772d0e6259..4c23164d9de3 100644 --- a/sw/source/core/layout/flyincnt.cxx +++ b/sw/source/core/layout/flyincnt.cxx @@ -65,11 +65,11 @@ void SwFlyInContentFrame::SetRefPoint( const Point& rPoint, { // OD 2004-05-27 #i26791# - member <aRelPos> moved to <SwAnchoredObject> OSL_ENSURE( rPoint != aRef || rRelAttr != GetCurrRelPos(), "SetRefPoint: no change" ); - std::unique_ptr<SwFlyNotify> pNotify; + std::unique_ptr<SwFlyNotify, o3tl::default_delete<SwFlyNotify>> xNotify; // No notify at a locked fly frame, if a fly frame is locked, there's // already a SwFlyNotify object on the stack (MakeAll). if( !IsLocked() ) - pNotify.reset(new SwFlyNotify( this )); + xNotify.reset(new SwFlyNotify( this )); aRef = rPoint; SetCurrRelPos( rRelAttr ); SwRectFnSet aRectFnSet(GetAnchorFrame()); @@ -81,13 +81,13 @@ void SwFlyInContentFrame::SetRefPoint( const Point& rPoint, // #i68520# InvalidateObjRectWithSpaces(); - if( pNotify ) + if (xNotify) { InvalidatePage(); setFrameAreaPositionValid(false); m_bInvalid = true; Calc(getRootFrame()->GetCurrShell()->GetOut()); - pNotify.reset(); + xNotify.reset(); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits