reportdesign/inc/ReportDefinition.hxx | 3 -
reportdesign/source/core/api/ReportDefinition.cxx | 56 ++++++++--------------
2 files changed, 21 insertions(+), 38 deletions(-)
New commits:
commit 8ed4a2d08b702cde076695349f9fbc380e856dd7
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jul 14 22:01:18 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jul 15 09:44:43 2025 +0200
reportdesign: Merge OReportDefinition::getUIConfigurationManager{,2}
Change-Id: Iee21520b671a75d916d40d47f90231ed6c95135f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187883
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/reportdesign/inc/ReportDefinition.hxx
b/reportdesign/inc/ReportDefinition.hxx
index 589f1f641a7d..7687b7eebd15 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -398,9 +398,6 @@ namespace reportdesign
virtual css::uno::Reference< css::task::XInteractionHandler >
getInteractionHandler() const override;
virtual bool isEnableSetModified() const override;
virtual OUString getDocumentBaseURL() const override;
-
- /// @throws css::uno::RuntimeException
- css::uno::Reference< css::ui::XUIConfigurationManager2 >
getUIConfigurationManager2( );
};
} // namespace reportdesign
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 206f5dfbb07d..2cd976f31f80 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1863,11 +1863,6 @@ uno::Reference< report::XFunctions > SAL_CALL
OReportDefinition::getFunctions()
}
uno::Reference< ui::XUIConfigurationManager > SAL_CALL
OReportDefinition::getUIConfigurationManager( )
-{
- return getUIConfigurationManager2();
-}
-
-uno::Reference< ui::XUIConfigurationManager2 >
OReportDefinition::getUIConfigurationManager2( )
{
::osl::MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed);
commit 3132e85a2e91b57e40a6775780eb80eebc664017
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jul 14 21:58:58 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jul 15 09:44:38 2025 +0200
reportdesign: Drop unnecessary UNO_QUERY_THROW
XUIConfigurationManager2 subclasses XUIConfigurationManager,
so there's no need to query for the latter interface
Change-Id: I3673399a902f8365617ee2b5659ff49fd1d978d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187882
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 9a3e42c2a24e..206f5dfbb07d 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1864,7 +1864,7 @@ uno::Reference< report::XFunctions > SAL_CALL
OReportDefinition::getFunctions()
uno::Reference< ui::XUIConfigurationManager > SAL_CALL
OReportDefinition::getUIConfigurationManager( )
{
- return uno::Reference< ui::XUIConfigurationManager >(
getUIConfigurationManager2(), uno::UNO_QUERY_THROW );
+ return getUIConfigurationManager2();
}
uno::Reference< ui::XUIConfigurationManager2 >
OReportDefinition::getUIConfigurationManager2( )
commit 7191f2b83b01c051c8e38aeebc09cd49f5e3d962
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Jul 14 21:45:31 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Jul 15 09:44:32 2025 +0200
reportdesign: Predefine this Sequence<OUString>
... instead of defining an array and copying the entries
one by one at runtime.
Change-Id: I568e8b9634d9e72f0f586d07b24379c5b7411f22
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187881
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 2c5c3e9d898a..9a3e42c2a24e 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -2119,38 +2119,29 @@ uno::Reference< uno::XInterface > SAL_CALL
OReportDefinition::createInstance( co
uno::Sequence< OUString > SAL_CALL
OReportDefinition::getAvailableServiceNames()
{
- static const std::u16string_view aSvxComponentServiceNameList[] =
- {
- u"com.sun.star.form.component.FixedText",
- u"com.sun.star.form.component.DatabaseImageControl",
- u"com.sun.star.style.PageStyle",
- u"com.sun.star.style.GraphicStyle",
- u"com.sun.star.style.FrameStyle",
- u"com.sun.star.drawing.Defaults",
- u"com.sun.star.document.ImportEmbeddedObjectResolver",
- u"com.sun.star.document.ExportEmbeddedObjectResolver",
- u"com.sun.star.document.ImportGraphicStorageHandler",
- u"com.sun.star.document.ExportGraphicStorageHandler",
- u"com.sun.star.chart2.data.DataProvider",
- u"com.sun.star.xml.NamespaceMap",
- u"com.sun.star.document.Settings",
- u"com.sun.star.drawing.GradientTable",
- u"com.sun.star.drawing.HatchTable",
- u"com.sun.star.drawing.BitmapTable",
- u"com.sun.star.drawing.TransparencyGradientTable",
- u"com.sun.star.drawing.DashTable",
- u"com.sun.star.drawing.MarkerTable"
- };
-
- static const sal_uInt16 nSvxComponentServiceNameListCount =
SAL_N_ELEMENTS(aSvxComponentServiceNameList);
-
- uno::Sequence< OUString > aSeq( nSvxComponentServiceNameListCount );
- OUString* pStrings = aSeq.getArray();
- for( sal_uInt16 nIdx = 0; nIdx < nSvxComponentServiceNameListCount; nIdx++
)
- pStrings[nIdx] = aSvxComponentServiceNameList[nIdx];
+ static const uno::Sequence<OUString> aSvxComponentServiceNameSeq
+ = { u"com.sun.star.form.component.FixedText"_ustr,
+ u"com.sun.star.form.component.DatabaseImageControl"_ustr,
+ u"com.sun.star.style.PageStyle"_ustr,
+ u"com.sun.star.style.GraphicStyle"_ustr,
+ u"com.sun.star.style.FrameStyle"_ustr,
+ u"com.sun.star.drawing.Defaults"_ustr,
+ u"com.sun.star.document.ImportEmbeddedObjectResolver"_ustr,
+ u"com.sun.star.document.ExportEmbeddedObjectResolver"_ustr,
+ u"com.sun.star.document.ImportGraphicStorageHandler"_ustr,
+ u"com.sun.star.document.ExportGraphicStorageHandler"_ustr,
+ u"com.sun.star.chart2.data.DataProvider"_ustr,
+ u"com.sun.star.xml.NamespaceMap"_ustr,
+ u"com.sun.star.document.Settings"_ustr,
+ u"com.sun.star.drawing.GradientTable"_ustr,
+ u"com.sun.star.drawing.HatchTable"_ustr,
+ u"com.sun.star.drawing.BitmapTable"_ustr,
+ u"com.sun.star.drawing.TransparencyGradientTable"_ustr,
+ u"com.sun.star.drawing.DashTable"_ustr,
+ u"com.sun.star.drawing.MarkerTable"_ustr };
uno::Sequence< OUString > aParentSeq(
SvxUnoDrawMSFactory::getAvailableServiceNames() );
- return comphelper::concatSequences( aParentSeq, aSeq );
+ return comphelper::concatSequences(aParentSeq,
aSvxComponentServiceNameSeq);
}
// XShape
