[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - sw/source

Cédric Bosdonnat cedric.bosdonnat at free.fr
Thu Jul 18 08:21:02 PDT 2013


 sw/source/core/tox/tox.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c1fac43432891bf9f396ff1ec7a1c2ed042bce54
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Thu Jul 18 16:38:39 2013 +0200

    n#825976: Table of Illustration has hyperlinks by default like TOC
    
    ...and that fixes the formatting of hyperlinks in docx Tableoof
    Illustrations.
    
    Change-Id: I990f31a8c9d0d56f58b7b87e368010576d8c8c0d

diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index ea77c51..eebf802 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)
         aTokens.push_back(SwFormToken(TOKEN_LINK_END));
 
     SetTemplate( 0, SW_RESSTR( nPoolId++ ));


More information about the Libreoffice-commits mailing list