diff options
| author | Tamás Zolnai <zolnaitamas2000@gmail.com> | 2016-11-23 03:27:11 +0000 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2016-11-23 02:46:17 +0000 |
| commit | c0d4aadf08c16f2d79508367c631366f7a856346 (patch) | |
| tree | 1609b99faa1db1e9597632defd0c67979dcec7d7 /sc/source/ui/unoobj/datauno.cxx | |
| parent | bump product version to 5.4.0.0.alpha0+ (diff) | |
| download | core-c0d4aadf08c16f2d79508367c631366f7a856346.tar.gz core-c0d4aadf08c16f2d79508367c631366f7a856346.zip | |
[API Change]: Create new GeneralFunction2 for adding median
New functionality added to pivot table became fully
broken with Eike's revertion:
50244309501d738e7314fa79785db139c826f8d7
This commit fixes this problem.
Change-Id: I67cfc63305bb9b2edeed2abd26d729fbf650579f
Reviewed-on: https://gerrit.libreoffice.org/31096
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'sc/source/ui/unoobj/datauno.cxx')
| -rw-r--r-- | sc/source/ui/unoobj/datauno.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 63c5a864c7cb..718af054bfcb 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -144,12 +144,6 @@ sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc e case SUBTOTAL_FUNC_AVE: eGeneral = sheet::GeneralFunction_AVERAGE; break; case SUBTOTAL_FUNC_CNT: eGeneral = sheet::GeneralFunction_COUNTNUMS; break; case SUBTOTAL_FUNC_CNT2: eGeneral = sheet::GeneralFunction_COUNT; break; -#if 0 -// disabled because of css::sheet::GeneralFunction API incompatibility - case SUBTOTAL_FUNC_MED: eGeneral = sheet::GeneralFunction_MEDIAN; break; -#else - case SUBTOTAL_FUNC_MED: eGeneral = sheet::GeneralFunction_NONE; break; -#endif case SUBTOTAL_FUNC_MAX: eGeneral = sheet::GeneralFunction_MAX; break; case SUBTOTAL_FUNC_MIN: eGeneral = sheet::GeneralFunction_MIN; break; case SUBTOTAL_FUNC_PROD: eGeneral = sheet::GeneralFunction_PRODUCT; break; |