2 files changed, 3 insertions, 21 deletions
diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx
index 619b66d7c420..5f81f80be026 100644
--- a/framework/source/uifactory/uicontrollerfactory.cxx
+++ b/framework/source/uifactory/uicontrollerfactory.cxx
@@ -261,24 +261,6 @@ PopupMenuControllerFactory::PopupMenuControllerFactory( const Reference< XCompon
 {
 }
 
-struct PopupMenuControllerFactoryInstance {
-    explicit PopupMenuControllerFactoryInstance(
-        css::uno::Reference<css::uno::XComponentContext> const & context):
-        instance(static_cast<cppu::OWeakObject *>(
-                    new PopupMenuControllerFactory(context)))
-    {
-    }
-
-    css::uno::Reference<css::uno::XInterface> instance;
-};
-
-struct PopupMenuControllerFactorySingleton:
-    public rtl::StaticWithArg<
-        PopupMenuControllerFactoryInstance,
-        css::uno::Reference<css::uno::XComponentContext>,
-        PopupMenuControllerFactorySingleton>
-{};
-
 class ToolbarControllerFactory :  public UIControllerFactory
 {
 public:
@@ -376,8 +358,7 @@ com_sun_star_comp_framework_PopupMenuControllerFactory_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(static_cast<cppu::OWeakObject *>(
-            PopupMenuControllerFactorySingleton::get(context).instance.get()));
+    return cppu::acquire(new PopupMenuControllerFactory(context));
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
diff --git a/framework/util/fwk.component b/framework/util/fwk.component
index f3a0cfcf1edd..2d71213468d6 100644
--- a/framework/util/fwk.component
+++ b/framework/util/fwk.component
@@ -110,7 +110,8 @@
     <service name="com.sun.star.util.PathSubstitution"/>
   </implementation>
   <implementation name="com.sun.star.comp.framework.PopupMenuControllerFactory"
-      constructor="com_sun_star_comp_framework_PopupMenuControllerFactory_get_implementation">
+      constructor="com_sun_star_comp_framework_PopupMenuControllerFactory_get_implementation"
+      single-instance="true">
     <service name="com.sun.star.frame.PopupMenuControllerFactory"/>
     <singleton name="com.sun.star.frame.thePopupMenuControllerFactory"/>
   </implementation>