summaryrefslogtreecommitdiff
path: root/sw/source/core
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-12-23 00:53:35 +0100
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2015-12-24 00:03:21 +0100
commit2cbeefa677220a035704d9c4c0dc31030565fc28 (patch)
treedf644afc6fa1bb43314767589e43fa00330bd890 /sw/source/core
parent5e12e40dc337afeb914f6121c1f8f17a3b4da08a (diff)
remove GetPropImpl wrapper
Change-Id: I53c3f97d35621af9b6c5c0336b8c998d3fe0b270
Diffstat (limited to 'sw/source/core')
-rw-r--r--sw/source/core/unocore/unostyle.cxx11
1 files changed, 5 insertions, 6 deletions
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<SwStyleProperties_Impl> m_pPropertiesImpl;
protected:
SfxStyleSheetBasePool* m_pBasePool;
- SwStyleProperties_Impl& GetPropImpl(){return *m_pPropertiesImpl;}
+ std::unique_ptr<SwStyleProperties_Impl> 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]);