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/filter/xml/xmldpimp.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/filter/xml/xmldpimp.cxx')
| -rw-r--r-- | sc/source/filter/xml/xmldpimp.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 19b84729c4d4..cc39b95ce0aa 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -994,7 +994,7 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, break; case XML_TOK_DATA_PILOT_FIELD_ATTR_FUNCTION : { - nFunction = (sal_Int16) ScXMLConverter::GetFunctionFromString( sValue ); + nFunction = ScXMLConverter::GetFunctionFromString2( sValue ); } break; case XML_TOK_DATA_PILOT_FIELD_ATTR_ORIENTATION : @@ -1522,8 +1522,7 @@ ScXMLDataPilotSubTotalContext::ScXMLDataPilotSubTotalContext( ScXMLImport& rImpo { case XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_FUNCTION : { - pDataPilotSubTotals->AddFunction( sal::static_int_cast<sal_Int16>( - ScXMLConverter::GetFunctionFromString( sValue ) ) ); + pDataPilotSubTotals->AddFunction( ScXMLConverter::GetFunctionFromString2( sValue ) ); } break; case XML_TOK_DATA_PILOT_SUBTOTAL_ATTR_DISPLAY_NAME: |