[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sc/source

Julien Nabet serval2412 at yahoo.fr
Tue Jun 30 04:22:49 PDT 2015


 sc/source/core/data/dptabsrc.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6a2c4efbd1d6086ef0f1162e0e20eb0540ded2ba
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Jun 25 23:21:19 2015 +0200

    Related tdf#92262: PIVOTTABLE: crash when clicking on the autofilter arrow
    
    Missing "else" in front of the "if"
    Regression from http://cgit.freedesktop.org/libreoffice/core/commit/?id=7b355da6853af6678c4ba22710d157cf8a6d43eb
    
    Change-Id: I3c32e8f09acbea7094c4268384ec4b1c4e028fc5
    Reviewed-on: https://gerrit.libreoffice.org/16497
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Deena Francis <deena.francis at gmail.com>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 594ef250f824772c467c0f3cc8001568d1e553a9)
    Reviewed-on: https://gerrit.libreoffice.org/16576
    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/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index f8c5ac7..1bcf434 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -2235,7 +2235,7 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const OUString& aPropertyName )
     uno::Any aRet;
     if ( aPropertyName == SC_UNO_DP_SHOWEMPTY )
         lcl_SetBoolInAny(aRet, bShowEmpty);
-    if ( aPropertyName == SC_UNO_DP_REPEATITEMLABELS )
+    else if ( aPropertyName == SC_UNO_DP_REPEATITEMLABELS )
         lcl_SetBoolInAny(aRet, bRepeatItemLabels);
     else if ( aPropertyName == SC_UNO_DP_SUBTOTAL )
     {


More information about the Libreoffice-commits mailing list