diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-11 10:09:04 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-11 10:16:42 +0200 |
| commit | bd596286207adf06936939a3ef8018efc1055591 (patch) | |
| tree | dc8e079155868ffbc5d023f04620c83f402dc6c2 /vcl/unx | |
| parent | be44f0e91b6061f6bbe6b4da2f264eed70fb6542 (diff) | |
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part10
Change-Id: I67acda35fa127547dcea0cd18c9dc16db7c00294
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_transferable.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index 0d7889b51bb4..a26b2891168f 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 = getCppuType( (OUString *) 0 ); + aFlavor.DataType = cppu::UnoType<OUString>::get() 0 ); 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 = getCppuType( (OUString *) 0 ); + aFlavor.DataType = cppu::UnoType<OUString>::get() 0 ); 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 = getCppuType( (OUString*)0 ); + pFlavors->DataType = cppu::UnoType<OUString>::get()0 ); } 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 = getCppuType( (OUString*)0 ); + aTemp.getArray()[0].DataType = cppu::UnoType<OUString>::get()0 ); 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 29493126884f..59cf9ada812b 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 == getCppuType( (OUString*)0 ) ) + aFlavor.DataType == cppu::UnoType<OUString>::get()0 ) ) return false; } |