sw/qa/extras/ooxmlimport/data/fdo73389.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 11 +++++++
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 23 +++++----------
3 files changed, 19 insertions(+), 15 deletions(-)
New commits:
commit 90c19d92344879577b41098ecb5ce1b007600609
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Tue Jan 21 11:08:15 2014 +0100
fdo#73389 Writer does not show a docx-document with nested table correctly
The table manager can work with more table simultaneously
and so m_aCellWidths contains more table's properties.Only one
item of it belongs to the current table (getCurrentCellwidths).
Regression from 74c5ed19f430327988194cdcd6bdff09591a93fa
(cherry picked from commit d0c383256ef72d5212d8e2db77582d0ebe417209)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
Change-Id: I93efac0c004af1b2524c955ffb20c3ecd74a2920
diff --git a/sw/qa/extras/ooxmlimport/data/fdo73389.docx
b/sw/qa/extras/ooxmlimport/data/fdo73389.docx
new file mode 100644
index 0000000..02b55f7
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo73389.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index e9be826..12e4c2e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -142,6 +142,7 @@ public:
void testBnc780044Spacing();
void testRPrChangeClosed();
void testFdo65090();
+ void testFdo73389();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -248,6 +249,7 @@ void Test::run()
{"bnc780044_spacing.docx", &Test::testBnc780044Spacing},
{"rprchange_closed.docx",&Test::testRPrChangeClosed},
{"fdo65090.docx", &Test::testFdo65090},
+ {"fdo73389.docx", &Test::testFdo73389},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1722,6 +1724,15 @@ void Test::testFdo65090()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<
uno::Sequence<text::TableColumnSeparator> >(xTableRows->getByIndex(0),
"TableColumnSeparators").getLength());
}
+void Test::testFdo73389()
+{
+ uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<container::XIndexAccess>
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+ // This was 9340, i.e. the width of the inner table was too large.
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(2842),
getProperty<sal_Int32>(xTables->getByIndex(0), "Width"));
+}
+
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index d2380a2..c2c0728 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -142,24 +142,17 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
*/
bool bFixed = true;
sal_Int32 nRowFixedWidth = 0;
- if (!m_aCellWidths.empty())
+ IntVectorPtr pCellWidths = getCurrentCellWidths();
+ // Step 1. Check whether all cells hava fixed
widths in the given row of table.
+ for (std::vector<sal_Int32>::const_iterator
aValIter = pCellWidths->begin(); aValIter != pCellWidths->end(); ++aValIter)
{
- // Step 1. Check whether all cells have fixed
widths in the given row of table.
- ::std::vector< IntVectorPtr >::iterator itr;
- for (itr = m_aCellWidths.begin(); itr !=
m_aCellWidths.end(); itr ++)
+ if (*aValIter == -1)
{
- IntVectorPtr itrVal = (*itr);
- for
(std::vector<sal_Int32>::const_iterator aValIter = itrVal->begin(); aValIter !=
itrVal->end(); ++aValIter)
- {
- if (*aValIter == -1)
- {
- bFixed = false;
- break;
- }
- // Sum the width of cells to find the
total width of given row
- nRowFixedWidth += (*aValIter);
- }
+ bFixed = false;
+ break;
}
+ // Sum the width of cells to find the total
width of given row
+ nRowFixedWidth += (*aValIter);
}
// Check whether the total width of given row is
compared with the maximum value of rows (m_nMaxFixedWidth).
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
