Kaydet (Commit) 71402a06 authored tarafından Albert Thuswaldner's avatar Albert Thuswaldner Kaydeden (comit) Markus Mohrhard

fdo#45747 reverted use of init lists for backwards compabillity

üst a02b445c
...@@ -61,6 +61,8 @@ ScSortParam::ScSortParam( const ScSortParam& r ) : ...@@ -61,6 +61,8 @@ ScSortParam::ScSortParam( const ScSortParam& r ) :
void ScSortParam::Clear() void ScSortParam::Clear()
{ {
ScSortKeyState aKeyState;
nCol1=nCol2=nDestCol = 0; nCol1=nCol2=nDestCol = 0;
nRow1=nRow2=nDestRow = 0; nRow1=nRow2=nDestRow = 0;
nCompatHeader = 2; nCompatHeader = 2;
...@@ -71,8 +73,12 @@ void ScSortParam::Clear() ...@@ -71,8 +73,12 @@ void ScSortParam::Clear()
aCollatorLocale = ::com::sun::star::lang::Locale(); aCollatorLocale = ::com::sun::star::lang::Locale();
aCollatorAlgorithm = ::rtl::OUString(); aCollatorAlgorithm = ::rtl::OUString();
aKeyState.bDoSort = false;
aKeyState.nField = 0;
aKeyState.bAscending = true;
// Initialize to default size // Initialize to default size
maKeyState.assign( DEFSORT, { false, 0, true } ); maKeyState.assign( DEFSORT, aKeyState );
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
...@@ -180,7 +186,9 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) ...@@ -180,7 +186,9 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
{ {
if (nNewCount < nSortSize) if (nNewCount < nSortSize)
{ {
maKeyState[nNewCount] = { true, rSub.nField[i], rSub.bAscending }; maKeyState[nNewCount].bDoSort = true;
maKeyState[nNewCount].nField = rSub.nField[i];
maKeyState[nNewCount].bAscending = rSub.bAscending;
++nNewCount; ++nNewCount;
} }
} }
...@@ -198,14 +206,20 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) ...@@ -198,14 +206,20 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
{ {
if (nNewCount < nSortSize) if (nNewCount < nSortSize)
{ {
maKeyState[nNewCount] = { true, nThisField, rOld.maKeyState[i].bAscending }; maKeyState[nNewCount].bDoSort = true;
maKeyState[nNewCount].nField = nThisField;
maKeyState[nNewCount].bAscending = rOld.maKeyState[i].bAscending;
++nNewCount; ++nNewCount;
} }
} }
} }
for (i=nNewCount; i<nSortSize; i++) // Rest loeschen for (i=nNewCount; i<nSortSize; i++) // Rest loeschen
maKeyState.push_back( ScSortKeyState({ false, 0, true }) ); {
maKeyState[nNewCount].bDoSort = false;
maKeyState[nNewCount].nField = 0;
maKeyState[nNewCount].bAscending = true;
}
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
...@@ -219,10 +233,19 @@ ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) : ...@@ -219,10 +233,19 @@ ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) :
bInplace(true), bInplace(true),
nDestTab(0),nDestCol(0),nDestRow(0), nCompatHeader(2) nDestTab(0),nDestCol(0),nDestRow(0), nCompatHeader(2)
{ {
maKeyState.push_back( ScSortKeyState( { true, nCol, true } ) ); ScSortKeyState aKeyState;
aKeyState.bDoSort = true;
aKeyState.nField = nCol;
aKeyState.bAscending = true;
maKeyState.push_back( aKeyState );
// Set the rest
aKeyState.bDoSort = false;
aKeyState.nField = 0;
for (sal_uInt16 i=1; i<GetSortKeyCount(); i++) for (sal_uInt16 i=1; i<GetSortKeyCount(); i++)
maKeyState.push_back( ScSortKeyState( { false, 0, true } ) ); maKeyState.push_back( aKeyState );
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
......
...@@ -165,10 +165,21 @@ void ScTabPageSortFields::Init() ...@@ -165,10 +165,21 @@ void ScTabPageSortFields::Init()
aLbSort2.Clear(); aLbSort2.Clear();
aLbSort3.Clear(); aLbSort3.Clear();
aLbSortArr = { &aLbSort1, &aLbSort2, &aLbSort3 }; aLbSortArr.push_back( &aLbSort1 );
aBtnUp = { &aBtnUp1, &aBtnUp2, &aBtnUp3 }; aLbSortArr.push_back( &aLbSort2 );
aBtnDown = { &aBtnDown1, &aBtnDown2, &aBtnDown3 }; aLbSortArr.push_back( &aLbSort3 );
aFlArr = { &aFlSort1, &aFlSort2, &aFlSort3 };
aBtnUp.push_back( &aBtnUp1 );
aBtnUp.push_back( &aBtnUp2 );
aBtnUp.push_back( &aBtnUp3 );
aBtnDown.push_back( &aBtnDown1 );
aBtnDown.push_back( &aBtnDown2 );
aBtnDown.push_back( &aBtnDown3 );
aFlArr.push_back( &aFlSort1 );
aFlArr.push_back( &aFlSort2 );
aFlArr.push_back( &aFlSort3 );
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
......
...@@ -376,7 +376,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ...@@ -376,7 +376,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
aSortParam.bNaturalSort = false; aSortParam.bNaturalSort = false;
aSortParam.bIncludePattern = true; aSortParam.bIncludePattern = true;
aSortParam.bInplace = true; aSortParam.bInplace = true;
aSortParam.maKeyState[0] = { true, nCol, nSlotId == SID_SORT_ASCENDING }; aSortParam.maKeyState[0].bDoSort = true;
aSortParam.maKeyState[0].nField = nCol;
aSortParam.maKeyState[0].bAscending = ( nSlotId == SID_SORT_ASCENDING );
for ( sal_uInt16 i=1; i<aSortParam.GetSortKeyCount(); i++ ) for ( sal_uInt16 i=1; i<aSortParam.GetSortKeyCount(); i++ )
aSortParam.maKeyState[i].bDoSort = false; aSortParam.maKeyState[i].bDoSort = false;
......
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