diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-12-30 16:47:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-01-26 12:01:21 +0000 |
| commit | a6f3ca06100bc23eee5017d6cf53e89282dc580d (patch) | |
| tree | aacf736ec60852bf8b72599e33afe479bc23d896 /include | |
| parent | 5891a45fa08729ba01f78bece9312b2c01d3a214 (diff) | |
tdf#101828 handle rtf/richtext correctly
Change-Id: Id894f62a918bd6e6fa59f8d546307343bf2bd4b0
Reviewed-on: https://gerrit.libreoffice.org/32682
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 048e30c1f8231e6cd144a9251061f6fa127b353e)
Reviewed-on: https://gerrit.libreoffice.org/33567
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sot/formats.hxx | 3 | ||||
| -rw-r--r-- | include/svtools/sores.hxx | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx index 04094b0010c0..482f65bad44f 100644 --- a/include/sot/formats.hxx +++ b/include/sot/formats.hxx @@ -172,8 +172,9 @@ enum class SotClipboardFormatId : sal_uLong STARWRITERGLOB_8_TEMPLATE = 142, MATHML = 143, JPEG = 144, + RICHTEXT = 145, // the point at which we start allocating "runtime" format IDs - USER_END = JPEG + USER_END = RICHTEXT }; /** Make it easier to iterate over format IDs */ diff --git a/include/svtools/sores.hxx b/include/svtools/sores.hxx index 66146721b754..1a1260aa96d1 100644 --- a/include/svtools/sores.hxx +++ b/include/svtools/sores.hxx @@ -100,7 +100,9 @@ #define STR_FORMAT_ID_DBACCESS_COMMAND (STR_FORMAT_START + 115) #define STR_FORMAT_ID_DIALOG_60 (STR_FORMAT_START + 116) #define STR_FORMAT_ID_HTML_NO_COMMENT (STR_FORMAT_START + 119) -#define STR_FORMAT_END (STR_FORMAT_ID_HTML_NO_COMMENT) +#define STR_FORMAT_ID_RICHTEXT (STR_FORMAT_START + 120) + +#define STR_FORMAT_END (STR_FORMAT_ID_RICHTEXT) #endif // INCLUDED_SVTOOLS_SORES_HXX |