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

Fix previous commit (vcl part)

Browse Source 
Change-Id: Ic46dae26076b87b0ef021c926604cbb2dfe6e198
This commit is contained in:
Julien Nabet
2014-05-11 10:39:55 +02:00
parent e3d01ad336
commit e42f2fa5e3
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vcl/unx/generic/dtrans/X11_selection.cxx
View File

@@ -615,7 +615,7 @@ bool SelectionManager::convertData(
if( aFlavor.MimeType.getToken( 0, ';', nIndex ).equalsAscii( "text/plain" ) ) if( aFlavor.MimeType.getToken( 0, ';', nIndex ).equalsAscii( "text/plain" ) )
{ {
if( aFlavor.MimeType.getToken( 0, ';', nIndex ).equalsAscii( "charset=utf-16" ) ) if( aFlavor.MimeType.getToken( 0, ';', nIndex ).equalsAscii( "charset=utf-16" ) )
aFlavor.DataType = cppu::UnoType<OUString>::get() 0 ); aFlavor.DataType = cppu::UnoType<OUString>::get();
else else
aFlavor.DataType = getCppuType( (Sequence< sal_Int8 >*)0 ); aFlavor.DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
} }
@@ -649,7 +649,7 @@ bool SelectionManager::convertData(
if( aEncoding != RTL_TEXTENCODING_DONTKNOW || bCompoundText ) if( aEncoding != RTL_TEXTENCODING_DONTKNOW || bCompoundText )
{ {
aFlavor.MimeType = "text/plain;charset=utf-16"; aFlavor.MimeType = "text/plain;charset=utf-16";
aFlavor.DataType = cppu::UnoType<OUString>::get() 0 ); aFlavor.DataType = cppu::UnoType<OUString>::get();
if( xTransferable->isDataFlavorSupported( aFlavor ) ) if( xTransferable->isDataFlavorSupported( aFlavor ) )
{ {
Any aValue( xTransferable->getTransferData( aFlavor ) ); Any aValue( xTransferable->getTransferData( aFlavor ) );
@@ -1331,7 +1331,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
if( aToken.equalsAscii( "charset=utf-16" ) ) if( aToken.equalsAscii( "charset=utf-16" ) )
{ {
bHaveUTF16 = true; bHaveUTF16 = true;
pFlavors->DataType = cppu::UnoType<OUString>::get()0 ); pFlavors->DataType = cppu::UnoType<OUString>::get();
} }
else if( aToken.equalsAscii( "charset=utf-8" ) ) else if( aToken.equalsAscii( "charset=utf-8" ) )
{ {
@@ -1356,7 +1356,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
for( i = 0; i < nNewFlavors-1; i++ ) for( i = 0; i < nNewFlavors-1; i++ )
aTemp.getArray()[i+1] = rTypes.getConstArray()[i]; aTemp.getArray()[i+1] = rTypes.getConstArray()[i];
aTemp.getArray()[0].MimeType = "text/plain;charset=utf-16"; aTemp.getArray()[0].MimeType = "text/plain;charset=utf-16";
aTemp.getArray()[0].DataType = cppu::UnoType<OUString>::get()0 ); aTemp.getArray()[0].DataType = cppu::UnoType<OUString>::get();
rTypes = aTemp; rTypes = aTemp;
std::vector< Atom > aNativeTemp( nNewFlavors ); std::vector< Atom > aNativeTemp( nNewFlavors );

2
vcl/unx/generic/dtrans/X11_transferable.cxx
View File

@@ -95,7 +95,7 @@ sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFla
if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) ) if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) )
{ {
if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( "text/plain;charset=utf-16" ) && if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( "text/plain;charset=utf-16" ) &&
aFlavor.DataType == cppu::UnoType<OUString>::get()0 ) ) aFlavor.DataType == cppu::UnoType<OUString>::get() )
return false; return false;
} }