Skip to content

C
core
Kaydet (Commit) 62325341 authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

ScDPValueData->ScDPValue. The last 'Data' sounds very redundant. 

Change-Id: I218315a0583ce6b0f10969b364a7a717ad309212
üst 0d22c49d
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 33 deletions
sc/inc/dpfilteredcache.hxx
Dosyayı görüntüle @ 62325341
......@@ -36,7 +36,7 @@ class ScDPItemData;
class ScDPCache;
class ScDocument;
class ScRange;
struct ScDPValueData;
struct ScDPValue;
struct ScQueryParam;
/**
......@@ -123,7 +123,7 @@ public:
that the data grid doesn't include the header row. Don't delete the
returned object! */
const ScDPItemData* getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const;
void getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const;
void getValue( ScDPValue& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const;
rtl::OUString getFieldName(SCCOL nIndex) const;
/** Get the unique entries for a field specified by index. The caller must
......
sc/inc/dpglobal.hxx
Dosyayı görüntüle @ 62325341
......@@ -35,14 +35,14 @@
#define PIVOT_FUNC_STD_VARP 0x0400
#define PIVOT_FUNC_AUTO 0x1000
struct ScDPValueData
struct ScDPValue
{
enum Type { Empty = 0, Value, String, Error };
double mfValue;
Type meType;
ScDPValueData();
ScDPValue();
void Set( double fV, Type eT );
};
......
sc/inc/dpitemdata.hxx
Dosyayı görüntüle @ 62325341
......@@ -110,7 +110,7 @@ public:
GroupValueAttr GetGroupValue() const;
bool HasStringData() const ;
ScDPValueData::Type GetCellType() const;
ScDPValue::Type GetCellType() const;
#if DEBUG_PIVOT_TABLE
void Dump(const char* msg) const;
......
sc/inc/dptabdat.hxx
Dosyayı görüntüle @ 62325341
......@@ -157,7 +157,7 @@ protected:
::std::vector< SCROW > aColData;
::std::vector< SCROW > aRowData;
::std::vector< SCROW > aPageData;
::std::vector<ScDPValueData> aValues;
::std::vector<ScDPValue> aValues;
};
void FillRowDataFromCacheTable(sal_Int32 nRow, const ScDPFilteredCache& rCacheTable, const CalcInfo& rInfo, CalcRowData& rData);
......
sc/inc/dptabres.hxx
Dosyayı görüntüle @ 62325341
......@@ -49,7 +49,7 @@ class ScDPAggData;
class ScDPResultMember;
class ScDPResultVisibilityData;
struct ScDPValueData;
struct ScDPValue;
class ScDPItemData;
/**
......@@ -168,7 +168,7 @@ public:
ScDPAggData() : fVal(0.0), fAux(0.0), nCount(SC_DPAGG_EMPTY), pChild(NULL) {}
~ScDPAggData() { delete pChild; }
void Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState );
void Update( const ScDPValue& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState );
void Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState );
sal_Bool IsCalculated() const;
......@@ -390,7 +390,7 @@ public:
void ProcessData( const ::std::vector<SCROW>& aChildMembers,
const ScDPResultDimension* pDataDim,
const ::std::vector<SCROW>& aDataMembers,
const ::std::vector<ScDPValueData>& aValues );
const ::std::vector<ScDPValue>& aValues );
void FillMemberResults( com::sun::star::uno::Sequence<
com::sun::star::sheet::MemberResult>* pSequences,
long& rPos, long nMeasure, sal_Bool bRoot,
......@@ -439,7 +439,7 @@ private:
ScDPDataDimension* pChildDimension;
ScDPAggData aAggregate;
void UpdateValues( const ::std::vector<ScDPValueData>& aValues, const ScDPSubTotalState& rSubState );
void UpdateValues( const ::std::vector<ScDPValue>& aValues, const ScDPSubTotalState& rSubState );
public:
ScDPDataMember( const ScDPResultData* pData, const ScDPResultMember* pRes );
......@@ -454,7 +454,7 @@ public:
sal_Bool IsNamedItem( SCROW r ) const;
sal_Bool HasHiddenDetails() const;
void ProcessData( const ::std::vector< SCROW >& aChildMembers, const ::std::vector<ScDPValueData>& aValues,
void ProcessData( const ::std::vector< SCROW >& aChildMembers, const ::std::vector<ScDPValue>& aValues,
const ScDPSubTotalState& rSubState );
sal_Bool HasError( long nMeasure, const ScDPSubTotalState& rSubState ) const;
double GetAggregate( long nMeasure, const ScDPSubTotalState& rSubState ) const;
......@@ -540,7 +540,7 @@ public:
void ProcessData( const ::std::vector<SCROW>& aMembers,
const ScDPResultDimension* pDataDim,
const ::std::vector<SCROW>& aDataMembers,
const ::std::vector<ScDPValueData>& aValues ) const; //! Test
const ::std::vector<ScDPValue>& aValues ) const; //! Test
void FillMemberResults( com::sun::star::uno::Sequence<
com::sun::star::sheet::MemberResult>* pSequences,
long nStart, long nMeasure );
......@@ -610,7 +610,7 @@ public:
~ScDPDataDimension();
void InitFrom( const ScDPResultDimension* pDim ); // recursive
void ProcessData( const ::std::vector< SCROW >& aDataMembers, const ::std::vector<ScDPValueData>& aValues,
void ProcessData( const ::std::vector< SCROW >& aDataMembers, const ::std::vector<ScDPValue>& aValues,
const ScDPSubTotalState& rSubState );
void FillDataRow( const ScDPResultDimension* pRefDim,
com::sun::star::uno::Sequence<com::sun::star::sheet::DataResult>& rSequence,
......
sc/source/core/data/dpfilteredcache.cxx
Dosyayı görüntüle @ 62325341
......@@ -278,7 +278,7 @@ const ScDPItemData* ScDPFilteredCache::getCell(SCCOL nCol, SCROW nRow, bool bRep
return mrCache.GetItemDataById( nCol, nId );
}
void ScDPFilteredCache::getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const
void ScDPFilteredCache::getValue( ScDPValue& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const
{
const ScDPItemData* pData = getCell( nCol, nRow, bRepeatIfEmpty );
......@@ -288,7 +288,7 @@ void ScDPFilteredCache::getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow,
rVal.meType = pData->GetCellType();
}
else
rVal.Set(0.0, ScDPValueData::Empty);
rVal.Set(0.0, ScDPValue::Empty);
}
rtl::OUString ScDPFilteredCache::getFieldName(SCCOL nIndex) const
......
sc/source/core/data/dpglobal.cxx
Dosyayı görüntüle @ 62325341
......@@ -9,9 +9,9 @@
#include "dpglobal.hxx"
ScDPValueData::ScDPValueData() : mfValue(0.0), meType(String) {}
ScDPValue::ScDPValue() : mfValue(0.0), meType(String) {}
void ScDPValueData::Set( double fV, Type eT )
void ScDPValue::Set( double fV, Type eT )
{
mfValue = fV;
meType = eT;
......
sc/source/core/data/dpitemdata.cxx
Dosyayı görüntüle @ 62325341
......@@ -267,21 +267,21 @@ ScDPItemData& ScDPItemData::operator= (const ScDPItemData& r)
return *this;
}
ScDPValueData::Type ScDPItemData::GetCellType() const
ScDPValue::Type ScDPItemData::GetCellType() const
{
switch (meType)
{
case Error:
return ScDPValueData::Error;
return ScDPValue::Error;
case Empty:
return ScDPValueData::Empty;
return ScDPValue::Empty;
case Value:
return ScDPValueData::Value;
return ScDPValue::Value;
default:
;
}
return ScDPValueData::String;
return ScDPValue::String;
}
#if DEBUG_PIVOT_TABLE
......
sc/source/core/data/dptabdat.cxx
Dosyayı görüntüle @ 62325341
......@@ -165,12 +165,12 @@ void ScDPTableData::FillRowDataFromCacheTable(sal_Int32 nRow, const ScDPFiltered
for (sal_Int32 i = 0; i < n; ++i)
{
long nDim = rInfo.aDataSrcCols[i];
rData.aValues.push_back( ScDPValueData() );
rData.aValues.push_back( ScDPValue() );
// #i111435# GetItemData needs dimension indexes including groups,
// so the index must be checked here (groups aren't useful as data fields).
if ( nDim < nCacheColumnCount )
{
ScDPValueData& rVal = rData.aValues.back();
ScDPValue& rVal = rData.aValues.back();
rCacheTable.getValue( rVal, static_cast<SCCOL>(nDim), static_cast<SCROW>(nRow), false);
}
}
......
sc/source/core/data/dptabres.cxx
Dosyayı görüntüle @ 62325341
......@@ -362,12 +362,12 @@ ScDPRelativePos::ScDPRelativePos( long nBase, long nDir ) :
// -----------------------------------------------------------------------
void ScDPAggData::Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState )
void ScDPAggData::Update( const ScDPValue& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState )
{
if (nCount<0) // error?
return; // nothing more...
if (rNext.meType == ScDPValueData::Empty)
if (rNext.meType == ScDPValue::Empty)
return;
if ( rSubState.eColForce != SUBTOTAL_FUNC_NONE && rSubState.eRowForce != SUBTOTAL_FUNC_NONE &&
......@@ -381,12 +381,12 @@ void ScDPAggData::Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, cons
if ( eFunc != SUBTOTAL_FUNC_CNT2 ) // CNT2 counts everything, incl. strings and errors
{
if (rNext.meType == ScDPValueData::Error)
if (rNext.meType == ScDPValue::Error)
{
nCount = -1; // -1 for error (not for CNT2)
return;
}
if (rNext.meType == ScDPValueData::String)
if (rNext.meType == ScDPValue::String)
return; // ignore
}
......@@ -1239,7 +1239,7 @@ long ScDPResultMember::GetSubTotalCount( long* pUserSubStart ) const
}
void ScDPResultMember::ProcessData( const vector< SCROW >& aChildMembers, const ScDPResultDimension* pDataDim,
const vector< SCROW >& aDataMembers, const vector<ScDPValueData>& aValues )
const vector< SCROW >& aDataMembers, const vector<ScDPValue>& aValues )
{
SetHasElements();
......@@ -1843,7 +1843,7 @@ static long lcl_GetSubTotalPos( const ScDPSubTotalState& rSubState )
return nRet;
}
void ScDPDataMember::UpdateValues( const vector<ScDPValueData>& aValues, const ScDPSubTotalState& rSubState )
void ScDPDataMember::UpdateValues( const vector<ScDPValue>& aValues, const ScDPSubTotalState& rSubState )
{
//! find out how many and which subtotals are used
......@@ -1867,7 +1867,7 @@ void ScDPDataMember::UpdateValues( const vector<ScDPValueData>& aValues, const S
}
}
void ScDPDataMember::ProcessData( const vector< SCROW >& aChildMembers, const vector<ScDPValueData>& aValues,
void ScDPDataMember::ProcessData( const vector< SCROW >& aChildMembers, const vector<ScDPValue>& aValues,
const ScDPSubTotalState& rSubState )
{
if ( pResultData->IsLateInit() && !pChildDimension && pResultMember && pResultMember->GetChildDimension() )
......@@ -2951,7 +2951,7 @@ bool ScDPResultDimension::IsValidEntry( const vector< SCROW >& aMembers ) const
void ScDPResultDimension::ProcessData( const vector< SCROW >& aMembers,
const ScDPResultDimension* pDataDim,
const vector< SCROW >& aDataMembers,
const vector<ScDPValueData>& aValues ) const
const vector<ScDPValue>& aValues ) const
{
if (aMembers.empty())
return;
......@@ -3498,7 +3498,7 @@ void ScDPDataDimension::InitFrom( const ScDPResultDimension* pDim )
}
}
void ScDPDataDimension::ProcessData( const vector< SCROW >& aDataMembers, const vector<ScDPValueData>& aValues,
void ScDPDataDimension::ProcessData( const vector< SCROW >& aDataMembers, const vector<ScDPValue>& aValues,
const ScDPSubTotalState& rSubState )
{
// the ScDPItemData array must contain enough entries for all dimensions - this isn't checked
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment