From af1c0ef8d397b652a4b58b29fbd7cab1a0ab5840 Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@collabora.com>
Date: Wed, 29 Jan 2014 10:35:38 +0100
Subject: Introduce com.sun.star.frame.ControllerFactory singletons:

com.sun.star.frame.thePopupMenuControllerFactory
com.sun.star.frame.theStatusbarControllerFactory
com.sun.star.frame.theToolbarControllerFactory

To replace their single-instance service variants.

Change-Id: I00586d0d61e63f9482cb659071e88aa9cf02d5b5
---
 desktop/source/app/app.cxx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'desktop/source')

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 88c7fbfd3926..82c03b4705fa 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -72,8 +72,7 @@
 #include <com/sun/star/ui/UIElementFactoryManager.hpp>
 #include <com/sun/star/ui/WindowStateConfiguration.hpp>
 #include <com/sun/star/frame/XUIControllerRegistration.hpp>
-#include <com/sun/star/frame/ToolbarControllerFactory.hpp>
-#include <com/sun/star/frame/PopupMenuControllerFactory.hpp>
+#include <com/sun/star/frame/thePopupMenuControllerFactory.hpp>
 #include <com/sun/star/office/Quickstart.hpp>
 
 #include <toolkit/helper/vclunohelper.hxx>
@@ -2199,7 +2198,7 @@ void Desktop::PreloadConfigurationData()
     // configuration file they also get preloaded!
 
     Reference< css::frame::XUIControllerRegistration > xPopupMenuControllerFactory =
-    css::frame::PopupMenuControllerFactory::create( xContext );
+    css::frame::thePopupMenuControllerFactory::get( xContext );
     try
     {
         xPopupMenuControllerFactory->hasController(
-- 
cgit