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

[Lionel Elie Mamane]

 forms/source/component/FormComponent.cxx |    2 +-
 svx/source/fmcomp/fmgridif.cxx           |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit e61bc7358880189bf084b6b58cb4c9e4f7ccb75f
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri May 27 15:37:18 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 376ba7a..75c09cc 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 );
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 041825e..b6f99bf4 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1572,8 +1572,19 @@ void FmXGridPeer::unloading(const EventObject& /*aEvent*/) throw( RuntimeExcepti
 }
 
 
-void FmXGridPeer::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException, std::exception )
+void FmXGridPeer::reloaded(const EventObject& aEvent) throw( RuntimeException, std::exception )
 {
+    {
+        const sal_Int32 cnt = m_xColumns->getCount();
+        for(sal_Int32 i=0; i<cnt; ++i)
+        {
+            Reference< XLoadListener> xll(m_xColumns->getByIndex(i), UNO_QUERY);
+            if(xll.is())
+            {
+                xll->reloaded(aEvent);
+            }
+        }
+    }
     updateGrid(m_xCursor);
 }