summaryrefslogtreecommitdiffstats
path: root/forms
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2016-05-27 15:37:18 +0200
committerMichael Meeks <michael.meeks@collabora.com>2016-05-31 15:47:17 +0000
commite61bc7358880189bf084b6b58cb4c9e4f7ccb75f (patch)
tree2e54106fc0897c62fc4d4ee06c4f560914ec9a72 /forms
parentwe need the space="preserve" also for formatted strings, tdf#96912 (diff)
downloadcore-e61bc7358880189bf084b6b58cb4c9e4f7ccb75f.tar.gz
core-e61bc7358880189bf084b6b58cb4c9e4f7ccb75f.zip
tdf#93403 check for changed DataSource on all Controls on form reload
1) OBoundControlModel: when reload() asks us to connect to database column, redo it even if it was previously done. 2) FmXGridPeer: when getting Reloaded event that we subscribed to (and specifically from frm::ODatabaseFrom), pass along the event to all columns before we treat it. The columns (controls) are themselves subscribed to it, but they may get the event after us, which means our treatment still uses stale data, which we continue to display. The column controls should continue to subscribe by themselves for the case that they are not in a grid, but direct children of the form. Change-Id: I0cbcf2dc792e8650157a69ddc414d755de0e549a Reviewed-on: https://gerrit.libreoffice.org/25549 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/FormComponent.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 376ba7a97844..75c09cc6a91b 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -2047,7 +2047,7 @@ void OBoundControlModel::impl_connectDatabaseColumn_noNotify( bool _bFromReload
OSL_ENSURE( xRowSet.is(), "OBoundControlModel::impl_connectDatabaseColumn_noNotify: no row set!" );
if ( !xRowSet.is() )
return;
- if ( !hasField() )
+ if ( !hasField() || _bFromReload )
{
// connect to the column
connectToField( xRowSet );