[Libreoffice-commits] core.git: 2 commits - chart2/qa oox/source

[Markus Mohrhard]

 chart2/qa/extras/data/ods/axis_number_format.ods |binary
 oox/source/drawingml/chart/titlecontext.cxx      |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a51f8cdda3f8d649d693aaf0c11e3a215b46bca1
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Apr 19 07:31:45 2015 +0200

    forgot to add test file
    
    Change-Id: Ic08080f34cb01d0be6b760339f773feebd8bebf2

diff --git a/chart2/qa/extras/data/ods/axis_number_format.ods b/chart2/qa/extras/data/ods/axis_number_format.ods
new file mode 100644
index 0000000..52e979a
Binary files /dev/null and b/chart2/qa/extras/data/ods/axis_number_format.ods differ
commit a6061d7b774e0ff25d2a9281d039c586b449bbf7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Apr 19 07:28:18 2015 +0200

    fix title overly MSO2007 vs OOXML import
    
    Change-Id: I36ca118fd1412febd3384c25359a7b285908336b

diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx
index 7c4a190..0f87cbf 100644
--- a/oox/source/drawingml/chart/titlecontext.cxx
+++ b/oox/source/drawingml/chart/titlecontext.cxx
@@ -88,6 +88,7 @@ TitleContext::~TitleContext()
 
 ContextHandlerRef TitleContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
 {
+    bool bMSO2007Doc = getFilter().isMSO2007Document();
     // this context handler is used for <c:title> only
     switch( nElement )
     {
@@ -95,8 +96,7 @@ ContextHandlerRef TitleContext::onCreateContext( sal_Int32 nElement, const Attri
             return new LayoutContext( *this, mrModel.mxLayout.create() );
 
         case C_TOKEN( overlay ):
-            // default is 'false', not 'true' as specified
-            mrModel.mbOverlay = rAttribs.getBool( XML_val, false );
+            mrModel.mbOverlay = rAttribs.getBool( XML_val, !bMSO2007Doc );
             return 0;
 
         case C_TOKEN( spPr ):