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-17 23:22:19 +0200 |
| commit | de6774e112006abc44f44211527f230bd2e74b04 (patch) | |
| tree | 0c95059f5035cef19780ebc76b1de447a69606a0 /include | |
| parent | valgrind, leak in SdStyleSheet (diff) | |
| download | core-de6774e112006abc44f44211527f230bd2e74b04.tar.gz core-de6774e112006abc44f44211527f230bd2e74b04.zip | |
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:
sd/qa/unit/export-tests.cxx
Change-Id: I4317e4a2f6f2e6f15c30932adc80f1227e010af0
Reviewed-on: https://gerrit.libreoffice.org/18706
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e17187c323428b7edea425278ea33bca77db12b5)
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/export/drawingml.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index fff1e2cacf8d..bf5669a71b83 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -108,7 +108,7 @@ protected: bool GetPropertyAndState( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > rXPropState, const OUString& aName, ::com::sun::star::beans::PropertyState& eState ); - const char* GetFieldType( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, bool& bIsField ); + OUString GetFieldValue( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, bool& bIsURLField ); /// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship |