include/sot/formats.hxx | 5 ++---
sot/source/base/exchange.cxx | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 544a978132dd8f9d44756f62f160a0883193d54a
Author: Varun Dhall <varun.dh...@studentpartner.com>
Date: Sun Jul 23 22:43:03 2017 +0530
EditEngine: Removing BIN format from sot
Change-Id: I495e2749b961dfca63bb1e27239ac6a09b80fd19
Reviewed-on: https://gerrit.libreoffice.org/40333
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/include/sot/formats.hxx b/include/sot/formats.hxx
index 17a9adb5d11a..260f43b8ea09 100644
--- a/include/sot/formats.hxx
+++ b/include/sot/formats.hxx
@@ -42,7 +42,7 @@ enum class SotClipboardFormatId : sal_uLong
SVXB = 12,
SVIM = 13,
XFA = 14,
- EDITENGINE = 15,
+ EDITENGINE_ODF_TEXT_FLAT = 15,
INTERNALLINK_STATE = 16,
SOLK = 17,
NETSCAPE_BOOKMARK = 18,
@@ -173,9 +173,8 @@ enum class SotClipboardFormatId : sal_uLong
MATHML = 143,
JPEG = 144,
RICHTEXT = 145,
- EDITENGINE_ODF_TEXT_FLAT = 146,
// the point at which we start allocating "runtime" format IDs
- USER_END = EDITENGINE_ODF_TEXT_FLAT
+ USER_END = RICHTEXT
};
/** Make it easier to iterate over format IDs */
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index f4a51bff5121..1d230a43fccf 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -72,7 +72,7 @@ namespace
/* 12 SotClipboardFormatId::SVXB*/ {
"application/x-openoffice-svxb;windows_formatname=\"SVXB (StarView
Bitmap/Animation)\"", "SVXB (StarView Bitmap/Animation)",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 13 SotClipboardFormatId::SVIM*/ {
"application/x-openoffice-svim;windows_formatname=\"SVIM (StarView
ImageMap)\"", "SVIM (StarView ImageMap)",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 14 SotClipboardFormatId::XFA*/ {
"application/x-openoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr)\"",
"XFA (XOutDev FillAttr)", &cppu::UnoType<Sequence<sal_Int8>>::get() },
- /* 15 SotClipboardFormatId::EDITENGINE*/ {
"application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"",
"EditEngineFormat", &cppu::UnoType<Sequence<sal_Int8>>::get() },
+ /* 15 SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT*/ {
"application/vnd.oasis.opendocument.text-flat-xml", "EditEngine ODF",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 16 SotClipboardFormatId::INTERNALLINK_STATE*/ {
"application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo
vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 17 SotClipboardFormatId::SOLK*/ {
"application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"",
"SOLK (StarOffice Link)", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 18 SotClipboardFormatId::NETSCAPE_BOOKMARK*/ {
"application/x-openoffice-netscape-bookmark;windows_formatname=\"Netscape
Bookmark\"", "Netscape Bookmark", &cppu::UnoType<Sequence<sal_Int8>>::get() },
@@ -202,8 +202,7 @@ namespace
/*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() },
/*144 SotClipboardFormatId::JPEG*/ { "image/jpeg", "JPEG Bitmap",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
- /*145 SotClipboardFormatId::RICHTEXT*/ { "text/richtext",
"Richtext Format", &cppu::UnoType<Sequence<sal_Int8>>::get() },
- /*146 SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT*/ {
"application/vnd.oasis.opendocument.text-flat-xml", "EditEngine ODF",
&cppu::UnoType<Sequence<sal_Int8>>::get() }
+ /*145 SotClipboardFormatId::RICHTEXT*/ { "text/richtext",
"Richtext Format", &cppu::UnoType<Sequence<sal_Int8>>::get() }
};
return &aInstance[0];
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
