summaryrefslogtreecommitdiff
path: root/sot
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2021-01-14 02:57:35 +0200
committerTor Lillqvist <tml@collabora.com>2021-01-14 18:07:59 +0100
commitba1cd4964259221549f3671f89a701e67d7deb71 (patch)
treece36f0d36fc9f5250b9320c061dbebf424ef24d9 /sot
parent06ecfbe3d236e06f597e5422bfc24a9a76c3f90c (diff)
Make SotExchange::GetFormat() accept a MIME type with additional parameters
For instance, if SotExchange::GetFormat() is passed a flavor with MIME type "application/x-openoffice-objectdescriptor-xml;windows_formatname=\"Star Object Descriptor (XML)\";typename=\"LibreOffice 7.2 Spreadsheet\"" we do want to recognize it as SotClipboardFormatId::OBJECTDESCRIPTOR, even if the MIME type in the entry for it in the array in ImplFormatArray_Impl only has the windows_formatname parameter. This is part of fixing https://github.com/CollaboraOnline/online/issues/849, but it will help for corresponding problems with LibreOffice on macOS, too. Note that on Linux, SotExchange::GetFormat() gets called with a flavor with a MIME type that does *not* have all the extra parameters (classname, typename, displayname, viewaspect, width, height, posx, posy) (See the GitHub issue mentioned above.) This change does not remove any checks for classname, typename, etc. There are/were no such checks in SotExchange::GetFormat(). But, in the (much different) code path for macOS (and iOS), with my work in process in vcl, SotExchange::GetFormat() gets called with a flavor with a MIME type that *does* contain those extra parameters. I don't see the point in introducing checks of the "sanity" of those into SotExchange::GetFormat(). Change-Id: Ie65ed1ab922cdaa6557eb65d980b9e886d3c6971 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109254 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'sot')
-rw-r--r--sot/source/base/exchange.cxx8
1 files changed, 7 insertions, 1 deletions
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index ff7b8add31bd..84a2427d334b 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -439,10 +439,16 @@ SotClipboardFormatId SotExchange::GetFormat( const DataFlavor& rFlavor )
// only into 5.1 chart documents - in 5.0 and 5.2 it was 42 ("StarChart 5.0")
// The registry only contains the entry for the 42 format id.
for( SotClipboardFormatId i = SotClipboardFormatId::RTF; i <= SotClipboardFormatId::USER_END; ++i )
- if( rMimeType.equalsAscii( pFormatArray_Impl[ static_cast<int>(i) ].pMimeType ) )
+ {
+ const char* const pFormatMimeType = pFormatArray_Impl[ static_cast<int>(i) ].pMimeType;
+ const sal_Int32 nFormatMimeTypeLen = rtl_str_getLength( pFormatMimeType );
+ if( rMimeType.startsWithAsciiL( pFormatMimeType, nFormatMimeTypeLen ) &&
+ ( rMimeType.getLength() == nFormatMimeTypeLen ||
+ rMimeType[ nFormatMimeTypeLen ] == ';' ) )
return ( (i == SotClipboardFormatId::STARCHARTDOCUMENT_50)
? SotClipboardFormatId::STARCHART_50
: i );
+ }
// then in the dynamic list
tDataFlavorList& rL = InitFormats_Impl();