diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-10-27 23:39:27 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-11-02 10:57:35 +0100 |
| commit | 5541e10ae62c236799091e3b6817a9dbcb09e7c4 (patch) | |
| tree | 4f6330eceb30d486ffda1d99b48d171a88bdc9eb /dtrans | |
| parent | e469d0f81d38ebe61766a6cb49e1a6a8b57ff0cd (diff) | |
tdf#119235 svx,sd: fix drag&drop from ColorBar
This was using the SfxPoolItem serialisation of XATTR_FILL* items,
where only XFillColorItem and XFillStyleItem were actually used;
the binary serialisation was removed without being aware of this
feature.
Fix this by using uno::Any instead, rather than reviving the binary
serialisation.
Also change the clipboard format strings, just to be safe.
(regression from 97b889b8b2b2554ce33fd6b3f0359fc18f39832d)
Change-Id: I1828621a9aae606a1ca47835eef608062efe64a0
Reviewed-on: https://gerrit.libreoffice.org/62455
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 0a6813ad5d57d0df72562c797a8b0581bfd65a11)
Reviewed-on: https://gerrit.libreoffice.org/62472
Tested-by: Jenkins
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
(cherry picked from commit 24ccbc35e8857cc8de784154d0648800d39ab20b)
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/source/win32/ftransl/ftransl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 64962aecf05a..8f079c646e22 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -144,7 +144,7 @@ static const std::vector< FormatEntry > g_TranslTable { // SotClipboardFormatId::SVIM FormatEntry("application/x-openoffice-svim;windows_formatname=\"SVIM (StarView ImageMap)\"", "SVIM (StarView ImageMap)", nullptr, CF_INVALID, CPPUTYPE_DEFAULT), // SotClipboardFormatId::XFA - FormatEntry("application/x-openoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr)\"", "XFA (XOutDev FillAttr)", nullptr, CF_INVALID, CPPUTYPE_DEFAULT), + FormatEntry("application/x-libreoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr Any)\"", "XFA (XOutDev FillAttr Any)", nullptr, CF_INVALID, CPPUTYPE_DEFAULT), // SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT FormatEntry("application/vnd.oasis.opendocument.text-flat-xml", "EditEngine ODF", nullptr, CF_INVALID, CPPUTYPE_DEFAULT), // SotClipboardFormatId::INTERNALLINK_STATE |