diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-19 09:21:02 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-11-05 22:02:46 +0100 |
| commit | 832e2019a9c45b1e605a87dcfec2143f03bde97f (patch) | |
| tree | 09d93ce5eb0dfb1581cf6ebac0eccd2ce1381db9 /xmloff/source/style | |
| parent | 55066180e80b77cdf8520b11cc60dec73c6e0d58 (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>
(cherry picked from commit 36fa2b8cf538baee272bf91da3d6cda2da6a392c)
Diffstat (limited to 'xmloff/source/style')
0 files changed, 0 insertions, 0 deletions