[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - formula/source

Markus Mohrhard markus.mohrhard at googlemail.com
Tue Mar 29 13:49:54 UTC 2016


 formula/source/ui/dlg/formula.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dc74d07b608bfed0df587790e8ca7a29931d96c1
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Mar 23 00:11:52 2016 +0100

    missing nullptr check, tdf#98427
    
    Change-Id: I657dc0c84eab6ff5b31976fac3317adc0a99dd51
    Reviewed-on: https://gerrit.libreoffice.org/23487
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>

diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 1cf839d..5ae6e48 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -590,7 +590,7 @@ bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString& rStrResult,
 void FormulaDlg_Impl::UpdateValues( bool bForceRecalcStruct )
 {
     OUString aStrResult;
-    if ( CalcValue( pFuncDesc->getFormula( m_aArguments ), aStrResult ) )
+    if ( pFuncDesc &&  CalcValue( pFuncDesc->getFormula( m_aArguments ), aStrResult ) )
         m_pWndResult->SetText( aStrResult );
 
     if (bMakingTree) return;


More information about the Libreoffice-commits mailing list