embedserv/source/embed/ed_ipersiststr.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit af662f323d864e47d6218a2a63700e13b6e907fa Author: Stephan Bergmann <[email protected]> Date: Fri Mar 4 17:04:57 2016 +0100 -Werror,-Wshadow In the second part, looks odd that those two lines are a perfect copy of what is already done near the start of the function, but I have no insight at all into that code, so just leave it at that. Change-Id: I6b1d973f77a3d9389880ddec500968144ba615f2 diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index eae7ae0..5bbee35 100644 --- a/embedserv/source/embed/ed_ipersiststr.cxx +++ b/embedserv/source/embed/ed_ipersiststr.cxx @@ -153,7 +153,7 @@ HRESULT copyXTempOutToIStream( uno::Reference< io::XOutputStream > xTempOut, ISt } sal_uInt32 nWritten = 0; - HRESULT hr = pStream->Write( (void*)aBuffer.getArray(), nReadBytes, &nWritten ); + hr = pStream->Write( (void*)aBuffer.getArray(), nReadBytes, &nWritten ); if ( !SUCCEEDED( hr ) || nWritten != nReadBytes ) return E_FAIL; @@ -807,8 +807,8 @@ STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ ) if ( hr == S_OK ) { - OUString aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ??? - CLIPFORMAT cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" ); + aCurType = getServiceNameFromGUID_Impl( &m_guid ); // ??? + cf = (CLIPFORMAT)RegisterClipboardFormatA( "Embedded Object" ); hr = WriteFmtUserTypeStg( m_pMasterStorage, cf, // ??? reinterpret_cast<LPWSTR>(( sal_Unicode* )aCurType.getStr()) ); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
