1 files changed, 7 insertions, 7 deletions
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index 71f33bc5b0ab..ab516b3d2416 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -62,7 +62,7 @@ public:
 
     virtual OUString SAL_CALL getImplementationName() override
     {
-        return "com.sun.star.comp.framework.ModuleAcceleratorConfiguration";
+        return u"com.sun.star.comp.framework.ModuleAcceleratorConfiguration"_ustr;
     }
 
     virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
@@ -72,7 +72,7 @@ public:
 
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
     {
-        return {"com.sun.star.ui.ModuleAcceleratorConfiguration"};
+        return {u"com.sun.star.ui.ModuleAcceleratorConfiguration"_ustr};
     }
 
     /// This has to be called after when the instance is acquire()'d.
@@ -80,7 +80,7 @@ public:
 
 private:
     /** helper to listen for configuration changes without ownership cycle problems */
-    css::uno::Reference< css::util::XChangesListener > m_xCfgListener;
+    rtl::Reference< WeakChangesListener > m_xCfgListener;
 };
 
 ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(
@@ -97,13 +97,13 @@ ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(
     } else
     {
         ::comphelper::SequenceAsHashMap lArgs(lArguments);
-        m_sModule = lArgs.getUnpackedValueOrDefault("ModuleIdentifier", OUString());
+        m_sModule = lArgs.getUnpackedValueOrDefault(u"ModuleIdentifier"_ustr, OUString());
         // OUString sLocale = lArgs.getUnpackedValueOrDefault("Locale", OUString("x-default"));
     }
 
     if (m_sModule.isEmpty())
         throw css::uno::RuntimeException(
-                "The module dependent accelerator configuration service was initialized with an empty module identifier!",
+                u"The module dependent accelerator configuration service was initialized with an empty module identifier!"_ustr,
                 static_cast< ::cppu::OWeakObject* >(this));
 }
 
@@ -146,8 +146,8 @@ com_sun_star_comp_framework_ModuleAcceleratorConfiguration_get_implementation(
     css::uno::XComponentContext *context,
     css::uno::Sequence<css::uno::Any> const &arguments)
 {
-    ModuleAcceleratorConfiguration *inst = new ModuleAcceleratorConfiguration(context, arguments);
-    css::uno::XInterface *acquired_inst = cppu::acquire(inst);
+    rtl::Reference<ModuleAcceleratorConfiguration> inst = new ModuleAcceleratorConfiguration(context, arguments);
+    css::uno::XInterface *acquired_inst = cppu::acquire(inst.get());
 
     inst->fillCache();