summaryrefslogtreecommitdiff
path: root/chart2/source
diff options
context:
space:
mode:
authorBalazs Varga <balazs.varga991@gmail.com>2020-01-30 23:58:57 +0100
committerLászló Németh <nemeth@numbertext.org>2020-01-31 10:43:22 +0100
commitdff7a46fb46d1fa2a3ad674ee493ae2d59150fe3 (patch)
treea20c2913d75c8173ed24064c877bb14568359700 /chart2/source
parent84b396a235671ea77f1a9fa0d131cb56d7662737 (diff)
tdf#130032 Chart OOXML Import: fix data label custom position
in case of all chart types except pie chart. Clean up commit 4223ff2be69f03e571464b0b09ad0d278918631b (tdf#48436 Chart: add CustomLabelPosition UNO API property). Note: use the correct default OOXML label placement in case of radar charts. Change-Id: I9a8f509304b3c70d879c8c6a95bc91d15ac28521 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87759 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/view/main/VDataSeries.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 33bf9bee481d..f64cb151a2d8 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -641,8 +641,10 @@ awt::Point VDataSeries::getLabelPosition( awt::Point aTextShapePos, sal_Int32 nP
aPos.Y = static_cast<sal_Int32>(aCustomLabelPosition.Secondary * m_aReferenceSize.Height) + aTextShapePos.Y;
}
}
- catch (const uno::Exception&) {}
-
+ catch (const uno::Exception&)
+ {
+ TOOLS_WARN_EXCEPTION("chart2", "");
+ }
return aPos;
}
@@ -659,8 +661,10 @@ bool VDataSeries::isLabelCustomPos(sal_Int32 nPointIndex) const
bCustom = true;
}
}
- catch (const uno::Exception&) {}
-
+ catch (const uno::Exception&)
+ {
+ TOOLS_WARN_EXCEPTION("chart2", "");
+ }
return bCustom;
}