diff options
Diffstat (limited to 'dtrans')
| -rw-r--r-- | dtrans/source/win32/dtobj/DataFmtTransl.cxx | 7 | ||||
| -rw-r--r-- | dtrans/source/win32/dtobj/XTDataObject.cxx | 7 | ||||
| -rw-r--r-- | dtrans/source/win32/misc/ImplHelper.cxx | 3 |
3 files changed, 10 insertions, 7 deletions
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx index c72f2646563b..ddb0ee6d750f 100644 --- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx +++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx @@ -26,6 +26,7 @@ #include "MimeAttrib.hxx" #include "DTransHelper.hxx" #include <rtl/string.h> +#include <o3tl/char16_t2wchar_t.hxx> #include "Fetc.hxx" #include <com/sun/star/datatransfer/DataFormatTranslator.hpp> @@ -87,7 +88,7 @@ CFormatEtc CDataFormatTranslator::getFormatEtcFromDataFlavor( const DataFlavor& aFormat >>= aClipFmtName; OSL_ASSERT( aClipFmtName.getLength( ) ); - cf = RegisterClipboardFormatW( SAL_W(aClipFmtName.getStr( )) ); + cf = RegisterClipboardFormatW( o3tl::toW(aClipFmtName.getStr( )) ); OSL_ENSURE( CF_INVALID != cf, "RegisterClipboardFormat failed" ); } @@ -163,7 +164,7 @@ CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformatName( const if ( !aClipFmtName.getLength( ) ) return CFormatEtc( CF_INVALID ); - CLIPFORMAT cf = sal::static_int_cast<CLIPFORMAT>(RegisterClipboardFormatW( SAL_W(aClipFmtName.getStr( )) )); + CLIPFORMAT cf = sal::static_int_cast<CLIPFORMAT>(RegisterClipboardFormatW( o3tl::toW(aClipFmtName.getStr( )) )); return getFormatEtcForClipformat( cf ); } @@ -172,7 +173,7 @@ OUString CDataFormatTranslator::getClipboardFormatName( CLIPFORMAT aClipformat ) OSL_PRECOND( CF_INVALID != aClipformat, "Invalid clipboard format" ); sal_Unicode wBuff[ MAX_CLIPFORMAT_NAME + 1 ]; // Null terminator isn't counted, apparently. - sal_Int32 nLen = GetClipboardFormatNameW( aClipformat, SAL_W(wBuff), MAX_CLIPFORMAT_NAME ); + sal_Int32 nLen = GetClipboardFormatNameW( aClipformat, o3tl::toW(wBuff), MAX_CLIPFORMAT_NAME ); return OUString( wBuff, nLen ); } diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx index ed498372d0aa..76442f27fd7c 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.cxx +++ b/dtrans/source/win32/dtobj/XTDataObject.cxx @@ -18,6 +18,7 @@ */ #include <osl/diagnose.h> +#include <o3tl/char16_t2wchar_t.hxx> #include "XTDataObject.hxx" #include <com/sun/star/datatransfer/DataFlavor.hpp> @@ -26,8 +27,8 @@ #include "TxtCnvtHlp.hxx" #include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> -#include "com/sun/star/awt/AsyncCallback.hpp" -#include "com/sun/star/awt/XCallback.hpp" +#include <com/sun/star/awt/AsyncCallback.hpp> +#include <com/sun/star/awt/XCallback.hpp> #include "FmtFilter.hxx" #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase.hxx> @@ -505,7 +506,7 @@ void SAL_CALL CXTDataObject::renderSynthesizedTextAndSetupStgMedium( FORMATETC& WideCharToMultiByteEx( GetACP( ), - SAL_W( aUnicodeText.getStr( ) ), + o3tl::toW( aUnicodeText.getStr( ) ), aUnicodeText.getLength( ), stgTransfHelper ); diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx index f9d5a07a7f28..356985a931f8 100644 --- a/dtrans/source/win32/misc/ImplHelper.cxx +++ b/dtrans/source/win32/misc/ImplHelper.cxx @@ -20,6 +20,7 @@ #include <osl/diagnose.h> #include "ImplHelper.hxx" #include <rtl/tencinfo.h> +#include <o3tl/char16_t2wchar_t.hxx> #include <string.h> #include <memory> @@ -107,7 +108,7 @@ OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype ) OSL_ASSERT(nResult); if (nResult) - winCP = SAL_U( buff.get() ); + winCP = o3tl::toU( buff.get() ); } |