diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-05-11 09:05:12 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-28 09:26:59 +0000 |
| commit | fe898641dd7f8ff3cc74804f01340fdade3e5ed7 (patch) | |
| tree | d095804aecaf584a2af7efe9e50e5694846d31c5 /g | |
| parent | 475edbbe446df3250b3d898b8e2cc4c380c60ece (diff) | |
tdf#91074 RTF import: handle \dplineco* for text frames
RTFSdrImport::resolve() already had the logic to use the relevant API
depending on if the shape is a text frame or not -- extract that to a
separate member function and use it from RTFDocumentImpl::popState(),
too.
(cherry picked from commit ec1a96e79e3e6225706151cb72eb3df763b0598d)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
writerfilter/source/rtftok/rtfsdrimport.cxx
writerfilter/source/rtftok/rtfsdrimport.hxx
Change-Id: I663b372244f09f002447ece62587143b2a575795
Reviewed-on: https://gerrit.libreoffice.org/15939
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'g')
0 files changed, 0 insertions, 0 deletions