[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf105215.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx| 14 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 ++-
3 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 8f8c71f4633bab43b2a2b3251b0c6ab69ab8b21a
Author: László Németh
AuthorDate: Wed Mar 18 13:56:17 2020 +0100
Commit: Gabor Kelemen
CommitDate: Wed Sep 23 19:44:56 2020 +0200
tdf#105215 DOCX import: fix paragraph-length direct formatting
in table cells.
Paragraph-level direct character formatting (w:p/w:pPr/w:rPr)
overwrote portion formatting (w:r/w:rPr), if the same
formatting was applied on all portions of the paragraph.
Note: with this fix, portion level direct character formatting
overwrites the paragraph-level direct formatting also in the
table row inserted below the actual row, like MSO does.
Regression from commit 2ab481b038b62b1ff576ac4d49d03c1798cd7f84
(tdf#90069 DOCX: fix character style of new table rows)
See also commit 0045b6f36e5e1445d699f87a0f6597d665b4cfe4
(tdf#130690: DOCX import: fix lost text formatting in cells)
Change-Id: Ice47b93e73aed28b09334eda2f26283c68bd0bd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90700
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 5ac6f02fdc6015a5d78071570dee310febf95fc6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103200
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf105215.docx
b/sw/qa/extras/ooxmlexport/data/tdf105215.docx
new file mode 100644
index ..e464d460b2e1
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf105215.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 6c596b7d1ca3..a10d253c287f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -1150,6 +1150,20 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf130690,
"tdf130690.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[2]/w:rPr/w:highlight", 0);
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf105215, "tdf105215.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:pPr/w:rPr/w:rFonts", "ascii", "Linux
Libertine G");
+
+// These were "Linux Libertine G"
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r/w:rPr",
5);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[1]/w:rPr/w:rFonts", "ascii", "Lohit
Devanagari");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[2]/w:rPr/w:rFonts", "ascii", "Lohit
Devanagari");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[3]/w:rPr/w:rFonts", "ascii", "Lohit
Devanagari");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[4]/w:rPr/w:rFonts", "ascii", "Lohit
Devanagari");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[5]/w:rPr/w:rFonts", "ascii", "Lohit
Devanagari");
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121597TrackedDeletionOfMultipleParagraphs,
"tdf121597.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 10f587bb750c..96dfd3d0bee5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1812,7 +1812,8 @@ void DomainMapper_Impl::finishParagraph( const
PropertyMapPtr& pPropertyMap, con
// all text portions contain the same value, so
next setPropertyValue() won't overwrite part of them
xRunProperties->getPropertyState(rParaProp.Name)
== css::beans::PropertyState_DIRECT_VALUE )
{
-xParaProps->setPropertyValue( rParaProp.Name,
rParaProp.Value );
+uno::Reference
xRunPropertySet(xCur, uno::UNO_QUERY);
+xParaProps->setPropertyValue( rParaProp.Name,
xRunPropertySet->getPropertyValue(rParaProp.Name) );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf130690.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|9 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 20 +++-
3 files changed, 16 insertions(+), 13 deletions(-)
New commits:
commit 67f9f9f379089481c1d1ecabc0f5b59f1f736fb8
Author: László Németh
AuthorDate: Mon Mar 2 17:43:58 2020 +0100
Commit: Gabor Kelemen
CommitDate: Wed Sep 23 19:38:27 2020 +0200
tdf#130690: DOCX import: fix lost text formatting in cells
by limiting paragraph-level character property expansion
for the whole table paragraph based on all text portions.
Follow-up of commit abb9c7db8bcc06f907d39a7811711882161d5803
(tdf#130494: DOCX import: limit paragraph-level character property)
regression from 2ab481b038b62b1ff576ac4d49d03c1798cd7f84
(tdf#90069 DOCX: fix character style of new table rows)
Change-Id: I4d14fd30c9fbc8464c2430726faf16e292f24e38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89848
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 0045b6f36e5e1445d699f87a0f6597d665b4cfe4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103199
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf130690.docx
b/sw/qa/extras/ooxmlexport/data/tdf130690.docx
new file mode 100644
index ..ab08dd99a3df
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf130690.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 0a3d0a7b8aa3..6c596b7d1ca3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -1141,6 +1141,15 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf130494,
"tdf130494.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r/w:rPr/w:highlight", 0);
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf130690, "tdf130690.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:pPr/w:rPr/w:highlight", "val",
"yellow");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[1]/w:rPr/w:highlight", 1);
+// keep direct formatting of table cell paragraph with removed highlighting
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[2]/w:rPr/w:highlight", 0);
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121597TrackedDeletionOfMultipleParagraphs,
"tdf121597.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b62f83c9b8c6..10f587bb750c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1799,26 +1799,20 @@ void DomainMapper_Impl::finishParagraph( const
PropertyMapPtr& pPropertyMap, con
}
// fix table paragraph properties
-if ( xParaProps && m_nTableDepth > 0 )
+if ( xTextRange.is() && xParaProps && m_nTableDepth > 0 )
{
uno::Sequence< beans::PropertyValue > aParaProps =
pParaContext->GetPropertyValues(false);
-
+uno::Reference xCur =
xTextRange->getText()->createTextCursorByRange(xTextRange);
+uno::Reference< beans::XPropertyState > xRunProperties(
xCur, uno::UNO_QUERY_THROW );
// tdf#90069 in tables, apply paragraph level character
style also on
// paragraph level to support its copy during insertion of
new table rows
for( const auto& rParaProp : std::as_const(aParaProps) )
{
-if ( m_pLastCharacterContext.get() &&
rParaProp.Name.startsWith("Char") && rParaProp.Name != "CharStyleName" &&
rParaProp.Name != "CharInteropGrabBag" )
+if ( rParaProp.Name.startsWith("Char") &&
rParaProp.Name != "CharStyleName" && rParaProp.Name != "CharInteropGrabBag" &&
+// all text portions contain the same value, so
next setPropertyValue() won't overwrite part of them
+xRunProperties->getPropertyState(rParaProp.Name)
== css::beans::PropertyState_DIRECT_VALUE )
{
-const uno::Sequence< beans::PropertyValue >
aLastCharProps = m_pLastCharacterContext->GetPropertyValues( );
-
-for( const auto& rLastCharProp :
std::as_const(aLastCharProps) )
-{
-if ( rLastCharProp == rParaProp )
-{
-xParaProps->setPropertyValue(
rParaProp.Name, rParaProp.Value );
-
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf130494.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|8
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 19 +++
3 files changed, 23 insertions(+), 4 deletions(-)
New commits:
commit 4af97fd43ae8761b39a8e7bdb49915177d5c07ea
Author: László Németh
AuthorDate: Fri Feb 7 15:06:50 2020 +0100
Commit: Gabor Kelemen
CommitDate: Wed Sep 23 19:20:11 2020 +0200
tdf#130494: DOCX import: limit paragraph-level character property
expansion for the whole table paragraph based on the
last character context.
regression from 2ab481b038b62b1ff576ac4d49d03c1798cd7f84
(tdf#90069 DOCX: fix character style of new table rows)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88199
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit abb9c7db8bcc06f907d39a7811711882161d5803)
Change-Id: I49da23c268436488ff1537771869c38108113c12
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103198
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf130494.docx
b/sw/qa/extras/ooxmlexport/data/tdf130494.docx
new file mode 100644
index ..bc2050feaa55
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf130494.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index cf2766ac2b45..0a3d0a7b8aa3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -1133,6 +1133,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf88496,
"tdf88496.docx")
CPPUNIT_ASSERT_EQUAL(3, getPages());
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf130494, "tdf130494.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:pPr/w:rPr/w:highlight", "val",
"yellow");
+// keep direct formatting of table cell paragraph with removed highlighting
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r/w:rPr/w:highlight", 0);
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121597TrackedDeletionOfMultipleParagraphs,
"tdf121597.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 67ec8b869544..b62f83c9b8c6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1801,14 +1801,25 @@ void DomainMapper_Impl::finishParagraph( const
PropertyMapPtr& pPropertyMap, con
// fix table paragraph properties
if ( xParaProps && m_nTableDepth > 0 )
{
-uno::Sequence< beans::PropertyValue > aValues =
pParaContext->GetPropertyValues(false);
+uno::Sequence< beans::PropertyValue > aParaProps =
pParaContext->GetPropertyValues(false);
// tdf#90069 in tables, apply paragraph level character
style also on
// paragraph level to support its copy during insertion of
new table rows
-for( const auto& rProp : std::as_const(aValues) )
+for( const auto& rParaProp : std::as_const(aParaProps) )
{
-if ( rProp.Name.startsWith("Char") && rProp.Name !=
"CharStyleName" && rProp.Name != "CharInteropGrabBag" )
-xParaProps->setPropertyValue( rProp.Name,
rProp.Value );
+if ( m_pLastCharacterContext.get() &&
rParaProp.Name.startsWith("Char") && rParaProp.Name != "CharStyleName" &&
rParaProp.Name != "CharInteropGrabBag" )
+{
+const uno::Sequence< beans::PropertyValue >
aLastCharProps = m_pLastCharacterContext->GetPropertyValues( );
+
+for( const auto& rLastCharProp :
std::as_const(aLastCharProps) )
+{
+if ( rLastCharProp == rParaProp )
+{
+xParaProps->setPropertyValue(
rParaProp.Name, rParaProp.Value );
+break;
+}
+}
+}
}
// tdf#128959 table paragraphs haven't got window and
orphan controls
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf118701.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 18 --
writerfilter/source/dmapper/DomainMapper.cxx |5 +++--
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 22 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 -
5 files changed, 28 insertions(+), 22 deletions(-)
New commits:
commit 342afecbd35921e18dde4cfd29f27ca520d1b7a0
Author: László Németh
AuthorDate: Fri Jul 10 18:52:42 2020 +0200
Commit: Gabor Kelemen
CommitDate: Tue Sep 15 14:00:54 2020 +0200
tdf#134793 DOCX import: fix numbering with inline images
before page break. Previous fix for tdf#118701
didn't keep numbering of the paragraph marked
for deletion.
This reverts commit b216fc5b583050cfb1cdf9bd82ec3c1bd2e09d70
(tdf#118701 DOCX import: fix image position on page break).
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98541
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 616a47c9570f9ce67b18a124f08f4a342bff3468)
Change-Id: I5bde927f15b4b1f682d81482734fadff7690f6d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102649
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf118701.docx
b/sw/qa/extras/ooxmlexport/data/tdf118701.docx
index 654a22709919..8fb26669d1fa 100644
Binary files a/sw/qa/extras/ooxmlexport/data/tdf118701.docx and
b/sw/qa/extras/ooxmlexport/data/tdf118701.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 8ec18a49eb4a..3d0f8f91a172 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -466,9 +466,23 @@ DECLARE_OOXMLIMPORT_TEST(TestTdf132483, "tdf132483.docx")
text::RelOrientation::PAGE_FRAME , nHRelPos);
}
-DECLARE_OOXMLIMPORT_TEST(testTdf118701, "tdf118701.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf118701, "tdf118701.docx")
{
-CPPUNIT_ASSERT_EQUAL_MESSAGE("At least one paragraph is missing from the
file!", 3, getParagraphs());
+// This was 6, related to moving inline images after the page breaks
+CPPUNIT_ASSERT_EQUAL(4, getPages());
+
+xmlDocPtr pXmlDoc = parseExport();
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr[1]/w:numPr", 0);
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr[1]/w:numPr", 0);
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:pPr[1]/w:numPr", 0);
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[4]/w:pPr[1]/w:numPr", 1);
+
+// Keep numbering of the paragraph of the inline image
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[8]/w:pPr[1]/w:numPr", 0);
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[9]/w:pPr[1]/w:numPr", 1);
+// This was 0
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[10]/w:pPr[1]/w:numPr", 1);
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 3339bb27e220..86ed6e3cfdb3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3460,7 +3460,8 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
&& !bSingleParagraphAfterRedline
&& !m_pImpl->GetIsDummyParaAddedForTableInSection()
&& !( pSectionContext &&
pSectionContext->GetBreakType() != -1 && pContext &&
pContext->isSet(PROP_BREAK_TYPE) )
-&& !m_pImpl->GetIsPreviousParagraphFramed());
+&& !m_pImpl->GetIsPreviousParagraphFramed()
+&& !m_pImpl->IsParaWithInlineObject());
const bool bNoNumbering = bRemove || (!m_pImpl->GetParaChanged()
&& m_pImpl->GetParaSectpr() && bSingleParagraph);
PropertyMapPtr xContext = bNoNumbering ?
m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) : PropertyMapPtr();
@@ -3475,7 +3476,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
}
m_pImpl->SetParaSectpr(false);
finishParagraph(bRemove);
-if (bRemove && m_pImpl->IsLastParaEmpty())
+if (bRemove)
m_pImpl->RemoveLastParagraph();
}
else
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b77428a35f53..67ec8b869544 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -310,7 +310,8 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bParaHadField(false),
m_bParaAutoBefore(false),
m_bFirstParagraphInCell(true),
-m_bSaveFirstParagraphInCell(false)
+m_bSaveFirstParagraphInCell(false),
+m_bParaWithInlineObject(false)
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf118701.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx|5 +
writerfilter/source/dmapper/DomainMapper.cxx |2 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 16
writerfilter/source/dmapper/DomainMapper_Impl.hxx |1 +
5 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit d8b5dbc8be757ef64b4d09dd1a72cb52c11d6d10
Author: Bakos Attila
AuthorDate: Tue Jun 30 15:03:31 2020 +0200
Commit: Gabor Kelemen
CommitDate: Tue Sep 15 13:27:44 2020 +0200
tdf#118701 DOCX import: fix image position on page break
If an image anchored to an empty paragraph only with
section properties, don't remove that paragraph to keep
the image on the page before the page break.
IsLastParaEmpty() tries to move a text cursor over the
empty paragraph marked for deletion. If it contains an
image anchored as a character, the cursor won't reach
the end of the previous paragraph by goLeft(2).
Co-authored-by: Attila Bánhegyi (NISZ)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97518
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit b216fc5b583050cfb1cdf9bd82ec3c1bd2e09d70)
Change-Id: Ic22c7553948eb06739232d7e35fc49ad14f96518
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102563
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf118701.docx
b/sw/qa/extras/ooxmlexport/data/tdf118701.docx
new file mode 100644
index ..654a22709919
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf118701.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 92d2d7869662..8ec18a49eb4a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -466,6 +466,11 @@ DECLARE_OOXMLIMPORT_TEST(TestTdf132483, "tdf132483.docx")
text::RelOrientation::PAGE_FRAME , nHRelPos);
}
+DECLARE_OOXMLIMPORT_TEST(testTdf118701, "tdf118701.docx")
+{
+CPPUNIT_ASSERT_EQUAL_MESSAGE("At least one paragraph is missing from the
file!", 3, getParagraphs());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index ec3809cd291a..3339bb27e220 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3475,7 +3475,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
}
m_pImpl->SetParaSectpr(false);
finishParagraph(bRemove);
-if (bRemove)
+if (bRemove && m_pImpl->IsLastParaEmpty())
m_pImpl->RemoveLastParagraph();
}
else
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6e6a074dad43..b77428a35f53 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -477,6 +477,22 @@ void DomainMapper_Impl::AddDummyParaForTableInSection()
}
}
+bool DomainMapper_Impl::IsLastParaEmpty()
+{
+bool bRet = true;
+if (!m_aTextAppendStack.empty() && m_aTextAppendStack.top().xTextAppend)
+{
+//creating cursor for finding text content
+uno::Reference xCursor =
m_aTextAppendStack.top().xTextAppend->createTextCursor();
+xCursor->gotoEnd(false);
+//selecting the last 2 characters in the document
+xCursor->goLeft(2, true);
+//the last paragraph is empty, if they are newlines
+bRet =
xCursor->getString().match(OUString(SAL_NEWLINE_STRING).concat(SAL_NEWLINE_STRING));
+}
+return bRet;
+}
+
void DomainMapper_Impl::RemoveLastParagraph( )
{
if (m_bDiscardHeaderFooter)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 7291973be2a1..9eef8dbee58d 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -619,6 +619,7 @@ public:
void RemoveDummyParaForTableInSection();
void AddDummyParaForTableInSection();
+bool IsLastParaEmpty();
void RemoveLastParagraph( );
void SetIsLastParagraphInSection( bool bIsLast );
bool GetIsLastParagraphInSection() const { return m_bIsLastParaInSection;}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf132483.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 13 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 +++-
3 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit a7d8293072b157438c2881c4a866d78b0ca72422
Author: Bakos Attila
AuthorDate: Fri Jul 10 12:42:11 2020 +0200
Commit: Gabor Kelemen
CommitDate: Sun Sep 13 21:28:04 2020 +0200
tdf#132483: DOCX import: fix OLE anchoring position
The relative orientation of OLE objects was
not copied from the replacement object to
OLE, resulting bad position.
Co-authored-by: Attila Bánhegyi (NISZ)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98493
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 54031e6a2912ebe723b4423b5d737c13c9bb03c5)
Change-Id: If62124e5a40218a224e047efbe86a09606b44af5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102566
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf132483.docx
b/sw/qa/extras/ooxmlexport/data/tdf132483.docx
new file mode 100644
index ..e4ebf4b78511
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf132483.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 18c2648becd3..92d2d7869662 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -453,6 +453,19 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf131539,
"tdf131539.odt")
CPPUNIT_ASSERT(aXmlVal.indexOf("margin-left:139.95")>-1);
}
+DECLARE_OOXMLIMPORT_TEST(TestTdf132483, "tdf132483.docx")
+{
+uno::Reference xOLEProps(getShape(1),
uno::UNO_QUERY_THROW);
+sal_Int16 nVRelPos = -1;
+sal_Int16 nHRelPos = -1;
+xOLEProps->getPropertyValue("VertOrientRelation") >>= nVRelPos;
+xOLEProps->getPropertyValue("HoriOrientRelation") >>= nHRelPos;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("The OLE is shifted vertically",
+text::RelOrientation::PAGE_FRAME , nVRelPos);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("The OLE is shifted horizontally",
+text::RelOrientation::PAGE_FRAME , nHRelPos);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c882ac586745..6e6a074dad43 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2062,7 +2062,9 @@ void DomainMapper_Impl::appendOLE( const OUString&
rStreamName, const std::share
OUString("HoriOrient"),
OUString("HoriOrientPosition"),
OUString("VertOrient"),
-OUString("VertOrientPosition")
+OUString("VertOrientPosition"),
+OUString("VertOrientRelation"),
+OUString("HoriOrientRelation")
};
for (const OUString & s : pProperties)
xOLEProperties->setPropertyValue(s,
xReplacementProperties->getPropertyValue(s));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/layout/data/tdf134685.docx |binary
sw/qa/extras/layout/layout.cxx | 10 ++
writerfilter/source/dmapper/TableData.hxx|9 +++--
writerfilter/source/dmapper/TableManager.cxx |7 ---
writerfilter/source/dmapper/TableManager.hxx |2 +-
5 files changed, 22 insertions(+), 6 deletions(-)
New commits:
commit 08796e1dfc34c8c17970bf3d7b360f57ce582f06
Author: László Németh
AuthorDate: Fri Jul 17 14:39:45 2020 +0200
Commit: Gabor Kelemen
CommitDate: Tue Aug 11 21:49:59 2020 +0200
tdf#134685 DOCX table import: fix gridBefore + cell width
Improve workaround to handle nested tables started at cell
start in a row with gridBefore. Omitted gridBefore cells
from commit 5483d4e10aad27889b961b9cb94d7ba6c86aed0b
(tdf#134606 DOCX table import: fix gridBefore + nesting)
resulted less cells in the row than defined by the grid,
and the different code path could lead to narrow cell width
with partially invisible nested table. Fix this by adding
gridBefore cell count to the cell span in the first cell.
Regression from commit 70274f86cdc1c023ffdd0130c262c1479262d76b
(tdf#116194 DOCX import: fix missing tables with w:gridBefore)
Conflicts:
sw/qa/extras/layout/layout.cxx
writerfilter/source/dmapper/TableManager.hxx
(cherry-picked from commit abea0d6647c7f1f7e76c73c26cb80e6a67dc5111)
Change-Id: If332305d54ff2b34b258270a607fb31ff7380149
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98973
Tested-by: Jenkins
Reviewed-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100476
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/layout/data/tdf134685.docx
b/sw/qa/extras/layout/data/tdf134685.docx
new file mode 100644
index ..86b59fa982f3
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf134685.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index f109a809355e..67ad3cb16343 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2941,6 +2941,16 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf127606)
assertXPath(pXmlDoc, "/root/page/body/tab/row/cell/txt[3]/Special",
"nHeight", "260");
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134685)
+{
+createDoc("tdf134685.docx");
+xmlDocPtr pXmlDoc = parseLayoutDump();
+sal_Int32 nWidth
+= getXPath(pXmlDoc, "/root/page/body/tab/row[6]/cell[1]/infos/bounds",
"width").toInt32();
+// This was 2223: the content was only partially visible according to the
lost cell width
+CPPUNIT_ASSERT_GREATER(static_cast(14000), nWidth);
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf109077)
{
createDoc("tdf109077.docx");
diff --git a/writerfilter/source/dmapper/TableData.hxx
b/writerfilter/source/dmapper/TableData.hxx
index 14fedc66fba8..1632696bceb6 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -249,10 +249,15 @@ public:
nRet.push_back(aCell->getGridSpan());
return nRet;
}
-void setCurrentGridSpan(sal_uInt32 nSpan)
+void setCurrentGridSpan(sal_uInt32 nSpan, bool bFirstCell = false)
{
if ( mCells.size() )
-mCells.back()->setGridSpan(nSpan);
+{
+if ( bFirstCell )
+mCells.front()->setGridSpan(nSpan);
+else
+mCells.back()->setGridSpan(nSpan);
+}
}
};
diff --git a/writerfilter/source/dmapper/TableManager.cxx
b/writerfilter/source/dmapper/TableManager.cxx
index 596d036a506a..678092a15280 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -64,9 +64,9 @@ std::vector TableManager::getCurrentGridSpans()
return mTableDataStack.top()->getCurrentRow()->getGridSpans();
}
-void TableManager::setCurrentGridSpan(sal_uInt32 nGridSpan)
+void TableManager::setCurrentGridSpan(sal_uInt32 nGridSpan, bool bFirstCell)
{
-mTableDataStack.top()->getCurrentRow()->setCurrentGridSpan(nGridSpan);
+mTableDataStack.top()->getCurrentRow()->setCurrentGridSpan(nGridSpan,
bFirstCell);
}
void TableManager::endOfRowAction() {}
@@ -456,6 +456,8 @@ void TableManager::endRow()
{
// don't add gridBefore cells in not valid TextRange
setCurrentGridBefore(0);
+setCurrentGridSpan(getCurrentGridSpans().front() + nGridBefore,
+ /*bFirstCell=*/true);
}
}
}
@@ -518,7 +520,6 @@ TableManager::TableManager()
TableManager::~TableManager() = default;
}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/TableManager.hxx
b/writerfilter/source/dmapper/TableManager.hxx
index efac7afdbd7c..f06f06b0cd72 100644
---
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf120760_ZOrderInHeader.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 16 +++
writerfilter/source/dmapper/GraphicImport.cxx | 17 +---
3 files changed, 29 insertions(+), 4 deletions(-)
New commits:
commit eab422c01c5595479c7aa33d13cb633bd5a4cafe
Author: Szabolcs Toth
AuthorDate: Thu Jun 18 15:58:32 2020 +0200
Commit: Gabor Kelemen
CommitDate: Fri Jul 31 13:46:31 2020 +0200
tdf#120760 DOCX shape import: fix Z-order with behindDoc
DrawingML attribute relativeHeight contains z-indices
for shape Z-order, but this depends on behindDoc, too.
We can use z-index = relativeHeight - MAX_INT32 on shapes
with behindDoc=true, as a simple workaround to get correct
Z-order, because unsigned relativeHeight values stored in
sal_Int32, and MIN_INT32 <= -MAX_INT32, and the temporary
negative z-indices will converted by GraphicZOrderHelper.
Note: this commit doesn't fix the old writerfilter
implementation problem, that DOCX relativeHeight is an
unsignedInt value according to W3C XML Schema, i.e. its
maximal value is 4294967295 (MAX_UINT32), not 2147483647
(MAX_INT32).
Co-authored-by: Balázs Regényi
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96614
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 6479096dc2bd40215ff80273b4d27cadb2688cb1)
Change-Id: I54a72a95bc69b307b2835636fff376b0aa9bc45c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99832
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf120760_ZOrderInHeader.docx
b/sw/qa/extras/ooxmlexport/data/tdf120760_ZOrderInHeader.docx
new file mode 100644
index ..77a6d48dd866
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf120760_ZOrderInHeader.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index bfdab8a541aa..c5441fae765a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -1236,6 +1236,22 @@ DECLARE_OOXMLEXPORT_TEST(testTdf112287, "tdf112287.docx")
assertXPath(pXmlDocument,
"/w:document/w:body/w:p[2]/w:pPr/w:framePr","vAnchor","margin");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testZOrderInHeader,
"tdf120760_ZOrderInHeader.docx")
+{
+// tdf#120760 Check that the Z-Order of the background is smaller than the
front shape's.
+xmlDocPtr pXml = parseExport("word/header1.xml");
+if (!pXml)
+return;
+
+// Get the Z-Order of the background image and of the shape in front of it.
+sal_Int32 nBackground = getXPath(pXml,
"/w:hdr/w:p[1]/w:r[1]/w:drawing/wp:anchor", "relativeHeight").toInt32();
+sal_Int32 nFrontShape = getXPath(pXml,
"/w:hdr/w:p[1]/w:r[1]/mc:AlternateContent[2]"
+"/mc:Choice/w:drawing/wp:anchor", "relativeHeight").toInt32();
+
+// Assert that background is in the back.
+CPPUNIT_ASSERT(nBackground < nFrontShape);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 8ebc0cdc3a43..16c65cdc1097 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -202,6 +202,7 @@ public:
bool bLayoutInCell;
bool bAllowOverlap = true;
bool bOpaque;
+bool bBehindDoc;
bool bContour;
bool bContourOutside;
WrapPolygon::Pointer_t mpWrapPolygon;
@@ -267,6 +268,7 @@ public:
,nWrap(text::WrapTextMode_NONE)
,bLayoutInCell(true)
,bOpaque( !rDMapper.IsInHeaderFooter() )
+,bBehindDoc(false)
,bContour(false)
,bContourOutside(true)
,nLeftMargin(319)
@@ -364,10 +366,15 @@ public:
{
if (zOrder >= 0)
{
+// tdf#120760 Send objects with behinddoc=true to the back.
+sal_Int32 nZOrder = zOrder;
+if (bBehindDoc && rDomainMapper.IsInHeaderFooter())
+nZOrder -= SAL_MAX_INT32;
GraphicZOrderHelper* pZOrderHelper =
rDomainMapper.graphicZOrderHelper();
bool bOldStyle = eGraphicImportType ==
GraphicImportType::IMPORT_AS_DETECTED_INLINE;
-
xGraphicObjectProperties->setPropertyValue(getPropertyName(PROP_Z_ORDER),
uno::makeAny(pZOrderHelper->findZOrder(zOrder, bOldStyle)));
-pZOrderHelper->addItem(xGraphicObjectProperties, zOrder);
+
xGraphicObjectProperties->setPropertyValue(getPropertyName(PROP_Z_ORDER),
+uno::makeAny(pZOrderHelper->findZOrder(nZOrder, bOldStyle)));
+pZOrderHelper->addItem(xGraphicObjectProperties, nZOrder);
}
}
@@ -602,8 +609,11 @@ void GraphicImport::lcl_attribute(Id nName, Value&
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf134606.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |7
writerfilter/source/dmapper/TableManager.cxx | 45 ++-
3 files changed, 37 insertions(+), 15 deletions(-)
New commits:
commit b83741f401be35eb001b46bc18c215e1498c3f37
Author: László Németh
AuthorDate: Wed Jul 8 10:36:29 2020 +0200
Commit: Gabor Kelemen
CommitDate: Fri Jul 31 11:41:04 2020 +0200
tdf#134606 DOCX table import: fix gridBefore + nesting
Nested tables in a table row with gridBefore could
result of broken outer table, if the row doesn't contain
text before the nested table, resulting invalid
TextRange for insertion of gridBefore cells.
Regression from commit 70274f86cdc1c023ffdd0130c262c1479262d76b
(tdf#116194 DOCX import: fix missing tables with w:gridBefore)
Change-Id: I6bb3948b6522d8785a1ea0ccf8d7c7f3c2bde189
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98320
Tested-by: Jenkins
Reviewed-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99604
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf134606.docx
b/sw/qa/extras/ooxmlexport/data/tdf134606.docx
new file mode 100644
index ..c5b95cef3236
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf134606.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index ceb397b23388..6fbcbaaeeccc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -623,6 +623,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116194, "tdf116194.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:tbl", 2);
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf134606, "tdf134606.docx")
+{
+// The problem was that the importer lost the nested table structure with
w:gridBefore
+xmlDocPtr pXmlDoc = parseExport();
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl");
+}
+
DECLARE_OOXMLEXPORT_TEST(testMsoBrightnessContrast,
"msobrightnesscontrast.docx")
{
uno::Reference textDocument(mxComponent,
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/TableManager.cxx
b/writerfilter/source/dmapper/TableManager.cxx
index 97e872f7f9b1..596d036a506a 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -425,23 +425,38 @@ void TableManager::endRow()
TableData::Pointer_t pTableData = mTableDataStack.top();
// Add borderless w:gridBefore cell(s) to the row
-if (pTableData)
+sal_uInt32 nGridBefore = getCurrentGridBefore();
+if (pTableData && nGridBefore > 0 &&
pTableData->getCurrentRow()->getCellCount() > 0)
{
-sal_uInt32 nGridBefore
-=
mpTableDataHandler->getDomainMapperImpl().getTableManager().getCurrentGridBefore();
-for (unsigned int i = 0; i < nGridBefore; ++i)
+const css::uno::Reference& xRowStart
+= pTableData->getCurrentRow()->getCellStart(0);
+if (xRowStart.is())
{
-css::table::BorderLine2 aBorderLine;
-aBorderLine.Color = 0;
-aBorderLine.InnerLineWidth = 0;
-aBorderLine.OuterLineWidth = 0;
-TablePropertyMapPtr pCellProperties(new TablePropertyMap);
-pCellProperties->Insert(PROP_TOP_BORDER,
css::uno::makeAny(aBorderLine));
-pCellProperties->Insert(PROP_LEFT_BORDER,
css::uno::makeAny(aBorderLine));
-pCellProperties->Insert(PROP_BOTTOM_BORDER,
css::uno::makeAny(aBorderLine));
-pCellProperties->Insert(PROP_RIGHT_BORDER,
css::uno::makeAny(aBorderLine));
-
pTableData->getCurrentRow()->addCell(pTableData->getCurrentRow()->getCellStart(0),
- pCellProperties,
/*bAddBefore=*/true);
+try
+{
+// valid TextRange for table creation (not a nested table)?
+xRowStart->getText()->createTextCursorByRange(xRowStart);
+
+for (unsigned int i = 0; i < nGridBefore; ++i)
+{
+css::table::BorderLine2 aBorderLine;
+aBorderLine.Color = 0;
+aBorderLine.InnerLineWidth = 0;
+aBorderLine.OuterLineWidth = 0;
+TablePropertyMapPtr pCellProperties(new TablePropertyMap);
+pCellProperties->Insert(PROP_TOP_BORDER,
css::uno::makeAny(aBorderLine));
+pCellProperties->Insert(PROP_LEFT_BORDER,
css::uno::makeAny(aBorderLine));
+pCellProperties->Insert(PROP_BOTTOM_BORDER,
css::uno::makeAny(aBorderLine));
+pCellProperties->Insert(PROP_RIGHT_BORDER,
css::uno::makeAny(aBorderLine));
+pTableData->getCurrentRow()->addCell(xRowStart,
pCellProperties,
+
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 11 +++
writerfilter/source/dmapper/DomainMapperTableManager.cxx |3 +++
2 files changed, 14 insertions(+)
New commits:
commit 36a59940c121ab648fae7d4f05a851eeb517a5eb
Author: László Németh
AuthorDate: Wed Jul 1 18:14:39 2020 +0200
Commit: Gabor Kelemen
CommitDate: Tue Jul 28 13:53:25 2020 +0200
tdf#133735 DOCX: fix paragraph settings of nested tables
First row of a nested tables lost its paragraph
settings, by dropping the collected paragraph data of
the unfinished row.
Regression from commit 81ce88aa80f8e7cde4fdc5b211e9500a3599643c
(tdf#132514 DOCX import: fix lost table style with footer)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97645
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 8b5be44b30119b67d7b3ca9c4140046976a1df59)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97790
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit aea7fe41358c218a12dc34e4c0942360f0d5fde6)
Change-Id: I17d81d0906f424fe35237ac285e8ad27090bcab0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99590
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index a5f3ae30e3eb..90d9c2129bef 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -383,6 +383,17 @@ DECLARE_OOXMLEXPORT_TEST(testFdo73389,"fdo73389.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tblPr/w:tblW","w","5000");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133735, "fdo73389.docx")
+{
+xmlDocPtr pXmlDoc = parseExport();
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[2]/w:tc[1]/w:p/w:pPr/w:spacing",
"after", "0");
+// This was 200
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing",
"after", "0");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[1]/w:tc[2]/w:p/w:pPr/w:spacing",
"after", "0");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tr[1]/w:tc[3]/w:p/w:pPr/w:spacing",
"after", "0");
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf59274, "tdf59274.docx")
{
// Table with "auto" table width and incomplete grid: 11 columns, but only
4 gridCol elements.
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 0b60c823b9d0..910020366888 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -566,6 +566,7 @@ void DomainMapperTableManager::endOfRowAction()
IntVectorPtr pTmpCellWidths = m_aCellWidths.back();
sal_uInt32 nTmpCell = m_nCell.back();
sal_uInt32 nTmpGridBefore = m_aGridBefore.back();
+TableParagraphVectorPtr pTableParagraphs = getCurrentParagraphs();
// endLevel and startLevel are taking care of the non finished row
// to carry it over to the next table
@@ -584,6 +585,8 @@ void DomainMapperTableManager::endOfRowAction()
m_aCellWidths.push_back(pTmpCellWidths);
m_nCell.push_back(nTmpCell);
m_aGridBefore.push_back(nTmpGridBefore);
+m_aParagraphsToEndTable.pop( );
+m_aParagraphsToEndTable.push( pTableParagraphs );
}
// Push the tmp position now that we compared it
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf133457.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx |9 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 17 ++---
3 files changed, 23 insertions(+), 3 deletions(-)
New commits:
commit 0462bce410def34c953ec974df1bc8305952b2c6
Author: Tibor Nagy
AuthorDate: Thu May 28 13:47:30 2020 +0200
Commit: Gabor Kelemen
CommitDate: Thu Jul 23 16:49:56 2020 +0200
tdf#133457 DOCX import: fix frame position regression
caused by commit f5636817e7677a3081263df9004940a7d5ac54af
(tdf#112287 DOCX frame import: fix default vAnchor).
Co-authored-by: Attila Bakos (NISZ)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95035
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 5e8761ef902a8d5d6534b7c1803242bacff72be3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95977
Reviewed-by: Xisco Fauli
(cherry picked from commit 067f7548f4e4cebcfcbc38457201d1c112ad80c3)
Change-Id: I6fe16ff274d6a2fa4a335c7790ecd0f01641a6fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99295
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf133457.docx
b/sw/qa/extras/ooxmlexport/data/tdf133457.docx
new file mode 100644
index ..8fb6730b0933
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf133457.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index 2b6b4c58307d..01904b93b365 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -1003,6 +1003,15 @@ DECLARE_OOXMLIMPORT_TEST(testTdf107119, "tdf107119.docx")
CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_PARALLEL,
getProperty(XPropsWrap, "Surround"));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf133457, "tdf133457.docx")
+{
+xmlDocPtr pXmlDocument = parseExport("word/document.xml");
+if (!pXmlDocument)
+return;
+
+assertXPath(pXmlDocument,
"/w:document/w:body/w:p[4]/w:pPr/w:framePr","vAnchor","text");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8cdf3e741f27..c882ac586745 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1148,10 +1148,21 @@ void
DomainMapper_Impl::CheckUnregisteredFrameConversion( )
pStyleProperties->IsyValid() ? pStyleProperties->Gety() :
DEFAULT_VALUE));
//Default the anchor in case FramePr_vAnchor is missing ECMA
17.3.1.11
-
aFrameProperties.push_back(comphelper::makePropertyValue(getPropertyName(PROP_VERT_ORIENT_RELATION),
sal_Int16(
-rAppendContext.pLastParagraphProperties->GetvAnchor() >= 0 ?
+if (rAppendContext.pLastParagraphProperties->GetWrap() ==
text::WrapTextMode::WrapTextMode_MAKE_FIXED_SIZE &&
+pStyleProperties->GetWrap() ==
text::WrapTextMode::WrapTextMode_MAKE_FIXED_SIZE)
+{
+
aFrameProperties.push_back(comphelper::makePropertyValue(getPropertyName(PROP_VERT_ORIENT_RELATION),
sal_Int16(
+rAppendContext.pLastParagraphProperties->GetvAnchor() >= 0
?
+rAppendContext.pLastParagraphProperties->GetvAnchor() :
+pStyleProperties->GetvAnchor() >= 0 ?
pStyleProperties->GetvAnchor() : text::RelOrientation::FRAME)));
+}
+else
+{
+
aFrameProperties.push_back(comphelper::makePropertyValue(getPropertyName(PROP_VERT_ORIENT_RELATION),
sal_Int16(
+rAppendContext.pLastParagraphProperties->GetvAnchor() >= 0
?
rAppendContext.pLastParagraphProperties->GetvAnchor() :
-pStyleProperties->GetvAnchor() >= 0 ?
pStyleProperties->GetvAnchor() : text::RelOrientation::PAGE_PRINT_AREA )));
+pStyleProperties->GetvAnchor() >= 0 ?
pStyleProperties->GetvAnchor() : text::RelOrientation::PAGE_PRINT_AREA)));
+}
aFrameProperties.push_back(comphelper::makePropertyValue(getPropertyName(PROP_SURROUND),
rAppendContext.pLastParagraphProperties->GetWrap() !=
text::WrapTextMode::WrapTextMode_MAKE_FIXED_SIZE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf112287.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 11 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 9615e7b2d91eb1754caf85055753505ea6db201b
Author: Tibor Nagy
AuthorDate: Wed May 6 11:15:35 2020 +0200
Commit: Gabor Kelemen
CommitDate: Tue Jul 14 00:14:57 2020 +0200
tdf#112287 DOCX frame import: fix default vAnchor
Vertical frame alignment was calculated from above
margin instead of the bottom one, resulting bad
positions, when vAnchor wasn't defined.
Co-author: Attila Bakos (NISZ)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93556
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit f5636817e7677a3081263df9004940a7d5ac54af)
Change-Id: I81bcf53ec826d5dcc9790c661d784b507d9ababc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98644
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf112287.docx
b/sw/qa/extras/ooxmlexport/data/tdf112287.docx
new file mode 100644
index ..3464e28985da
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf112287.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 87795d6ba6c6..bfdab8a541aa 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -1225,6 +1225,17 @@ DECLARE_OOXMLEXPORT_TEST(testNonBMPChar,
"nonbmpchar.docx")
CPPUNIT_ASSERT_EQUAL(aExpected, xTextRange1->getString());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf112287, "tdf112287.docx")
+{
+// tdf#131775: Check if correct spaceing.
+
+xmlDocPtr pXmlDocument = parseExport("word/document.xml");
+if (!pXmlDocument)
+return;
+
+assertXPath(pXmlDocument,
"/w:document/w:body/w:p[2]/w:pPr/w:framePr","vAnchor","margin");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0777188dedba..8cdf3e741f27 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1151,7 +1151,7 @@ void DomainMapper_Impl::CheckUnregisteredFrameConversion(
)
aFrameProperties.push_back(comphelper::makePropertyValue(getPropertyName(PROP_VERT_ORIENT_RELATION),
sal_Int16(
rAppendContext.pLastParagraphProperties->GetvAnchor() >= 0 ?
rAppendContext.pLastParagraphProperties->GetvAnchor() :
-pStyleProperties->GetvAnchor() >= 0 ?
pStyleProperties->GetvAnchor() : text::RelOrientation::FRAME )));
+pStyleProperties->GetvAnchor() >= 0 ?
pStyleProperties->GetvAnchor() : text::RelOrientation::PAGE_PRINT_AREA )));
aFrameProperties.push_back(comphelper::makePropertyValue(getPropertyName(PROP_SURROUND),
rAppendContext.pLastParagraphProperties->GetWrap() !=
text::WrapTextMode::WrapTextMode_MAKE_FIXED_SIZE
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf132514.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx| 10
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |3 --
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 17 +++
writerfilter/source/dmapper/DomainMapperTableManager.hxx |3 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx|2 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx| 10
writerfilter/source/dmapper/PropertyMap.hxx |9 +++
8 files changed, 41 insertions(+), 13 deletions(-)
New commits:
commit e640f2e8410b952296fd8101ef88c234c50b90fe
Author: László Németh
AuthorDate: Mon May 4 13:42:14 2020 +0200
Commit: Gabor Kelemen
CommitDate: Mon Jul 13 23:20:38 2020 +0200
tdf#132514 DOCX import: fix lost table style with footer
Table paragraphs collected for table style processing
were mixed when both body text and footer contain tables,
i.e. clearing paragraph vector at processing the first table
resulted missing paragraph vector and table style processing
for the other one. (Note: only missing bottom paragraph margin
and line spacing were the problems here, not all table style
based paragraph settings, as in branch 'master'.)
Now tables in footer, also nested tables collect their
paragraphs in separated table paragraph vectors.
Regression from commit 6c5da2cd7af5c2d90e4d8e9635ba8c9989c87923
(tdf#119054 DOCX: fix not table style based bottom margin).
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93415
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 81ce88aa80f8e7cde4fdc5b211e9500a3599643c)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/PropertyMap.hxx
Change-Id: Ib8568d8379cfb7da869120cdc7fe12895252d661
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93525
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
(cherry picked from commit 6b812999c944e50ac7a9ac8245800f4cf99421ce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98642
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf132514.docx
b/sw/qa/extras/ooxmlexport/data/tdf132514.docx
new file mode 100644
index ..d32f84104e26
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf132514.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index bfd67a6ede7a..2b6b4c58307d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -481,6 +481,16 @@ DECLARE_OOXMLEXPORT_TEST(testTdf119054, "tdf119054.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "line",
"240");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf132514, "tdf132514.docx")
+{
+xmlDocPtr pXmlDoc = parseExport();
+if (!pXmlDoc)
+return;
+// Keep table style setting, when the footer also contain a table
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:p[2]/w:pPr/w:spacing", "before",
"0");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[2]/w:p[2]/w:pPr/w:spacing", "after",
"0");
+}
+
DECLARE_OOXMLEXPORT_TEST(testFdo69636, "fdo69636.docx")
{
/*
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index a0b214a76555..5a0ee4eb8b16 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -1026,7 +1026,7 @@ void
DomainMapperTableHandler::ApplyParaProperty(css::beans::PropertyValues aTab
if (pTableProp != aTableProperties.end())
{
uno::Any aValue = pTableProp->Value;
-for (const auto& rParaProp : m_rDMapper_Impl.m_aParagraphsToEndTable)
+for (const auto& rParaProp :
*m_rDMapper_Impl.getTableManager().getCurrentParagraphs())
{
// there is no direct paragraph formatting
if (!rParaProp.m_pPropertyMap->isSet(eId))
@@ -1224,7 +1224,6 @@ void DomainMapperTableHandler::endTable(unsigned int
nestedTableLevel, bool bTab
m_aCellProperties.clear();
m_aRowProperties.clear();
m_bHadFootOrEndnote = false;
-m_rDMapper_Impl.m_aParagraphsToEndTable.clear();
#ifdef DBG_UTIL
TagLogger::getInstance().endElement();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index c16485d48771..0b60c823b9d0 100644
---
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf107119.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx|7 +++
writerfilter/source/dmapper/DomainMapper.cxx |5 +++--
3 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 050e5f2f754bca091676e657e766a7889cb3051a
Author: Tibor Nagy
AuthorDate: Wed May 20 13:31:51 2020 +0200
Commit: Gabor Kelemen
CommitDate: Fri Jun 12 09:22:20 2020 +0200
tdf#107119 DOCX import: fix parallel text wrap around frames
It was imported as "optimal page wrap" instead of parallel one,
resulting different page layout depending on the distance
of the frame object from the page margins.
Co-authored-by: Attila Bakos (NISZ)
Change-Id: I0db65c224f537bfd4f95ee073743a3d17d9e0e4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94576
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 358f654af36fa12102685237f6eadebae4610fb5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96142
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf107119.docx
b/sw/qa/extras/ooxmlexport/data/tdf107119.docx
new file mode 100644
index ..98de4f2ac7bd
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf107119.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index d460679b50ba..bfd67a6ede7a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
@@ -986,6 +987,12 @@ DECLARE_OOXMLEXPORT_TEST(testSyncedRelativePercent,
"tdf93676-1.odt")
assertXPath(pXmlDoc, "//wp14:pctHeight", 0);
}
+DECLARE_OOXMLIMPORT_TEST(testTdf107119, "tdf107119.docx")
+{
+uno::Reference XPropsWrap(getShape(1),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_PARALLEL,
getProperty(XPropsWrap, "Surround"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 938cc59be726..50c5704a032a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -866,10 +866,11 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
sal::static_int_cast(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_none ||
sal::static_int_cast(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_auto,
"wrap not around, not_Beside, through, none or
auto?");
-if( sal::static_int_cast(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_around ||
-sal::static_int_cast(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_through ||
+if( sal::static_int_cast(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_through ||
sal::static_int_cast(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_auto )
pParaProperties->SetWrap (
text::WrapTextMode_DYNAMIC ) ;
+else if (sal::static_int_cast(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_around)
+
pParaProperties->SetWrap(text::WrapTextMode_PARALLEL);
else if (sal::static_int_cast(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_Wrap_none)
pParaProperties->SetWrap (
text::WrapTextMode_THROUGH ) ;
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf59274.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 14 +
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 37 ++-
3 files changed, 50 insertions(+), 1 deletion(-)
New commits:
commit 08a33f29f26ca21668e67f46e40ec3264d743d9c
Author: László Németh
AuthorDate: Tue Mar 10 15:44:59 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 19:19:37 2020 +0200
tdf#59274 DOCX import: fix tables with incomplete grid
Fix layout of "auto" width tables with incomplete grids,
where table width is defined by cells of an arbitrary
table row, not necessarily the first row, and last cells
of the rows can be wider, than their saved values.
Change-Id: I68bc8f1a4f57f3c64d0e83c585f2be129d9b5a84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90261
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 116cadb5d2582532c69677a2f8499e8e9b7b9b80)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96145
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf59274.docx
b/sw/qa/extras/ooxmlexport/data/tdf59274.docx
new file mode 100644
index ..38aad9ae9137
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf59274.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 835947da9dfb..86b5ce6e4c28 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -383,6 +383,20 @@ DECLARE_OOXMLEXPORT_TEST(testFdo73389,"fdo73389.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tblPr/w:tblW","w","5000");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf59274, "tdf59274.docx")
+{
+// Table with "auto" table width and incomplete grid: 11 columns, but only
4 gridCol elements.
+xmlDocPtr pXmlDoc = parseExport();
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblPr/w:tblW", "type",
"dxa");
+// This was 7349: sum of the cell widths in first row, but the table width
is determined by a longer row later.
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblPr/w:tblW", "w",
"9048");
+// This was 1224: too narrow first cell in first row
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcW", "w", "4291");
+// This was 3674: too wide last cell in first row
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[4]/w:tcPr/w:tcW", "w", "1695");
+}
+
DECLARE_OOXMLEXPORT_TEST(testDMLGroupshapeSdt, "dml-groupshape-sdt.docx")
{
uno::Reference xGroupShape(getShape(1), uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index d422cfa98c13..c16485d48771 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -646,6 +646,7 @@ void DomainMapperTableManager::endOfRowAction()
for (int i : (*pTableGrid))
nFullWidthRelative = o3tl::saturating_add(nFullWidthRelative, i);
+bool bIsIncompleteGrid = false;
if( pTableGrid->size() == ( nGrids + m_nGridAfter ) && m_nCell.back( ) > 0
)
{
/*
@@ -714,7 +715,8 @@ void DomainMapperTableManager::endOfRowAction()
}
else if ( !pCellWidths->empty() &&
( m_nLayoutType == NS_ooxml::LN_Value_doc_ST_TblLayout_fixed
- || pCellWidths->size() == ( nGrids + m_nGridAfter ) )
+ || pCellWidths->size() == ( nGrids + m_nGridAfter )
+ || ((bIsIncompleteGrid = true) && nGrids + m_nGridAfter >
pTableGrid->size() && pCellWidths->size() > 0) )
)
{
// If we're here, then the number of cells does not equal to the amount
@@ -725,21 +727,54 @@ void DomainMapperTableManager::endOfRowAction()
// On the other hand even if the layout is not fixed, but the cell
widths
// provided equal the total number of cells, and there are no
after/before cells
// then use the cell widths to calculate the column separators.
+// Also handle autofit tables with incomplete grids, when rows can have
+// different widths and last cells can be wider, than their values.
uno::Sequence< text::TableColumnSeparator >
aSeparators(pCellWidths->size() - 1);
text::TableColumnSeparator* pSeparators = aSeparators.getArray();
sal_Int16 nSum = 0;
sal_uInt32 nPos = 0;
+
+if (bIsIncompleteGrid)
+nFullWidthRelative = 0;
+
// Avoid divide by zero (if there's no grid, position using cell
widths).
if( nFullWidthRelative == 0 )
for (size_t i = 0; i < pCellWidths->size(); ++i)
nFullWidthRelative += (*pCellWidths)[i];
+if (bIsIncompleteGrid)
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf92472.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 21 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 ++--
3 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit 025ff5782fa199932871a8ec18491bbb11751bda
Author: László Németh
AuthorDate: Fri Feb 28 16:55:23 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 17:11:28 2020 +0200
tdf#92472 DOCX import: fix checkbox size set by direct formatting
at beginning of paragraphs.
Follow-up of the commit 22ad4d69d771708f28a2d9e137cfd43ac846cf3a
(tdf#121045 DOCX import: fix checkbox size in table).
Change-Id: I06f0dfa4376ff8f5730d8cfe1cbc3de022e8aaff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89726
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 294babdbbe0a10c732cd5247c5636638c97a4c30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96141
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf92472.docx
b/sw/qa/extras/ooxmlexport/data/tdf92472.docx
new file mode 100644
index ..6cf2b50e9103
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf92472.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 7c64edb83f74..6561bbeb6cb8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -160,6 +160,27 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121045,
"tdf121045.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[5]/w:rPr/w:szCs", "val", "20");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf92472, "tdf92472.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr/w:rPr/w:sz", "val",
"20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr/w:rPr/w:szCs",
"val", "20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[1]/w:fldChar",
"fldCharType", "begin");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:instrText", 1);
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[3]/w:fldChar",
"fldCharType", "separate");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[5]/w:fldChar",
"fldCharType", "end");
+// form control keeps its direct formatted font size
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:rPr/w:sz", "val",
"20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:rPr/w:szCs",
"val", "20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[3]/w:rPr/w:sz", "val",
"20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[3]/w:rPr/w:szCs",
"val", "20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[4]/w:rPr/w:sz", "val",
"20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[4]/w:rPr/w:szCs",
"val", "20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[5]/w:rPr/w:sz", "val",
"20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[5]/w:rPr/w:szCs",
"val", "20");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf120315, "tdf120315.docx")
{
// tdf#120315 cells of the second column weren't vertically merged
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f2234f38b37f..b3357d97fb45 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4622,8 +4622,8 @@ void DomainMapper_Impl::CloseFieldCommand()
OUString const sFirstParam(std::get<1>(field).empty()
? OUString() : std::get<1>(field).front());
-// apply font size to the form control in tables
-if ( m_nTableDepth > 0 && m_pLastCharacterContext.get() &&
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) )
+// apply font size to the form control
+if ( m_pLastCharacterContext.get() &&
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) )
{
uno::Reference< text::XTextAppend > xTextAppend =
m_aTextAppendStack.top().xTextAppend;
if (xTextAppend.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf121045.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 21 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 19 +++
3 files changed, 40 insertions(+)
New commits:
commit 2b644016116337f106d988b459e530489b3a93e8
Author: László Németh
AuthorDate: Mon Feb 24 10:55:38 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 17:06:26 2020 +0200
tdf#121045 DOCX import: fix checkbox size in table
in cell starting position.
Change-Id: Ib99726c03ff3f83177a015721e562ebc5bc516d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89338
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96133
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf121045.docx
b/sw/qa/extras/ooxmlexport/data/tdf121045.docx
new file mode 100644
index ..271aca1ec0a6
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf121045.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 09a179eb2bb0..7c64edb83f74 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -139,6 +139,27 @@ DECLARE_OOXMLEXPORT_TEST(testTdf130610,
"tdf130610_bold_in_2_styles.ott")
}
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121045, "tdf121045.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:pPr/w:rPr/w:sz", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:pPr/w:rPr/w:szCs", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[1]/w:fldChar", "fldCharType",
"begin");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[2]/w:instrText", 1);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[3]/w:fldChar", "fldCharType",
"separate");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[5]/w:fldChar", "fldCharType",
"end");
+// form control keeps its direct formatted font size
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[2]/w:rPr/w:sz", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[2]/w:rPr/w:szCs", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[3]/w:rPr/w:sz", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[3]/w:rPr/w:szCs", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[4]/w:rPr/w:sz", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[4]/w:rPr/w:szCs", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[5]/w:rPr/w:sz", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[5]/w:rPr/w:szCs", "val", "20");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf120315, "tdf120315.docx")
{
// tdf#120315 cells of the second column weren't vertically merged
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 87322694cbd4..f2234f38b37f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4622,6 +4622,25 @@ void DomainMapper_Impl::CloseFieldCommand()
OUString const sFirstParam(std::get<1>(field).empty()
? OUString() : std::get<1>(field).front());
+// apply font size to the form control in tables
+if ( m_nTableDepth > 0 && m_pLastCharacterContext.get() &&
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) )
+{
+uno::Reference< text::XTextAppend > xTextAppend =
m_aTextAppendStack.top().xTextAppend;
+if (xTextAppend.is())
+{
+uno::Reference< text::XTextCursor > xCrsr =
xTextAppend->getText()->createTextCursor();
+uno::Reference< text::XText > xText =
xTextAppend->getText();
+if(xCrsr.is() && xText.is())
+{
+xCrsr->gotoEnd(false);
+uno::Reference< beans::XPropertySet > xProp( xCrsr,
uno::UNO_QUERY );
+
xProp->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT),
m_pLastCharacterContext->getProperty(PROP_CHAR_HEIGHT)->second);
+if (
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT_COMPLEX) )
+
xProp->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT_COMPLEX),
m_pLastCharacterContext->getProperty(PROP_CHAR_HEIGHT_COMPLEX)->second);
+
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/layout/data/tdf128959.docx |binary
sw/qa/extras/layout/layout.cxx| 21 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 --
3 files changed, 29 insertions(+), 2 deletions(-)
New commits:
commit feb2aed404d102475a9d46ff9588bde7fcbabf4b
Author: László Németh
AuthorDate: Tue Jan 28 14:32:54 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 16:28:35 2020 +0200
tdf#128959 DOCX import: fix missing text lines in tables
Orphan/widow line break settings aren't always ignored
by Writer table layout code, in this case, in vertically
merged cells, resulting missing paragraph lines.
As a workaround for interoperability, disable orphan/widow
control in cell paragraphs during the DOCX import to get
correct layout in Writer, too.
Change-Id: I48fdb0a3bb421fd4df2c729e307a7ef483e3e772
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87637
Reviewed-by: László Németh
Tested-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96107
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/layout/data/tdf128959.docx
b/sw/qa/extras/layout/data/tdf128959.docx
new file mode 100644
index ..f22f66504478
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf128959.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index e33eaf66e108..790d3485a337 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3749,6 +3749,27 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf117982)
//the source document.
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128959)
+{
+// no orphan/widow control in table cells
+SwDoc* pDocument = createDoc("tdf128959.docx");
+CPPUNIT_ASSERT(pDocument);
+discardDumpedLayout();
+xmlDocPtr pXmlDoc = parseLayoutDump();
+
+// first two lines of the paragraph in the split table cell on the first
page
+// (these lines were completely lost)
+assertXPath(
+pXmlDoc,
"/root/page[1]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[1]", "Line",
+"a)Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas
porttitor congue ");
+assertXPath(
+pXmlDoc,
"/root/page[1]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[2]", "Line",
+"massa. Fusce posuere, magna sed pulvinar ultricies, purus lectus
malesuada libero, sit ");
+// last line of the paragraph in the split table cell on the second page
+assertXPath(pXmlDoc,
"/root/page[2]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[1]", "Line",
+"amet commodo magna eros quis urna.");
+}
+
static SwRect lcl_getVisibleFlyObjRect(SwWrtShell* pWrtShell)
{
SwRootFrame* pRoot = pWrtShell->GetLayout();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 666bd9b46ffb..87322694cbd4 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1786,17 +1786,23 @@ void DomainMapper_Impl::finishParagraph( const
PropertyMapPtr& pPropertyMap, con
}
}
-// tdf#90069 in tables, apply paragraph level character style
also on
-// paragraph level to support its copy during insertion of new
table rows
+// fix table paragraph properties
if ( xParaProps && m_nTableDepth > 0 )
{
uno::Sequence< beans::PropertyValue > aValues =
pParaContext->GetPropertyValues(false);
+// tdf#90069 in tables, apply paragraph level character
style also on
+// paragraph level to support its copy during insertion of
new table rows
for( const auto& rProp : std::as_const(aValues) )
{
if ( rProp.Name.startsWith("Char") && rProp.Name !=
"CharStyleName" && rProp.Name != "CharInteropGrabBag" )
xParaProps->setPropertyValue( rProp.Name,
rProp.Value );
}
+
+// tdf#128959 table paragraphs haven't got window and
orphan controls
+uno::Any aAny = uno::makeAny(static_cast(0));
+xParaProps->setPropertyValue("ParaOrphans", aAny);
+xParaProps->setPropertyValue("ParaWidows", aAny);
}
}
if( !bKeepLastParagraphProperties )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf94801.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |7 +++
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |5 +
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx|6 +++---
sw/qa/extras/rtfimport/rtfimport.cxx |2 +-
writerfilter/source/dmapper/ConversionHelper.cxx |9 +
writerfilter/source/dmapper/ConversionHelper.hxx |1 +
writerfilter/source/dmapper/DomainMapperTableManager.cxx |8 ++--
8 files changed, 32 insertions(+), 6 deletions(-)
New commits:
commit 837879013c855b366106cf5806b81104186bd9d3
Author: László Németh
AuthorDate: Tue Jan 14 12:56:54 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 13:52:34 2020 +0200
tdf#94801 DOCX import: fix table width loss by rounding
up the converted sum of table grid values. Small table
width loss (< 1/100 mm) could result big layout differences,
based on different line breaking etc.
When table width is calculated by sum of table grid widths,
now there is only a single conversion to 1/100 mm at the end,
with rounding up the width instead of rounding down.
Preventing regressions, both grid and cell width values are
stored in the original twip now, instead of converting them to
1/100 mm one by one.
Change-Id: I6f0755b6604f4976b8ecb25255c76fe6afd5e35b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86718
Reviewed-by: László Németh
Tested-by: László Németh
(cherry picked from commit 62d084d50c0e6c90918f687251ffbb15264d7317)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96105
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf94801.docx
b/sw/qa/extras/ooxmlexport/data/tdf94801.docx
new file mode 100644
index ..bdbd3f5e5400
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf94801.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 7ec5da49be9f..9e99abb06848 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -327,6 +327,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf117988, "tdf117988.docx")
CPPUNIT_ASSERT_EQUAL(1, getPages());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf94801, "tdf94801.docx")
+{
+// This was a 2-page document with unwanted line breaking in table cells,
because
+// the table was narrower, than defined (< 1/100 mm loss during twip to
1/100 mm conversion)
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testParagraphSplitOnSectionBorder,
"parasplit-on-section-border.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 375c6d874021..09a179eb2bb0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -251,6 +251,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf124367, "tdf124367.docx")
uno::UNO_QUERY);
uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
uno::Reference xTableRows = xTextTable->getRows();
+
+// import is still good, FIXME the export
+if (mbExported)
+ return;
+
// it was 2761 at the first import, and 2760 at the second import, due to
incorrect rounding
CPPUNIT_ASSERT_EQUAL(static_cast(2762),
getProperty>(
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 88f8610cc0e5..b60a20cbd2eb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -890,7 +890,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo59273, "fdo59273.docx")
uno::Reference
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
// Was 115596 (i.e. 10 times wider than necessary), as w:tblW was missing
and the importer didn't set it.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(12961), getProperty(xTextTable,
"Width"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(12963), getProperty(xTextTable,
"Width"));
uno::Reference xTableRows = xTextTable->getRows();
// Was 9997, so the 4th column had ~zero width
@@ -1022,7 +1022,7 @@ DECLARE_OOXMLEXPORT_TEST(testTableAutoColumnFixedSize2,
"table-auto-column-fixed
uno::Reference
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
// This was 17907, i.e. the sum of the width of the 3 cells (10152 twips
each), which is too wide.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(16891), getProperty(xTextTable,
"Width"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(16893),
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/uiwriter/data2/tdf90069.docx |binary
sw/qa/extras/uiwriter/uiwriter2.cxx | 31 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 +
3 files changed, 44 insertions(+)
New commits:
commit 725de1dadf1eb35771278e2f671eb36056153454
Author: László Németh
AuthorDate: Wed Jan 8 14:26:40 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 13:46:47 2020 +0200
tdf#90069 DOCX: fix character style of new table rows
DOCX table import didn't set paragraph level
character styles on paragraph level, only on
text portions, resulting default character style
in the newly inserted table rows instead of copying
the style of the previous table row.
Change-Id: Idb4438c767bdc7e0026fc6e0f0a795d8efdda3c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86429
Tested-by: Jenkins
Reviewed-by: László Németh
Tested-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96086
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/uiwriter/data2/tdf90069.docx
b/sw/qa/extras/uiwriter/data2/tdf90069.docx
new file mode 100644
index ..719502a67e78
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/tdf90069.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 6472929fc5ab..949c04514da8 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -49,6 +49,7 @@
#include
#include
#include
+#include
namespace
{
@@ -2469,4 +2470,34 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf129655)
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "//fly/txt[@WritingMode='Vertical']", 1);
}
+
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf90069)
+{
+SwDoc* pDoc = createDoc("tdf90069.docx");
+
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+SwDocShell* pDocShell = pTextDoc->GetDocShell();
+CPPUNIT_ASSERT(pDocShell);
+
+SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+
+sal_uLong nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+
+lcl_dispatchCommand(mxComponent, ".uno:InsertRowsAfter", {});
+pWrtShell->Down(false);
+pWrtShell->Insert("foo");
+
+SwTextNode* pTextNodeA1 =
static_cast(pDoc->GetNodes()[nIndex]);
+CPPUNIT_ASSERT(pTextNodeA1->GetText().startsWith("Insert"));
+nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+SwTextNode* pTextNodeA2 =
static_cast(pDoc->GetNodes()[nIndex]);
+CPPUNIT_ASSERT_EQUAL(OUString("foo"), pTextNodeA2->GetText());
+CPPUNIT_ASSERT_EQUAL(true,
pTextNodeA2->GetSwAttrSet().HasItem(RES_CHRATR_FONT));
+OUString sFontName =
pTextNodeA2->GetSwAttrSet().GetItem(RES_CHRATR_FONT)->GetFamilyName();
+CPPUNIT_ASSERT_EQUAL(OUString("Lohit Devanagari"), sFontName);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a04af3c1c8aa..666bd9b46ffb 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1785,6 +1785,19 @@ void DomainMapper_Impl::finishParagraph( const
PropertyMapPtr& pPropertyMap, con
}
}
}
+
+// tdf#90069 in tables, apply paragraph level character style
also on
+// paragraph level to support its copy during insertion of new
table rows
+if ( xParaProps && m_nTableDepth > 0 )
+{
+uno::Sequence< beans::PropertyValue > aValues =
pParaContext->GetPropertyValues(false);
+
+for( const auto& rProp : std::as_const(aValues) )
+{
+if ( rProp.Name.startsWith("Char") && rProp.Name !=
"CharStyleName" && rProp.Name != "CharInteropGrabBag" )
+xParaProps->setPropertyValue( rProp.Name,
rProp.Value );
+}
+}
}
if( !bKeepLastParagraphProperties )
rAppendContext.pLastParagraphProperties = pToBeSavedProperties;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
