summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-11-04 16:54:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2022-11-04 22:03:18 +0100
commit8c4490d4980087cfe1735984d6e41130a6560524 (patch)
treec78241b42492c83a1ad079a7a3d13c8df596dcc9 /include
parent5da75fcb400579d11430ec3d4c29b4646797fc5c (diff)
ofz#53011 Timeout: drop categorized tokens we don't have handlers for
since commit 3514ad82c4200be292ef6eaa1e94c5c6a41884e4 Date: Mon Dec 10 10:02:46 2012 +0100 sw: unused SwRTFParser Change-Id: Iaabd3d992f5e8cd8166afd3520fa8552b6219e27 we only had writer handlers back then so misplacement of these "private" tags in unexpected context was always a hang, but with no consumers of them we can drop them entirely and avoid the problem. Change-Id: I6a914e5adcbebba52171d8327414f1c71ada7f19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142288 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/svtools/rtfkeywd.hxx5
-rw-r--r--include/svtools/rtftoken.h7
2 files changed, 0 insertions, 12 deletions
diff --git a/include/svtools/rtfkeywd.hxx b/include/svtools/rtfkeywd.hxx
index 49771933cc04..d1a4a59073b2 100644
--- a/include/svtools/rtfkeywd.hxx
+++ b/include/svtools/rtfkeywd.hxx
@@ -1105,11 +1105,6 @@
#define OOO_STRING_SVTOOLS_RTF_FLYCOLUMN "\\flycolumn"
#define OOO_STRING_SVTOOLS_RTF_FLYPAGE "\\flypage"
#define OOO_STRING_SVTOOLS_RTF_FLYINPARA "\\flyinpara"
-#define OOO_STRING_SVTOOLS_RTF_BRDBOX "\\brdbox"
-#define OOO_STRING_SVTOOLS_RTF_BRDLNCOL "\\brdlncol"
-#define OOO_STRING_SVTOOLS_RTF_BRDLNIN "\\brdlnin"
-#define OOO_STRING_SVTOOLS_RTF_BRDLNOUT "\\brdlnout"
-#define OOO_STRING_SVTOOLS_RTF_BRDLNDIST "\\brdlndist"
#define OOO_STRING_SVTOOLS_RTF_SHADOW "\\shadow"
#define OOO_STRING_SVTOOLS_RTF_SHDWDIST "\\shdwdist"
#define OOO_STRING_SVTOOLS_RTF_SHDWSTYLE "\\shdwstyle"
diff --git a/include/svtools/rtftoken.h b/include/svtools/rtftoken.h
index fb191c8ffa08..11c96a2f75e6 100644
--- a/include/svtools/rtftoken.h
+++ b/include/svtools/rtftoken.h
@@ -656,13 +656,6 @@ enum RTF_TOKEN_IDS {
RTF_BRDROUTSET,
RTF_BRDRFRAME,
- // Swg border tokens
- RTF_BRDBOX = (RTF_BRDRDEF|RTF_SWGDEFS),
- RTF_BRDLINE_COL,
- RTF_BRDLINE_IN,
- RTF_BRDLINE_OUT,
- RTF_BRDLINE_DIST,
-
/* */
RTF_PLAIN = RTF_CHRFMT,