summaryrefslogtreecommitdiff
path: root/writerfilter/source/rtftok/rtfdocumentimpl.hxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-05-10 09:16:17 +0200
committerCaolán McNamara <caolanm@redhat.com>2016-05-18 11:38:55 +0000
commit7879b89da30025c8efb812bb31a88f9e382b42a5 (patch)
treea929635e95f4a3bb090522175e28abe60de57bed /writerfilter/source/rtftok/rtfdocumentimpl.hxx
parent853df7a5fa2b48f62a350c0e9eb1be3f6014dedc (diff)
tdf#96275 RTF import: fix anchor of shapes inside tables
Table text is buffered, so buffer the shape import as well, otherwise the anchor will precede the buffered text -> incorrect anchor position. (cherry picked from commit 015fd55c94b7b650ed8e572cafaf3b0f903b01b9) Conflicts: writerfilter/source/rtftok/rtfdocumentimpl.cxx Change-Id: I527b898e2cd5fafaf122a20e11df66ba8d3185cf Reviewed-on: https://gerrit.libreoffice.org/24937 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter/source/rtftok/rtfdocumentimpl.hxx')
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.hxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index e089f01436f8..17318c4fd47a 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -44,7 +44,7 @@ enum class RTFBorderState
CHARACTER
};
-/// Minimalistic buffer of elements for nested cells.
+/// Different kind of buffers for table cell contents.
enum RTFBufferTypes
{
BUFFER_PROPS,
@@ -56,6 +56,8 @@ enum RTFBufferTypes
BUFFER_ENDRUN,
BUFFER_PAR,
BUFFER_STARTSHAPE,
+ /// Imports a shape.
+ BUFFER_RESOLVESHAPE,
BUFFER_ENDSHAPE,
BUFFER_RESOLVESUBSTREAM
};