Kaydet (Commit) 36bf1324 authored tarafından Oliver Specht's avatar Oliver Specht

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/23086Reviewed-by: 's avatarOliver Specht <oliver.specht@cib.de>
Tested-by: 's avatarOliver Specht <oliver.specht@cib.de>
üst 416526cf
...@@ -354,7 +354,7 @@ void SdTiledRenderingTest::testGetTextSelection() ...@@ -354,7 +354,7 @@ void SdTiledRenderingTest::testGetTextSelection()
CPPUNIT_ASSERT_EQUAL(OString("Shape"), pXImpressDocument->getTextSelection("text/plain;charset=utf-8", aUsedFormat)); CPPUNIT_ASSERT_EQUAL(OString("Shape"), pXImpressDocument->getTextSelection("text/plain;charset=utf-8", aUsedFormat));
// Make sure returned RTF is not empty. // 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() void SdTiledRenderingTest::testSetGraphicSelection()
......
...@@ -68,7 +68,7 @@ namespace ...@@ -68,7 +68,7 @@ namespace
/* 7 EMPTY*/ { "", "", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /* 7 EMPTY*/ { "", "", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 8 EMPTY*/ { "", "", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /* 8 EMPTY*/ { "", "", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/* 9 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() }, /* 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() }, /* 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() }, /* 13 SotClipboardFormatId::SVIM*/ { "application/x-openoffice-svim;windows_formatname=\"SVIM (StarView ImageMap)\"", "SVIM (StarView ImageMap)", &cppu::UnoType<Sequence<sal_Int8>>::get() },
......
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