diff options
| author | Armin Le Grand <alg@apache.org> | 2014-02-20 15:49:56 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-02 14:32:06 +0300 |
| commit | 21f2ef19c514b72a1c28c071aa17b864b5f5ebff (patch) | |
| tree | 73f34d4af16c5b05b524a1d54ad58e818697f457 /dtrans | |
| parent | 3ae6b906c50d2f1b955d877d2aec07f1c6ec0fc9 (diff) | |
Resolves: #i124085# improved support for PNG clipboard format on windows
(cherry picked from commit 3bd259ce52b15e968302ecca39f72d06af66e301)
Change-Id: Ie9b677d8948912b372a13353cd82a2f5e2f1cf49
Reviewed-on: https://gerrit.libreoffice.org/8785
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/source/win32/ftransl/ftransl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index 4d256901c388..f0f5daf6e266 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -483,9 +483,9 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable() //SOT_FORMATSTR_ID_DIALOG_60 m_TranslTable.push_back(FormatEntry("application/vnd.sun.xml.dialog", "Dialog 6.0", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_BMP - m_TranslTable.push_back(FormatEntry("image/bmp", "Windows Bitmap", NULL, 49657 /* ID for "image/bmp" CF_INVALID*/, CPPUTYPE_DEFAULT)); + m_TranslTable.push_back(FormatEntry("image/bmp", "Windows Bitmap", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_PNG - m_TranslTable.push_back(FormatEntry("image/png", "PNG", NULL, 49656 /* ID for "image/png" CF_INVALID*/, CPPUTYPE_DEFAULT)); + m_TranslTable.push_back(FormatEntry("image/png", "PNG", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_DUMMY3 m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy3;windows_formatname=\"SO_DUMMYFORMAT_3\"", "SO_DUMMYFORMAT_3", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SOT_FORMATSTR_ID_DUMMY4 |