diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-01-20 13:44:46 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-22 15:34:28 +0000 |
commit | 7a0eec199901962b03f04371e9474caf8c408c01 (patch) | |
tree | 50f6ca1e32565d31a8fc6832c130daf110eb6c81 /writerfilter/source/dmapper/DomainMapperTableManager.cxx | |
parent | b703da40bb052809ff94a714fb8da7aadf2d7d6b (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
(cherry picked from commit d0c383256ef72d5212d8e2db77582d0ebe417209)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
Change-Id: I93efac0c004af1b2524c955ffb20c3ecd74a2920
Reviewed-on: https://gerrit.libreoffice.org/7565
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapperTableManager.cxx')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 59afbb3e9310..157fbf83b914 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -142,20 +142,13 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) */ bool bFixed = false; sal_Int32 nRowFixedWidth = 0; - if (!m_aCellWidths.empty()) + IntVectorPtr pCellWidths = getCurrentCellWidths(); + // Step 1. Check whether any cell has fixed width in the given row of table. + for (std::vector<sal_Int32>::const_iterator aValIter = pCellWidths->begin(); aValIter != pCellWidths->end(); ++aValIter) { - // Step 1. Check whether any cell has fixed width in the given row of table. - ::std::vector< IntVectorPtr >::iterator itr; - for (itr = m_aCellWidths.begin(); itr != m_aCellWidths.end(); itr ++) - { - IntVectorPtr itrVal = (*itr); - for (std::vector<sal_Int32>::const_iterator aValIter = itrVal->begin(); aValIter != itrVal->end(); ++aValIter) - { - // Sum the width of cells to find the total width of given row - nRowFixedWidth += (*aValIter); - bFixed = true; - } - } + // Sum the width of cells to find the total width of given row + nRowFixedWidth += (*aValIter); + bFixed = true; } // Check whether the total width of given row is compared with the maximum value of rows (m_nMaxFixedWidth). |