summaryrefslogtreecommitdiff
path: root/sw/source/filter/ww8/docxattributeoutput.hxx
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2011-05-26 09:59:43 +0100
committerNoel Power <noel.power@novell.com>2011-05-26 10:09:10 +0100
commitfb75384566defd74b0769d09ac22eb6f460c20c9 (patch)
tree6a3e8c72514d3bc71d98f7716c15f6e126f5edba /sw/source/filter/ww8/docxattributeoutput.hxx
parentb1b3fa5b0acc78c5aef1e1a144f828e4cab81773 (diff)
rework of fix for fdo#35826
The problem stems from how and when we get notification ( via EndURL ) of the termination of the hyperlink. On investigation it seems that if we get EndURL before RunText then it's the previous text run that is enclosed in the hyperlink if we get endURL after Runtext then it's *this* run that needs to have a following hyperlink close.
Diffstat (limited to 'sw/source/filter/ww8/docxattributeoutput.hxx')
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx9
1 files changed, 8 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 5554d1d8ea..bf7c7d3af7 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -581,7 +581,14 @@ private:
const sw::Frame *m_pParentFrame;
// close of hyperlink needed
- bool m_bCloseHyperlink;
+ enum HyperLinkCloseState
+ {
+ Undetected = 0,
+ Detected,
+ EndInPrevRun,
+ EndInThisRun
+ };
+ HyperLinkCloseState m_nCloseHyperlinkStatus;
public:
DocxAttributeOutput( DocxExport &rExport, ::sax_fastparser::FSHelperPtr pSerializer, oox::drawingml::DrawingML* pDrawingML );