From 17913d4f4eb7da664da787a2e83bfb86d7b659ab Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 19 Jan 2016 12:31:03 +0100
Subject: 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
---
 include/sot/formats.hxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include')

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 */
-- 
cgit