7 files changed, 15 insertions, 15 deletions
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index 1a3fa8641a6c..2ff45588002b 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -22,8 +22,8 @@
 #include <MediaDescriptorHelper.hxx>
 #include <ChartController.hxx>
 #include <ChartModel.hxx>
+#include <unotools/fcm.hxx>
 #include <unotools/mediadescriptor.hxx>
-#include <unotools/mvc.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/frame/XLoadable.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -111,7 +111,7 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa
     //connect frame, controller and model one to each other:
     if(xModel.is())
     {
-        utl::ConnectModelViewController(xModel, xFrame, xController);
+        utl::ConnectFrameControllerModel(xFrame, xController, xModel);
     }
 
     // call initNew() or load() at XLoadable
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index bfcdfc074026..7b10bf2b523f 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -52,8 +52,8 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <sfx2/docfile.hxx>
+#include <unotools/fcm.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <unotools/mvc.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/svapp.hxx>
 
@@ -449,7 +449,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const OU
             Reference< XController2 > xController( xModel2->createViewController( sViewName, Sequence< PropertyValue >(), rFrame ), UNO_SET_THROW );
 
             // introduce model/view/controller to each other
-            utl::ConnectModelViewController(xModel, rFrame, xController);
+            utl::ConnectFrameControllerModel(rFrame, xController, xModel);
 
             bSuccess = true;
         }
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index d5c4395efe3a..f2dfd2a497f9 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -38,7 +38,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/urlobj.hxx>
-#include <unotools/mvc.hxx>
+#include <unotools/fcm.hxx>
 #include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index d59a36b5bb09..c9e7d62cc5f9 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -76,8 +76,8 @@
 #include <o3tl/safeint.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/string_view.hxx>
+#include <unotools/fcm.hxx>
 #include <unotools/mediadescriptor.hxx>
-#include <unotools/mvc.hxx>
 #include <comphelper/multiinterfacecontainer3.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/sequence.hxx>
@@ -3423,7 +3423,7 @@ void AutoRecovery::implts_openOneDoc(const OUString&               sURL       ,
             }
 
             // introduce model/view/controller to each other
-            utl::ConnectModelViewController(xModel, xTargetFrame, xController);
+            utl::ConnectFrameControllerModel(xTargetFrame, xController, xModel);
         }
 
         rInfo.Document = xModel.get();
diff --git a/include/unotools/mvc.hxx b/include/unotools/fcm.hxx
index 6c9d65a778d3..30df362884ba 100644
--- a/include/unotools/mvc.hxx
+++ b/include/unotools/fcm.hxx
@@ -34,11 +34,11 @@ inline void ConnectModelController(const css::uno::Reference<css::frame::XModel>
     xModel->setCurrentController(xController);
 }
 
-// Introduce model/view/controller to each other
+// Introduce frame/controller/model to each other
 inline void
-ConnectModelViewController(const css::uno::Reference<css::frame::XModel>& xModel,
-                           const css::uno::Reference<css::frame::XFrame>& xFrame,
-                           const css::uno::Reference<css::frame::XController2>& xController)
+ConnectFrameControllerModel(const css::uno::Reference<css::frame::XFrame>& xFrame,
+                            const css::uno::Reference<css::frame::XController2>& xController,
+                            const css::uno::Reference<css::frame::XModel>& xModel)
 {
     ConnectModelController(xModel, xController);
     if (xFrame)
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index eb33a7e1e5a1..275ee32dbb12 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -58,7 +58,7 @@
 #include <svx/view3d.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/sdmetitm.hxx>
-#include <unotools/mvc.hxx>
+#include <unotools/fcm.hxx>
 
 using namespace ::com::sun::star;
 
@@ -150,7 +150,7 @@ sd::DrawDocShellRef SdMiscTest::Load(const OUString& rURL, sal_Int32 nFormat)
     CPPUNIT_ASSERT(xController.is());
 
     // introduce model/view/controller to each other
-    utl::ConnectModelViewController(xModel2, xTargetFrame, xController);
+    utl::ConnectFrameControllerModel(xTargetFrame, xController, xModel2);
 
     sd::ViewShell *pViewShell = xDocSh->GetViewShell();
     CPPUNIT_ASSERT(pViewShell);
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index bf9a7b247fbe..f03b08fe5886 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -57,8 +57,8 @@
 #include <sal/log.hxx>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
+#include <unotools/fcm.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <unotools/mvc.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
@@ -581,7 +581,7 @@ Reference< XController2 > SfxFrameLoader_Impl::impl_createDocumentView( const Re
     ), UNO_SET_THROW );
 
     // introduce model/view/controller to each other
-    utl::ConnectModelViewController(i_rModel, i_rFrame, xController);
+    utl::ConnectFrameControllerModel(i_rFrame, xController, i_rModel);
 
     return xController;
 }