diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-29 21:26:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-29 22:02:24 +0100 |
| commit | 2434e019252cbc8b6a567eafe89ccfdf4749b838 (patch) | |
| tree | 34266abc748b07e650c0e3dd441d561cce1864c6 /sc/source/core/data/dptabsrc.cxx | |
| parent | a15db9dbb306031c9a4903a6875de94473c740da (diff) | |
reorg FillItemData
Change-Id: Ia70bf1c7fb4bf524b92c3f97103cd74bccf46822
Diffstat (limited to 'sc/source/core/data/dptabsrc.cxx')
| -rw-r--r-- | sc/source/core/data/dptabsrc.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 859b0caa929f..390bc0e89c1c 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -463,8 +463,7 @@ Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<s sal_Int32 nIndex = pMembers->GetIndexFromName( rFilter.MatchValueName ); if ( nIndex >= 0 ) { - ScDPItemData aItem; - pMembers->getByIndex(nIndex)->FillItemData( aItem ); + ScDPItemData aItem(pMembers->getByIndex(nIndex)->FillItemData()); aFilterCriteria.push_back( ScDPFilteredCache::Criterion() ); aFilterCriteria.back().mnFieldIndex = nCol; aFilterCriteria.back().mpFilter.reset( @@ -737,8 +736,7 @@ void ScDPSource::FilterCacheByPageDimensions() ScDPMember* pMem = pMems->getByIndex(j); if (pMem->isVisible()) { - ScDPItemData aData; - pMem->FillItemData(aData); + ScDPItemData aData(pMem->FillItemData()); pGrpFilter->addMatchItem(aData); } } @@ -1450,8 +1448,7 @@ const ScDPItemData& ScDPDimension::GetSelectedData() ScDPMember* pMember = pMembers->getByIndex(i); if (aSelectedPage.equals(pMember->GetNameStr( false))) { - pSelectedData = new ScDPItemData(); - pMember->FillItemData( *pSelectedData ); + pSelectedData = new ScDPItemData(pMember->FillItemData()); } } } @@ -2582,12 +2579,12 @@ sal_Int32 ScDPMember::Compare( const ScDPMember& rOther ) const return pSource->GetData()->Compare( pSource->GetSourceDim(nDim),mnDataId,rOther.GetItemDataId()); } -void ScDPMember::FillItemData( ScDPItemData& rData ) const +ScDPItemData ScDPMember::FillItemData() const { //TODO: handle date hierarchy... const ScDPItemData* pData = GetItemData(); - rData = (pData ? *pData : ScDPItemData()); + return (pData ? *pData : ScDPItemData()); } const OUString* ScDPMember::GetLayoutName() const |