summaryrefslogtreecommitdiff
path: root/framework/source/services
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2020-07-08 20:31:00 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-07-09 08:27:53 +0200
commit6653107b838be22da2ceb6e9123dafe67b45dd91 (patch)
tree769d2981f3255905dfce762e16c42ff6a863acc9 /framework/source/services
parent5483d4e10aad27889b961b9cb94d7ba6c86aed0b (diff)
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>
Diffstat (limited to 'framework/source/services')
-rw-r--r--framework/source/services/dispatchhelper.cxx2
-rw-r--r--framework/source/services/mediatypedetectionhelper.cxx1
-rw-r--r--framework/source/services/uriabbreviation.cxx3
3 files changed, 4 insertions, 2 deletions
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 & )