Kaydet (Commit) 4824d5ea authored tarafından Martin van Zijl's avatar Martin van Zijl Kaydeden (comit) Noel Grandin

tdf#119804 allow sort when header row protected

Change-Id: I303c11f8dbe4ccd302961b4afc0f67cd9c5d2582
Reviewed-on: https://gerrit.libreoffice.org/66133
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 101cd1b9
...@@ -504,7 +504,18 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, ...@@ -504,7 +504,18 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
nTab = aLocalParam.nDestTab; nTab = aLocalParam.nDestTab;
} }
ScEditableTester aTester( &rDoc, nTab, aLocalParam.nCol1,aLocalParam.nRow1, // tdf#119804: If there is a header row/column, it won't be affected by
// sorting; so we can exclude it from the test.
SCROW nStartingRowToEdit = aLocalParam.nRow1;
SCROW nStartingColToEdit = aLocalParam.nCol1;
if ( aLocalParam.bHasHeader )
{
if ( aLocalParam.bByRow )
nStartingRowToEdit++;
else
nStartingColToEdit++;
}
ScEditableTester aTester( &rDoc, nTab, nStartingColToEdit,nStartingRowToEdit,
aLocalParam.nCol2,aLocalParam.nRow2 ); aLocalParam.nCol2,aLocalParam.nRow2 );
if (!aTester.IsEditable()) if (!aTester.IsEditable())
{ {
......
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