[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - writerfilter/source

[Justin Luth]

 writerfilter/source/dmapper/DomainMapperTableManager.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bed818c5d5e92a0b189f25e18495fc205d949128
Author: Justin Luth <justin_luth at sil.org>
Date:   Mon Jan 2 17:50:26 2017 +0300

    tdf#104876 writerfilter: m_bTableSizeTypeInserted = false here
    
    fixes commit cbd0fbc287051f918e4adb32b3e9b58dfbf8059d
    which removed the insertion code with the explanation saying
      we should simply not do anything,
      and that'll lead to the right behavior,
      don't try to be smart and try to set TABLE_WIDTH here
    but still left the flag set, falsely indicating that the
    tableSizeType had been inserted.
    
    TODO: the table size still isn't correct.
    
    Reviewed-on: https://gerrit.libreoffice.org/32385
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    Tested-by: Justin Luth <justin_luth at sil.org>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    (cherry picked from commit e73c961a7fb23246dc4a9c27d7ed0808b9ba74b5)
    
    Change-Id: I0720083c992d1d03a5fe259d5b4b177a0c8108f8
    Reviewed-on: https://gerrit.libreoffice.org/32647
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index b558afd..39e8ffd 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -158,6 +158,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
                         {
                             pPropMap->setValue( TablePropertyMap::TABLE_WIDTH_TYPE, text::SizeType::FIX );
                             pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, m_nTableWidth );
+                            m_bTableSizeTypeInserted = true;
                         }
                         else if( sal::static_int_cast<Id>(pMeasureHandler->getUnit()) == NS_ooxml::LN_Value_ST_TblWidth_pct )
                         {
@@ -166,6 +167,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
                                 nPercent = 100;
                             pPropMap->setValue( TablePropertyMap::TABLE_WIDTH_TYPE, text::SizeType::VARIABLE );
                             pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, nPercent );
+                            m_bTableSizeTypeInserted = true;
                         }
                         else if( sal::static_int_cast<Id>(pMeasureHandler->getUnit()) == NS_ooxml::LN_Value_ST_TblWidth_auto )
                         {
@@ -193,9 +195,9 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
                                 // Set the width type of table with 'Auto' and set the width value to 0 (as per grid values)
                                 pPropMap->setValue( TablePropertyMap::TABLE_WIDTH_TYPE, text::SizeType::VARIABLE );
                                 pPropMap->setValue( TablePropertyMap::TABLE_WIDTH, 0 );
+                                m_bTableSizeTypeInserted = true;
                             }
                         }
-                        m_bTableSizeTypeInserted = true;
                     }
 #ifdef DEBUG_WRITERFILTER
                     pPropMap->dumpXml();