Kaydet (Commit) 7d53e6da authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Get number-grouping to work again.

Though I stil need to fix the sorting issue, which occurs because I
use string items to represent the range items.
üst f96c760b
......@@ -127,9 +127,9 @@ typedef ::std::vector<ScDPGroupDimension> ScDPGroupDimensionVec;
class SC_DLLPUBLIC ScDPNumGroupDimension
{
ScDPNumGroupInfo aGroupInfo; // settings
mutable ScDPNumGroupInfo aGroupInfo; // settings
ScDPDateGroupHelper* pDateHelper;
mutable ::std::vector< SCROW > maMemberEntries;
mutable std::vector<SCROW> maMemberEntries;
mutable bool bHasNonInteger; // initialized in GetNumEntries
mutable sal_Unicode cDecSeparator; // initialized in GetNumEntries
......@@ -148,8 +148,7 @@ public:
const ScDPDateGroupHelper* GetDateHelper() const { return pDateHelper; }
const std::vector<SCROW>& GetNumEntries(
SCCOL nSourceDim, const ScDPCache* pCache,
const std::vector< SCROW >& rOriginal) const;
SCCOL nSourceDim, ScDPCache* pCache, const std::vector<SCROW>& rOriginal) const;
void MakeDateHelper( const ScDPNumGroupInfo& rInfo, long nDim, sal_Int32 nPart );
......
This diff is collapsed.
......@@ -549,7 +549,8 @@ void XclExpPCField::InsertNumDateGroupItems( const ScDPObject& rDPObj, const ScD
if( nDatePart != 0 )
aTmpDim.MakeDateHelper( rNumInfo, mnFieldIdx, nDatePart );
const std::vector<SCROW>& aMemberIds = aTmpDim.GetNumEntries(
static_cast<SCCOL>( GetBaseFieldIndex() ), aDPData.GetCacheTable().getCache(), aOrignial);
static_cast<SCCOL>(GetBaseFieldIndex()),
const_cast<ScDPCache*>(aDPData.GetCacheTable().getCache()), aOrignial);
for ( size_t nIdx = 0 ; nIdx < aMemberIds.size(); nIdx++ )
{
const ScDPItemData* pData = aDPData.GetMemberById( static_cast< long >( GetBaseFieldIndex() ) , aMemberIds[ nIdx] );
......
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