diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-03-09 23:36:42 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2016-03-17 23:54:43 +0100 |
| commit | 321f54b2c8100a8ebd2ca362968674792427a45b (patch) | |
| tree | 9b498b738503d09a33cfd9a6470d714a09c35f56 | |
| parent | Resolves: tdf#98726 sneaky transparent clearlooks-phenix scrollbars (diff) | |
| download | core-321f54b2c8100a8ebd2ca362968674792427a45b.tar.gz core-321f54b2c8100a8ebd2ca362968674792427a45b.zip | |
make lcl_GetStyleProperty a member
Change-Id: Ib4c36f337e03016b8bad5b564d267bf035979c1a
| -rw-r--r-- | sw/source/core/unocore/unostyle.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 01c87e6f0999..dcec61faed57 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -281,6 +281,8 @@ protected: css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase, SfxStyleSheetBase* pBase) + throw(uno::RuntimeException, std::exception); css::uno::Sequence< css::uno::Any > SAL_CALL GetPropertyValues_Impl( const css::uno::Sequence< OUString >& aPropertyNames ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; @@ -1943,13 +1945,11 @@ void SwXStyle::setPropertyValues( } } -static uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, - const SfxItemPropertySet& rPropSet, - SwStyleBase_Impl& rBase, - SfxStyleSheetBase* pBase, - SfxStyleFamily eFamily, - SwDoc *pDoc) throw(uno::RuntimeException, std::exception) +uno::Any SwXStyle::lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry, const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase, SfxStyleSheetBase* pBase) + throw(uno::RuntimeException, std::exception) { + SwDoc* pDoc = GetDoc(); + SfxStyleFamily eFamily = GetFamily(); uno::Any aRet; if(FN_UNO_IS_PHYSICAL == rEntry.nWID) @@ -2302,7 +2302,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl( m_pBasePool->SetSearchMask(m_rEntry.m_eFamily, nSaveMask ); } - pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase, m_rEntry.m_eFamily, GetDoc() ); + pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase); } else if(m_bIsDescriptor) { @@ -3345,7 +3345,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( const SfxItemSet& rSetSet = pSetItem->GetItemSet(); { SwStyleBase_Impl::ItemSetOverrider o(aBase, &const_cast< SfxItemSet& >(rSetSet)); - pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase, GetFamily(), GetDoc()); + pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase); } } else if(pEntry->nWID == SID_ATTR_PAGE_ON) @@ -3370,7 +3370,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( default: { // part of PageStyle, fallback to default - pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase, GetFamily(), GetDoc() ); + pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase); } } } @@ -3416,14 +3416,14 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( const SfxItemSet& rSetSet = pSetItem->GetItemSet(); { SwStyleBase_Impl::ItemSetOverrider o(aBase, &const_cast<SfxItemSet&>(rSetSet)); - pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase, GetFamily(), GetDoc()); + pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase); } } } else { // part of PageStyle, fallback to default - pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase, GetFamily(), GetDoc() ); + pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase); } break; @@ -3499,7 +3499,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl( default: { //UUUU - pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase, GetFamily(), GetDoc() ); + pRet[nProp] = lcl_GetStyleProperty(*pEntry, *pPropSet, aBase, pBase); break; } } |