[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - sc/source

[Kohei Yoshida]

 sc/source/ui/docshell/dbdocfun.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 44b270d2e05ab29d73366c5db3e31750614b7c6e
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Sat Jul 12 21:46:13 2014 -0400

    fdo#80462: Don't always increment the start row position.
    
    Sometimes someone might attempt to sort only a single row.
    
    Change-Id: Ie29d4cf7ec0bd3a5c945997083368b6ef6074268
    (cherry picked from commit 5902dcf0995cdd0a6c1dbd1f9c21b0b2b3f5609f)
    Reviewed-on: https://gerrit.libreoffice.org/10260
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit f97d25b66e88742e4cb4011cc4cc0bc682c1ee1c)
    Reviewed-on: https://gerrit.libreoffice.org/10278
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: Zolnai Tamás <zolnaitamas2000 at gmail.com>

diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 1e7cbdb..d9d5550 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -493,7 +493,9 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
 
     WaitObject aWait( rDocShell.GetActiveDialogParent() );
 
-    SCROW nStartRow = aLocalParam.nRow1 + (aLocalParam.bHasHeader ? 1 : 0);
+    SCROW nStartRow = aLocalParam.nRow1;
+    if (aLocalParam.bByRow && aLocalParam.bHasHeader && nStartRow < aLocalParam.nRow2)
+        ++nStartRow;
 
     // Calculate the script types for all cells in the sort range beforehand.
     // This will speed up the row height adjustment that takes place after the