[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwptablelayout.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 10bac220a31f7f4f80bee440fa0f7292f0a5d54c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 10 15:57:34 2015 +0000

    there can be 0 columns
    
    Change-Id: Ie367e88df7165d728015a1b3987b220a23203765
    (cherry picked from commit 6857a386a4cfe4ddb42515cb00df5bd6648d0964)

diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index c3aabee..e73bbcd 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -584,7 +584,7 @@ void LwpTableLayout::RegisterColumns()
         m_pColumns[nColId] = pColumnLayout;
         if (!pColumnLayout->IsJustifiable())
         {
-            pWidthCalculated[pColumnLayout->GetColumnID()] = sal_True;
+            pWidthCalculated[nColId] = sal_True;
             dTableWidth -= pColumnLayout->GetWidth();
             nJustifiableColumn --;
         }
@@ -594,7 +594,7 @@ void LwpTableLayout::RegisterColumns()
     }
 
     // if all columns are not justifiable, the rightmost column will be changed to justifiable
-    if(nJustifiableColumn == 0)
+    if (nJustifiableColumn == 0 && nCols != 0)
     {
         nJustifiableColumn ++;
         if (m_pColumns[nCols - 1])