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

Stephan Bergmann sbergman at redhat.com
Mon Jun 29 03:27:30 PDT 2015


 svtools/source/contnr/svtabbx.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d2cf81e689082893afa4a54f0387ee6582ea6475
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 29 12:27:01 2015 +0200

    -fsanitize=vptr: avoid premature downcast
    
    Change-Id: I6e355e9283987c1a900b28c5271142aebb55e3b1

diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index a6385ad..562cf20 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -655,11 +655,11 @@ bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriSta
         sal_uInt16 nItemCount = pEntry->ItemCount();
         if ( nItemCount > ( _nColumn + 1 ) )
         {
-            SvLBoxButton* pItem = static_cast<SvLBoxButton*>( pEntry->GetItem( _nColumn + 1 ) );
+            SvLBoxItem* pItem = pEntry->GetItem( _nColumn + 1 );
             if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON)
             {
                 bRet = true;
-                _rState = ( ( pItem->GetButtonFlags() & SvItemStateFlags::UNCHECKED ) == SvItemStateFlags::NONE )
+                _rState = ( ( static_cast<SvLBoxButton*>(pItem)->GetButtonFlags() & SvItemStateFlags::UNCHECKED ) == SvItemStateFlags::NONE )
                             ? TRISTATE_TRUE : TRISTATE_FALSE;
             }
         }


More information about the Libreoffice-commits mailing list