[Libreoffice-commits] core.git: vcl/unx

[Julien Nabet]

 vcl/unx/generic/dtrans/X11_selection.cxx    |    8 ++++----
 vcl/unx/generic/dtrans/X11_transferable.cxx |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e42f2fa5e338ed57a1466c5ac6fd0959aaca72a8
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun May 11 10:39:55 2014 +0200

    Fix previous commit (vcl part)
    
    Change-Id: Ic46dae26076b87b0ef021c926604cbb2dfe6e198

diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index a26b289..d505fc2 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -615,7 +615,7 @@ bool SelectionManager::convertData(
         if( aFlavor.MimeType.getToken( 0, ';', nIndex ).equalsAscii( "text/plain" ) )
         {
             if( aFlavor.MimeType.getToken( 0, ';', nIndex ).equalsAscii( "charset=utf-16" ) )
-                aFlavor.DataType = cppu::UnoType<OUString>::get() 0 );
+                aFlavor.DataType = cppu::UnoType<OUString>::get();
             else
                 aFlavor.DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
         }
@@ -649,7 +649,7 @@ bool SelectionManager::convertData(
             if( aEncoding != RTL_TEXTENCODING_DONTKNOW || bCompoundText )
             {
                 aFlavor.MimeType = "text/plain;charset=utf-16";
-                aFlavor.DataType = cppu::UnoType<OUString>::get() 0 );
+                aFlavor.DataType = cppu::UnoType<OUString>::get();
                 if( xTransferable->isDataFlavorSupported( aFlavor ) )
                 {
                     Any aValue( xTransferable->getTransferData( aFlavor ) );
@@ -1331,7 +1331,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
                     if( aToken.equalsAscii( "charset=utf-16" ) )
                     {
                         bHaveUTF16 = true;
-                        pFlavors->DataType = cppu::UnoType<OUString>::get()0 );
+                        pFlavors->DataType = cppu::UnoType<OUString>::get();
                     }
                     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++ )
                 aTemp.getArray()[i+1] = rTypes.getConstArray()[i];
             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;
 
             std::vector< Atom > aNativeTemp( nNewFlavors );
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx
index 59cf9ad..55c5092 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -95,7 +95,7 @@ sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFla
     if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) )
     {
         if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( "text/plain;charset=utf-16" ) &&
-            aFlavor.DataType == cppu::UnoType<OUString>::get()0 ) )
+            aFlavor.DataType == cppu::UnoType<OUString>::get() )
             return false;
     }