diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-18 09:23:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-18 12:15:20 +0100 |
| commit | f95bdd424760f759dcc7197d004d98bf20f056d3 (patch) | |
| tree | 9082c75b8b237b8e002a1be4ad3bf5e6828271f0 /chart2/source/inc/servicenames.hxx | |
| parent | 258dc1f332155cd565d34b1ce3b51edc3c2fbf64 (diff) | |
loplugin:stringliteraldefine in chart2
and drop namespace declarations that were surrounding the #define
- namespace decls have no affect on #defines
Change-Id: Ic66ba7837ba3a5c48a0cf414af30985c480d73af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125278
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/inc/servicenames.hxx')
| -rw-r--r-- | chart2/source/inc/servicenames.hxx | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx index 18e023d6c80d..30e9b40f5efa 100644 --- a/chart2/source/inc/servicenames.hxx +++ b/chart2/source/inc/servicenames.hxx @@ -18,35 +18,46 @@ */ #pragma once -namespace chart -{ -#define CHART_MODEL_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartModel" -#define CHART_MODEL_SERVICE_NAME "com.sun.star.chart2.ChartDocument" +#include <rtl/ustring.hxx> + +inline constexpr OUStringLiteral CHART_MODEL_SERVICE_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.ChartModel"; +inline constexpr OUStringLiteral CHART_MODEL_SERVICE_NAME = u"com.sun.star.chart2.ChartDocument"; //@todo create your own service containing the service com.sun.star.document.OfficeDocument -#define CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartController" -#define CHART_CONTROLLER_SERVICE_NAME "com.sun.star.chart2.ChartController" +inline constexpr OUStringLiteral CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.ChartController"; +inline constexpr OUStringLiteral CHART_CONTROLLER_SERVICE_NAME + = u"com.sun.star.chart2.ChartController"; //@todo create your own service containing the service com.sun.star.frame.Controller -#define CHART_VIEW_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartView" -#define CHART_VIEW_SERVICE_NAME "com.sun.star.chart2.ChartView" +inline constexpr OUStringLiteral CHART_VIEW_SERVICE_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.ChartView"; +inline constexpr OUStringLiteral CHART_VIEW_SERVICE_NAME = u"com.sun.star.chart2.ChartView"; -#define CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartFrameLoader" -#define CHART_FRAMELOADER_SERVICE_NAME "com.sun.star.frame.SynchronousFrameLoader" +inline constexpr OUStringLiteral CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.ChartFrameLoader"; +inline constexpr OUStringLiteral CHART_FRAMELOADER_SERVICE_NAME + = u"com.sun.star.frame.SynchronousFrameLoader"; -#define CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.WizardDialog" -#define CHART_WIZARD_DIALOG_SERVICE_NAME "com.sun.star.chart2.WizardDialog" +inline constexpr OUStringLiteral CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.WizardDialog"; +inline constexpr OUStringLiteral CHART_WIZARD_DIALOG_SERVICE_NAME + = u"com.sun.star.chart2.WizardDialog"; -#define CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartTypeDialog" -#define CHART_TYPE_DIALOG_SERVICE_NAME "com.sun.star.chart2.ChartTypeDialog" +inline constexpr OUStringLiteral CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.ChartTypeDialog"; +inline constexpr OUStringLiteral CHART_TYPE_DIALOG_SERVICE_NAME + = u"com.sun.star.chart2.ChartTypeDialog"; // wrapper for old UNO API (com.sun.star.chart) -#define CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME "com.sun.star.comp.chart2.ChartDocumentWrapper" -#define CHART_CHARTAPIWRAPPER_SERVICE_NAME "com.sun.star.chart2.ChartDocumentWrapper" +inline constexpr OUStringLiteral CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME + = u"com.sun.star.comp.chart2.ChartDocumentWrapper"; +inline constexpr OUStringLiteral CHART_CHARTAPIWRAPPER_SERVICE_NAME + = u"com.sun.star.chart2.ChartDocumentWrapper"; // accessibility -#define CHART_ACCESSIBLE_TEXT_SERVICE_NAME "com.sun.star.accessibility.AccessibleTextComponent" - -} //namespace chart +inline constexpr OUStringLiteral CHART_ACCESSIBLE_TEXT_SERVICE_NAME + = u"com.sun.star.accessibility.AccessibleTextComponent"; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |