summaryrefslogtreecommitdiff
path: root/xmloff/source
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-10-19 09:21:02 +0200
committerCaolán McNamara <caolanm@redhat.com>2015-11-03 20:26:49 +0000
commit36fa2b8cf538baee272bf91da3d6cda2da6a392c (patch)
tree61816754787ca23398d8f87b35436f8b5ae2d864 /xmloff/source
parent0da689ecb8d81cbcf1abf9cb0055cb650c8e4350 (diff)
tdf#94374 DOCX import: allow insert -> object -> document
(cherry picked from commit 50d48709af3406eb270e5357f5d2cc6a218337a9) Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I977930d59ef1ae9ae8bd2dfa9a7f3816c46d982c Reviewed-on: https://gerrit.libreoffice.org/19758 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 'xmloff/source')
0 files changed, 0 insertions, 0 deletions