From 6653107b838be22da2ceb6e9123dafe67b45dd91 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Wed, 8 Jul 2020 20:31:00 +0200
Subject: clean up macro usage

Change-Id: I06669718f692cc5e9e209b4e490365f4f016afdb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98389
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 framework/source/services/dispatchhelper.cxx           | 2 +-
 framework/source/services/mediatypedetectionhelper.cxx | 1 +
 framework/source/services/uriabbreviation.cxx          | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'framework/source/services')

diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index b0c6e7e9b4a5..b4e5718ab56b 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <framework/dispatchhelper.hxx>
-#include <macros/xserviceinfo.hxx>
 #include <services.h>
 
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
@@ -28,6 +27,7 @@
 #include <comphelper/profilezone.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <vcl/threadex.hxx>
+#include <cppuhelper/supportsservice.hxx>
 
 namespace framework
 {
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index d936b36a4004..f4388d217c13 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -20,6 +20,7 @@
 #include <services/mediatypedetectionhelper.hxx>
 #include <services.h>
 #include <svl/inettype.hxx>
+#include <cppuhelper/supportsservice.hxx>
 
 namespace framework
 {
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index ae27f5a9e1c4..abccde76f59d 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -23,6 +23,7 @@
 #include <sal/config.h>
 
 #include <tools/urlobj.hxx>
+#include <cppuhelper/supportsservice.hxx>
 
 // framework namespace
 namespace framework
@@ -42,7 +43,7 @@ sal_Bool SAL_CALL UriAbbreviation::supportsService( const OUString& sServiceName
 
 css::uno::Sequence< OUString > SAL_CALL UriAbbreviation::getSupportedServiceNames()
 {
-    return { SERVICENAME_STRINGABBREVIATION };
+    return { "com.sun.star.util.UriAbbreviation" };
 }
 
 UriAbbreviation::UriAbbreviation(css::uno::Reference< css::uno::XComponentContext > const & )
-- 
cgit