diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-09-01 13:36:48 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-09-02 17:43:03 +0200 |
| commit | e0ca5569833664fa32aa6519032fbcaa0b16b14d (patch) | |
| tree | 55e0396ae9a2dae4f936a70461a7b89b234bbe7a /unotest | |
| parent | 64989e44b28efef7ff90362f8a13a76c73a53bc4 (diff) | |
sw reqif-xhtml export, embedded objects: prepare pres data earlier
If an embedded object has some native data, we provide presentation data
(replacement graphic) for it in the OLE1 container. We usually take this
from the OLE2 container, but it's OK to omit the presentation data
there.
So refactor to have the presentation data available from the OLE node
(already used for RTF purposes) earlier, that'll allow taking the OLE1
presentation data from RTF if it's missing from OLE2.
(cherry picked from commit 4d33262b1b652b57f222c9f1cce7d976725399d4)
Conflicts:
sw/source/filter/html/htmlreqifreader.cxx
Change-Id: Ib6b1b5e843308b0f7af04499de5a1ef5461f7b00
Diffstat (limited to 'unotest')
0 files changed, 0 insertions, 0 deletions