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

[Caolán McNamara]

 sc/source/ui/dbgui/tpsort.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2a19ea84b7498d323b8737e0df86037755181c93
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 23 14:42:28 2015 +0000

    Resolves: fdo#88735 crash after calling sort after subtotal removal
    
    Change-Id: Ia30271426ea47b7bf5af85d16591a02e6d52b3d9
    (cherry picked from commit 0442cd217645aa4fdd924e4c2e4f90a77f1fbbad)
    Reviewed-on: https://gerrit.libreoffice.org/14141
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index a9a793c..1f21119 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -151,7 +151,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
         FillFieldLists(0);
 
     // ListBox selection:
-    if ( aSortData.maKeyState[0].bDoSort )
+    if (!aSortData.maKeyState.empty() && aSortData.maKeyState[0].bDoSort)
     {
         // Make sure that the all sort keys are reset
         for ( sal_uInt16 i=nSortKeyCount; i<aSortData.GetSortKeyCount(); i++ )