diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-01-07 22:13:07 -0500 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2014-01-08 13:06:15 +0000 |
commit | 584b8621afec7a77ceab2e2f029687a7dd1a18c3 (patch) | |
tree | 7c00cb5ef7d19336fad8d98c5c9b6bf984174952 | |
parent | d391dd145631ffdbc6e506ba59db7d1977331aff (diff) |
fdo#72774: Generate correct group items for the year group.
This changes bring it back to the same algorithm used in 3.5.
Change-Id: I16855cef1de133a1f886baa823d5b0d2b148e781
(cherry picked from commit c2e88a32314012afb799e321ec1d658f99f71781)
Reviewed-on: https://gerrit.libreoffice.org/7306
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
-rw-r--r-- | sc/inc/dputil.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/dpdimsave.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/data/dpgroup.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/dputil.cxx | 13 |
4 files changed, 12 insertions, 9 deletions
diff --git a/sc/inc/dputil.hxx b/sc/inc/dputil.hxx index e4ed831c2713..9568e9591ab4 100644 --- a/sc/inc/dputil.hxx +++ b/sc/inc/dputil.hxx @@ -45,7 +45,7 @@ public: SvNumberFormatter* pFormatter); static sal_Int32 getDatePartValue( - double fValue, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, + double fValue, const ScDPNumGroupInfo* pInfo, sal_Int32 nDatePart, SvNumberFormatter* pFormatter); static OUString getDisplayedMeasureName(const OUString& rName, ScSubTotalFunc eFunc); diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 16f68b841bdb..2db40232711c 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -338,8 +338,8 @@ void fillDateGroupDimension( { case sheet::DataPilotFieldGroupBy::YEARS: nStart = ScDPUtil::getDatePartValue( - fSourceMin, rDateInfo, sheet::DataPilotFieldGroupBy::YEARS, pFormatter); - nEnd = ScDPUtil::getDatePartValue(fSourceMax, rDateInfo, sheet::DataPilotFieldGroupBy::YEARS, pFormatter); + fSourceMin, NULL, sheet::DataPilotFieldGroupBy::YEARS, pFormatter); + nEnd = ScDPUtil::getDatePartValue(fSourceMax, NULL, sheet::DataPilotFieldGroupBy::YEARS, pFormatter); break; case sheet::DataPilotFieldGroupBy::QUARTERS: nStart = 1; nEnd = 4; break; case sheet::DataPilotFieldGroupBy::MONTHS: nStart = 1; nEnd = 12; break; diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index 1e8059a64934..6a9f8248923e 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -911,7 +911,7 @@ void ScDPGroupTableData::FillGroupValues(vector<SCROW>& rItems, const vector<lon { SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); sal_Int32 nPartValue = ScDPUtil::getDatePartValue( - pData->GetValue(), *pNumInfo, nDatePart, pFormatter); + pData->GetValue(), pNumInfo, nDatePart, pFormatter); ScDPItemData aItem(nDatePart, nPartValue); rItems[i] = pCache->GetIdByItemData(nColumn, aItem); diff --git a/sc/source/core/data/dputil.cxx b/sc/source/core/data/dputil.cxx index e34bc79eee93..558e18941ba6 100644 --- a/sc/source/core/data/dputil.cxx +++ b/sc/source/core/data/dputil.cxx @@ -294,16 +294,19 @@ OUString ScDPUtil::getNumGroupName( } sal_Int32 ScDPUtil::getDatePartValue( - double fValue, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, + double fValue, const ScDPNumGroupInfo* pInfo, sal_Int32 nDatePart, SvNumberFormatter* pFormatter) { // Start and end are inclusive // (End date without a time value is included, with a time value it's not) - if (fValue < rInfo.mfStart && !rtl::math::approxEqual(fValue, rInfo.mfStart)) - return ScDPItemData::DateFirst; - if (fValue > rInfo.mfEnd && !rtl::math::approxEqual(fValue, rInfo.mfEnd)) - return ScDPItemData::DateLast; + if (pInfo) + { + if (fValue < pInfo->mfStart && !rtl::math::approxEqual(fValue, pInfo->mfStart)) + return ScDPItemData::DateFirst; + if (fValue > pInfo->mfEnd && !rtl::math::approxEqual(fValue, pInfo->mfEnd)) + return ScDPItemData::DateLast; + } sal_Int32 nResult = 0; |