diff options
| author | Eike Rathke <erack@redhat.com> | 2016-11-22 19:50:52 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-11-22 19:56:33 +0100 |
| commit | 50244309501d738e7314fa79785db139c826f8d7 (patch) | |
| tree | 109eba4ff688bfc1762420b261ae3957c857995d /sc/source/ui | |
| parent | 8e31d8a27baa76564f3b71e0d31750ae56873c61 (diff) | |
[API Change] revert incompatible change of enum css::sheet::GeneralFunction
Quick solution before 5-3 branch off without reverting everything related.
This will need a new constant value type for API instead of the enum and an
internal mapping from/to the enum.
Kept the GeneralFunction_MEDIAN at all places in uing code so it can be
easily grep'ed for.
Change-Id: I95256649f16ded08e467003d2924be0ff5efb87f
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/unoobj/dapiuno.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/datauno.cxx | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index fe2590b09c7c..a09053b4d865 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -184,7 +184,10 @@ GeneralFunction ScDataPilotConversion::FirstFunc( PivotFunc nBits ) if ( nBits & PivotFunc::Sum ) return GeneralFunction_SUM; if ( nBits & PivotFunc::Count ) return GeneralFunction_COUNT; if ( nBits & PivotFunc::Average ) return GeneralFunction_AVERAGE; +#if 0 +// disabled because of css::sheet::GeneralFunction API incompatibility if ( nBits & PivotFunc::Median ) return GeneralFunction_MEDIAN; +#endif if ( nBits & PivotFunc::Max ) return GeneralFunction_MAX; if ( nBits & PivotFunc::Min ) return GeneralFunction_MIN; if ( nBits & PivotFunc::Product ) return GeneralFunction_PRODUCT; @@ -205,7 +208,10 @@ PivotFunc ScDataPilotConversion::FunctionBit( GeneralFunction eFunc ) case GeneralFunction_SUM: nRet = PivotFunc::Sum; break; case GeneralFunction_COUNT: nRet = PivotFunc::Count; break; case GeneralFunction_AVERAGE: nRet = PivotFunc::Average; break; +#if 0 +// disabled because of css::sheet::GeneralFunction API incompatibility case GeneralFunction_MEDIAN: nRet = PivotFunc::Median; break; +#endif case GeneralFunction_MAX: nRet = PivotFunc::Max; break; case GeneralFunction_MIN: nRet = PivotFunc::Min; break; case GeneralFunction_PRODUCT: nRet = PivotFunc::Product; break; diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 403bb6a461b3..63c5a864c7cb 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -144,7 +144,12 @@ 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; |