Revert "if/else branches contain same code"

This reverts commit 13bf1976.

Revert "if/else branches contain same code"
This reverts commit 13bf1976.
d1fcea67 · Markus Mohrhard · 300365c2 · d1fcea67
Kaydet (Commit) d1fcea67 authored Mar 25, 2012 tarafından Markus Mohrhard
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 5 deletions

chart2uno.cxx sc/source/ui/unoobj/chart2uno.cxx +18 -5

No files found.
--- 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 (bNoGlue || meGlue == GLUETYPE_ROWS)
-                if (!pCol)
                {
-                    pCol = pNewRowTable.get();
+                    pCol = static_cast<Table*>(pCols->Get(nInsCol));
-                    pCols->Insert(nInsCol, pNewRowTable.release());
+                    if (!pCol)
-                    pNewRowTable.reset(new Table);
+                    {
+                        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);