diff options
| author | Regina Henschel <regina@apache.org> | 2015-07-08 12:31:43 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-08 16:57:49 +0200 |
| commit | 64bc8b45b5c23efc5fe57585a69aa4263aaf4e83 (patch) | |
| tree | d61a0aa25685e951ffa32751afb89e97c35531a0 /dtrans | |
| parent | 26aebe26f706d9fbc9c113f5c1fdc495578435bf (diff) | |
i#107734 Support for Math Input Panel in Windows 7
The patch introduces a new command .uno:ImportMathClipboard to module Math.
It imports MathML content from clipboard and transforms it to Starmath
It handles clipboard MIME type 'application/mathml+xml' and
plain text, which can be interpreted as MathML segment.
It partly solves issues #i14252, #i34781, and #i53509 too.
Review by: Hanya <hanya.runo@gmail.com>
(cherry picked from commit 9ec2148653436be8612273439180749e71e2ce58)
Conflicts:
dtrans/source/win32/ftransl/ftransl.cxx
officecfg/registry/data/org/openoffice/Office/UI/MathCommands.xcu
sot/inc/sot/formats.hxx
sot/source/base/exchange.cxx
starmath/sdi/smath.sdi
starmath/source/view.cxx
Change-Id: I6cb5e8f737ee2e39f9ce96aba841db347a8806e4
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/source/win32/ftransl/ftransl.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx index bc14f54391bb..7fe0b55d98bd 100644 --- a/dtrans/source/win32/ftransl/ftransl.cxx +++ b/dtrans/source/win32/ftransl/ftransl.cxx @@ -458,6 +458,8 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable() m_TranslTable.push_back(FormatEntry("image/bmp", "Windows Bitmap", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SotClipboardFormatId::PNG m_TranslTable.push_back(FormatEntry("image/png", "PNG", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); + //SotClipboardFormatId::MATHML + m_TranslTable.push_back(FormatEntry("application/mathml+xml", "MathML", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SotClipboardFormatId::DUMMY3 m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy3;windows_formatname=\"SO_DUMMYFORMAT_3\"", "SO_DUMMYFORMAT_3", NULL, CF_INVALID, CPPUTYPE_DEFAULT)); //SotClipboardFormatId::DUMMY4 |