5 files changed, 11 insertions, 12 deletions
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx
index b6f49e37ed24..8d001499bad0 100644
--- a/shell/source/backends/desktopbe/desktopbackend.cxx
+++ b/shell/source/backends/desktopbe/desktopbackend.cxx
@@ -106,7 +106,7 @@ void Default::setPropertyValue(OUString const &, css::uno::Any const &)
 {
     throw css::lang::IllegalArgumentException(
         "setPropertyValue not supported",
-        static_cast< cppu::OWeakObject * >(this), -1);
+        getXWeak(), -1);
 }
 
 OUString xdg_user_dir_lookup (const char *type, bool bAllowHomeDir)
@@ -252,7 +252,7 @@ css::uno::Any Default::getPropertyValue(OUString const & PropertyName)
     }
 
     throw css::beans::UnknownPropertyException(
-        PropertyName, static_cast< cppu::OWeakObject * >(this));
+        PropertyName, getXWeak());
 }
 
 css::uno::Reference< css::uno::XInterface > createBackend(
@@ -290,7 +290,7 @@ shell_DesktopBackend_get_implementation(
         backend = createBackend(context,
             "com.sun.star.configuration.backend.KF5Backend");
     if (!backend)
-        backend = static_cast< cppu::OWeakObject * >(new Default);
+        backend = getXWeak(new Default);
     backend->acquire();
     return backend.get();
 }
diff --git a/shell/source/backends/kf5be/kf5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx
index 7137a9999873..b811300a8e6e 100644
--- a/shell/source/backends/kf5be/kf5backend.cxx
+++ b/shell/source/backends/kf5be/kf5backend.cxx
@@ -220,8 +220,7 @@ Service::Service()
 
 void Service::setPropertyValue(OUString const&, css::uno::Any const&)
 {
-    throw css::lang::IllegalArgumentException("setPropertyValue not supported",
-                                              static_cast<cppu::OWeakObject*>(this), -1);
+    throw css::lang::IllegalArgumentException("setPropertyValue not supported", getXWeak(), -1);
 }
 
 css::uno::Any Service::getPropertyValue(OUString const& PropertyName)
@@ -247,7 +246,7 @@ css::uno::Any Service::getPropertyValue(OUString const& PropertyName)
         return css::uno::Any(css::beans::Optional<css::uno::Any>());
         //TODO: obtain values from KDE?
     }
-    throw css::beans::UnknownPropertyException(PropertyName, static_cast<cppu::OWeakObject*>(this));
+    throw css::beans::UnknownPropertyException(PropertyName, getXWeak());
 }
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 9f1d22fef93e..d34c3441e6bc 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -286,7 +286,7 @@ void LocaleBackend::setPropertyValue(
 {
     throw css::lang::IllegalArgumentException(
         "setPropertyValue not supported",
-        static_cast< cppu::OWeakObject * >(this), -1);
+        getXWeak(), -1);
 }
 
 css::uno::Any LocaleBackend::getPropertyValue(
@@ -302,7 +302,7 @@ css::uno::Any LocaleBackend::getPropertyValue(
         return css::uno::Any(getUILocale());
     } else {
         throw css::beans::UnknownPropertyException(
-            PropertyName, static_cast< cppu::OWeakObject * >(this));
+            PropertyName, getXWeak());
     }
 }
 
diff --git a/shell/source/backends/macbe/macbackend.mm b/shell/source/backends/macbe/macbackend.mm
index cb35a4b9d066..e84ecd4b8013 100644
--- a/shell/source/backends/macbe/macbackend.mm
+++ b/shell/source/backends/macbe/macbackend.mm
@@ -186,7 +186,7 @@ void MacOSXBackend::setPropertyValue(
 {
     throw css::lang::IllegalArgumentException(
         "setPropertyValue not supported",
-        static_cast< cppu::OWeakObject * >(this), -1);
+        getXWeak(), -1);
 }
 
 css::uno::Any MacOSXBackend::getPropertyValue(
@@ -365,7 +365,7 @@ css::uno::Any MacOSXBackend::getPropertyValue(
         return css::uno::Any(css::beans::Optional< css::uno::Any >());
     } else {
         throw css::beans::UnknownPropertyException(
-            PropertyName, static_cast< cppu::OWeakObject * >(this));
+            PropertyName, getXWeak());
     }
 }
 
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 71de3b135b4c..109ef7fa6519 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -301,7 +301,7 @@ void WinInetBackend::setPropertyValue(
 {
     throw css::lang::IllegalArgumentException(
         "setPropertyValue not supported",
-        static_cast< cppu::OWeakObject * >(this), -1);
+        getXWeak(), -1);
 }
 
 css::uno::Any WinInetBackend::getPropertyValue(
@@ -333,7 +333,7 @@ css::uno::Any WinInetBackend::getPropertyValue(
         return css::uno::Any(valueProxyType_);
     } else {
         throw css::beans::UnknownPropertyException(
-            PropertyName, static_cast< cppu::OWeakObject * >(this));
+            PropertyName, getXWeak());
     }
 }