sw/qa/extras/ooxmlexport/data/tdf138739.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 8 ++++++++
sw/source/core/doc/textboxhelper.cxx | 19 ++-----------------
3 files changed, 10 insertions(+), 17 deletions(-)
New commits:
commit 25ca25ee25278536c56a2ac4a63af91100ce4d2e
Author: Attila Bakos (NISZ) <bakos.attilakar...@nisz.hu>
AuthorDate: Tue Dec 8 16:40:48 2020 +0100
Commit: László Németh <nem...@numbertext.org>
CommitDate: Mon Dec 21 09:07:46 2020 +0100
tdf#138739 sw: fix regression of first paragraph
First paragraph of the document lost its formatting
from commit 056933bc55608d0ca061539ae124d7b9386cdb62.
(tdf#137802 sw: fix crash on deleting last paragraph).
This reverts commit 056933bc55608d0ca061539ae124d7b9386cdb62.
Change-Id: I7d42c9a22b456ce3faa9cf08c6c73a2878636c8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107427
Tested-by: László Németh <nem...@numbertext.org>
Reviewed-by: László Németh <nem...@numbertext.org>
diff --git a/sw/qa/extras/ooxmlexport/data/tdf138739.docx
b/sw/qa/extras/ooxmlexport/data/tdf138739.docx
new file mode 100755
index 000000000000..7b5bb302bfa1
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf138739.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index c91488efb93b..b06f90fe9622 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -425,6 +425,14 @@ DECLARE_OOXMLEXPORT_TEST(testTdf98000_changePageStyle,
"tdf98000_changePageStyle
CPPUNIT_ASSERT_MESSAGE("Different page1/page2 styles", sPageOneStyle !=
sPageTwoStyle);
}
+DECLARE_OOXMLEXPORT_TEST(testTdf138739, "tdf138739.docx")
+{
+ uno::Reference<beans::XPropertySet> xParaProps(getParagraph(1),
uno::UNO_QUERY);
+
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Font type name does not match!",
OUString("Comic Sans MS"),
+
xParaProps->getPropertyValue("CharFontName").get<OUString>());
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf135216_evenOddFooter,
"tdf135216_evenOddFooter.odt")
{
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
diff --git a/sw/source/core/doc/textboxhelper.cxx
b/sw/source/core/doc/textboxhelper.cxx
index cbf1384bd27c..0e2aa715cbd8 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -83,23 +83,8 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape, bool
bCopyText)
pShape->GetDoc()->GetDocShell()->GetBaseModel(), uno::UNO_QUERY);
uno::Reference<text::XTextContentAppend>
xTextContentAppend(xTextDocument->getText(),
uno::UNO_QUERY);
- try
- {
- SdrObject* pSourceSDRShape = pShape->FindRealSdrObject();
- uno::Reference<text::XTextContent>
XSourceShape(pSourceSDRShape->getUnoShape(),
- uno::UNO_QUERY_THROW);
- xTextContentAppend->insertTextContentWithProperties(
- xTextFrame, uno::Sequence<beans::PropertyValue>(),
XSourceShape->getAnchor());
- }
- catch (uno::Exception&)
- {
- // Before the textframe was appended now it is inserted to the begin
of the doc in order
- // to prevent crash when someone removes the para where the textframe
anchored:
- uno::Reference<text::XTextCursor> xCursor =
xTextDocument->getText()->createTextCursor();
- xCursor->gotoStart(false);
- xTextContentAppend->insertTextContentWithProperties(
- xTextFrame, uno::Sequence<beans::PropertyValue>(),
xCursor->getStart());
- }
+ xTextContentAppend->appendTextContent(xTextFrame,
uno::Sequence<beans::PropertyValue>());
+
// Link FLY and DRAW formats, so it becomes a text box (needed for
syncProperty calls).
uno::Reference<text::XTextFrame> xRealTextFrame(xTextFrame,
uno::UNO_QUERY);
auto pTextFrame = dynamic_cast<SwXTextFrame*>(xRealTextFrame.get());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
