diff options
| author | YogeshBharate <yogesh.bharate@synerzip.com> | 2013-12-27 17:09:14 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-10 18:15:54 +0100 |
| commit | ec5903ddb6165f0882aa1ffe4f3ff3e1c1127910 (patch) | |
| tree | 94d75bb0ec899332e909162fefb32da6879c2ed4 /sw/inc | |
| parent | f60b61b2cf87e89938c760877a56bc4dd5c577a9 (diff) | |
fdo#69613: Code changes for TOC with flag '\z' should get preserved after RT.
Issue :
TOC field flag '\z' was not getting preserved after RT.
Implementation :
Provided import & export support for TOC field flag '\z'.
XML file difference :
In document.xml,
Before - <w:instrText>
TOC
</w:instrText>
After - <w:instrText>
TOC \z \o "1-3" \o "1-3" \h
</w:instrText>
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyIds.hxx
Reviewed on:
https://gerrit.libreoffice.org/7217
Change-Id: I84f90a722c7afbdf626db2cc60c4e73580891d36
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 42727553d0a0..3f54ad9ebb89 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -398,6 +398,7 @@ namespace nsSwTOXElement const SwTOXElement TOX_GRAPHIC = 32; const SwTOXElement TOX_FRAME = 64; const SwTOXElement TOX_SEQUENCE = 128; + const SwTOXElement TOX_TABLEADER = 256; } typedef sal_uInt16 SwTOIOptions; diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index 208592a81386..d3c983a56573 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -178,6 +178,7 @@ #define WID_USE_LEVEL_FROM_SOURCE 1020 #define WID_LEVEL_FORMAT 1021 #define WID_LEVEL_PARAGRAPH_STYLES 1022 +#define WID_HIDE_TABLEADER_PAGENUMBERS 1023 #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 bc705364a856..674d984cf9b9 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -121,6 +121,7 @@ #define UNO_NAME_CHAR_DIFF_HEIGHT_COMPLEX "CharDiffHeightComplex" #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_CHAR_FLASH "CharFlash" #define UNO_NAME_CHAR_KERNING "CharKerning" |