diff options
| -rw-r--r-- | sc/inc/dpobject.hxx | 3 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/data/dpcache.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/dpobject.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 2 |
5 files changed, 11 insertions, 12 deletions
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 5f3963d95bd6..5f5496e9b43c 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -133,8 +133,7 @@ public: void SetAllowMove(bool bSet); void InvalidateData(); - void ClearSource(); - + void ClearTableData(); void Output( const ScAddress& rPos ); ScRange GetNewOutputRange( bool& rOverflow ); diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index 007975804780..cf1526f19861 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -1358,7 +1358,7 @@ void Test::testPivotTable() pDPs->InsertNewTable(pDPObj2); aOutRange = pDPObj2->GetOutRange(); - pDPObj2->ClearSource(); + pDPObj2->ClearTableData(); pDPObj2->Output(aOutRange.aStart); { // Expected output table content. 0 = empty cell @@ -1394,7 +1394,7 @@ void Test::testPivotTable() CPPUNIT_ASSERT_MESSAGE("Reloading a cache shouldn't remove any cache.", pDPs->GetSheetCaches().size() == 1); - pDPObj2->ClearSource(); + pDPObj2->ClearTableData(); pDPObj2->Output(aOutRange.aStart); { diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index 0281a54ede2d..6ad497ee7826 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -242,7 +242,7 @@ struct ClearObjectSource : std::unary_function<ScDPObject*, void> { void operator() (ScDPObject* p) const { - p->ClearSource(); + p->ClearTableData(); } }; diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 3b192b5dae36..31afb26d612d 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -213,7 +213,7 @@ ScDPObject::~ScDPObject() delete pSheetDesc; delete pImpDesc; delete pServDesc; - ClearSource(); + ClearTableData(); } void ScDPObject::EnableGetPivotData(bool b) @@ -282,7 +282,7 @@ void ScDPObject::SetSheetDesc(const ScSheetSourceDesc& rDesc) aParam.bHasHeader = true; pSheetDesc->SetQueryParam(aParam); - ClearSource(); // new source must be created + ClearTableData(); // new source must be created } void ScDPObject::SetImportDesc(const ScImportSourceDesc& rDesc) @@ -296,7 +296,7 @@ void ScDPObject::SetImportDesc(const ScImportSourceDesc& rDesc) delete pImpDesc; pImpDesc = new ScImportSourceDesc(rDesc); - ClearSource(); // new source must be created + ClearTableData(); // new source must be created } void ScDPObject::SetServiceData(const ScDPServiceDesc& rDesc) @@ -310,7 +310,7 @@ void ScDPObject::SetServiceData(const ScDPServiceDesc& rDesc) delete pServDesc; pServDesc = new ScDPServiceDesc(rDesc); - ClearSource(); // new source must be created + ClearTableData(); // new source must be created } void ScDPObject::WriteSourceDataTo( ScDPObject& rDest ) const @@ -485,7 +485,7 @@ void ScDPObject::CreateObjects() { // if groups are involved, create a new source with the ScDPGroupTableData if ( bSettingsChanged && pSaveData && pSaveData->GetExistingDimensionData() ) - ClearSource(); + ClearTableData(); if (!xSource.is()) { @@ -542,7 +542,7 @@ void ScDPObject::InvalidateData() bSettingsChanged = true; } -void ScDPObject::ClearSource() +void ScDPObject::ClearTableData() { Reference< XComponent > xObjectComp( xSource, UNO_QUERY ); if ( xObjectComp.is() ) diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index e560741a8785..d1644b4938b4 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1324,7 +1324,7 @@ bool ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewOb // (and re-read column entry collections) // so all changes take effect if ( pNewObj == pOldObj && pDestObj->IsImportData() ) - pDestObj->ClearSource(); + pDestObj->ClearTableData(); pDestObj->InvalidateData(); // before getting the new output area |