diff options
| -rw-r--r-- | sc/inc/dpobject.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/dpobject.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 132a352c9ee9..0a2c05256f5b 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -135,7 +135,7 @@ public: void SetAllowMove(BOOL bSet); void InvalidateData(); - void InvalidateSource(); + void ClearSource(); void Output( const ScAddress& rPos ); diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 235164905e02..eb8aaf23d62f 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -212,7 +212,7 @@ ScDPObject::~ScDPObject() delete pSheetDesc; delete pImpDesc; delete pServDesc; - InvalidateSource(); + ClearSource(); } void ScDPObject::SetAlive(BOOL bSet) @@ -276,7 +276,7 @@ void ScDPObject::SetSheetDesc(const ScSheetSourceDesc& rDesc) aParam.bHasHeader = true; pSheetDesc->SetQueryParam(aParam); - InvalidateSource(); // new source must be created + ClearSource(); // new source must be created } void ScDPObject::SetImportDesc(const ScImportSourceDesc& rDesc) @@ -290,7 +290,7 @@ void ScDPObject::SetImportDesc(const ScImportSourceDesc& rDesc) delete pImpDesc; pImpDesc = new ScImportSourceDesc(rDesc); - InvalidateSource(); // new source must be created + ClearSource(); // new source must be created } void ScDPObject::SetServiceData(const ScDPServiceDesc& rDesc) @@ -304,7 +304,7 @@ void ScDPObject::SetServiceData(const ScDPServiceDesc& rDesc) delete pServDesc; pServDesc = new ScDPServiceDesc(rDesc); - InvalidateSource(); // new source must be created + ClearSource(); // new source must be created } void ScDPObject::WriteSourceDataTo( ScDPObject& rDest ) const @@ -438,7 +438,7 @@ void ScDPObject::CreateObjects() { // if groups are involved, create a new source with the ScDPGroupTableData if ( bSettingsChanged && pSaveData && pSaveData->GetExistingDimensionData() ) - InvalidateSource(); + ClearSource(); if (!xSource.is()) { @@ -492,7 +492,7 @@ void ScDPObject::InvalidateData() bSettingsChanged = TRUE; } -void ScDPObject::InvalidateSource() +void ScDPObject::ClearSource() { 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 5839d7f52465..573eca24fbce 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -1299,7 +1299,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->InvalidateSource(); + pDestObj->ClearSource(); pDestObj->InvalidateData(); // before getting the new output area |