diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-12-06 16:08:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-12-08 20:48:47 +0100 |
| commit | f987cc2910ae90229ae7f76ed1dc9325b57b5cb6 (patch) | |
| tree | 159488b7765ec05d88e4478b4f191697395e14b0 /xmloff | |
| parent | a2d8f15fb70682931a3e8e6e64342fb98858ecf9 (diff) | |
tdf#71737: save allows links in illustration index, but load doesn't
since illustration index links were initially implemented by
commit 2c10d784deb86501b5488044a61d9fc2efc6321a
Date: Tue Jul 16 15:49:44 2013 +0200
fdo#39904, n#825976: implement hyperlinks for Illustrations index
(cherry picked from commit 8bb2c7f1556c10508c8ac451c579539ccf5dacfb)
Change-Id: I679fb9c40cd5dc55a5d546ef7c533faf9de2e483
Reviewed-on: https://gerrit.libreoffice.org/45967
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 523da0bfba2546552b4181e0268f41bc38a1903f)
Reviewed-on: https://gerrit.libreoffice.org/46108
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/text/XMLIndexIllustrationSourceContext.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/text/XMLIndexTemplateContext.cxx | 12 | ||||
| -rw-r--r-- | xmloff/source/text/XMLIndexTemplateContext.hxx | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx index 87fa6219b570..4e79914d4856 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.cxx @@ -63,7 +63,7 @@ SvXMLImportContextRef XMLIndexIllustrationSourceContext::CreateChildContext( aLevelNameTableMap, XML_TOKEN_INVALID, // no outline-level attr aLevelStylePropNameTableMap, - aAllowedTokenTypesTable); + aIllustrationAllowedTokenTypesTable); } else { diff --git a/xmloff/source/text/XMLIndexTemplateContext.cxx b/xmloff/source/text/XMLIndexTemplateContext.cxx index 16f62f89a121..87295c1afd73 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.cxx +++ b/xmloff/source/text/XMLIndexTemplateContext.cxx @@ -432,6 +432,18 @@ const SvXMLEnumMapEntry<sal_uInt16>* aLevelNameTableMap = nullptr; const sal_Char* aLevelStylePropNameTableMap[] = { nullptr, "ParaStyleLevel1", nullptr }; +const bool aIllustrationAllowedTokenTypesTable[] = +{ + true, // XML_TOK_INDEX_TYPE_ENTRY_TEXT = + true, // XML_TOK_INDEX_TYPE_TAB_STOP, + true, // XML_TOK_INDEX_TYPE_TEXT, + true, // XML_TOK_INDEX_TYPE_PAGE_NUMBER, + true, // XML_TOK_INDEX_TYPE_CHAPTER, + true, // XML_TOK_INDEX_TYPE_LINK_START, + true, // XML_TOK_INDEX_TYPE_LINK_END, + false // XML_TOK_INDEX_TYPE_BIBLIOGRAPHY +}; + const bool aAllowedTokenTypesTable[] = { true, // XML_TOK_INDEX_TYPE_ENTRY_TEXT = diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index 03562ee91541..b2907ef1efb3 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -56,6 +56,7 @@ extern const bool aAllowedTokenTypesBibliography[]; // table, illustration and object tables: extern const SvXMLEnumMapEntry<sal_uInt16>* aLevelNameTableMap; // NULL: no outline-level extern const sal_Char* aLevelStylePropNameTableMap[]; +extern const bool aIllustrationAllowedTokenTypesTable[]; extern const bool aAllowedTokenTypesTable[]; |