diff options
| author | YogeshBharate <yogesh.bharate@synerzip.com> | 2013-12-31 12:58:21 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-13 14:46:30 +0100 |
| commit | 8e634d0d557bcad6bf56adb30d202e88675f17d1 (patch) | |
| tree | 89ad02366336b3fe81f7c4437f5f0f4bbefcaeac /sw/inc | |
| parent | a401dc5dcf2a5a4e8f427d3077d473be72ebbcf2 (diff) | |
fdo#69613: Code changes for TOC with flag '\w' should get preserved after RT.
Issue :
TOC field flag '\w' was not getting preserved after RT.
Implementation :
Provided import & export support for TOC field flag '\w'.
XML file difference :
In document.xml,
Before - <w:instrText>
TOC \o "1-3" \h \z \w
</w:instrText>
After - <w:instrText>
TOC \w \o "1-3" \o "1-3" \h
</w:instrText>
Conflicts:
sw/inc/tox.hxx
sw/inc/unomap.hxx
sw/inc/unoprnms.hxx
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/7238
Change-Id: Ia5d602c6db0b59933d325058ce2d8111e4f03df5
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/tox.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/unomap.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/unoprnms.hxx | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 3f54ad9ebb89..c4252a1c84dc 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -399,6 +399,7 @@ namespace nsSwTOXElement const SwTOXElement TOX_FRAME = 64; const SwTOXElement TOX_SEQUENCE = 128; const SwTOXElement TOX_TABLEADER = 256; + const SwTOXElement TOX_TAB_IN_TOC = 512; } typedef sal_uInt16 SwTOIOptions; diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index d3c983a56573..e9e63a78218d 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -179,6 +179,7 @@ #define WID_LEVEL_FORMAT 1021 #define WID_LEVEL_PARAGRAPH_STYLES 1022 #define WID_HIDE_TABLEADER_PAGENUMBERS 1023 +#define WID_TAB_IN_TOC 1024 #define WID_MAIN_ENTRY_CHARACTER_STYLE_NAME 1025 #define WID_CREATE_FROM_TABLES 1026 #define WID_CREATE_FROM_TEXT_FRAMES 1027 diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 674d984cf9b9..da63af3c1d96 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -122,6 +122,7 @@ #define UNO_NAME_CHAR_ESCAPEMENT_HEIGHT "CharEscapementHeight" #define UNO_NAME_CHAR_COLOR "CharColor" #define UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS "HideTabLeaderAndPageNumber" +#define UNO_NAME_TAB_IN_TOC "TabInTOC" #define UNO_NAME_CHAR_FLASH "CharFlash" #define UNO_NAME_CHAR_KERNING "CharKerning" |