svx/source/fmcomp/gridcell.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 07ce7182fc7115292aea8f5bd43f4f983c1eb1a3
Author: Lionel Elie Mamane <lio...@mamane.lu>
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/17299
Reviewed-by: Eike Rathke <er...@redhat.com>
Reviewed-by: Michael Stahl <mst...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 52b8289..1e0cd51 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1576,7 +1576,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
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
