mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS vcl69 (1.82.8); FILE MERGED

Browse Source 
2006/10/26 15:34:50 pl 1.82.8.1: #i57040# do proper tokenizing
This commit is contained in:
Rüdiger Timm
2006-12-04 15:35:18 +00:00
parent d0d2a13057
commit c801698ac6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dtrans/source/X11/X11_selection.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: X11_selection.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * 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; sal_Int32 nIndex = 0;
if( pFlavors->MimeType.getToken( 0, ';', nIndex ).equalsAsciiL( "text/plain", 10 ) ) 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 // 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++; pAtoms++;
continue; continue;
} }
bHaveText = true; bHaveText = true;
if( pFlavors->MimeType.getToken( 0, ';', nIndex ).compareToAscii( "charset=utf-16" ) == 0 ) if( aToken.compareToAscii( "charset=utf-16" ) == 0 )
{ {
bHaveUTF16 = true; bHaveUTF16 = true;
pFlavors->DataType = getCppuType( (OUString*)0 ); 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; aUTF8Type = *pAtoms;
} }