From 2321626477d4ff930d8bc392efa6ea84e8825171 Mon Sep 17 00:00:00 2001 From: Oliver Specht Date: Mon, 7 Oct 2024 15:14:10 +0200 Subject: [PATCH] tdf#163340 replace list on paste Pasting paragraph with list should apply the source list to the target paragraph if the target is empty or completely selected. Change-Id: I27d462f121c03b6c5625f8c0967bc975d3ac2f88 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174606 Tested-by: Gabor Kelemen Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- sw/qa/extras/uiwriter/data/tdf163340.odt | Bin 0 -> 20151 bytes sw/qa/extras/uiwriter/uiwriter9.cxx | 28 +++++++++++++++++++++ .../core/doc/DocumentContentOperationsManager.cxx | 5 ++-- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 sw/qa/extras/uiwriter/data/tdf163340.odt diff --git a/sw/qa/extras/uiwriter/data/tdf163340.odt b/sw/qa/extras/uiwriter/data/tdf163340.odt new file mode 100644 index 0000000000000000000000000000000000000000..cae622e5b5f39fad50ae09ce695b4b218cfd85a1 GIT binary patch literal 20151 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 literal 0 HcwPel00001 diff --git a/sw/qa/extras/uiwriter/uiwriter9.cxx b/sw/qa/extras/uiwriter/uiwriter9.cxx index 30e4d60481d9..f97d5a572d4d 100644 --- a/sw/qa/extras/uiwriter/uiwriter9.cxx +++ b/sw/qa/extras/uiwriter/uiwriter9.cxx @@ -798,6 +798,34 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf162326_Character) CPPUNIT_ASSERT_EQUAL(short(1), getProperty(getRun(getParagraph(3), 2), u"CharUnderline"_ustr)); } +CPPUNIT_TEST_FIXTURE(SwUiWriterTest9, testTdf163340) +{ + createSwDoc("tdf163340.odt"); + uno::Reference xModel(mxComponent, uno::UNO_QUERY); + uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); + uno::Reference xText = xTextDocument->getText(); + uno::Reference xSelSupplier(xModel->getCurrentController(), + uno::UNO_QUERY_THROW); + uno::Reference xParaCursor(xTextDocument->getText()->createTextCursor(), + uno::UNO_QUERY); + + for (int i = 0; i < 14; i++) + xParaCursor->gotoNextParagraph(false); + xParaCursor->gotoEndOfParagraph(true); + xSelSupplier->select(uno::Any(xParaCursor)); + + CPPUNIT_ASSERT_EQUAL(u"A."_ustr, getProperty(xParaCursor, u"ListLabelString"_ustr)); + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); + + xParaCursor = uno::Reference(xText->createTextCursor(), uno::UNO_QUERY); + for (int i = 0; i < 3; i++) + xParaCursor->gotoNextParagraph(false); + xParaCursor->gotoEndOfParagraph(true); + CPPUNIT_ASSERT_EQUAL(u"1."_ustr, getProperty(xParaCursor, u"ListLabelString"_ustr)); + xSelSupplier->select(uno::Any(xParaCursor)); + dispatchCommand(mxComponent, u".uno:Paste"_ustr, {}); + CPPUNIT_ASSERT_EQUAL(u"A."_ustr, getProperty(xParaCursor, u"ListLabelString"_ustr)); +} } // end of anonymous namespace CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 2588decb8136..e8c0055f9e49 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -5010,7 +5010,6 @@ static void lcl_PopNumruleState( // #i86492# - restore also item if ( lcl_MarksWholeNode(rPam) ) return; - if (aNumRuleItemHolderIfSet) { pDestTextNd->SetAttr(*aNumRuleItemHolderIfSet); @@ -5202,9 +5201,11 @@ bool DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo // - source contains at least one paragraph which is not in a list // or // - source is a table + // - tdf#163340 overwrite list if source has a list + if ( pNumRuleToPropagate && ((pDestTextNd && !pDestTextNd->GetText().getLength() && - !pDestTextNd->IsInList() && + (!pDestTextNd->IsInList() || rPam.GetPointNode().GetTextNode()->IsInList() ) && !lcl_ContainsOnlyParagraphsInList(rPam)) || rPam.GetBound().nNode.GetNode().GetNodeType() == SwNodeType::Table) ) { -- 2.11.4.GIT