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 12:01:56 +0100 |
commit | 404966834ca7e4b5a8f1a2fb9a6c304206e4bbe7 (patch) | |
tree | c8eaa5fb8941e2a0951418cb3db13e1a61d3aa8a | |
parent | a0c91ab17f0ecc5d1592098af1f567c205f37712 (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>
25 files changed, 74 insertions, 75 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 13d70e6368c6..78cd235b1536 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -176,7 +176,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 @@ -477,8 +477,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 1b29bb63203d..fcad49362c54 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -535,7 +535,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 2e607d313931..838590609f85 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -287,7 +287,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 } } @@ -2268,7 +2268,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 b5671577c204..11c1d29b93ec 100644 --- a/sw/source/uibase/app/appenv.cxx +++ b/sw/source/uibase/app/appenv.cxx @@ -161,7 +161,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 9d72bda9b3c9..a87d672ea1ad 100644 --- a/sw/source/uibase/app/applab.cxx +++ b/sw/source/uibase/app/applab.cxx @@ -203,7 +203,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 55e82e50e8f0..378a4049f343 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -981,7 +981,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 2ebbe2be324d..35616c653137 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 @@ bool SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM { rShell.UnSelectFrame(); rShell.LeaveSelFrameMode(); - rView.AttrChangedNotify(&rShell); + rView.AttrChangedNotify(nullptr); } break; @@ -675,7 +675,7 @@ bool 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 @@ bool 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 @@ bool SwSpellDialogChildWindow::MakeTextSelection_Impl(SwWrtShell& rShell, ShellM SfxBindings& rBind = rView.GetViewFrame()->GetBindings(); rBind.Invalidate( SID_ATTR_SIZE ); rShell.EnterStdMode(); - rView.AttrChangedNotify(&rShell); + rView.AttrChangedNotify(nullptr); } } } @@ -791,7 +791,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 4deb00ac74ae..7c382e51ee7c 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -1715,8 +1715,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 e45c19fabf00..e5755d128d8e 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -2339,7 +2339,7 @@ KEYINPUT_CHECKTABLE_INSDEL: { rSh.UnSelectFrame(); rSh.LeaveSelFrameMode(); - m_rView.AttrChangedNotify(&rSh); + m_rView.AttrChangedNotify(nullptr); rSh.MoveSection( GoCurrSection, fnSectionEnd ); } eKeyState = SwKeyState::InsChar; @@ -2362,7 +2362,7 @@ KEYINPUT_CHECKTABLE_INSDEL: { rSh.UnSelectFrame(); rSh.LeaveSelFrameMode(); - m_rView.AttrChangedNotify(&rSh); + m_rView.AttrChangedNotify(nullptr); rSh.MoveSection( GoCurrSection, fnSectionEnd ); eKeyState = SwKeyState::End; } @@ -2577,7 +2577,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(); @@ -3199,7 +3199,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 ); @@ -3244,7 +3244,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 ); @@ -3257,7 +3257,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 @@ -3273,7 +3273,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; @@ -3568,7 +3568,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; } } @@ -3598,7 +3598,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() ) @@ -4434,7 +4434,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 @@ -4453,7 +4453,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 ) @@ -5144,7 +5144,7 @@ void SwEditWin::EnterDrawTextMode( const Point& aDocPos ) m_rView.LeaveDrawCreate(); } m_rView.NoRotate(); - m_rView.AttrChangedNotify( &m_rView.GetWrtShell() ); + m_rView.AttrChangedNotify(nullptr); } } @@ -5162,7 +5162,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; } @@ -5183,7 +5183,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; @@ -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); } rSh.EnterSelFrameMode( &aDocPos ); @@ -5772,7 +5772,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*/ ); @@ -5786,7 +5786,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 { @@ -5801,7 +5801,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 93ebb733a265..bb8333bf911a 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 d59379e2c856..175f349cbe42 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -293,7 +293,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if( rSh.IsFrameSelected() || rSh.IsObjSelected() ) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } else return; @@ -324,7 +324,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) bIgnore = true; if( rSh.IsFrameSelected() || rSh.IsObjSelected()) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } } } @@ -356,7 +356,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if (rSh.IsFrameSelected() || rSh.IsObjSelected()) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } else return; @@ -391,7 +391,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) if (rSh.IsFrameSelected() || rSh.IsObjSelected()) rSh.EnterSelFrameMode(); - pView->AttrChangedNotify( &rSh ); + pView->AttrChangedNotify(nullptr); } else return; @@ -748,7 +748,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 bbabedc2eded..f8783e9e9e6c 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 f41ced6a011a..9075d9bf5f13 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -224,7 +224,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: @@ -556,7 +556,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 09bced48737c..acccd9dc6b32 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -512,7 +512,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; @@ -556,7 +556,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 7a83bd2ae52e..aa6285cabc56 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -220,7 +220,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 297d0363d234..470e6f018cb3 100644 --- a/sw/source/uibase/shells/mediash.cxx +++ b/sw/source/uibase/shells/mediash.cxx @@ -101,7 +101,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 d810ed63cec2..4c047cb4df2e 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -493,7 +493,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) pAnnotationWin->UpdateText(sText); // explicit state update to get the Undo state right - GetView().AttrChangedNotify(GetShellPtr()); + GetView().AttrChangedNotify(nullptr); } } } @@ -540,7 +540,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; } @@ -625,7 +625,7 @@ void SwTextShell::ExecField(SfxRequest &rReq) SwViewShell::SetCareWin(nullptr); 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 7110db3bc4b7..56e5c69a0639 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -178,7 +178,7 @@ void SwView::GotFocus() const if ( pAsFormShell ) { pAsFormShell->ForgetActiveControl(); - const_cast< SwView* >( this )->AttrChangedNotify( m_pWrtShell ); + const_cast< SwView* >( this )->AttrChangedNotify(nullptr); } else if ( m_pPostItMgr ) { @@ -186,7 +186,7 @@ void SwView::GotFocus() const if ( pAsAnnotationShell ) { m_pPostItMgr->SetActiveSidebarWin(nullptr); - const_cast< SwView* >( this )->AttrChangedNotify( m_pWrtShell ); + const_cast< SwView* >( this )->AttrChangedNotify(nullptr); } } if( GetWrtShellPtr() ) @@ -215,7 +215,7 @@ IMPL_LINK_NOARG(SwView, FormControlActivated, LinkParamNone*, void) if ( pSdrView && pSdrView->IsTextEdit() ) pSdrView->SdrEndTextEdit( true ); - AttrChangedNotify( m_pWrtShell ); + AttrChangedNotify(nullptr); } } @@ -500,7 +500,7 @@ extern "C" } } -IMPL_LINK_NOARG(SwView, AttrChangedNotify, SwCursorShell*, void) +IMPL_LINK_NOARG(SwView, AttrChangedNotify, LinkParamNone*, void) { if ( GetEditWin().IsChainMode() ) GetEditWin().SetChainMode( false ); @@ -1617,7 +1617,7 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) GetDrawFuncPtr()->Deactivate(); SetDrawFuncPtr(nullptr); LeaveDrawCreate(); - AttrChangedNotify(m_pWrtShell); + AttrChangedNotify(nullptr); } } else diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx index 4f3650a6e7dc..ba88e702a29a 100644 --- a/sw/source/uibase/uiview/view1.cxx +++ b/sw/source/uibase/uiview/view1.cxx @@ -76,7 +76,7 @@ void SwView::Activate(bool bMDIActivate) m_sSwViewData.clear(); } - AttrChangedNotify(m_pWrtShell); + AttrChangedNotify(nullptr); // Initialize Fielddlg newly if necessary (e.g. for TYP_SETVAR) sal_uInt16 nId = SwFieldDlgWrapper::GetChildWindowId(); @@ -106,7 +106,7 @@ void SwView::Activate(bool bMDIActivate) } else // At least call the Notify (as a precaution because of the SlotFilter). - AttrChangedNotify(m_pWrtShell); + AttrChangedNotify(nullptr); SfxViewShell::Activate(bMDIActivate); } diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 0ebe24988797..fc7b760c0508 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -817,7 +817,7 @@ void SwView::Execute(SfxRequest &rReq) else if ( m_pWrtShell->IsDrawCreate() ) { GetDrawFuncPtr()->BreakCreate(); - AttrChangedNotify(m_pWrtShell); // shell change if needed + AttrChangedNotify(nullptr); // shell change if needed } else if ( m_pWrtShell->HasSelection() || IsDrawMode() ) { @@ -839,7 +839,7 @@ void SwView::Execute(SfxRequest &rReq) rBind.Invalidate( SID_ATTR_SIZE ); } m_pWrtShell->EnterStdMode(); - AttrChangedNotify(m_pWrtShell); // shell change if necessary + AttrChangedNotify(nullptr); // shell change if necessary } } else if ( GetEditWin().GetApplyTemplate() ) @@ -1087,10 +1087,9 @@ void SwView::Execute(SfxRequest &rReq) SwDBManager* pDBManager = rSh.GetDBManager(); if (pDBManager) { - SwDBData aData; - aData = rSh.GetDBData(); + 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(); @@ -2392,7 +2391,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 86a671102228..a8bf4c1cd321 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -225,7 +225,7 @@ void SwView::ExecDraw(SfxRequest& rReq) m_pWrtShell->EnterSelFrameMode(); LeaveDrawCreate(); - AttrChangedNotify(m_pWrtShell); + AttrChangedNotify(nullptr); return; } @@ -343,7 +343,7 @@ void SwView::ExecDraw(SfxRequest& rReq) } SetDrawFuncPtr(pFuncPtr); - AttrChangedNotify(m_pWrtShell); + AttrChangedNotify(nullptr); pFuncPtr->Activate(nSlotId); NoRotate(); @@ -386,7 +386,7 @@ void SwView::ExecDraw(SfxRequest& rReq) if(bEndTextEdit && pSdrView && pSdrView->IsTextEdit()) pSdrView->SdrEndTextEdit( true ); - AttrChangedNotify(m_pWrtShell); + AttrChangedNotify(nullptr); } // End drawing diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 871b24520a6f..3112c8d99727 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -385,7 +385,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(); } @@ -605,7 +605,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 ffb464c5b20a..e2748fed437f 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -631,7 +631,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(); @@ -1732,7 +1732,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 0695185d2fa2..57240a87b4e2 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/wrtsh3.cxx b/sw/source/uibase/wrtsh/wrtsh3.cxx index 337e005470d6..61a8b81427a9 100644 --- a/sw/source/uibase/wrtsh/wrtsh3.cxx +++ b/sw/source/uibase/wrtsh/wrtsh3.cxx @@ -121,7 +121,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; } |