diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-08-26 18:05:08 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-10-02 14:58:37 +0200 |
| commit | 6d82539be0f72aa4308aad5c31cc6f6b66e73134 (patch) | |
| tree | aaf072138b41c33ef792688dc53763a6e5a4a4b1 /external | |
| parent | 65f7589aabc5ca6e5cdb311580d293c2b9e54de1 (diff) | |
tdf#91293: Preserve hyperlink on URL field OOXML export
The fix is twofold:
1.Get URL property from the underlying text field, not from the
text run -- put text field properties into rXPropSet (that's
what GETA macro later queries), not into rRun
6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 does s/rXPropSet/rRun/
afaics for no good reason
2. Retrieve string content from URL field early, so that the test
for empty text content doesn't fire
Reviewed-on: https://gerrit.libreoffice.org/18031
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Conflicts:
oox/source/export/drawingml.cxx
sd/qa/unit/export-tests.cxx
Change-Id: I4317e4a2f6f2e6f15c30932adc80f1227e010af0
Reviewed-on: https://gerrit.libreoffice.org/18709
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'external')
0 files changed, 0 insertions, 0 deletions