Kaydet (Commit) fa68bed1 authored tarafından Caolán McNamara's avatar Caolán McNamara

crashtesting: multiple export failures

since...

commit 84392651
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/48147Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 252ce90e
......@@ -863,7 +863,9 @@ void ChartExport::exportLegend( const Reference< css::chart::XChartDocument >& x
FSEND);
chart2::RelativePosition aPos = aRelativePos.get<chart2::RelativePosition>();
uno::Any aRelativeSize = xProp->getPropertyValue("RelativeSize");
chart2::RelativeSize aSize = aRelativeSize.get<chart2::RelativeSize>();
chart2::RelativeSize aSize;
if (aRelativeSize.hasValue())
aSize = aRelativeSize.get<chart2::RelativeSize>();
const double x = aPos.Primary;
const double y = aPos.Secondary;
......@@ -877,13 +879,17 @@ void ChartExport::exportLegend( const Reference< css::chart::XChartDocument >& x
XML_val, IS(y),
FSEND);
pFS->singleElement(FSNS(XML_c, XML_w),
XML_val, IS(w),
FSEND);
if (aRelativeSize.hasValue())
{
pFS->singleElement(FSNS(XML_c, XML_w),
XML_val, IS(w),
FSEND);
pFS->singleElement(FSNS(XML_c, XML_h),
XML_val, IS(h),
FSEND);
}
pFS->singleElement(FSNS(XML_c, XML_h),
XML_val, IS(h),
FSEND);
SAL_WARN_IF(aPos.Anchor != css::drawing::Alignment_TOP_LEFT, "oox", "unsupported anchor position");
pFS->endElement(FSNS(XML_c, XML_manualLayout));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment