diff options
| author | Justin Luth <justin_luth@sil.org> | 2022-04-06 09:28:49 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-04-15 20:00:22 +0200 |
| commit | ad76fa39f3a43822103141dbbaea3b057e5d3a15 (patch) | |
| tree | 9d4d0eb5c6a3ef11df6b4562fa16ed11f2ea22a8 | |
| parent | e7710ecab5da8ba734a0270e87bba269041ae391 (diff) | |
tdf#147861 sw ms export: DI_SUB_MASK must exclude FIXED now
This is a follow-up to
7.4 commit daef39352b008fc1f903fd8c09288ff5e772fa42
There is only one place in which DI_SUB_MASK is used,
so I'm just changing it to what it could have always been,
since it never was actually used to mask out DI_SUB_FIXED.
Otherwise, I might have made this a MASK2 or whatever.
The issue here is that AUTHOR was not being recognized
when it was paired with FIXED, so every FIXEDFLD was
ended up being considered as a date/time.
In practice, this didn't really change anything
because bWriteExpand already ignored any of
these areas of the code. It is only when I turn off
bWriteExpand as I implement fixes that I am seeing
the wrong field type being created.
And regardless, since the field is FIXED, the visible
content remains the same anyway (until someone in MS Word
refreshes the field with F9).
Both Author and date have the same field name ":Created"
so I couldn't super easily test this.
Change-Id: Icd2d0be2d3fbe24dc4763e0e25801569bcca471b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132660
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit e61eed211766f26a3896c1d912dc7349abbe823d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132698
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
(cherry picked from commit 2e6acddd815bca6261634b69b015c6deead74b58)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132702
Reviewed-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | sw/inc/docufld.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 62363f01bbd1..b4fe720970b6 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -79,7 +79,7 @@ namespace nsSwDocInfoSubType const SwDocInfoSubType DI_SUB_TIME = 0x0200; const SwDocInfoSubType DI_SUB_DATE = 0x0300; const SwDocInfoSubType DI_SUB_FIXED = 0x1000; - const SwDocInfoSubType DI_SUB_MASK = 0xff00; + const SwDocInfoSubType DI_SUB_MASK = 0x0f00; } enum SwPageNumSubType |