From 16e98d669f2d1dd36c39007daab05a8696b08ebb Mon Sep 17 00:00:00 2001
From: Mike Kaganski <mike.kaganski@collabora.com>
Date: Thu, 27 Oct 2022 22:17:55 +0300
Subject: Introduce utl::ConnectModelViewController

And use it to avoid code duplication

Change-Id: I18447bc1a0388d57a273b310977a0f0fb54152b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141946
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
---
 dbaccess/source/filter/xml/dbloader2.cxx | 8 +++-----
 dbaccess/source/ui/browser/dbloader.cxx  | 5 ++---
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index d00dba43445d..bfcdfc074026 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -53,6 +53,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <sfx2/docfile.hxx>
 #include <unotools/moduleoptions.hxx>
+#include <unotools/mvc.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/svapp.hxx>
 
@@ -447,11 +448,8 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
             Reference< XModel2 > xModel2( xModel, UNO_QUERY_THROW );
             Reference< XController2 > xController( xModel2->createViewController( sViewName, Sequence< PropertyValue >(), rFrame ), UNO_SET_THROW );
 
-            xController->attachModel( xModel );
-            xModel->connectController( xController );
-            rFrame->setComponent( xController->getComponentWindow(), xController );
-            xController->attachFrame( rFrame );
-            xModel->setCurrentController( xController );
+            // introduce model/view/controller to each other
+            utl::ConnectModelViewController(xModel, rFrame, xController);
 
             bSuccess = true;
         }
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index cb1371c80c57..d5c4395efe3a 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -38,6 +38,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/urlobj.hxx>
+#include <unotools/mvc.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
@@ -177,9 +178,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
         if ( xReportModel.is() )
         {
             xController.set( ReportDesign::create( m_xContext ) );
-            xController->attachModel( xReportModel );
-            xReportModel->connectController( xController );
-            xReportModel->setCurrentController( xController );
+            utl::ConnectModelController(xReportModel, xController);
         }
     }
 
-- 
cgit