From 2cbeefa677220a035704d9c4c0dc31030565fc28 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 23 Dec 2015 00:53:35 +0100 Subject: remove GetPropImpl wrapper Change-Id: I53c3f97d35621af9b6c5c0336b8c998d3fe0b270 --- sw/source/core/unocore/unostyle.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'sw/source/core') diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 0e3830186a19..0009d8f2b5b7 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -258,11 +258,10 @@ class SwXStyle : public cppu::WeakImplHelper bool m_bIsDescriptor; bool m_bIsConditional; OUString m_sParentStyleName; - std::unique_ptr m_pPropertiesImpl; protected: SfxStyleSheetBasePool* m_pBasePool; - SwStyleProperties_Impl& GetPropImpl(){return *m_pPropertiesImpl;} + std::unique_ptr m_pPropertiesImpl; css::uno::Reference< css::beans::XPropertySet > mxStyleData; css::uno::Reference< css::container::XNameAccess > mxStyleFamily; @@ -1158,8 +1157,8 @@ SwXStyle::SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam, m_eFamily(eFam), m_bIsDescriptor(false), m_bIsConditional(false), - m_pPropertiesImpl(nullptr), - m_pBasePool(&rPool) + m_pBasePool(&rPool), + m_pPropertiesImpl(nullptr) { if(!m_pBasePool) return; @@ -3455,7 +3454,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl( } else if(IsDescriptor()) { - if(!GetPropImpl().SetProperty(rPropName, pValues[nProp])) + if(!m_pPropertiesImpl->SetProperty(rPropName, pValues[nProp])) throw lang::IllegalArgumentException(); } else @@ -3756,7 +3755,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( else if(IsDescriptor()) { const uno::Any* pAny = nullptr; - GetPropImpl().GetProperty(rPropName, pAny); + m_pPropertiesImpl->GetProperty(rPropName, pAny); if (!pAny->hasValue()) { SwStyleProperties_Impl::GetProperty(rPropName, mxStyleData, pRet[nProp]); -- cgit v1.2.3