svx/source/svdraw/svdotextdecomposition.cxx | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 38f82134e0e5b1c1d5e09e124927a851393b8484
Author: Katarina Behrens <katarina.behr...@cib.de>
AuthorDate: Tue Jan 15 14:11:49 2019 +0100
Commit: Katarina Behrens <katarina.behr...@cib.de>
CommitDate: Wed Jan 16 10:14:36 2019 +0100
Different way to determine if paragraph is within a list
pptx import seems little flaky in this regard, EE_PARA_OUTLLEVEL
isn't always set (no such problem with odp). Instead, we'll query
paragraph's depth and visibility of bullets/numbering
Change-Id: Ia8cf6b7bb0e065a1378875442a99d79b006e2d77
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx
b/svx/source/svdraw/svdotextdecomposition.cxx
index 05490ba7960d..ff83f15c4274 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -500,15 +500,15 @@ namespace
void
impTextBreakupHandler::impFlushLinePrimitivesToParagraphPrimitives(sal_Int32
nPara)
{
+ sal_Int16 nDepth = mrOutliner.GetDepth(nPara);
+ EBulletInfo eInfo = mrOutliner.GetBulletInfo(nPara);
+ // Pass -1 to signal VclMetafileProcessor2D that there is no active
+ // bullets/numbering in this paragraph (i.e. this is normal text)
+ const sal_Int16 nOutlineLevel( eInfo.bVisible ? nDepth : -1);
+
// ALWAYS create a paragraph primitive, even when no content was
added. This is done to
// have the correct paragraph count even with empty paragraphs. Those
paragraphs will
// have an empty sub-PrimitiveSequence.
- const sal_Int16 nOutlineLevel(nPara >= 0 && nPara <
mrOutliner.GetParagraphCount()
- ?
mrOutliner.GetParaAttribs(nPara).Get(EE_PARA_OUTLLEVEL).GetValue()
- : -1);
-
- //Z This basically makes OutlineLevel information available in
VclMetafileProcessor2D,
- //Z so may be used similar to 'SetAlternateText' in
processGraphicPrimitive2D for PDF export
maParagraphPrimitives.push_back(
new drawinglayer::primitive2d::TextHierarchyParagraphPrimitive2D(
maLinePrimitives,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
