reportdesign/source/core/api/Group.cxx | 4 ++-- reportdesign/source/core/api/Section.cxx | 4 ++-- reportdesign/source/core/inc/Group.hxx | 7 ++++--- reportdesign/source/core/inc/Section.hxx | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-)
New commits: commit 885c0b1948668243bbb6379017a89834e31fdbab Author: Noel Grandin <[email protected]> AuthorDate: Tue Oct 1 12:41:54 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Tue Oct 1 19:34:46 2024 +0200 use more concrete UNO types in reportdesign Change-Id: Ic5d773bc063629b13293ff875cb5c894373e7d08 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174317 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index d7fe730184a4..fbb3f6915754 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -297,12 +297,12 @@ void SAL_CALL OGroup::removeVetoableChangeListener( const OUString& PropertyName void OGroup::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() ) diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 59ea0280956b..6bff419b64e9 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -75,7 +75,7 @@ static uno::Sequence< OUString> lcl_getAbsent(bool _bPageSection) return uno::Sequence< OUString >(pProps,SAL_N_ELEMENTS(pProps)); } -uno::Reference<report::XSection> OSection::createOSection( +rtl::Reference<OSection> OSection::createOSection( const rtl::Reference< OReportDefinition >& xParentDef, const uno::Reference< uno::XComponentContext >& context, bool const bPageSection) @@ -86,7 +86,7 @@ uno::Reference<report::XSection> OSection::createOSection( return pNew; } -uno::Reference<report::XSection> OSection::createOSection( +rtl::Reference<OSection> OSection::createOSection( const rtl::Reference< OGroup >& xParentGroup, const uno::Reference< uno::XComponentContext >& context) { diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx index 67a4b5b5ebd1..e929e226a295 100644 --- a/reportdesign/source/core/inc/Group.hxx +++ b/reportdesign/source/core/inc/Group.hxx @@ -34,6 +34,7 @@ namespace reportdesign { class OFunctions; class OGroups; + class OSection; typedef ::cppu::WeakComponentImplHelper< css::report::XGroup , css::lang::XServiceInfo> GroupBase; typedef ::cppu::PropertySetMixin< css::report::XGroup> GroupPropertySet; @@ -48,8 +49,8 @@ namespace reportdesign { css::uno::Reference< css::uno::XComponentContext > m_xContext; unotools::WeakReference< OGroups > m_xParent; - css::uno::Reference< css::report::XSection> m_xHeader; - css::uno::Reference< css::report::XSection> m_xFooter; + rtl::Reference< OSection> m_xHeader; + rtl::Reference< OSection> m_xFooter; rtl::Reference< OFunctions > m_xFunctions; ::rptshared::GroupProperties m_aProps; @@ -90,7 +91,7 @@ namespace reportdesign void setSection( const OUString& _sProperty ,bool _bOn ,const OUString& _sName - ,css::uno::Reference< css::report::XSection>& _member); + ,rtl::Reference< OSection>& _member); protected: // TODO: VirtualFunctionFinder: This is virtual function! diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index 595cc9596e8c..0f12e551189c 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -131,10 +131,10 @@ namespace reportdesign ,const css::uno::Reference< css::uno::XComponentContext >& context, css::uno::Sequence< OUString> const&); public: - static css::uno::Reference< css::report::XSection> + static rtl::Reference< OSection> createOSection(const rtl::Reference< OReportDefinition >& _xParent ,const css::uno::Reference< css::uno::XComponentContext >& context,bool _bPageSection=false); - static css::uno::Reference< css::report::XSection> + static rtl::Reference< OSection> createOSection(const rtl::Reference< OGroup >& _xParent ,const css::uno::Reference< css::uno::XComponentContext >& context);
