[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source
Eike Rathke
erack at redhat.com
Thu May 7 07:06:34 PDT 2015
sc/source/core/data/table3.cxx | 9 ++++-----
sc/source/ui/docshell/dbdocfun.cxx | 13 ++++++++-----
2 files changed, 12 insertions(+), 10 deletions(-)
New commits:
commit 88ea6b734a2a87a41196370cc1d66476e2a19514
Author: Eike Rathke <erack at redhat.com>
Date: Mon May 4 20:45:45 2015 +0200
Resolves tdf#90757 ensure start row / end row order makes sense
... in case the header is the only row.
Change-Id: I5e6046007a8d668f9834e108aaf8af0072629fc8
(cherry picked from commit 46fa99f61aff88f1697959a9d3c41a5c3c3c05e9)
Reviewed-on: https://gerrit.libreoffice.org/15631
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index f02a4b6..46d38c8 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1702,11 +1702,10 @@ void ScTable::Sort(
SCROW nLastRow = 0;
for (SCCOL nCol = rSortParam.nCol1; nCol <= rSortParam.nCol2; nCol++)
nLastRow = std::max(nLastRow, aCol[nCol].GetLastDataPos());
- rSortParam.nRow2 = nLastRow = std::min(nLastRow, rSortParam.nRow2);
- SCROW nRow1 = (rSortParam.bHasHeader ?
- rSortParam.nRow1 + 1 : rSortParam.nRow1);
+ rSortParam.nRow2 = nLastRow = std::max( std::min(nLastRow, rSortParam.nRow2), rSortParam.nRow1);
+ SCROW nRow1 = (rSortParam.bHasHeader ? rSortParam.nRow1 + 1 : rSortParam.nRow1);
aSortParam = rSortParam; // must be assigned before calling IsSorted()
- if (!IsSorted(nRow1, nLastRow))
+ if (nRow1 < nLastRow && !IsSorted(nRow1, nLastRow))
{
if(pProgress)
pProgress->SetState( 0, nLastRow-nRow1 );
@@ -1735,7 +1734,7 @@ void ScTable::Sort(
SCCOL nCol1 = (rSortParam.bHasHeader ?
rSortParam.nCol1 + 1 : rSortParam.nCol1);
aSortParam = rSortParam; // must be assigned before calling IsSorted()
- if (!IsSorted(nCol1, nLastCol))
+ if (nCol1 < nLastCol && !IsSorted(nCol1, nLastCol))
{
if(pProgress)
pProgress->SetState( 0, nLastCol-nCol1 );
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index bb97463..b2ab010 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -569,10 +569,13 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
pDBData->SetSortParam(rSortParam);
- ScRange aDirtyRange(
- aLocalParam.nCol1, nStartRow, nTab,
- aLocalParam.nCol2, aLocalParam.nRow2, nTab);
- rDoc.SetDirty( aDirtyRange, true );
+ if (nStartRow <= aLocalParam.nRow2)
+ {
+ ScRange aDirtyRange(
+ aLocalParam.nCol1, nStartRow, nTab,
+ aLocalParam.nCol2, aLocalParam.nRow2, nTab);
+ rDoc.SetDirty( aDirtyRange, true );
+ }
if (bPaint)
{
@@ -590,7 +593,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
rDocShell.PostPaint(ScRange(nStartX, nStartY, nTab, nEndX, nEndY, nTab), nPaint);
}
- if (!bUniformRowHeight)
+ if (!bUniformRowHeight && nStartRow <= aLocalParam.nRow2)
rDocShell.AdjustRowHeight(nStartRow, aLocalParam.nRow2, nTab);
aModificator.SetDocumentModified();
More information about the Libreoffice-commits
mailing list