From c801698ac63e9e35d3bebb853ff5ab60bf29102c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Mon, 4 Dec 2006 15:35:18 +0000 Subject: [PATCH] INTEGRATION: CWS vcl69 (1.82.8); FILE MERGED 2006/10/26 15:34:50 pl 1.82.8.1: #i57040# do proper tokenizing --- dtrans/source/X11/X11_selection.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dtrans/source/X11/X11_selection.cxx b/dtrans/source/X11/X11_selection.cxx index b39c2481e961..fdebb4daa611 100644 --- a/dtrans/source/X11/X11_selection.cxx +++ b/dtrans/source/X11/X11_selection.cxx @@ -4,9 +4,9 @@ * * $RCSfile: X11_selection.cxx,v $ * - * $Revision: 1.82 $ + * $Revision: 1.83 $ * - * last change: $Author: vg $ $Date: 2006-09-27 10:52:48 $ + * last change: $Author: rt $ $Date: 2006-12-04 16:35:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1363,19 +1363,20 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor > sal_Int32 nIndex = 0; if( pFlavors->MimeType.getToken( 0, ';', nIndex ).equalsAsciiL( "text/plain", 10 ) ) { + OUString aToken(pFlavors->MimeType.getToken( 0, ';', nIndex )); // omit text/plain;charset=unicode since it is not well defined - if( pFlavors->MimeType.getToken( 0, ';', nIndex ).compareToAscii( "charset=unicode" ) == 0 ) + if( aToken.compareToAscii( "charset=unicode" ) == 0 ) { pAtoms++; continue; } bHaveText = true; - if( pFlavors->MimeType.getToken( 0, ';', nIndex ).compareToAscii( "charset=utf-16" ) == 0 ) + if( aToken.compareToAscii( "charset=utf-16" ) == 0 ) { bHaveUTF16 = true; pFlavors->DataType = getCppuType( (OUString*)0 ); } - else if( pFlavors->MimeType.getToken( 0, ';', nIndex ).compareToAscii( "charset=utf-8" ) == 0 ) + else if( aToken.compareToAscii( "charset=utf-8" ) == 0 ) { aUTF8Type = *pAtoms; }