Kaydet (Commit) 4aa72e0d authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Fridrich Štrba

restructure insert code as a precursor to further simplification

üst 3ffdb45a
...@@ -761,13 +761,13 @@ void Chart2Positioner::createPositionMap() ...@@ -761,13 +761,13 @@ void Chart2Positioner::createPositionMap()
} }
else else
{ {
if (pCols->Insert(nInsCol, pNewRowTable.get())) pCol = static_cast<Table*>(pCols->Get(nInsCol));
if (!pCol)
{ {
pCol = pNewRowTable.release(); pCol = pNewRowTable.get();
pCols->Insert(nInsCol, pNewRowTable.release());
pNewRowTable.reset(new Table); pNewRowTable.reset(new Table);
} }
else
pCol = static_cast<Table*>(pCols->Get(nInsCol));
} }
sal_uInt32 nInsRow = static_cast<sal_uInt32>(bNoGlue ? nNoGlueRow : nRow1); sal_uInt32 nInsRow = static_cast<sal_uInt32>(bNoGlue ? nNoGlueRow : nRow1);
...@@ -786,7 +786,7 @@ void Chart2Positioner::createPositionMap() ...@@ -786,7 +786,7 @@ void Chart2Positioner::createPositionMap()
if (pCol->Get(nInsRow) == NULL) if (pCol->Get(nInsRow) == NULL)
{ {
if (bExternal) if (bExternal)
pCol->Insert(nInsRow, new ScExternalSingleRefToken(nFileId, aTabName, aCellData)); pCol->Insert(nInsRow, new ScExternalSingleRefToken(nFileId, aTabName, aCellData))
else else
pCol->Insert(nInsRow, new ScSingleRefToken(aCellData)); pCol->Insert(nInsRow, new ScSingleRefToken(aCellData));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment