filter/source/msfilter/eschesdo.cxx | 2 ++ oox/source/export/chartexport.cxx | 11 +++++++---- sc/source/filter/excel/xecontent.cxx | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-)
New commits: commit 86b9f03c3f754f7b753893ff2772f6b17bf3de3c Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sun Dec 8 00:05:59 2013 +0100 fix infinite loop during export Change-Id: I75bfafbc7343aaddbbc5c7433e28b5d4154177dc diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index af2a954..ca78c69 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -101,6 +101,8 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty // for position calculations, we normalize the angle between 0 and 90 degrees if ( nAngle < 0 ) nAngle = ( 36000 + nAngle ) % 36000; + if ( nAngle % 18000 == 0 ) + nAngle = 0; while ( nAngle > 9000 ) nAngle = ( 18000 - ( nAngle % 18000 ) ); commit fab6109465409e009a3b2daa469b9360fe8f68c3 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sun Dec 8 00:05:33 2013 +0100 fix OOXML validation error with conditional formatting Change-Id: I737b3f5bf140a0cf80fac6cae243922882cca018 diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 3cee5e6..e977e46 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -811,10 +811,10 @@ const char* GetOperatorString(ScConditionMode eMode, bool& bFrmla2) pRet = "notBetween"; break; case SC_COND_DUPLICATE: - pRet = "duplicateValues"; + pRet = NULL; break; case SC_COND_NOTDUPLICATE: - pRet = "uniqueValues"; + pRet = NULL; break; case SC_COND_DIRECT: break; commit b2f7859fc2835d151fd6970a1233ea4f8768dbe1 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Sat Dec 7 23:49:36 2013 +0100 fix validation error in OOXML chart export Change-Id: I750b33054ea0ee6202c0046a9f3947ab8bf44cd6 diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 680e19b..3768cd3 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1244,10 +1244,13 @@ void ChartExport::exportLineChart( Reference< chart2::XChartType > xChartType ) if( GetProperty( xPropSet, "SymbolType" ) ) mAny >>= nSymbolType; - const char* marker = nSymbolType == ::com::sun::star::chart::ChartSymbolType::NONE? "0":"1"; - pFS->singleElement( FSNS( XML_c, XML_marker ), - XML_val, marker, - FSEND ); + if( !mbIs3DChart ) + { + const char* marker = nSymbolType == ::com::sun::star::chart::ChartSymbolType::NONE? "0":"1"; + pFS->singleElement( FSNS( XML_c, XML_marker ), + XML_val, marker, + FSEND ); + } exportAxesId( nAttachedAxis ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits