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

More scope reduction.

üst dcf9b304
......@@ -874,13 +874,14 @@ const std::vector<SCROW>& ScDPNumGroupDimension::GetNumEntries(
if (!maMemberEntries.empty())
return maMemberEntries;
SvNumberFormatter* pFormatter = pCache->GetDoc()->GetFormatTable();
if ( pDateHelper )
if (pDateHelper)
{
// Grouped by dates.
pDateHelper->FillColumnEntries(
nSourceDim, const_cast<ScDPCache*>(pCache), maMemberEntries, rOriginal);
else
{
return maMemberEntries;
}
// Copy textual entries.
// Also look through the source entries for non-integer numbers, minimum and maximum.
// GetNumEntries (GetColumnEntries) must be called before accessing the groups
......@@ -954,6 +955,7 @@ const std::vector<SCROW>& ScDPNumGroupDimension::GetNumEntries(
// The first group has to be created nonetheless. GetNumGroupForValue has corresponding logic.
bool bFirstGroup = true;
SvNumberFormatter* pFormatter = pCache->GetDoc()->GetFormatTable();
while ( bFirstGroup || ( fLoop < aGroupInfo.mfEnd && !rtl::math::approxEqual( fLoop, aGroupInfo.mfEnd ) ) )
{
String aName = lcl_GetNumGroupName( fLoop, aGroupInfo, bHasNonInteger, cDecSeparator, pFormatter );
......@@ -974,7 +976,6 @@ const std::vector<SCROW>& ScDPNumGroupDimension::GetNumEntries(
lcl_InsertValue<true>( nSourceDim, pCache, maMemberEntries, aLastName, aGroupInfo.mfEnd + aGroupInfo.mfStep );
fprintf(stdout, "ScDPNumGroupDimension::GetNumEntries: FIXME\n");
}
return maMemberEntries;
}
......
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