diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-07-13 11:37:30 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-07-14 07:43:14 +0200 |
| commit | 9f4af852c4050d45bb5ab314480fc83639bea90a (patch) | |
| tree | 23ce60d8ef929d52efc587d3d6308fd24641cd7d /include | |
| parent | fc8b757dad5d98f4ba1cd40d03505873128670cd (diff) | |
tdf#148198: merge identical hyperlinks of adjacent text ranges on ODF export
The true hyperlink boundaries are available as SwpHints starts/ends, which are used
in DOC(X) export (see SwWW8AttrIter::OutAttrWithRange).
However, I don't see a reasonable way to expose this information to xmloff, so I
decided instead to just merge the identical hyperlink properties of adjacent ranges
into a single hyperlink. This will allow to fix already split hyperlinks saved in
previous versions. The downside is that this disallows to have separate adjacent
identical hyperlinks - I hope that this would not be a real issue.
Change-Id: I901e6035a5e89bc515b5742c6a5f564c77faf05b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137013
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xmloff/txtparae.hxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 546bf2adca3c..e474a9c5b763 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -50,7 +50,7 @@ namespace com::sun::star { namespace beans { class XPropertySet; class XPropertyState; class XPropertySetInfo; } - namespace container { class XEnumeration; class XIndexAccess; } + namespace container { class XEnumeration; class XIndexAccess; class XNameReplace; } namespace text { class XTextContent; class XTextRange; class XText; class XFootnote; class XTextFrame; class XTextSection; class XTextField; } @@ -182,16 +182,11 @@ public: return xRubyPropMapper; } - OUString FindTextStyleAndHyperlink( + OUString FindTextStyle( const css::uno::Reference< css::beans::XPropertySet > & rPropSet, - bool& rbHyperlink, bool& rbHasCharStyle, bool& rbHasAutoStyle, const XMLPropertyState** pAddState = nullptr) const; - bool addHyperlinkAttributes( - const css::uno::Reference< css::beans::XPropertySet > & rPropSet, - const css::uno::Reference< css::beans::XPropertyState > & rPropState, - const css::uno::Reference< css::beans::XPropertySetInfo > & rPropSetInfo ); void exportTextRangeEnumeration( const css::uno::Reference< css::container::XEnumeration > & rRangeEnum, |