[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Fri Sep 9 06:45:03 PDT 2011
binfilter/bf_sc/source/core/data/sc_documen3.cxx | 2 -
binfilter/bf_sc/source/core/data/sc_document.cxx | 4 --
binfilter/bf_sc/source/core/data/sc_dpobject.cxx | 41 ----------------------
binfilter/bf_sc/source/filter/xml/sc_xmldpimp.cxx | 4 --
binfilter/inc/bf_sc/dpobject.hxx | 9 ----
5 files changed, 60 deletions(-)
New commits:
commit 5646d8eedbc5a0baefa5054584ac6ba51caaf3df
Author: Joseph Powers <jpowers27 at cox.net>
Date: Fri Sep 9 06:20:45 2011 -0700
Cleanup of classes ScDPObject & ScDPCollection
diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
index f587e47..50de0c3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
@@ -438,8 +438,6 @@ using namespace ::com::sun::star;
/*N*/ pRangeName->UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz );
/*N*/ if (pPivotCollection)
/*N*/ pPivotCollection->UpdateReference( eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, nDx, nDy, nDz );
-/*N*/ if ( pDPCollection )
-/*N*/ pDPCollection->UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz );
/*N*/ UpdateChartRef( eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, nDx, nDy, nDz );
/*N*/ UpdateRefAreaLinks( eUpdateRefMode, aRange, nDx, nDy, nDz );
/*N*/ if ( pCondFormList )
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index facc10a..7b8ab2c 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -263,8 +263,6 @@ namespace binfilter {
/*N*/ if (pPivotCollection)
/*N*/ pPivotCollection->UpdateReference(
/*N*/ URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 );
-/*N*/ if (pDPCollection)
-/*?*/ pDPCollection->UpdateReference( URM_INSDEL, aRange, 0,0,1 );
/*N*/ UpdateChartRef( URM_INSDEL, 0,0,nPos, MAXCOL,MAXROW,MAXTAB, 0,0,1 );
/*N*/ UpdateRefAreaLinks( URM_INSDEL, aRange, 0,0,1 );
/*N*/ if ( pUnoBroadcaster )
@@ -327,8 +325,6 @@ namespace binfilter {
/*N*/ if (pPivotCollection)
/*N*/ pPivotCollection->UpdateReference(
/*N*/ URM_INSDEL, 0,0,nTab, MAXCOL,MAXROW,MAXTAB, 0,0,-1 );
-/*N*/ if (pDPCollection)
-/*N*/ pDPCollection->UpdateReference( URM_INSDEL, aRange, 0,0,-1 );
/*N*/ if (pDetOpList)
/*N*/ pDetOpList->UpdateReference( this, URM_INSDEL, aRange, 0,0,-1 );
/*N*/ UpdateChartRef( URM_INSDEL, 0,0,nTab, MAXCOL,MAXROW,MAXTAB, 0,0,-1 );
diff --git a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
index 36d2819..7b620e5 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
@@ -219,17 +219,6 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ InvalidateSource(); // new source must be created
/*N*/ }
-/*N*/ void ScDPObject::SetImportDesc(const ScImportSourceDesc&)
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void ScDPObject::SetServiceData(const ScDPServiceDesc&)
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
/*N*/ BOOL ScDPObject::IsSheetData() const
/*N*/ {
/*N*/ return ( pSheetDesc != NULL );
@@ -257,15 +246,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/
/*N*/ DELETEZ( pOutput ); // not valid when xSource is changed
/*N*/
-/*N*/ if ( pImpDesc )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ else if ( pServDesc )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ if ( !xSource.is() ) // sheet data or error in above cases
/*N*/ {
/*N*/ DBG_ASSERT( !pImpDesc && !pServDesc, "DPSource could not be created" );
@@ -316,12 +296,6 @@ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ void ScDPObject::UpdateReference( UpdateRefMode /*eUpdateRefMode*/,
-/*N*/ const ScRange& /*rRange*/, short /*nDx*/, short /*nDy*/, short /*nDz*/ )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
-}
-
/*N*/ USHORT lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp ) // PIVOT_FUNC mask
/*N*/ {
/*N*/ uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDimProp, uno::UNO_QUERY );
@@ -441,12 +415,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/
/*N*/ long nDupSource = -1;
/*N*/ uno::Reference<uno::XInterface> xIntOrig = ScUnoHelpFunctions::AnyToInterface( aOrigAny );
-/*N*/ if ( xIntOrig.is() )
-/*N*/ {
-/*?*/ uno::Reference<container::XNamed> xNameOrig( xIntOrig, uno::UNO_QUERY );
-/*?*/ if ( xNameOrig.is() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
/*N*/
/*N*/ BOOL bDupUsed = FALSE;
/*N*/ if ( nDupSource >= 0 )
@@ -659,8 +627,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if ( pDoc )
/*N*/ pDoc->GetString( nCol, nRow, nTab, aDocStr );
-/*N*/ else
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/
/*N*/ if ( aDocStr.Len() )
/*N*/ pDim = rSaveData.GetDimensionByName(aDocStr);
@@ -844,13 +810,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return bSuccess;
/*N*/ }
-/*N*/ void ScDPCollection::UpdateReference( UpdateRefMode eUpdateRefMode,
-/*N*/ const ScRange& r, short nDx, short nDy, short nDz )
-/*N*/ {
-/*N*/ for (USHORT i=0; i<nCount; i++)
-/*N*/ ((ScDPObject*)At(i))->UpdateReference( eUpdateRefMode, r, nDx, nDy, nDz );
-/*N*/ }
-
/*N*/ String ScDPCollection::CreateNewName( USHORT nMin ) const
/*N*/ {
/*N*/ String aBase = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("DataPilot"));
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmldpimp.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmldpimp.cxx
index b994646..b27dd85 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmldpimp.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmldpimp.cxx
@@ -269,7 +269,6 @@ void ScXMLDataPilotTableContext::EndElement()
aImportDesc.aObject = sSourceObject;
aImportDesc.nType = sheet::DataImportMode_SQL;
aImportDesc.bNative = bIsNative;
- pDPObject->SetImportDesc(aImportDesc);
}
break;
case TABLE :
@@ -278,7 +277,6 @@ void ScXMLDataPilotTableContext::EndElement()
aImportDesc.aDBName = sDatabaseName;
aImportDesc.aObject = sSourceObject;
aImportDesc.nType = sheet::DataImportMode_TABLE;
- pDPObject->SetImportDesc(aImportDesc);
}
break;
case QUERY :
@@ -287,14 +285,12 @@ void ScXMLDataPilotTableContext::EndElement()
aImportDesc.aDBName = sDatabaseName;
aImportDesc.aObject = sSourceObject;
aImportDesc.nType = sheet::DataImportMode_QUERY;
- pDPObject->SetImportDesc(aImportDesc);
}
break;
case SERVICE :
{
ScDPServiceDesc aServiceDesk(sServiceName, sServiceSourceObject, sServiceSourceName,
sServiceUsername, sServicePassword);
- pDPObject->SetServiceData(aServiceDesk);
}
break;
case CELLRANGE :
diff --git a/binfilter/inc/bf_sc/dpobject.hxx b/binfilter/inc/bf_sc/dpobject.hxx
index dd6052a..2d0f103 100644
--- a/binfilter/inc/bf_sc/dpobject.hxx
+++ b/binfilter/inc/bf_sc/dpobject.hxx
@@ -119,9 +119,6 @@ public:
const ScRange& GetOutRange() const { return aOutRange; }
void SetSheetDesc(const ScSheetSourceDesc& rDesc);
- void SetImportDesc(const ScImportSourceDesc& rDesc);
- void SetServiceData(const ScDPServiceDesc& rDesc);
-
const ScSheetSourceDesc* GetSheetDesc() const { return pSheetDesc; }
const ScImportSourceDesc* GetImportSourceDesc() const { return pImpDesc; }
@@ -141,9 +138,6 @@ public:
BOOL FillOldParam(ScPivotParam& rParam, BOOL bForFile) const;
void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource);
- void UpdateReference( UpdateRefMode eUpdateRefMode,
- const ScRange& r, short nDx, short nDy, short nDz );
-
static void ConvertOrientation( ScDPSaveData& rSaveData,
PivotField* pFields, USHORT nCount, USHORT nOrient,
ScDocument* pDoc, USHORT nRow, USHORT nTab,
@@ -173,9 +167,6 @@ public:
void ConvertOldTables( ScPivotCollection& rOldColl );
- void UpdateReference( UpdateRefMode eUpdateRefMode,
- const ScRange& r, short nDx, short nDy, short nDz );
-
String CreateNewName( USHORT nMin = 1 ) const;
void EnsureNames();
};
More information about the Libreoffice-commits
mailing list