commit cf59d64ae2f9321845af669678370d68c52b7985
author Stephan Bergmann <sbergman@redhat.com> Mon Apr 10 10:15:32 2017 +0200
committer Stephan Bergmann <sbergman@redhat.com> Mon Apr 10 10:15:32 2017 +0200
tree ccb99f6c61ca743de1ec5a445e105f9b6479f4b8
parent 77a57a5cac6018552b2ca8c4a419afeb179e38e2

Clean up uses of SAL_U/SAL_W: embeddedobj

Change-Id: I02c9ed6b4bd92346bbeee1138c49b4bf5b39ad56

embeddedobj/source/msole/olecomponent.cxx

diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index 0e2f837..08fef37 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -46,6 +46,7 @@
#include <oleembobj.hxx>
#include <mtnotification.hxx>
#include <memory>
#include <string>

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<LPCWSTR>(aFilePath.getStr()),
                                        aFilePath.c_str(),
                                        IID_IUnknown,
                                        OLERENDER_DRAW, // OLERENDER_FORMAT
                                        nullptr,