diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-19 12:31:03 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-19 13:52:20 +0100 |
| commit | 17913d4f4eb7da664da787a2e83bfb86d7b659ab (patch) | |
| tree | e0004f931d15323a54a500ca36e700bd95be88e9 /include | |
| parent | d2c90ac2627d70de065272fafa5ae0e7563bf011 (diff) | |
sot: accept JPEG as a clipboard format where we accept PNG already
(cherry picked from commit f731ecfd7bd3c703455e07447e9bb593e7b6e059)
Conflicts:
include/sot/formats.hxx
sot/source/base/exchange.cxx
Change-Id: I64602d31e8aa873e2280f86eaf618dd6007acaf1
Diffstat (limited to 'include')
| -rw-r--r-- | include/sot/formats.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx index cb2ee82ad74a..fb01473c65e3 100644 --- a/include/sot/formats.hxx +++ b/include/sot/formats.hxx @@ -185,8 +185,9 @@ enum class SotClipboardFormatId : sal_uLong HC_GDIMETAFILE = 140, PNG = 141, STARWRITERGLOB_8_TEMPLATE = 142, + JPEG = 143, // the point at which we start allocating "runtime" format IDs - USER_END = STARWRITERGLOB_8_TEMPLATE + USER_END = JPEG }; /** Make it easier to iterate over format IDs */ |