chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx | 4 +-
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 4 +-
chart2/source/controller/main/ChartFrameloader.cxx | 4 +-
chart2/source/inc/servicenames.hxx | 18 ------------
chart2/source/model/main/ChartModel.cxx | 4 +-
5 files changed, 8 insertions(+), 26 deletions(-)
New commits:
commit f78f6f790cd1de70504e270caa55b4acd8b4f723
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Jun 15 20:17:39 2025 +0200
Commit: Noel Grandin <noelgran...@gmail.com>
CommitDate: Tue Jun 17 18:50:06 2025 +0200
inline some constants
these are only used in a single place
Change-Id: I9aae2331bc22e7ac842870a6b27030fc57c01b08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186591
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 50af5e4d0c69..c92148b036c0 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -45,12 +45,12 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg()
// lang::XServiceInfo
OUString SAL_CALL ChartTypeUnoDlg::getImplementationName()
{
- return CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME;
+ return u"com.sun.star.comp.chart2.ChartTypeDialog"_ustr;
}
css::uno::Sequence<OUString> SAL_CALL
ChartTypeUnoDlg::getSupportedServiceNames()
{
- return { CHART_TYPE_DIALOG_SERVICE_NAME };
+ return { u"com.sun.star.chart2.ChartTypeDialog"_ustr };
}
uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId()
{
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index e3c540743ff0..694397a83b5f 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -57,7 +57,7 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg()
// lang::XServiceInfo
OUString SAL_CALL CreationWizardUnoDlg::getImplementationName()
{
- return CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME;
+ return u"com.sun.star.comp.chart2.WizardDialog"_ustr;
}
sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService( const OUString&
rServiceName )
@@ -67,7 +67,7 @@ sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService(
const OUString& rServic
css::uno::Sequence< OUString > SAL_CALL
CreationWizardUnoDlg::getSupportedServiceNames()
{
- return { CHART_WIZARD_DIALOG_SERVICE_NAME };
+ return { u"com.sun.star.chart2.WizardDialog"_ustr };
}
// XInterface
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx
b/chart2/source/controller/main/ChartFrameloader.cxx
index 2ff45588002b..cbaec55db9e0 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -60,7 +60,7 @@ bool ChartFrameLoader::impl_checkCancel()
OUString SAL_CALL ChartFrameLoader::getImplementationName()
{
- return CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME;
+ return u"com.sun.star.comp.chart2.ChartFrameLoader"_ustr;
}
sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString&
rServiceName )
@@ -70,7 +70,7 @@ sal_Bool SAL_CALL ChartFrameLoader::supportsService( const
OUString& rServiceNam
css::uno::Sequence< OUString > SAL_CALL
ChartFrameLoader::getSupportedServiceNames()
{
- return { CHART_FRAMELOADER_SERVICE_NAME };
+ return { u"com.sun.star.frame.SynchronousFrameLoader"_ustr };
}
// frame::XFrameLoader
diff --git a/chart2/source/inc/servicenames.hxx
b/chart2/source/inc/servicenames.hxx
index 6c28cc0a77dc..ebc6c18a77c3 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -20,28 +20,10 @@
#include <rtl/ustring.hxx>
-inline constexpr OUString CHART_MODEL_SERVICE_IMPLEMENTATION_NAME
- = u"com.sun.star.comp.chart2.ChartModel"_ustr;
-inline constexpr OUString CHART_MODEL_SERVICE_NAME =
u"com.sun.star.chart2.ChartDocument"_ustr;
//@todo create your own service containing the service
com.sun.star.document.OfficeDocument
inline constexpr OUString CHART_VIEW_SERVICE_IMPLEMENTATION_NAME
= u"com.sun.star.comp.chart2.ChartView"_ustr;
inline constexpr OUString CHART_VIEW_SERVICE_NAME =
u"com.sun.star.chart2.ChartView"_ustr;
-inline constexpr OUString CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME
- = u"com.sun.star.comp.chart2.ChartFrameLoader"_ustr;
-inline constexpr OUString CHART_FRAMELOADER_SERVICE_NAME
- = u"com.sun.star.frame.SynchronousFrameLoader"_ustr;
-
-inline constexpr OUString CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME
- = u"com.sun.star.comp.chart2.WizardDialog"_ustr;
-inline constexpr OUString CHART_WIZARD_DIALOG_SERVICE_NAME
- = u"com.sun.star.chart2.WizardDialog"_ustr;
-
-inline constexpr OUString CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME
- = u"com.sun.star.comp.chart2.ChartTypeDialog"_ustr;
-inline constexpr OUString CHART_TYPE_DIALOG_SERVICE_NAME
- = u"com.sun.star.chart2.ChartTypeDialog"_ustr;
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/ChartModel.cxx
b/chart2/source/model/main/ChartModel.cxx
index ffc9979cbd7f..c422e6869495 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -332,7 +332,7 @@ void
ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV
OUString SAL_CALL ChartModel::getImplementationName()
{
- return CHART_MODEL_SERVICE_IMPLEMENTATION_NAME;
+ return u"com.sun.star.comp.chart2.ChartModel"_ustr;
}
sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName )
@@ -343,7 +343,7 @@ sal_Bool SAL_CALL ChartModel::supportsService( const
OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames()
{
return {
- CHART_MODEL_SERVICE_NAME,
+ u"com.sun.star.chart2.ChartDocument"_ustr,
u"com.sun.star.document.OfficeDocument"_ustr,
u"com.sun.star.chart.ChartDocument"_ustr
};
