diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-10-10 16:11:14 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2020-03-03 14:31:48 +0100 |
commit | 147849c328e7fcef65b5e4ea17a473d2bab3bdb1 (patch) | |
tree | dab4949155cf1736837f2bd1e874f5f5d84f5562 | |
parent | 3fe9dfca2d44d9e41ee329883f199359c673f382 (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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89883
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
26 files changed, 74 insertions, 74 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 7add73be4c23..050648beb901 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -175,7 +175,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 @@ -486,8 +486,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 ling 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 94e2cc86e81e..f18ba61d0569 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -534,7 +534,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 1edaf9a9f590..3e29c1b83f3b 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -286,7 +286,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 } } @@ -2486,7 +2486,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 8815f6a97ee2..6d90b30be544 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 9cc87905358b..07614ae74202 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -199,7 +199,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 ae3e12610985..9c694a2bad4e 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1014,7 +1014,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 4761ee310f05..ac46455ac70d 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -137,7 +137,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); } } @@ -666,7 +666,7 @@ void SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM { rShell.UnSelectFrame(); rShell.LeaveSelFrameMode(); - rView.AttrChangedNotify(&rShell); + rView.AttrChangedNotify(nullptr); } break; @@ -675,7 +675,7 @@ void SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM case ShellMode::Bezier: if(FindNextDrawTextError_Impl(rShell)) { - rView.AttrChangedNotify(&rShell); + rView.AttrChangedNotify(nullptr); break; } SAL_FALLTHROUGH; // to deselect the object @@ -685,7 +685,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() ) { @@ -704,7 +704,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); } } } @@ -788,7 +788,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 b9cce5ee9579..7dcf3b896aef 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -1776,8 +1776,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, aEmptyOUStr, OUString(), *rSh.GetCursor() ); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 06d98b1c6dac..687786b51bfa 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -2310,7 +2310,7 @@ KEYINPUT_CHECKTABLE_INSDEL: { rSh.UnSelectFrame(); rSh.LeaveSelFrameMode(); - m_rView.AttrChangedNotify(&rSh); + m_rView.AttrChangedNotify(nullptr); rSh.MoveSection( GoCurrSection, fnSectionEnd ); } eKeyState = SwKeyState::InsChar; @@ -2333,7 +2333,7 @@ KEYINPUT_CHECKTABLE_INSDEL: { rSh.UnSelectFrame(); rSh.LeaveSelFrameMode(); - m_rView.AttrChangedNotify(&rSh); + m_rView.AttrChangedNotify(nullptr); rSh.MoveSection( GoCurrSection, fnSectionEnd ); eKeyState = SwKeyState::End; } @@ -2550,7 +2550,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(); @@ -3161,7 +3161,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 ); @@ -3206,7 +3206,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 ); @@ -3219,7 +3219,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 @@ -3235,7 +3235,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; @@ -3530,7 +3530,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; } } @@ -3560,7 +3560,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() ) @@ -4391,7 +4391,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 @@ -4410,7 +4410,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 ) @@ -5086,7 +5086,7 @@ void SwEditWin::EnterDrawTextMode( const Point& aDocPos ) m_rView.LeaveDrawCreate(); } m_rView.NoRotate(); - m_rView.AttrChangedNotify( &m_rView.GetWrtShell() ); + m_rView.AttrChangedNotify(nullptr); } } @@ -5104,7 +5104,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; } @@ -5125,7 +5125,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; @@ -5679,7 +5679,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 ); @@ -5705,7 +5705,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*/ ); @@ -5719,7 +5719,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 { @@ -5734,7 +5734,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 4785e35cfdc7..732181f3b6fb 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -415,7 +415,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 4d155f6ba039..c386f9ea710f 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -299,7 +299,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if( rSh.IsFrameSelected() || rSh.IsObjSelected() ) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } else return; @@ -330,7 +330,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) bIgnore = true; if( rSh.IsFrameSelected() || rSh.IsObjSelected()) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } } } @@ -362,7 +362,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if (rSh.IsFrameSelected() || rSh.IsObjSelected()) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } else return; @@ -416,7 +416,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if (rSh.IsFrameSelected() || rSh.IsObjSelected()) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } pDlg->disposeOnce(); @@ -778,7 +778,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 db2476563b26..9473c3a6c299 100644 --- a/sw/source/uibase/shells/beziersh.cxx +++ b/sw/source/uibase/shells/beziersh.cxx @@ -90,7 +90,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; @@ -103,13 +103,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 baf3939e0282..f8b762a78c5a 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -223,7 +223,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: @@ -555,7 +555,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 d163785593eb..93b813650812 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -542,7 +542,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; @@ -586,7 +586,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 025ea65256fc..cf6e1765e3fd 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -216,7 +216,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 fba429fba732..703bce652224 100644 --- a/sw/source/uibase/shells/mediash.cxx +++ b/sw/source/uibase/shells/mediash.cxx @@ -99,7 +99,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 8fd310a47510..1d61b0f95785 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -439,7 +439,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) pAnnotationWin->UpdateText(sText); // explicit state update to get the Undo state right - GetView().AttrChangedNotify(GetShellPtr()); + GetView().AttrChangedNotify(nullptr); } } } @@ -486,7 +486,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; } @@ -570,7 +570,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 039977ff6827..0f0fde20ecab 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -179,7 +179,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 ) { @@ -187,7 +187,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() ) @@ -216,7 +216,7 @@ IMPL_LINK_NOARG(SwView, FormControlActivated, LinkParamNone*, void) if ( pSdrView && pSdrView->IsTextEdit() ) pSdrView->SdrEndTextEdit( true ); - AttrChangedNotify( m_pWrtShell.get() ); + AttrChangedNotify(nullptr); } } @@ -501,7 +501,7 @@ extern "C" } } -IMPL_LINK_NOARG(SwView, AttrChangedNotify, SwCursorShell*, void) +IMPL_LINK_NOARG(SwView, AttrChangedNotify, LinkParamNone*, void) { if ( GetEditWin().IsChainMode() ) GetEditWin().SetChainMode( false ); @@ -1620,7 +1620,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 e985721e78e5..4cbc5bab54fe 100644 --- a/sw/source/uibase/uiview/view1.cxx +++ b/sw/source/uibase/uiview/view1.cxx @@ -103,7 +103,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(); @@ -133,7 +133,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 fefb9af1a8ed..a8e91e57e98d 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -852,7 +852,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() ) { @@ -874,7 +874,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() ) @@ -1130,7 +1130,7 @@ void SwView::Execute(SfxRequest &rReq) SwDBData aData; 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(); @@ -2417,7 +2417,7 @@ void SwView::GenerateFormLetter(bool bUseCurrentDocument) aData.nCommandType = sDBName.getToken(2, DB_DELIM ).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 278fe1baf8c8..62f2842f0cb0 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -218,7 +218,7 @@ void SwView::ExecDraw(SfxRequest& rReq) m_pWrtShell->EnterSelFrameMode(); LeaveDrawCreate(); - AttrChangedNotify(m_pWrtShell.get()); + AttrChangedNotify(nullptr); return; } @@ -336,7 +336,7 @@ void SwView::ExecDraw(SfxRequest& rReq) auto pTempFuncPtr = pFuncPtr.get(); SetDrawFuncPtr(std::move(pFuncPtr)); - AttrChangedNotify(m_pWrtShell.get()); + AttrChangedNotify(nullptr); pTempFuncPtr->Activate(nSlotId); NoRotate(); @@ -379,7 +379,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 f38cfba8782c..4400d024a52b 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -386,7 +386,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(); } @@ -606,7 +606,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 204f8ed45447..cdc485583443 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -666,7 +666,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(); @@ -1768,7 +1768,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 7133474aea54..f750855c2cdc 100644 --- a/sw/source/uibase/wrtsh/select.cxx +++ b/sw/source/uibase/wrtsh/select.cxx @@ -356,7 +356,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 fe43ef52fabb..a3b61a8a3d20 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1915,7 +1915,7 @@ void SwWrtShell::InsertPostIt(SwFieldMgr& rFieldMgr, 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 cc6a5684d9f6..b7c028e9a2e0 100644 --- a/sw/source/uibase/wrtsh/wrtsh3.cxx +++ b/sw/source/uibase/wrtsh/wrtsh3.cxx @@ -122,7 +122,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; } |