summaryrefslogtreecommitdiff
path: root/include/oox/export/chartexport.hxx
diff options
context:
space:
mode:
authorBartosz Kosiorek <gang65@poczta.onet.pl>2018-01-03 23:27:16 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-01-27 21:07:29 +0100
commit46f1fbcea97f777d12efed580a8f04da154106a3 (patch)
tree03798a6c7d49f201f783a12ea345ce538f8a5774 /include/oox/export/chartexport.hxx
parentf884e99aea2bf53a8cdc51a8de97cdb4d829576f (diff)
tdf#114173 Preserve size of chart legend during xlsx export
This is a combination of 2 commits. tdf#114173 Preserve size of chart legend during xlsx export During export chart into .xlsx file, the information about size of legend was not saved. Example of proper size: <c:w val="0.41459448854442293"/> <c:h val="0.23161616722845749"/> another issue was hardcoded "layoutTarget" which was always "inner": <c:layoutTarget val="inner"/> also properties regarding default text style was not preserved: <c:txPr> <a:bodyPr/> <a:lstStyle/> <a:p> <a:pPr> <a:defRPr sz="900" b="0" i="0" u="none" strike="noStrike" kern="1200" baseline="0"> <a:solidFill> <a:schemeClr val="tx1"> <a:lumMod val="65000"/> <a:lumOff val="35000"/> </a:schemeClr> </a:solidFill> </a:defRPr> </a:pPr> <a:endParaRPr lang="pl-PL"/> </a:p> </c:txPr> With this patch all these issues was resolved, and in case of layoutTarget "outer", the field is not availble at all, according to specification. Change-Id: I2c9b7a112bdd911542b5273e660222d7fefa2d88 Reviewed-on: https://gerrit.libreoffice.org/47358 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 84392651d2731cce91c3b2e144bed4ac07e4ddf1) crashtesting: multiple export failures since... commit 84392651d2731cce91c3b2e144bed4ac07e4ddf1 Date: Wed Jan 3 23:27:16 2018 +0100 tdf#114173 Preserve size of chart legend during xlsx export Change-Id: Iebc936a0f490d6b707dfee0343732753f56728e7 Reviewed-on: https://gerrit.libreoffice.org/48147 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit fa68bed11c180ebb0d45fb7779d538098b2921ff) Reviewed-on: https://gerrit.libreoffice.org/48153 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/48726
Diffstat (limited to 'include/oox/export/chartexport.hxx')
-rw-r--r--include/oox/export/chartexport.hxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index f8c055c3be92..9055e99002f0 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -135,7 +135,8 @@ private:
css::chart::XChartDocument >& rChartDoc );
void exportTitle( const css::uno::Reference<
css::drawing::XShape >& xShape );
- void exportPlotArea( );
+ void exportPlotArea( const css::uno::Reference<
+ css::chart::XChartDocument >& rChartDoc );
void exportPlotAreaShapeProps( const css::uno::Reference< css::beans::XPropertySet >& xPropSet );
void exportFill( const css::uno::Reference< css::beans::XPropertySet >& xPropSet );
void exportGradientFill( const css::uno::Reference< css::beans::XPropertySet >& xPropSet );
@@ -186,7 +187,7 @@ private:
void exportErrorBar(const css::uno::Reference< css::beans::XPropertySet >& xErrorBarProps,
bool bYError);
- void exportManualLayout(const css::chart2::RelativePosition& rPos, const css::chart2::RelativeSize& rSize);
+ void exportManualLayout(const css::chart2::RelativePosition& rPos, const css::chart2::RelativeSize& rSize, const bool bIsExcludingDiagramPositioning);
void exportAxes( );
void exportAxis(const AxisIdPair& rAxisIdPair);