From cf59d64ae2f9321845af669678370d68c52b7985 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 10 Apr 2017 10:15:32 +0200 Subject: [PATCH] Clean up uses of SAL_U/SAL_W: embeddedobj Change-Id: I02c9ed6b4bd92346bbeee1138c49b4bf5b39ad56 --- embeddedobj/source/msole/olecomponent.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 0e2f837a0ad9..08fef37640d7 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -46,6 +46,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::comphelper; @@ -922,12 +923,12 @@ void OleComponent::InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent ) hr = pOleLink->GetSourceDisplayName( &pOleStr ); if ( SUCCEEDED( hr ) && pOleStr ) { - OUString aFilePath( SAL_U(pOleStr) ); + std::wstring aFilePath( pOleStr ); if ( pMalloc ) pMalloc->Free( pOleStr ); hr = OleCreateFromFile( CLSID_NULL, - reinterpret_cast(aFilePath.getStr()), + aFilePath.c_str(), IID_IUnknown, OLERENDER_DRAW, // OLERENDER_FORMAT nullptr,