Skip to content

C
core
Kaydet (Commit) 6af00cf9 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Fridrich Štrba
Dosyalara gözat
Seçenekler

remove unnecessary use of local variable and auto_ptr

üst 13bf1976
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
sc/source/ui/unoobj/chart2uno.cxx
Dosyayı görüntüle @ 6af00cf9
...@@ -717,7 +717,6 @@ void Chart2Positioner::createPositionMap() ...@@ -717,7 +717,6 @@ void Chart2Positioner::createPositionMap()
bool bNoGlue = (meGlue == GLUETYPE_NONE); bool bNoGlue = (meGlue == GLUETYPE_NONE);
SAL_WNODEPRECATED_DECLARATIONS_PUSH SAL_WNODEPRECATED_DECLARATIONS_PUSH
auto_ptr<Table> pCols(new Table); auto_ptr<Table> pCols(new Table);
auto_ptr<Table> pNewRowTable(new Table);
SAL_WNODEPRECATED_DECLARATIONS_POP SAL_WNODEPRECATED_DECLARATIONS_POP
Table* pCol = NULL; Table* pCol = NULL;
SCROW nNoGlueRow = 0; SCROW nNoGlueRow = 0;
...@@ -752,9 +751,8 @@ void Chart2Positioner::createPositionMap() ...@@ -752,9 +751,8 @@ void Chart2Positioner::createPositionMap()
pCol = static_cast<Table*>(pCols->Get(nInsCol)); pCol = static_cast<Table*>(pCols->Get(nInsCol));
if (!pCol) if (!pCol)
{ {
pCol = pNewRowTable.get(); pCol = new Table;
pCols->Insert(nInsCol, pNewRowTable.release()); pCols->Insert(nInsCol, pCol);
pNewRowTable.reset(new Table);
} }
sal_uInt32 nInsRow = static_cast<sal_uInt32>(bNoGlue ? nNoGlueRow : nRow1); sal_uInt32 nInsRow = static_cast<sal_uInt32>(bNoGlue ? nNoGlueRow : nRow1);
...@@ -773,7 +771,7 @@ void Chart2Positioner::createPositionMap() ...@@ -773,7 +771,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));
} }
...@@ -782,7 +780,6 @@ void Chart2Positioner::createPositionMap() ...@@ -782,7 +780,6 @@ void Chart2Positioner::createPositionMap()
} }
nNoGlueRow += nRow2 - nRow1 + 1; nNoGlueRow += nRow2 - nRow1 + 1;
} }
pNewRowTable.reset(NULL);
bool bFillRowHeader = mbRowHeaders; bool bFillRowHeader = mbRowHeaders;
bool bFillColumnHeader = mbColHeaders; bool bFillColumnHeader = mbColHeaders;
......
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