sd/qa/unit/tiledrendering/tiledrendering.cxx | 2 +-
sot/source/base/exchange.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 36bf13247b01075b533b127c7e5ffc760f9642f8
Author: Oliver Specht <oliver.spe...@cib.de>
Date: Wed Mar 9 16:19:51 2016 +0100
tdf#97591: mark RTF clipboard format as text/rtf
text/rtf replaces text/richtext which is not RTF
Change-Id: I2be750b595ba23ed75698b68c0d4ffd8f3a12870
Reviewed-on: https://gerrit.libreoffice.org/23086
Reviewed-by: Oliver Specht <oliver.spe...@cib.de>
Tested-by: Oliver Specht <oliver.spe...@cib.de>
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx
b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 0bc9ad8..f1c9901 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -354,7 +354,7 @@ void SdTiledRenderingTest::testGetTextSelection()
CPPUNIT_ASSERT_EQUAL(OString("Shape"),
pXImpressDocument->getTextSelection("text/plain;charset=utf-8", aUsedFormat));
// Make sure returned RTF is not empty.
-
CPPUNIT_ASSERT(!OString(pXImpressDocument->getTextSelection("text/richtext",
aUsedFormat)).isEmpty());
+ CPPUNIT_ASSERT(!OString(pXImpressDocument->getTextSelection("text/rtf",
aUsedFormat)).isEmpty());
}
void SdTiledRenderingTest::testSetGraphicSelection()
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 36c5a50..80cebd0 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -68,7 +68,7 @@ namespace
/* 7 EMPTY*/ { "", "",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 8 EMPTY*/ { "", "",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 9 EMPTY*/ { "", "",
&cppu::UnoType<Sequence<sal_Int8>>::get() },
- /* 10 SotClipboardFormatId::RTF*/ {
"text/richtext", "Rich Text Format", &cppu::UnoType<Sequence<sal_Int8>>::get()
},
+ /* 10 SotClipboardFormatId::RTF*/ {
"text/rtf", "Rich Text Format", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 11 SotClipboardFormatId::DRAWING*/ {
"application/x-openoffice-drawing;windows_formatname=\"Drawing Format\"",
"Drawing Format", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 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() },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
