From 26fbcd216e21f2c5ce38263eb1eb893697815212 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 2 Oct 2020 14:14:53 +0200
Subject: [PATCH] Use the new single-instance="true" attribute in vcl

Change-Id: I8ad9bf5631c2ae2e5a38eb8a422fa601d9f08c1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103842
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 vcl/vclplug_win.component  | 2 +-
 vcl/win/dtrans/ftransl.cxx | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/vcl/vclplug_win.component b/vcl/vclplug_win.component
index d6dc9f24e93f..0187827d54a4 100644
--- a/vcl/vclplug_win.component
+++ b/vcl/vclplug_win.component
@@ -20,7 +20,7 @@
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.datatransfer.DataFormatTranslator"
-        constructor="dtrans_CDataFormatTranslatorUNO_get_implementation">
+        constructor="dtrans_CDataFormatTranslatorUNO_get_implementation" single-instance="true">
     <service name="com.sun.star.datatransfer.DataFormatTranslator"/>
   </implementation>
   <implementation name="com.sun.star.comp.datatransfer.dnd.OleDragSource_V1"
diff --git a/vcl/win/dtrans/ftransl.cxx b/vcl/win/dtrans/ftransl.cxx
index 1bbf90c689c4..f7eb3e2086ed 100644
--- a/vcl/win/dtrans/ftransl.cxx
+++ b/vcl/win/dtrans/ftransl.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
-#include <rtl/ref.hxx>
+#include <cppuhelper/weak.hxx>
 #include "ImplHelper.hxx"
 
 #include <shlobj.h>
@@ -540,8 +540,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 dtrans_CDataFormatTranslatorUNO_get_implementation(
     css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
 {
-    static rtl::Reference<CDataFormatTranslatorUNO> g_Instance(new CDataFormatTranslatorUNO(context));
-    g_Instance->acquire();
-    return static_cast<cppu::OWeakObject*>(g_Instance.get());
+    return cppu::acquire(static_cast<cppu::OWeakObject*>(new CDataFormatTranslatorUNO(context)));
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */