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

[Markus Mohrhard]

 xmloff/source/chart/SchXMLLegendContext.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a01d54ba65d3ef20eebb5f943cfe8a18daad22a8
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat May 2 20:36:30 2015 +0200

    it works if we first set the size and then the position, tdf#86624
    
    Change-Id: I8ed98981ef3041839ab73b749a04febe369f66fe
    Reviewed-on: https://gerrit.libreoffice.org/15600
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
index 7bb30bf..80e829d 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -188,14 +188,14 @@ void SchXMLLegendContext::StartElement( const uno::Reference< xml::sax::XAttribu
         }
     }
 
-    if( bHasXPosition && bHasYPosition )
-        xLegendShape->setPosition( aLegendPos );
-
     if( bHasExpansion && nLegendExpansion!= chart::ChartLegendExpansion_CUSTOM )
         xLegendProps->setPropertyValue("Expansion", uno::makeAny(nLegendExpansion) );
     else if( bHasHeight && bHasWidth )
         xLegendShape->setSize( aLegendSize );
 
+    if( bHasXPosition && bHasYPosition )
+        xLegendShape->setPosition( aLegendPos );
+
     // the fill style has the default "none" in XML, but "solid" in the model.
     xLegendProps->setPropertyValue("FillStyle", uno::makeAny( drawing::FillStyle_NONE ));