From f4bccae9eb48d36de9edd1fa5551e5e8de85b17e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 20 May 2013 17:18:56 +0100
Subject: Revert "fdo#46808, Adapt frame::PopupMenuControllerFactory UNO
 service"

This reverts commit e93a0018871ebea4da1959c72c06f3c7f4dc7b27.

Conflicts:
	desktop/source/app/app.cxx
	framework/source/uielement/menubarmanager.cxx
	framework/source/uielement/popupmenucontroller.cxx
	offapi/UnoApi_offapi.mk

Change-Id: I3d4d49f98603e75357fb315a603a10851b3a7090
---
 desktop/source/app/app.cxx | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'desktop')

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index de0e7b544131..0b05fab5e916 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -41,7 +41,6 @@
 #include <com/sun/star/frame/SessionListener.hpp>
 #include <com/sun/star/frame/XSessionManagerListener.hpp>
 #include <com/sun/star/frame/XSynchronousDispatch.hpp>
-#include <com/sun/star/frame/PopupMenuControllerFactory.hpp>
 #include <com/sun/star/document/CorruptedFilterConfigurationException.hpp>
 #include <com/sun/star/configuration/CorruptedConfigurationException.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
@@ -2215,16 +2214,21 @@ void Desktop::PreloadConfigurationData()
 
     // preload popup menu controller factories. As all controllers are in the same
     // configuration file they also get preloaded!
-    Reference< css::frame::XToolbarControllerFactory > xPopupMenuControllerFactory =
-        css::frame::PopupMenuControllerFactory::create( xContext );
-    try
-    {
-        xPopupMenuControllerFactory->hasController(
-                    OUString( ".uno:CharFontName" ),
-                    OUString() );
-    }
-    catch ( const ::com::sun::star::uno::Exception& )
+    Reference< ::com::sun::star::frame::XUIControllerRegistration > xPopupMenuControllerFactory(
+        rFactory->createInstance(
+            rtl::OUString( "com.sun.star.frame.PopupMenuControllerFactory" )),
+            UNO_QUERY );
+    if ( xPopupMenuControllerFactory.is() )
     {
+        try
+        {
+            xPopupMenuControllerFactory->hasController(
+                        rtl::OUString( ".uno:CharFontName" ),
+                        OUString() );
+        }
+        catch ( const ::com::sun::star::uno::Exception& )
+        {
+        }
     }
 
     // preload filter configuration
@@ -2269,6 +2273,8 @@ void Desktop::OpenClients()
 
     const CommandLineArgs& rArgs = GetCommandLineArgs();
 
+    Reference<XMultiServiceFactory> rFactory = ::comphelper::getProcessServiceFactory();
+
     if (!rArgs.IsQuickstart())
     {
         sal_Bool bShowHelp = sal_False;
-- 
cgit