diff options
| author | Jian Fang Zhang <zhangjf@apache.org> | 2012-09-12 11:19:10 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-31 13:58:08 +0100 |
| commit | 0181f258e5598ee59b1c4847818944b8da16bd51 (patch) | |
| tree | 36a8dae21eb74c0981d167407c81acd4cde40fcc /sw/inc/unomap.hxx | |
| parent | 0f33ad3847da22350e69fd998d7494e4334c1ed9 (diff) | |
Resolves: #i119558# set default page mode value to false for docx
To avoid default page mode affect the calculation of table row height
Found by: xiao ting xiao, tingxiaox@gmail.com
Patch by: zhaoshzh, aoo.zhaoshzh@gmail.com
Review by: zhangjf
(cherry picked from commit 28e1cb1240e7c7a274a04756c7cab2f5797de400)
Conflicts:
sw/inc/unomap.hxx
sw/inc/unoprnms.hxx
sw/source/core/unocore/unomap.cxx
sw/source/core/unocore/unoprnms.cxx
sw/source/ui/uno/unotxdoc.cxx
writerfilter/source/dmapper/PropertyIds.cxx
Change-Id: I41745eb9d727a5ae87d34872f9dc3f4442c7bc8d
Diffstat (limited to 'sw/inc/unomap.hxx')
| -rw-r--r-- | sw/inc/unomap.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index 7f130a210a8a..128570c3b1ee 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -237,7 +237,8 @@ #define WID_DOC_LOCK_UPDATES 1016 #define WID_DOC_HAS_VALID_SIGNATURES 1017 #define WID_DOC_BUILDID 1024 -#define WID_DOC_ISTEMPLATEID 1025 +#define WID_DOC_ISTEMPLATEID 1025 +#define WID_DOC_DEFAULT_PAGE_MODE 1069 // MailMerge #define WID_SELECTION 1071 |