diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-10-10 16:11:14 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-11 09:53:32 +0200 |
commit | e6c4674418cd7423943599f3bd3cdf1643284690 (patch) | |
tree | e19e118da69c23d0d9ef450f42e76f845dbb9312 | |
parent | e44efeea57c1925069b4c772adccd9b19b77cebb (diff) |
SwCursorShell argument of AttrChangedNotify is unused
Change-Id: I1fde665dcb77d29cad7f6a5c12e82c1822cff022
Reviewed-on: https://gerrit.libreoffice.org/80621
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
26 files changed, 74 insertions, 74 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 66c597b21bef..0cb7ded8a2f5 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -172,7 +172,7 @@ private: Link<const SwFlyFrameFormat*,void> m_aFlyMacroLnk; /**< Link will be called, if the Cursor is set into a fly. A macro can then be called */ - Link<SwCursorShell*,void> m_aChgLnk; /**< link will be called by every attribute/ + Link<LinkParamNone*,void> m_aChgLnk; /**< link will be called by every attribute/ format changes at cursor position.*/ Link<SwCursorShell&,void> m_aGrfArrivedLnk; ///< Link calls to UI if a graphic is arrived @@ -483,8 +483,8 @@ public: const Link<const SwFlyFrameFormat*,void>& GetFlyMacroLnk() const { return m_aFlyMacroLnk; } // Methods returning/altering link for changes of attributes/formats. - void SetChgLnk( const Link<SwCursorShell*,void> &rLnk ) { m_aChgLnk = rLnk; } - const Link<SwCursorShell*,void>& GetChgLnk() const { return m_aChgLnk; } + void SetChgLnk( const Link<LinkParamNone*,void> &rLnk ) { m_aChgLnk = rLnk; } + const Link<LinkParamNone*,void>& GetChgLnk() const { return m_aChgLnk; } // Methods returning/altering link for "graphic completely loaded". void SetGrfArrivedLnk( const Link<SwCursorShell&,void> &rLnk ) { m_aGrfArrivedLnk = rLnk; } diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index e2a18d00a231..13f73dc09123 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -537,7 +537,7 @@ public: void StateTabWin(SfxItemSet&); // attributes have changed - DECL_LINK( AttrChangedNotify, SwCursorShell*, void ); + DECL_LINK( AttrChangedNotify, LinkParamNone*, void ); // form control has been activated DECL_LINK( FormControlActivated, LinkParamNone*, void ); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 994a2d4af3bc..7b03cacfa15d 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -282,7 +282,7 @@ void SwCursorShell::EndAction( const bool bIdleEnd, const bool DoSetPosX ) // call ChgCall if there is still one if( m_bCallChgLnk && m_bChgCallFlag && m_aChgLnk.IsSet() ) { - m_aChgLnk.Call( this ); + m_aChgLnk.Call(nullptr); m_bChgCallFlag = false; // reset flag } } @@ -2498,7 +2498,7 @@ void SwCursorShell::CallChgLnk() else if( m_aChgLnk.IsSet() ) { if( m_bCallChgLnk ) - m_aChgLnk.Call( this ); + m_aChgLnk.Call(nullptr); m_bChgCallFlag = false; // reset flag } } diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx index c4ce58a03c01..60b716d9943f 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -159,7 +159,7 @@ void SwModule::InsertEnv( SfxRequest& rReq ) xDocSh->DoInitNew(); pFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, SFX_INTERFACE_NONE ); pNewView = static_cast<SwView*>( pFrame->GetViewShell()); - pNewView->AttrChangedNotify( &pNewView->GetWrtShell() ); // so that SelectShell is being called + pNewView->AttrChangedNotify(nullptr); // so that SelectShell is being called pSh = pNewView->GetWrtShellPtr(); OUString aTmp( SwResId(STR_ENV_TITLE) ); diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx index 5ca5eb8e8b49..da1e18009143 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -200,7 +200,7 @@ void SwModule::InsertLab(SfxRequest& rReq, bool bLabel) SfxViewFrame* pViewFrame = SfxViewFrame::DisplayNewDocument( *xDocSh, rReq ); SwView *pNewView = static_cast<SwView*>( pViewFrame->GetViewShell()); - pNewView->AttrChangedNotify( &pNewView->GetWrtShell() );// So that SelectShell is being called. + pNewView->AttrChangedNotify(nullptr);// So that SelectShell is being called. // Set document title OUString aTmp; diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 6c059feda08b..5c4bb4411092 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -974,7 +974,7 @@ static SfxObjectShell* lcl_CreateWorkingDocument( SwView* pWorkView = static_cast< SwView* >( pWorkFrame->GetViewShell() ); SwWrtShell* pWorkWrtShell = pWorkView->GetWrtShellPtr(); pWorkWrtShell->GetViewOptions()->SetIdle( false ); - pWorkView->AttrChangedNotify( pWorkWrtShell );// in order for SelectShell to be called + pWorkView->AttrChangedNotify(nullptr);// in order for SelectShell to be called SwDoc* pWorkDoc = pWorkWrtShell->GetDoc(); pWorkDoc->GetIDocumentUndoRedo().DoUndo( false ); pWorkDoc->ReplaceDocumentProperties( *pSourceDoc ); diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index f9b85ca705f8..a518176926ab 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -138,7 +138,7 @@ static void lcl_LeaveDrawText(SwWrtShell& rSh) // go out of the frame rSh.SelectObj(aPt, SW_LEAVE_FRAME); rSh.EnterStdMode(); - rSh.GetView().AttrChangedNotify(&rSh); + rSh.GetView().AttrChangedNotify(nullptr); } } @@ -668,7 +668,7 @@ void SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM { rShell.UnSelectFrame(); rShell.LeaveSelFrameMode(); - rView.AttrChangedNotify(&rShell); + rView.AttrChangedNotify(nullptr); } break; @@ -677,7 +677,7 @@ void SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM case ShellMode::Bezier: if(FindNextDrawTextError_Impl(rShell)) { - rView.AttrChangedNotify(&rShell); + rView.AttrChangedNotify(nullptr); break; } [[fallthrough]]; // to deselect the object @@ -687,7 +687,7 @@ void SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM if ( rShell.IsDrawCreate() ) { rView.GetDrawFuncPtr()->BreakCreate(); - rView.AttrChangedNotify(&rShell); + rView.AttrChangedNotify(nullptr); } else if ( rShell.HasSelection() || rView.IsDrawMode() ) { @@ -706,7 +706,7 @@ void SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM SfxBindings& rBind = rView.GetViewFrame()->GetBindings(); rBind.Invalidate( SID_ATTR_SIZE ); rShell.EnterStdMode(); - rView.AttrChangedNotify(&rShell); + rView.AttrChangedNotify(nullptr); } } } @@ -790,7 +790,7 @@ bool SwSpellDialogChildWindow::FindNextDrawTextError_Impl(SwWrtShell& rSh) rSh.SelectObj( aTmp, 0, pTextObj ); SdrPageView* pPV = pDrView->GetSdrPageView(); rView.BeginTextEdit( pTextObj, pPV, &rView.GetEditWin(), false, true ); - rView.AttrChangedNotify(&rSh); + rView.AttrChangedNotify(nullptr); bNextDoc = true; } } diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 4c2af3bdcda6..20639bacd8bf 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -1950,8 +1950,8 @@ bool SwTransferable::PasteFileContent( TransferableDataHelper& rData, if( pStream && pRead ) { - Link<SwCursorShell*,void> aOldLink( rSh.GetChgLnk() ); - rSh.SetChgLnk( Link<SwCursorShell*,void>() ); + Link<LinkParamNone*,void> aOldLink( rSh.GetChgLnk() ); + rSh.SetChgLnk( Link<LinkParamNone*,void>() ); const SwPosition& rInsPos = *rSh.GetCursor()->Start(); SwReader aReader(*pStream, OUString(), OUString(), *rSh.GetCursor()); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 6eddf90f54b9..3d2c12c0a0e1 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -2313,7 +2313,7 @@ KEYINPUT_CHECKTABLE_INSDEL: { rSh.UnSelectFrame(); rSh.LeaveSelFrameMode(); - m_rView.AttrChangedNotify(&rSh); + m_rView.AttrChangedNotify(nullptr); rSh.MoveSection( GoCurrSection, fnSectionEnd ); } eKeyState = SwKeyState::InsChar; @@ -2336,7 +2336,7 @@ KEYINPUT_CHECKTABLE_INSDEL: { rSh.UnSelectFrame(); rSh.LeaveSelFrameMode(); - m_rView.AttrChangedNotify(&rSh); + m_rView.AttrChangedNotify(nullptr); rSh.MoveSection( GoCurrSection, fnSectionEnd ); eKeyState = SwKeyState::End; } @@ -2553,7 +2553,7 @@ KEYINPUT_CHECKTABLE_INSDEL: m_rView.GetDrawFuncPtr()->Deactivate(); m_rView.SetDrawFuncPtr(nullptr); m_rView.LeaveDrawCreate(); - m_rView.AttrChangedNotify( &rSh ); + m_rView.AttrChangedNotify(nullptr); } rSh.HideCursor(); rSh.EnterSelFrameMode(); @@ -3168,7 +3168,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) m_rView.GetDrawFuncPtr()->Deactivate(); m_rView.SetDrawFuncPtr(nullptr); m_rView.LeaveDrawCreate(); - m_rView.AttrChangedNotify( &rSh ); + m_rView.AttrChangedNotify(nullptr); } rSh.EnterSelFrameMode( &aDocPos ); @@ -3213,7 +3213,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) { rSh.UnSelectFrame(); rSh.LeaveSelFrameMode(); - m_rView.AttrChangedNotify(&rSh); + m_rView.AttrChangedNotify(nullptr); } bool bSelObj = rSh.SelectObj( aDocPos, nFlag ); @@ -3226,7 +3226,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) // frame first; ShowCursor() happens in LeaveSelFrameMode() g_bValidCursorPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false)); rSh.LeaveSelFrameMode(); - m_rView.AttrChangedNotify( &rSh ); + m_rView.AttrChangedNotify(nullptr); bCallBase = false; } else @@ -3242,7 +3242,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) m_rView.GetDrawFuncPtr()->Deactivate(); m_rView.SetDrawFuncPtr(nullptr); m_rView.LeaveDrawCreate(); - m_rView.AttrChangedNotify( &rSh ); + m_rView.AttrChangedNotify(nullptr); } UpdatePointer( aDocPos, rMEvt.GetModifier() ); return; @@ -3538,7 +3538,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) if (rMarkList.GetMark(0) == nullptr) { rSh.LeaveSelFrameMode(); - m_rView.AttrChangedNotify(&rSh); + m_rView.AttrChangedNotify(nullptr); g_bFrameDrag = false; } } @@ -3568,7 +3568,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) { rSh.UnSelectFrame(); rSh.LeaveSelFrameMode(); - m_rView.AttrChangedNotify(&rSh); + m_rView.AttrChangedNotify(nullptr); g_bFrameDrag = false; } if ( !rSh.IsExtMode() ) @@ -4408,7 +4408,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) rSh.Edit(); } - m_rView.AttrChangedNotify( &rSh ); + m_rView.AttrChangedNotify(nullptr); } else if (rMEvt.GetButtons() == MOUSE_RIGHT && rSh.IsDrawCreate()) m_rView.GetDrawFuncPtr()->BreakCreate(); // abort drawing @@ -4427,7 +4427,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt) if ( m_rView.GetDrawFuncPtr() && m_rView.GetDrawFuncPtr()->MouseButtonUp(rMEvt) ) { m_rView.GetDrawFuncPtr()->Deactivate(); - m_rView.AttrChangedNotify( &rSh ); + m_rView.AttrChangedNotify(nullptr); if ( rSh.IsObjSelected() ) rSh.EnterSelFrameMode(); if ( m_rView.GetDrawFuncPtr() && m_bInsFrame ) @@ -5100,7 +5100,7 @@ void SwEditWin::EnterDrawTextMode( const Point& aDocPos ) m_rView.LeaveDrawCreate(); } m_rView.NoRotate(); - m_rView.AttrChangedNotify( &m_rView.GetWrtShell() ); + m_rView.AttrChangedNotify(nullptr); } } @@ -5118,7 +5118,7 @@ bool SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos) return true; bool bRet = m_rView.GetDrawFuncPtr()->MouseButtonDown( rMEvt ); - m_rView.AttrChangedNotify( &rSh ); + m_rView.AttrChangedNotify(nullptr); return bRet; } @@ -5139,7 +5139,7 @@ bool SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos) } if( bUnLockView ) rSh.LockView( false ); - m_rView.AttrChangedNotify( &rSh ); + m_rView.AttrChangedNotify(nullptr); return true; } return false; @@ -5691,7 +5691,7 @@ void SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) m_rView.GetDrawFuncPtr()->Deactivate(); m_rView.SetDrawFuncPtr(nullptr); m_rView.LeaveDrawCreate(); - m_rView.AttrChangedNotify( &rSh ); + m_rView.AttrChangedNotify(nullptr); } rSh.EnterSelFrameMode( &aDocPos ); @@ -5717,7 +5717,7 @@ void SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) { rSh.UnSelectFrame(); rSh.LeaveSelFrameMode(); - m_rView.AttrChangedNotify(&rSh); + m_rView.AttrChangedNotify(nullptr); } bool bSelObj = rSh.SelectObj( aDocPos, 0/*nFlag*/ ); @@ -5731,7 +5731,7 @@ void SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) g_bValidCursorPos = !(CRSR_POSCHG & rSh.CallSetCursor(&aDocPos, false)); rSh.LeaveSelFrameMode(); m_rView.LeaveDrawCreate(); - m_rView.AttrChangedNotify( &rSh ); + m_rView.AttrChangedNotify(nullptr); } else { @@ -5746,7 +5746,7 @@ void SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos ) m_rView.GetDrawFuncPtr()->Deactivate(); m_rView.SetDrawFuncPtr(nullptr); m_rView.LeaveDrawCreate(); - m_rView.AttrChangedNotify( &rSh ); + m_rView.AttrChangedNotify(nullptr); } UpdatePointer( aDocPos ); } diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index ddfb69f0bb6e..6e695bf93045 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -417,7 +417,7 @@ bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt) } if (bCheckShell) - m_pView->AttrChangedNotify( m_pSh ); // if necessary turn on BezierShell + m_pView->AttrChangedNotify(nullptr); // if necessary turn on BezierShell //!!!!!!!!!! Attention suicide !!!!!!!!!!! Everything should be renewed once if ( bAutoCap ) diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 8aeba7910d5c..8da42ad496d4 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -303,7 +303,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if( rSh.IsFrameSelected() || rSh.IsObjSelected() ) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } else return; @@ -334,7 +334,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) bIgnore = true; if( rSh.IsFrameSelected() || rSh.IsObjSelected()) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } } } @@ -366,7 +366,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if (rSh.IsFrameSelected() || rSh.IsObjSelected()) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } else return; @@ -419,7 +419,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if (rSh.IsFrameSelected() || rSh.IsObjSelected()) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } pDlg->disposeOnce(); @@ -784,7 +784,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) { rSh.HideCursor(); rSh.EnterSelFrameMode(); - GetView().AttrChangedNotify( &rSh ); + GetView().AttrChangedNotify(nullptr); } } break; diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx index a0cd422c4cdd..35e2afcec1ac 100644 --- a/sw/source/uibase/shells/beziersh.cxx +++ b/sw/source/uibase/shells/beziersh.cxx @@ -92,7 +92,7 @@ void SwBezierShell::Execute(SfxRequest const &rReq) pSh->LeaveSelFrameMode(); pSh->NoEdit(); } - GetView().AttrChangedNotify(pSh); // Shell change if applicable... + GetView().AttrChangedNotify(nullptr); // Shell change if applicable... } } break; @@ -105,13 +105,13 @@ void SwBezierShell::Execute(SfxRequest const &rReq) if ( pSh->IsDrawCreate() ) { GetView().GetDrawFuncPtr()->BreakCreate(); - GetView().AttrChangedNotify(pSh); // Shell change if applicable... + GetView().AttrChangedNotify(nullptr); // Shell change if applicable... } else if ( pSh->HasSelection() || GetView().IsDrawMode() ) { GetView().LeaveDrawCreate(); pSh->EnterStdMode(); - GetView().AttrChangedNotify(pSh); // Shell change if applicable... + GetView().AttrChangedNotify(nullptr); // Shell change if applicable... } } break; diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index 3e6ae90b7c1b..d1b72f12ca82 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -227,7 +227,7 @@ void SwDrawShell::Execute(SfxRequest &rReq) } GetView().FlipDrawSelMode(); pSdrView->SetFrameDragSingles(GetView().IsDrawSelMode()); - GetView().AttrChangedNotify(&rSh); // Shell switch + GetView().AttrChangedNotify(nullptr); // Shell switch break; case SID_OBJECT_HELL: @@ -559,7 +559,7 @@ void SwDrawShell::ExecFormText(SfxRequest const & rReq) if ( pDrView->IsTextEdit() ) { pDrView->SdrEndTextEdit( true ); - GetView().AttrChangedNotify(&rSh); + GetView().AttrChangedNotify(nullptr); } pDrView->SetAttributes(rSet); diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 2354f2a58489..c975ecebfbae 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -552,7 +552,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) pTmpView->SetAttributes( aAttr ); rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin()); - rSh.GetView().AttrChangedNotify( &rSh ); + rSh.GetView().AttrChangedNotify(nullptr); } return; @@ -596,7 +596,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq ) } pTmpView->SetAttributes( aAttr ); rSh.GetView().BeginTextEdit( pTmpObj, pTmpPV, &rSh.GetView().GetEditWin() ); - rSh.GetView().AttrChangedNotify( &rSh ); + rSh.GetView().AttrChangedNotify(nullptr); } return; diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 04435600b453..674ed73378bf 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -222,7 +222,7 @@ void SwDrawTextShell::ExecFormText(SfxRequest const & rReq) SwView& rTempView = GetView(); pDrView->SdrEndTextEdit(true); //this removes the current shell from the dispatcher stack!! - rTempView.AttrChangedNotify(&rSh); + rTempView.AttrChangedNotify(nullptr); } pDrView->SetAttributes(rSet); diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx index 87156c1e99ad..44ee00225128 100644 --- a/sw/source/uibase/shells/mediash.cxx +++ b/sw/source/uibase/shells/mediash.cxx @@ -100,7 +100,7 @@ void SwMediaShell::ExecMedia(SfxRequest const &rReq) if( pSh->IsSelFrameMode() ) pSh->LeaveSelFrameMode(); - GetView().AttrChangedNotify( pSh ); + GetView().AttrChangedNotify(nullptr); } } break; diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index bd27ab4b40b0..4b11b081882a 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -443,7 +443,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) pAnnotationWin->UpdateText(sText); // explicit state update to get the Undo state right - GetView().AttrChangedNotify(GetShellPtr()); + GetView().AttrChangedNotify(nullptr); } } } @@ -490,7 +490,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) if (comphelper::LibreOfficeKit::isActive() && !sCommentText.isEmpty()) { rSh.SetRedlineComment(sCommentText); - GetView().AttrChangedNotify(GetShellPtr()); + GetView().AttrChangedNotify(nullptr); MaybeNotifyRedlineModification(const_cast<SwRangeRedline*>(pRedline), pRedline->GetDoc()); break; } @@ -574,7 +574,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) pDlg.disposeAndClear(); g_bNoInterrupt = false; rSh.ClearMark(); - GetView().AttrChangedNotify(GetShellPtr()); + GetView().AttrChangedNotify(nullptr); } } break; diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index db44d727e72e..4f25d13563f4 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -182,7 +182,7 @@ void SwView::GotFocus() const if ( pAsFormShell ) { pAsFormShell->ForgetActiveControl(); - const_cast< SwView* >( this )->AttrChangedNotify( m_pWrtShell.get() ); + const_cast< SwView* >( this )->AttrChangedNotify(nullptr); } else if ( m_pPostItMgr ) { @@ -190,7 +190,7 @@ void SwView::GotFocus() const if ( pAsAnnotationShell ) { m_pPostItMgr->SetActiveSidebarWin(nullptr); - const_cast< SwView* >( this )->AttrChangedNotify( m_pWrtShell.get() ); + const_cast< SwView* >( this )->AttrChangedNotify(nullptr); } } if( GetWrtShellPtr() ) @@ -219,7 +219,7 @@ IMPL_LINK_NOARG(SwView, FormControlActivated, LinkParamNone*, void) if ( pSdrView && pSdrView->IsTextEdit() ) pSdrView->SdrEndTextEdit( true ); - AttrChangedNotify( m_pWrtShell.get() ); + AttrChangedNotify(nullptr); } } @@ -504,7 +504,7 @@ extern "C" } } -IMPL_LINK_NOARG(SwView, AttrChangedNotify, SwCursorShell*, void) +IMPL_LINK_NOARG(SwView, AttrChangedNotify, LinkParamNone*, void) { if ( GetEditWin().IsChainMode() ) GetEditWin().SetChainMode( false ); @@ -1639,7 +1639,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) GetDrawFuncPtr()->Deactivate(); SetDrawFuncPtr(nullptr); LeaveDrawCreate(); - AttrChangedNotify(m_pWrtShell.get()); + AttrChangedNotify(nullptr); } } else diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx index b82c9d49c140..0e959855ccf5 100644 --- a/sw/source/uibase/uiview/view1.cxx +++ b/sw/source/uibase/uiview/view1.cxx @@ -104,7 +104,7 @@ void SwView::Activate(bool bMDIActivate) m_sSwViewData.clear(); } - AttrChangedNotify(m_pWrtShell.get()); + AttrChangedNotify(nullptr); // Initialize Fielddlg newly if necessary (e.g. for TYP_SETVAR) sal_uInt16 nId = SwFieldDlgWrapper::GetChildWindowId(); @@ -134,7 +134,7 @@ void SwView::Activate(bool bMDIActivate) } else // At least call the Notify (as a precaution because of the SlotFilter). - AttrChangedNotify(m_pWrtShell.get()); + AttrChangedNotify(nullptr); SfxViewShell::Activate(bMDIActivate); } diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index b708f47d3b83..15644c016ce9 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -847,7 +847,7 @@ void SwView::Execute(SfxRequest &rReq) else if ( m_pWrtShell->IsDrawCreate() ) { GetDrawFuncPtr()->BreakCreate(); - AttrChangedNotify(m_pWrtShell.get()); // shell change if needed + AttrChangedNotify(nullptr); // shell change if needed } else if ( m_pWrtShell->HasSelection() || IsDrawMode() ) { @@ -869,7 +869,7 @@ void SwView::Execute(SfxRequest &rReq) rBind.Invalidate( SID_ATTR_SIZE ); } m_pWrtShell->EnterStdMode(); - AttrChangedNotify(m_pWrtShell.get()); // shell change if necessary + AttrChangedNotify(nullptr); // shell change if necessary } } else if ( GetEditWin().GetApplyTemplate() ) @@ -1124,7 +1124,7 @@ void SwView::Execute(SfxRequest &rReq) { SwDBData aData = rSh.GetDBData(); rSh.EnterStdMode(); // force change in text shell; necessary for mixing DB fields - AttrChangedNotify( &rSh ); + AttrChangedNotify(nullptr); Sequence<PropertyValue> aProperties(3); PropertyValue* pValues = aProperties.getArray(); @@ -2422,7 +2422,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) aData.nCommandType = sDBName.getToken(0, DB_DELIM, nIdx).toInt32(); } rSh.EnterStdMode(); // force change in text shell; necessary for mixing DB fields - AttrChangedNotify( &rSh ); + AttrChangedNotify(nullptr); if (pDBManager) { diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index 5b23eff34d18..6866b31cd3b1 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -221,7 +221,7 @@ void SwView::ExecDraw(SfxRequest& rReq) m_pWrtShell->EnterSelFrameMode(); LeaveDrawCreate(); - AttrChangedNotify(m_pWrtShell.get()); + AttrChangedNotify(nullptr); return; } @@ -339,7 +339,7 @@ void SwView::ExecDraw(SfxRequest& rReq) auto pTempFuncPtr = pFuncPtr.get(); SetDrawFuncPtr(std::move(pFuncPtr)); - AttrChangedNotify(m_pWrtShell.get()); + AttrChangedNotify(nullptr); pTempFuncPtr->Activate(nSlotId); NoRotate(); @@ -382,7 +382,7 @@ void SwView::ExecDraw(SfxRequest& rReq) if(bEndTextEdit && pSdrView && pSdrView->IsTextEdit()) pSdrView->SdrEndTextEdit( true ); - AttrChangedNotify(m_pWrtShell.get()); + AttrChangedNotify(nullptr); } // End drawing diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 9208c2644ab4..388d59ce9dd7 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -381,7 +381,7 @@ SwXMailMerge::SwXMailMerge() : m_xDocSh->DoInitNew(); SfxViewFrame *pFrame = SfxViewFrame::LoadHiddenDocument( *m_xDocSh, SFX_INTERFACE_NONE ); SwView *pView = static_cast<SwView*>( pFrame->GetViewShell() ); - pView->AttrChangedNotify( &pView->GetWrtShell() ); //So that SelectShell is called. + pView->AttrChangedNotify(nullptr); //So that SelectShell is called. m_xModel = m_xDocSh->GetModel(); } @@ -596,7 +596,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( // while still in Update of Sfx. // (GetSelection in Update is not allowed) if (!aCurDocumentURL.isEmpty()) - pView->AttrChangedNotify( &pView->GetWrtShell() );//So that SelectShell is called. + pView->AttrChangedNotify(nullptr);//So that SelectShell is called. SharedComponent aRowSetDisposeHelper; if (!xCurResultSet.is()) diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index fcbaee259716..7dbdb7574bc9 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -659,7 +659,7 @@ SfxObjectShellLock SwXTextView::BuildTmpSelectionDoc() rOldSh.FillPrtDoc(pTempDoc, pPrt); SfxViewFrame* pDocFrame = SfxViewFrame::LoadHiddenDocument( *xDocSh, SFX_INTERFACE_NONE ); SwView* pDocView = static_cast<SwView*>( pDocFrame->GetViewShell() ); - pDocView->AttrChangedNotify( &pDocView->GetWrtShell() );//So that SelectShell is called. + pDocView->AttrChangedNotify(nullptr);//So that SelectShell is called. SwWrtShell* pSh = pDocView->GetWrtShellPtr(); IDocumentDeviceAccess& rIDDA = pSh->getIDocumentDeviceAccess(); @@ -1755,7 +1755,7 @@ void SAL_CALL SwXTextView::insertTransferable( const uno::Reference< datatransfe SwTransferable::Paste( rSh, aDataHelper ); if( rSh.IsFrameSelected() || rSh.IsObjSelected() ) rSh.EnterSelFrameMode(); - GetView()->AttrChangedNotify( &rSh ); + GetView()->AttrChangedNotify(nullptr); } } } diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx index 348876e7ffad..ae439faeee2a 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -358,7 +358,7 @@ long SwWrtShell::ResetSelect(const Point *,bool) // After canceling of all selections an update of Attr-Controls // could be necessary. - GetChgLnk().Call(this); + GetChgLnk().Call(nullptr); } Invalidate(); SwTransferable::ClearSelection( *this ); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 6d6f9cfdbd8c..36878840658e 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1953,7 +1953,7 @@ void SwWrtShell::InsertPostIt(SwFieldMgr& rFieldMgr, const SfxRequest& rReq) // A frame is selected, end frame selection. EnterStdMode(); - GetView().AttrChangedNotify(this); + GetView().AttrChangedNotify(nullptr); // Set up text selection, so the anchor of the frame will be the anchor of the // comment. diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx index 7d58670cffe1..0a71baae0909 100644 --- a/sw/source/uibase/wrtsh/wrtsh3.cxx +++ b/sw/source/uibase/wrtsh/wrtsh3.cxx @@ -123,7 +123,7 @@ void SwWrtShell::DrawSelChanged( ) bool bOldVal = g_bNoInterrupt; g_bNoInterrupt = true; // Trick to run AttrChangedNotify by timer. - GetView().AttrChangedNotify(this); + GetView().AttrChangedNotify(nullptr); g_bNoInterrupt = bOldVal; } |