From 74c5ed19f430327988194cdcd6bdff09591a93fa Mon Sep 17 00:00:00 2001
From: Adam Co <rattles2013@gmail.com>
Date: Wed, 26 Jun 2013 11:08:56 +0300
Subject: [PATCH] DOCX import fix for table with auto size

Change-Id: Ic86f4f142e579bdef3e954492e1c1e382a545739
Reviewed-on: https://gerrit.libreoffice.org/4496
---
 .../data/table-auto-column-fixed-size.docx    | Bin 0 -> 17672 bytes
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx      |  12 +++++
 .../dmapper/DomainMapperTableManager.cxx      |  44 +++++++++++++++++-
 .../dmapper/DomainMapperTableManager.hxx      |   1 +
 4 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx

diff --git a/sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx b/sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx
new file mode 100644
index 0000000000000000000000000000000000000000..557edcb3cb0bdae0e3441e397d2ff8c736024a76
GIT binary patch
literal 17672
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
D#B>O<

literal 0
HcmV?d00001

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4f23d926686c..985bd66b80cd 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -121,6 +121,7 @@ public:
     void testN820788();
     void testN820504();
     void testFdo43641();
+    void testTableAutoColumnFixedSize();
 
     CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -208,6 +209,7 @@ void Test::run()
         {"n820788.docx", &Test::testN820788},
         {"n820504.docx", &Test::testN820504},
         {"fdo43641.docx", &Test::testFdo43641},
+        {"table-auto-column-fixed-size.docx", &Test::testTableAutoColumnFixedSize},
     };
     header();
     for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1462,6 +1464,16 @@ void Test::testFdo43641()
     CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(928694)), xLine->getSize().Width);
 }
 
+void Test::testTableAutoColumnFixedSize()
+{
+    uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
+    uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+    uno::Reference<text::XTextTable> xTextTable(xTables->getByIndex(0), uno::UNO_QUERY);
+
+    // Width was not recognized during import when table size was 'auto'
+    CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(3996)), getProperty<sal_Int32>(xTextTable, "Width"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 48d1e3132690..6aabf59418cd 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -57,6 +57,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool bOOXML) :
     m_bRowSizeTypeInserted(false),
     m_bTableSizeTypeInserted(false),
     m_nLayoutType(0),
+    m_nMaxFixedWidth(0),
     m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
 {
     m_pTablePropsHandler->SetTableManager( this );
@@ -132,8 +133,47 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
                         }
                         else if( sal::static_int_cast<Id>(pMeasureHandler->getUnit()) == NS_ooxml::LN_Value_ST_TblWidth_auto )
                         {
-                            pPropMap->setValue( TablePropertyMap::TABLE_WIDTH_TYPE, text::SizeType::VARIABLE );
-                            pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, 100 );
+                            /*
+                            This attribute specifies the width type of table. This is used as part of the table layout
+                            algorithm specified by the tblLayout element.(See 17.4.64 and 17.4.65 of the ISO/IEC 29500-1:2011.)
+                            If this valus is 'auto', the table layout has to uses the preferred widths on the table items to generate
+                            the final sizing of the table, but then must use the contents of each cell to determine final column widths.
+                            (See 17.18.87 of the ISO/IEC 29500-1:2011.)
+                            */
+                            bool bFixed = false;
+                            sal_Int32 nRowFixedWidth = 0;
+                            if (!m_aCellWidths.empty())
+                            {
+                                // 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;
+                                    }
+                                }
+                            }
+
+                            // Check whether the total width of given row is compared with the maximum value of rows (m_nMaxFixedWidth).
+                            if (bFixed )
+                            {
+                                // Check if total width
+                                if (m_nMaxFixedWidth < nRowFixedWidth)
+                                    m_nMaxFixedWidth = nRowFixedWidth;
+
+                                pPropMap->setValue( TablePropertyMap::TABLE_WIDTH_TYPE, text::SizeType::FIX );
+                                pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, m_nMaxFixedWidth );
+                            }
+                            else
+                            {
+                                // Set the width type of table with 'Auto' and set the width value to 100(%)
+                                pPropMap->setValue( TablePropertyMap::TABLE_WIDTH_TYPE, text::SizeType::VARIABLE );
+                                pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, 100 );
+                            }
                         }
                         m_bTableSizeTypeInserted = true;
                     }
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 1384197a585f..6243b619c0e1 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -62,6 +62,7 @@ class DomainMapperTableManager : public DomainMapperTableManager_Base_t
     bool m_bTableSizeTypeInserted;
     /// Table layout algorithm, IOW if we should consider fixed column width or not.
     sal_uInt32 m_nLayoutType;
+    sal_Int32 m_nMaxFixedWidth;
 
     TablePropertiesHandler   *m_pTablePropsHandler;
     PropertyMapPtr            m_pStyleProps;