summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorC├ędric Bosdonnat <cedric.bosdonnat@free.fr>2013-07-18 16:38:39 +0200
committerFridrich Strba <fridrich@documentfoundation.org>2013-07-22 17:00:59 +0000
commit3b8d2fe1382618ab247db89a6c508f537e416098 (patch)
tree536b670877383d33139ac8076bf998b3e2210b4e
parentfdb5bd8e1af6796ab3436aba4fa903c0fdb6c221 (diff)
n#825976: Table of Illustration has hyperlinks by default like TOC
...and that fixes the formatting of hyperlinks in docx Tableoof Illustrations. (cherry picked from commit c1fac43432891bf9f396ff1ec7a1c2ed042bce54) (cherry picked from commit 49d077b80c15ec9d069435da08bbfe38cdd57c5a) Change-Id: I990f31a8c9d0d56f58b7b87e368010576d8c8c0d (cherry picked from commit fb7b24dc5affb4f29f61a8716c97370951ccba80) Reviewed-on: https://gerrit.libreoffice.org/5028 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
-rw-r--r--sw/source/core/tox/tox.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 677d84fe920d..8b989891974c 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -310,11 +310,15 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
}
SwFormTokens aTokens;
- if (TOX_CONTENT == eType)
+ if (TOX_CONTENT == eType || TOX_ILLUSTRATIONS == eType )
{
SwFormToken aLinkStt (TOKEN_LINK_START);
aLinkStt.sCharStyleName = String(SW_RES(STR_POOLCHR_TOXJUMP));
aTokens.push_back(aLinkStt);
+ }
+
+ if (TOX_CONTENT == eType)
+ {
aTokens.push_back(SwFormToken(TOKEN_ENTRY_NO));
aTokens.push_back(SwFormToken(TOKEN_ENTRY_TEXT));
}
@@ -334,7 +338,7 @@ SwForm::SwForm( TOXTypes eTyp ) // #i21237#
aTokens.push_back(SwFormToken(TOKEN_PAGE_NUMS));
}
- if (TOX_CONTENT == eType)
+ if (TOX_CONTENT == eType || TOX_ILLUSTRATIONS == eType)
aTokens.push_back(SwFormToken(TOKEN_LINK_END));
SetTemplate( 0, SW_RESSTR( nPoolId++ ));