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

Clean up uses of SAL_U/SAL_W: embeddedobj

Browse Source 
Change-Id: I02c9ed6b4bd92346bbeee1138c49b4bf5b39ad56
This commit is contained in:
Stephan Bergmann
2017-04-10 10:15:32 +02:00
parent 77a57a5cac
commit cf59d64ae2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
embeddedobj/source/msole/olecomponent.cxx
View File

@@ -46,6 +46,7 @@
#include <oleembobj.hxx> #include <oleembobj.hxx>
#include <mtnotification.hxx> #include <mtnotification.hxx>
#include <memory> #include <memory>
#include <string>
using namespace ::com::sun::star; using namespace ::com::sun::star;
using namespace ::comphelper; using namespace ::comphelper;
@@ -922,12 +923,12 @@ void OleComponent::InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent )
hr = pOleLink->GetSourceDisplayName( &pOleStr ); hr = pOleLink->GetSourceDisplayName( &pOleStr );
if ( SUCCEEDED( hr ) && pOleStr ) if ( SUCCEEDED( hr ) && pOleStr )
{ {
OUString aFilePath( SAL_U(pOleStr) ); std::wstring aFilePath( pOleStr );
if ( pMalloc ) if ( pMalloc )
pMalloc->Free( pOleStr ); pMalloc->Free( pOleStr );
hr = OleCreateFromFile( CLSID_NULL, hr = OleCreateFromFile( CLSID_NULL,
reinterpret_cast<LPCWSTR>(aFilePath.getStr()), aFilePath.c_str(),
IID_IUnknown, IID_IUnknown,
OLERENDER_DRAW, // OLERENDER_FORMAT OLERENDER_DRAW, // OLERENDER_FORMAT
nullptr, nullptr,