svx/source/fmcomp/gridcell.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit bcca7b95d60fadfbaf93b542c110e177e838db8a Author: Lionel Elie Mamane <[email protected]> Date: Wed Jul 22 16:25:28 2015 +0200 tdf#92725 FormattedField: when model value is NULL, force empty display string as opposed to implicitly keeping whatever unrelated string was there before. Change-Id: Ifaf1b41e951e97f209ecb617b32ec4f7522b1d08 Reviewed-on: https://gerrit.libreoffice.org/17297 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 4d4725e..54c868a 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1578,7 +1578,7 @@ void DbFormattedField::updateFromModel( Reference< XPropertySet > _rxModel ) OUString sText; Any aValue = _rxModel->getPropertyValue( FM_PROP_EFFECTIVE_VALUE ); - if ( aValue >>= sText ) + if ( !aValue.hasValue() || (aValue >>= sText) ) { // our effective value is transferred as string pFormattedWindow->SetTextFormatted( sText ); pFormattedWindow->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
