From d1fcea677a0d814ca92a00717a4ff7090291f6cd Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Sun, 25 Mar 2012 04:37:41 +0200
Subject: Revert "if/else branches contain same code"

This reverts commit 13bf19769e6e0522d920594225b9baa2c1b7dd63.
---
 sc/source/ui/unoobj/chart2uno.cxx | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'sc/source')

diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 1a04ce472a15..e2f7059ac566 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -749,12 +749,25 @@ void Chart2Positioner::createPositionMap()
 
             for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol, ++nInsCol)
             {
-                pCol = static_cast<Table*>(pCols->Get(nInsCol));
-                if (!pCol)
+                if (bNoGlue || meGlue == GLUETYPE_ROWS)
                 {
-                    pCol = pNewRowTable.get();
-                    pCols->Insert(nInsCol, pNewRowTable.release());
-                    pNewRowTable.reset(new Table);
+                    pCol = static_cast<Table*>(pCols->Get(nInsCol));
+                    if (!pCol)
+                    {
+                        pCol = pNewRowTable.get();
+                        pCols->Insert(nInsCol, pNewRowTable.release());
+                        pNewRowTable.reset(new Table);
+                    }
+                }
+                else
+                {
+                    pCol = static_cast<Table*>(pCols->Get(nInsCol));
+                    if (!pCol)
+                    {
+                        pCol = pNewRowTable.get();
+                        pCols->Insert(nInsCol, pNewRowTable.release());
+                        pNewRowTable.reset(new Table);
+                    }
                 }
 
                 sal_uInt32 nInsRow = static_cast<sal_uInt32>(bNoGlue ? nNoGlueRow : nRow1);
-- 
cgit