editeng/source/editeng/impedit2.cxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
New commits: commit 53d900fb334b2ce08ff19de0f765108e8c91a36f Author: Mark Hung <[email protected]> AuthorDate: Mon Oct 8 21:49:44 2018 +0800 Commit: Mark Hung <[email protected]> CommitDate: Thu Oct 11 13:40:46 2018 +0200 tdf#119065 fix the style of two connected paragraphs. Invoke ImpConnectParagraphs with bSpecialBackward set to false by default in DeleteLeftOrRight(). Old design connect backward when pressing backspace to connect two paragraphs. The former paragraph of the two ( or the remain one ) adopt the paragraph style ( bullet on/off status, color, etc. ) from the later paragraph. It's hard to understand the intention of the original design, and the design was not activated until LibreOffice6.1, hence just don't connect backward anymore. Change-Id: I3697acc01d718d7a769fb8d0bd573084c4fe2969 Reviewed-on: https://gerrit.libreoffice.org/61537 Tested-by: Jenkins Reviewed-by: Mark Hung <[email protected]> diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 025182a07bb8..d1f985ac631c 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2394,12 +2394,7 @@ EditPaM ImpEditEngine::DeleteLeftOrRight( const EditSelection& rSel, sal_uInt8 n if ( ( nDelMode == DeleteMode::RestOfContent ) || ( aDelStart.GetNode() == aDelEnd.GetNode() ) ) return ImpDeleteSelection( EditSelection( aDelStart, aDelEnd ) ); - // Decide now if to delete selection (RESTOFCONTENTS) - bool bSpecialBackward = ( nMode == DEL_LEFT ) && ( nDelMode == DeleteMode::Simple ); - if ( aStatus.IsAnyOutliner() ) - bSpecialBackward = false; - - return ImpConnectParagraphs( aDelStart.GetNode(), aDelEnd.GetNode(), bSpecialBackward ); + return ImpConnectParagraphs(aDelStart.GetNode(), aDelEnd.GetNode()); } EditPaM ImpEditEngine::ImpDeleteSelection(const EditSelection& rCurSel) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
