sw/source/uibase/wrtsh/wrtsh1.cxx | 28 ---------------------------- 1 file changed, 28 deletions(-)
New commits: commit 4fa1436a37e3190b64c14567278ea026f66ffa5c Author: Justin Luth <[email protected]> AuthorDate: Wed Oct 13 14:56:44 2021 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Sun Feb 26 10:27:11 2023 +0000 tdf#134426 tdf#138873 sw: Revert "tdf#79717 ... ...save/restore character format on selection overwrite" which might also fix tdf#144638 as well. This reverts LO 6.3 commit 6abed0ea006f3616e40faf2ae782cf64f8ac2914. This 6.3 fix for bug 79717 has caused too many other problems that are not being looked at, so it should just be reverted. It is spamming documents with direct formatting which is a terrible thing to have happen by accident. It completely wrecks the proper use of styles. Also revert asscoiated follow-up commits: Revert "tdf#79717 save/restore character style on selection overwrite" This reverts commit 6.3 04bd1925706360414438b814046b543c5e317d0a. Revert "tdf#79717: sw_uiwriter: Add unittest" This reverts commit 7.1 b05955b480fe4d32852e7be8a118d46ca7e6dbfa. These effectively revert 7.0.4 12eac5bcbc9b71bf00cb88b918988826229cca35 but its unit test is left intact. Change-Id: Ideced4d38bfdf4c82f1744534afbaad29689fded Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123566 Tested-by: Jenkins Reviewed-by: Justin Luth <[email protected]> Reviewed-by: Mike Kaganski <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123577 Reviewed-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147577 Tested-by: Thorsten Behrens <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index c240c630df3a..b37173efc254 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -216,11 +216,6 @@ void SwWrtShell::Insert( const OUString &rStr ) bCallIns = m_bIns /*|| bHasSel*/; bool bDeleted = false; - typedef svl::Items<RES_CHRATR_BEGIN, RES_CHRATR_RSID - 1, - RES_CHRATR_RSID + 1, RES_CHRATR_END - 1, - RES_TXTATR_CHARFMT, RES_TXTATR_CHARFMT> CharItems; - SfxItemSet aCharAttrSet(GetAttrPool(), CharItems{}); - if( bHasSel || ( !m_bIns && SelectHiddenRange() ) ) { // Only here parenthesizing, because the normal @@ -238,12 +233,6 @@ void SwWrtShell::Insert( const OUString &rStr ) aRewriter.AddRule(UndoArg3, aTmpStr); } - // tdf#79717 Save character formatting of the start of the selection - const SwPosition *pStart = GetCursor()->Start(); - SwPaM aPaM(pStart->nNode.GetNode(), pStart->nContent.GetIndex(), - pStart->nNode.GetNode(), pStart->nContent.GetIndex() + 1); - GetPaMAttr(&aPaM, aCharAttrSet); - StartUndo(SwUndoId::REPLACE, &aRewriter); bStarted = true; Push(); @@ -257,23 +246,6 @@ void SwWrtShell::Insert( const OUString &rStr ) bCallIns ? SwEditShell::Insert2( rStr, bDeleted ) : SwEditShell::Overwrite( rStr ); - if( bDeleted ) - { - // tdf#79717 Restore formatting of the deleted selection - SwPosition* pEnd = GetCursor()->Start(); - SwPaM aPaM(pEnd->nNode.GetNode(), pEnd->nContent.GetIndex() - rStr.getLength(), - pEnd->nNode.GetNode(), pEnd->nContent.GetIndex()); - - std::set<sal_uInt16> aAttribs; - for (sal_uInt16 i = RES_CHRATR_BEGIN; i < RES_CHRATR_END; ++i) - if (i != sal_uInt16(RES_CHRATR_RSID)) - aAttribs.insert(aAttribs.end(), i); - aAttribs.insert(aAttribs.end(), RES_TXTATR_CHARFMT); - ResetAttr(aAttribs, &aPaM); - - SetAttrSet(aCharAttrSet, SetAttrMode::DEFAULT, &aPaM); - } - if( bStarted ) { EndUndo();
