diff options
| author | YogeshBharate <yogesh.bharate@synerzip.com> | 2014-01-02 15:03:02 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-13 17:08:01 +0100 |
| commit | dbd42432c7b8f8149080bb13b103b35f2532eee8 (patch) | |
| tree | 1e3ddcc768c184ce40392417b1c34c0b9a7c75ac /sw/inc/unomap.hxx | |
| parent | Keep in sync with desktop_strings[] in salplug.cxx (diff) | |
| download | core-dbd42432c7b8f8149080bb13b103b35f2532eee8.tar.gz core-dbd42432c7b8f8149080bb13b103b35f2532eee8.zip | |
fdo#69613: Code changes for TOC with flag '\x' should get preserved after RT.
Issue :
TOC field flag '\x' was not getting preserved after RT.
Implementation :
Provided import & export support for TOC field flag '\x'.
XML file difference :
In document.xml,
Before:
‒<w:r w:rsidR="00A9725D">
‒<w:instrText xml:space="preserve">
TOC \o "1-3"
</w:instrText>
</w:r>
‒<w:r w:rsidR="008A34F6">
‒<w:instrText>
\h
</w:instrText>
</w:r>
‒<w:r w:rsidR="00A9725D">
‒<w:instrText xml:space="preserve">
\x
</w:instrText>
After:
‒<w:instrText>
TOC \x \o "1-3" \h
</w:instrText>
Conflicts:
sw/inc/tox.hxx
sw/inc/unoprnms.hxx
sw/source/core/unocore/unoidx.cxx
sw/source/core/unocore/unomap.cxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/ui/index/cntex.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyIds.hxx
Reviewed on:
https://gerrit.libreoffice.org/7257
Change-Id: I8f196446a3beb8deea6b7ddde50e16c9cea73cd9
Diffstat (limited to 'sw/inc/unomap.hxx')
| -rw-r--r-- | sw/inc/unomap.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index f0b72598e59b..060d0ae95038 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -219,6 +219,7 @@ #define WID_PRIMARY_KEY_READING 1059 #define WID_SECONDARY_KEY_READING 1060 #define WID_TOC_BOOKMARK 1061 +#define WID_TOC_NEWLINE 1062 // Text document #define WID_DOC_CHAR_COUNT 1000 |