Skip to content

C
core
Kaydet (Commit) bd532483 authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

Use scoped_ptr for this. 

Change-Id: I54d0bbe460f95ada7632d7c9cbedb8a677995fd4
üst 68fccdc9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
sc/source/core/data/table3.cxx
Dosyayı görüntüle @ bd532483
...@@ -2063,9 +2063,9 @@ void ScTable::TopTenQuery( ScQueryParam& rParam ) ...@@ -2063,9 +2063,9 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
bSortCollatorInitialized = true; bSortCollatorInitialized = true;
InitSortCollator( aLocalSortParam ); InitSortCollator( aLocalSortParam );
} }
ScSortInfoArray* pArray = CreateSortInfoArray(nRow1, rParam.nRow2, bGlobalKeepQuery); boost::scoped_ptr<ScSortInfoArray> pArray(CreateSortInfoArray(nRow1, rParam.nRow2, bGlobalKeepQuery));
DecoladeRow( pArray, nRow1, rParam.nRow2 ); DecoladeRow( pArray.get(), nRow1, rParam.nRow2 );
QuickSort( pArray, nRow1, rParam.nRow2 ); QuickSort( pArray.get(), nRow1, rParam.nRow2 );
ScSortInfo** ppInfo = pArray->GetFirstArray(); ScSortInfo** ppInfo = pArray->GetFirstArray();
SCSIZE nValidCount = nCount; SCSIZE nValidCount = nCount;
// keine Note-/Leerzellen zaehlen, sind ans Ende sortiert // keine Note-/Leerzellen zaehlen, sind ans Ende sortiert
...@@ -2142,7 +2142,6 @@ void ScTable::TopTenQuery( ScQueryParam& rParam ) ...@@ -2142,7 +2142,6 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
rItem.meType = ScQueryEntry::ByValue; rItem.meType = ScQueryEntry::ByValue;
rItem.mfVal = 0; rItem.mfVal = 0;
} }
delete pArray;
} }
break; break;
default: default:
......
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