[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - oox/source

Gülşah Köse (via logerrit) logerrit at kemper.freedesktop.org
Sun Aug 16 21:44:00 UTC 2020


 oox/source/drawingml/table/tableproperties.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 95d258e747d1449c562ca4fe6eaf86363c6e5fcf
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Mon Aug 10 10:04:51 2020 +0300
Commit:     Gülşah Köse <gulsah.kose at collabora.com>
CommitDate: Sun Aug 16 23:43:29 2020 +0200

    tdf#133015 Fix table position during import multicol textbox.
    
    Change-Id: Ied1a03ff9f4556a551738b698ccb284fe74299da
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100414
    Tested-by: Jenkins
    Reviewed-by: Gülşah Köse <gulsah.kose at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100828
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 431a198e7ef2..9e7b8d8e7f30 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -151,7 +151,7 @@ void TableProperties::pushToPropSet(const ::oox::core::XmlFilterBase& rFilterBas
     for (auto& tableRow : mvTableRows)
     {
         sal_Int32 nColumn = 0;
-        sal_Int32 nColumnSize = tableRow.getTableCells().size();
+        sal_Int32 nColumnSize = mvTableGrid.size();
         sal_Int32 nRemovedColumn = 0; //
 
         for (sal_Int32 nColIndex = 0; nColIndex < nColumnSize; nColIndex++)


More information about the Libreoffice-commits mailing list