chart2/source/view/main/OpenGLRender.cxx | 2 -- oox/source/export/chartexport.cxx | 17 +++++++---------- 2 files changed, 7 insertions(+), 12 deletions(-)
New commits: commit 0d0f80900db7854d31531861e0992459244d74ce Author: Markus Mohrhard <[email protected]> Date: Sun Apr 20 00:02:01 2014 +0200 auto is not a valid value for c:symbol's val attribute Change-Id: Idbdab90e100cbd2de83a2255e2554b5024a2f927 diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 32abeb9..78c6ea9 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -3013,9 +3013,6 @@ void ChartExport::exportMarker(Reference< chart2::XDataSeries > xSeries) break; } - if( aSymbol.Style == chart2::SymbolStyle_AUTO ) - pSymbolType = "auto"; - if( pSymbolType ) { pFS->singleElement( FSNS( XML_c, XML_symbol ), commit 8925abe25d4b426b091f23ec8e7f5e7d21d10583 Author: Markus Mohrhard <[email protected]> Date: Thu Apr 17 21:19:22 2014 +0200 early bail out Change-Id: I342c49f968a921167c4da8b98e7e17e79b945491 diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index ae7a926..32abeb9 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1555,13 +1555,13 @@ void ChartExport::exportHiLowLines() return; Reference< beans::XPropertySet > xStockPropSet = xChartPropProvider->getMinMaxLine(); - if( xStockPropSet.is() ) - { - pFS->startElement( FSNS( XML_c, XML_hiLowLines ), - FSEND ); - exportShapeProps( xStockPropSet ); - pFS->endElement( FSNS( XML_c, XML_hiLowLines ) ); - } + if( !xStockPropSet.is() ) + return; + + pFS->startElement( FSNS( XML_c, XML_hiLowLines ), + FSEND ); + exportShapeProps( xStockPropSet ); + pFS->endElement( FSNS( XML_c, XML_hiLowLines ) ); } void ChartExport::exportUpDownBars( Reference< chart2::XChartType > xChartType) commit 078612f6c3ab62c6f7bb99625611dc791ab868da Author: Markus Mohrhard <[email protected]> Date: Wed Apr 16 00:55:51 2014 +0200 no need for that using statement Change-Id: Ide94e0e4909574b01e5d739be3e9f9dd7652ba86 diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index 1fe93f3..9bd8e72 100644 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -43,8 +43,6 @@ using namespace com::sun::star; -using namespace std; - #define DEBUG_PNG 0 #if RENDER_TO_FILE #define BMP_HEADER_LEN 54 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
