[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source

[Kohei Yoshida]

 oox/source/drawingml/chart/axisconverter.cxx   |    8 +-------
 oox/source/drawingml/chart/objectformatter.cxx |    8 +++-----
 oox/source/token/properties.txt                |    1 +
 3 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 5d91431f2bd772cf4658a39faace7dd390208d64
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Jul 7 13:26:23 2014 -0400

    Adjust for the splitting of number format properties in chart.
    
    Since 1d38cb365543924f9c50014e6b2227e77de1d0c9, "number format" and
    "link number format to source" properties are 2 separate properties.  Adjust
    OOXML import code for that split.
    
    Also, always set axis' number format via NumberFormat property even when it's
    a percent format.  The axis object doesn't keep a non-percent and percent
    number formats separately.
    
    Change-Id: I8667b6f1a78d88cc37d059518919ad1b37f154e1
    (cherry picked from commit af5a6615dfdbe5c2cacdcacb00fc6f418b925c06)
    Reviewed-on: https://gerrit.libreoffice.org/10123
    Reviewed-by: Matúš Kukan <matus.kukan at collabora.com>
    Tested-by: Matúš Kukan <matus.kukan at collabora.com>

diff --git a/oox/source/drawingml/chart/axisconverter.cxx b/oox/source/drawingml/chart/axisconverter.cxx
index 6767c3e..a15c23e 100644
--- a/oox/source/drawingml/chart/axisconverter.cxx
+++ b/oox/source/drawingml/chart/axisconverter.cxx
@@ -307,13 +307,7 @@ void AxisConverter::convertFromModel( const Reference< XCoordinateSystem >& rxCo
         // number format ------------------------------------------------------
 
         if( (aScaleData.AxisType == cssc2::AxisType::REALNUMBER) || (aScaleData.AxisType == cssc2::AxisType::PERCENT) )
-        {
-            bool bPercent = false;
-            if( mrModel.maNumberFormat.maFormatCode.indexOf('%') >= 0)
-                bPercent = true;
-            mrModel.maNumberFormat.mbSourceLinked = false;
-            getFormatter().convertNumberFormat( aAxisProp, mrModel.maNumberFormat, bPercent );
-        }
+            getFormatter().convertNumberFormat(aAxisProp, mrModel.maNumberFormat, false);
 
         // position of crossing axis ------------------------------------------
 
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 54ef18a..d406ce9 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -1133,11 +1133,7 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo
     if( mxData->mxNumFmts.is() )
     {
         sal_Int32 nPropId = bPercentFormat ? PROP_PercentageNumberFormat : PROP_NumberFormat;
-        if( rNumberFormat.mbSourceLinked || rNumberFormat.maFormatCode.isEmpty() )
-        {
-            rPropSet.setAnyProperty( nPropId, Any() );
-        }
-        else try
+        try
         {
             sal_Int32 nIndex = rNumberFormat.maFormatCode.equalsIgnoreAsciiCase("general") ?
                 mxData->mxNumTypes->getStandardIndex( mxData->maFromLocale ) :
@@ -1150,6 +1146,8 @@ void ObjectFormatter::convertNumberFormat( PropertySet& rPropSet, const NumberFo
             OSL_FAIL( OStringBuffer( "ObjectFormatter::convertNumberFormat - cannot create number format '" ).
                 append( OUStringToOString( rNumberFormat.maFormatCode, osl_getThreadTextEncoding() ) ).append( '\'' ).getStr() );
         }
+
+        rPropSet.setProperty(PROP_LinkNumberFormatToSource, makeAny(rNumberFormat.mbSourceLinked));
     }
 }
 
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 0ad6d7a..44c7597 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -298,6 +298,7 @@ LineStartWidth
 LineStyle
 LineTransparence
 LineWidth
+LinkNumberFormatToSource
 LinkURL
 LoadReadonly
 LookUpLabels