summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-01-20 13:44:46 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-01-20 13:46:22 +0100
commitd0c383256ef72d5212d8e2db77582d0ebe417209 (patch)
treec0ba1a793f634e0e1a91ba6e833dcc77c760cc0e
parentaab6645595dc4210cc61a97aa9c137ecea5adace (diff)
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 Change-Id: I93efac0c004af1b2524c955ffb20c3ecd74a2920
-rw-r--r--sw/qa/extras/ooxmlimport/data/fdo73389.docxbin0 -> 11067 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx10
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx23
3 files changed, 18 insertions, 15 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/fdo73389.docx b/sw/qa/extras/ooxmlimport/data/fdo73389.docx
new file mode 100644
index 000000000000..02b55f74e2b8
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/fdo73389.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0f5de741e82d..cde673b7bdaf 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1704,8 +1704,18 @@ DECLARE_OOXMLIMPORT_TEST(testFdo69649, "fdo69649.docx")
xTocString = xTocString.copy(256);
CPPUNIT_ASSERT(xTocString.startsWithIgnoreAsciiCase( "Heading 15.1:\t15" ) );
}
+
+DECLARE_OOXMLIMPORT_TEST(testFdo73389,"fdo73389.docx")
+{
+ 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"));
+}
#endif
+
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 9625a1fd1aab..6969fe337516 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 have 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).