sw/inc/redline.hxx | 5 ----- sw/source/core/undo/undobj.cxx | 3 --- sw/source/uibase/misc/redlndlg.cxx | 7 ------- sw/source/uibase/shells/textfld.cxx | 14 -------------- 4 files changed, 29 deletions(-)
New commits: commit e4568240bdfd173c274a392e61c05445afb73dd2 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Tue Sep 3 15:43:22 2024 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Sep 3 18:55:43 2024 +0200 SwRedlineHint is dead ever since commit 43a36b36986dd2112fc90340e7a8a11ea5369def Author: Robert Roth <robert.roth....@gmail.com> Date: Mon Nov 1 02:50:47 2010 +0200 Commented out code, bogus comments removed, some german comments translated. Change-Id: I9a6424080728ee42e1705e144cd53aa6069f2abe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172826 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 06ea78c6d37e..20befbaa43d7 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -344,11 +344,6 @@ public: { return m_aRedlineData; } }; -class SW_DLLPUBLIC SwRedlineHint final : public SfxHint -{ -}; - - namespace sw { std::vector<std::unique_ptr<SwRangeRedline>> GetAllValidRanges(std::unique_ptr<SwRangeRedline> p); diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 55f25bd238d6..28563edbbf56 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -1450,9 +1450,6 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM const & rPam ) RedlineFlags eOld = rDoc.getIDocumentRedlineAccess().GetRedlineFlags(); rDoc.getIDocumentRedlineAccess().SetRedlineFlags_intern( eOld | RedlineFlags::DontCombineRedlines ); - //#i92154# let UI know about a new redline with comment - if (rDoc.GetDocShell() && (!pRedl->GetComment().isEmpty()) ) - rDoc.GetDocShell()->Broadcast(SwRedlineHint()); auto const result(rDoc.getIDocumentRedlineAccess().AppendRedline(pRedl, true)); assert(result != IDocumentRedlineAccess::AppendResult::IGNORED); // SwRedlineSaveData::RedlineToDoc: insert redline failed diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 2f758048d14b..61fff609764b 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -1465,13 +1465,6 @@ IMPL_LINK(SwRedlineAcceptDlg, CommandHdl, const CommandEvent&, rCEvt, bool) const SwRangeRedline &rRedline = pSh->GetRedline(nPos); - /* enable again once we have redline comments in the margin - sComment = rRedline.GetComment(); - if ( !sComment.Len() ) - GetActiveView()->GetDocShell()->Broadcast(SwRedlineHint(&rRedline,SWREDLINE_INSERTED)); - const_cast<SwRangeRedline&>(rRedline).Broadcast(SwRedlineHint(&rRedline,SWREDLINE_FOCUS)); - */ - OUString sComment = convertLineEnd(rRedline.GetComment(), GetSystemLineEnd()); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ::DialogGetRanges fnGetRange = pFact->GetDialogGetRangesFunc(); diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx index 88ad90347ceb..1335958232eb 100644 --- a/sw/source/uibase/shells/textfld.cxx +++ b/sw/source/uibase/shells/textfld.cxx @@ -536,20 +536,6 @@ void SwTextShell::ExecField(SfxRequest &rReq) break; case FN_REDLINE_COMMENT: { - /* this code can be used once we want redline comments in the margin, all other stuff can - then be deleted - String sComment; - const SwRangeRedline *pRedline = rSh.GetCurrRedline(); - - if (pRedline) - { - sComment = pRedline->GetComment(); - if ( !sComment.Len() ) - GetView().GetDocShell()->Broadcast(SwRedlineHint(pRedline,SWREDLINE_INSERTED)); - const_cast<SwRangeRedline*>(pRedline)->Broadcast(SwRedlineHint(pRedline,SWREDLINE_FOCUS,&GetView())); - } - */ - const SwRangeRedline *pRedline = rSh.GetCurrRedline(); SwDoc *pDoc = rSh.GetDoc(); // If index is specified, goto and select the appropriate redline