reportdesign/inc/ReportDefinition.hxx | 4 +++-
reportdesign/source/core/api/ReportDefinition.cxx | 14 +++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit f3c67c1e3439fc46883b8cc32f9c541cfd9998a0
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Apr 3 15:46:47 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Apr 3 20:33:20 2025 +0200
use more concrete UNO in reportdesign
Change-Id: I4ad63bbc248c6561b6166131e1ed87baf625af3b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183678
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/reportdesign/inc/ReportDefinition.hxx
b/reportdesign/inc/ReportDefinition.hxx
index f2f3fb18577c..722200a30acc 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -44,6 +44,7 @@
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/propertysetmixin.hxx>
+#include <rtl/ref.hxx>
#include <svx/unomod.hxx>
#include <memory>
@@ -59,6 +60,7 @@ namespace utl
}
namespace reportdesign
{
+ class OSection;
class OReportComponentProperties;
typedef cppu::PartialWeakComponentImplHelper<
css::report::XReportDefinition
,
css::document::XEventBroadcaster
@@ -97,7 +99,7 @@ namespace reportdesign
void setSection( const OUString& _sProperty
,bool _bOn
,const OUString& _sName
- ,css::uno::Reference< css::report::XSection>&
_member);
+ ,rtl::Reference< OSection>& _member);
template <typename T> void set( const OUString& _sProperty
,const T& Value
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 0c5c5d91bca5..e997b73b84dd 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -464,11 +464,11 @@ struct OReportDefinitionImpl
uno::Sequence< beans::PropertyValue > m_aArgs;
rtl::Reference< OGroups > m_xGroups;
- uno::Reference< report::XSection> m_xReportHeader;
- uno::Reference< report::XSection> m_xReportFooter;
- uno::Reference< report::XSection> m_xPageHeader;
- uno::Reference< report::XSection> m_xPageFooter;
- uno::Reference< report::XSection> m_xDetail;
+ rtl::Reference< OSection > m_xReportHeader;
+ rtl::Reference< OSection > m_xReportFooter;
+ rtl::Reference< OSection > m_xPageHeader;
+ rtl::Reference< OSection > m_xPageFooter;
+ rtl::Reference< OSection > m_xDetail;
uno::Reference< embed::XStorage > m_xStorage;
uno::Reference< frame::XController >
m_xCurrentController;
uno::Reference< container::XIndexAccess > m_xViewData;
@@ -1025,12 +1025,12 @@ uno::Reference< util::XCloneable > SAL_CALL
OReportDefinition::createClone( )
void OReportDefinition::setSection( const OUString& _sProperty
,bool _bOn
,const OUString& _sName
- ,uno::Reference< report::XSection>& _member)
+ ,rtl::Reference< OSection>& _member)
{
BoundListeners l;
{
::osl::MutexGuard aGuard(m_aMutex);
- prepareSet(_sProperty, uno::Any(_member), uno::Any(_bOn), &l);
+ prepareSet(_sProperty,
uno::Any(uno::Reference<report::XSection>(_member)), uno::Any(_bOn), &l);
// create section if needed
if ( _bOn && !_member.is() )
