[Libreoffice-commits] core.git: sc/source

[Stephan Bergmann]

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

New commits:
commit 47816cf3674fbbe2355b53692fe2facfbe3cfdc9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 12 09:03:22 2017 +0100

    Fix unnecessary wrong downcast
    
    ...from ScFormatEntry to ScCondFormatEntry instead of just ScConditionEntry,
    introduced with 3f614f431475e1bf3bb3bbeac59b0681309628b7 "tdf#95295: don't add
    duplicate conditional formats".  Caused e.g. CppunitTest_sc_bugfix_test to fail
    under -fsanitize=vptr, when trying to downcast a ScValidationData.
    
    Change-Id: I913076d3538bafbdb2ac57b6bb1bd89199b048a6

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index eae43e7049c8..5dbe88df5102 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -629,7 +629,7 @@ bool ScConditionEntry::IsEqual( const ScFormatEntry& rOther, bool bIgnoreSrcPos
     if (GetType() != rOther.GetType())
         return false;
 
-    const ScCondFormatEntry& r = static_cast<const ScCondFormatEntry&>(rOther);
+    const ScConditionEntry& r = static_cast<const ScConditionEntry&>(rOther);
 
     bool bEq = (eOp == r.eOp && nOptions == r.nOptions &&
                 lcl_IsEqual( pFormula1, r.pFormula1 ) &&