|
 |
f085be |
From c76daf9b5f1efc44eaf6541314f122d641c791cc Mon Sep 17 00:00:00 2001
|
|
|
f085be |
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@collabora.com>
|
|
|
f085be |
Date: Tue, 29 Jul 2014 07:53:22 +0200
|
|
|
f085be |
Subject: [PATCH 091/137] bnc#862510: PPTX import: Properly show data labels in
|
|
|
f085be |
percent format.
|
|
|
f085be |
|
|
|
f085be |
Usually, "General" is "0.00" number format, but in this case, when we
|
|
|
f085be |
want to show percent value, MSO writes that instead of "0%".
|
|
|
f085be |
|
|
|
f085be |
Change-Id: I748719765f58e66f9f3fb43c2b527c6823ef6fa1
|
|
|
f085be |
(cherry picked from commit 5f47e319428a703ea53ce49d166e7628aaa60789)
|
|
|
f085be |
Reviewed-on: https://gerrit.libreoffice.org/10781
|
|
|
f085be |
Reviewed-by: Tor Lillqvist <tml@collabora.com>
|
|
|
f085be |
Tested-by: Tor Lillqvist <tml@collabora.com>
|
|
|
f085be |
---
|
|
|
f085be |
oox/source/drawingml/chart/objectformatter.cxx | 7 +++++--
|
|
|
f085be |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
f085be |
|
|
|
f085be |
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
|
|
|
f085be |
index b5b0a5b..8e91941 100644
|
|
|
f085be |
--- a/oox/source/drawingml/chart/objectformatter.cxx
|
|
|
f085be |
+++ b/oox/source/drawingml/chart/objectformatter.cxx
|
|
|
f085be |
@@ -1113,9 +1113,12 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo
|
|
|
f085be |
sal_Int32 nPropId = bPercentFormat ? PROP_PercentageNumberFormat : PROP_NumberFormat;
|
|
|
f085be |
try
|
|
|
f085be |
{
|
|
|
f085be |
- sal_Int32 nIndex = rNumberFormat.maFormatCode.equalsIgnoreAsciiCase("general") ?
|
|
|
f085be |
+ bool bGeneral = rNumberFormat.maFormatCode.equalsIgnoreAsciiCase("general");
|
|
|
f085be |
+ sal_Int32 nIndex = bGeneral && !bPercentFormat ?
|
|
|
f085be |
mxData->mxNumTypes->getStandardIndex( mxData->maFromLocale ) :
|
|
|
f085be |
- mxData->mxNumFmts->addNewConverted( rNumberFormat.maFormatCode, mxData->maEnUsLocale, mxData->maFromLocale );
|
|
|
f085be |
+ mxData->mxNumFmts->addNewConverted(
|
|
|
f085be |
+ bGeneral ? OUString("0%") : rNumberFormat.maFormatCode,
|
|
|
f085be |
+ mxData->maEnUsLocale, mxData->maFromLocale );
|
|
|
f085be |
if( nIndex >= 0 )
|
|
|
f085be |
rPropSet.setProperty( nPropId, nIndex );
|
|
|
f085be |
}
|
|
|
f085be |
--
|
|
|
f085be |
1.9.3
|
|
|
f085be |
|