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

Caolán McNamara caolanm at redhat.com
Thu Jul 17 05:57:39 PDT 2014


 oox/source/ole/olehelper.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7bfee546dcd199c0325ec7c7edd5799ce0df79cf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 17 13:37:47 2014 +0100

    coverity#735310 Unchecked return value
    
    Change-Id: I1a35da4b23b9ff8efa8f500eaf18e4c259cc0177

diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 420a80d..1be5d6f 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -397,8 +397,7 @@ OleFormCtrlExportHelper::OleFormCtrlExportHelper(  const Reference< XComponentCo
             else if ( nClassId == FormComponentType::COMMANDBUTTON )
             {
                 bool bToggle = false;
-                aPropSet.getProperty( bToggle, PROP_Toggle );
-                if ( bToggle )
+                if ( aPropSet.getProperty( bToggle, PROP_Toggle ) && bToggle )
                     nClassId = TOGGLEBUTTON;
             }
             else if ( nClassId == FormComponentType::CONTROL )


More information about the Libreoffice-commits mailing list