Kaydet (Commit) f731ecfd authored tarafından Miklos Vajna's avatar Miklos Vajna

sot: accept JPEG as a clipboard format where we accept PNG already

Change-Id: I64602d31e8aa873e2280f86eaf618dd6007acaf1
üst 94f7321e
...@@ -171,8 +171,9 @@ enum class SotClipboardFormatId : sal_uLong ...@@ -171,8 +171,9 @@ enum class SotClipboardFormatId : sal_uLong
PNG = 141, PNG = 141,
STARWRITERGLOB_8_TEMPLATE = 142, STARWRITERGLOB_8_TEMPLATE = 142,
MATHML = 143, MATHML = 143,
JPEG = 144,
// the point at which we start allocating "runtime" format IDs // the point at which we start allocating "runtime" format IDs
USER_END = MATHML USER_END = JPEG
}; };
/** Make it easier to iterate over format IDs */ /** Make it easier to iterate over format IDs */
......
...@@ -202,6 +202,7 @@ namespace ...@@ -202,6 +202,7 @@ namespace
/*141 SotClipboardFormatId::PNG*/ { "image/png", "PNG Bitmap", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*141 SotClipboardFormatId::PNG*/ { "image/png", "PNG Bitmap", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/*142 SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, "Writer/Global 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*142 SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, "Writer/Global 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/*143 SotClipboardFormatId::MATHML*/ { "application/mathml+xml", "MathML", &::cppu::UnoType<const Sequence< sal_Int8 >>::get() }, /*143 SotClipboardFormatId::MATHML*/ { "application/mathml+xml", "MathML", &::cppu::UnoType<const Sequence< sal_Int8 >>::get() },
/*144 SotClipboardFormatId::JPEG*/ { "image/jpeg", "JPEG Bitmap", &cppu::UnoType<Sequence<sal_Int8>>::get() },
}; };
return &aInstance[0]; return &aInstance[0];
} }
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment