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 /sot | |
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 'sot')
-rw-r--r-- | sot/source/base/exchange.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 8b3541f09ad1..599525d2cc29 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -201,6 +201,7 @@ namespace /*140 SotClipboardFormatId::GDIMETAFILE*/ { "application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"", "High Contrast GDIMetaFile", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*141 SotClipboardFormatId::PNG*/ { "image/png", "PNG Bitmap", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*142 SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, "Writer/Global 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, + /*143 SotClipboardFormatId::MATHML*/ { "application/mathml+xml", "MathML", &::cppu::UnoType<const Sequence< sal_Int8 >>::get() }, }; return &aInstance[0]; } |