diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-04 17:04:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-04 17:04:57 +0100 |
| commit | af662f323d864e47d6218a2a63700e13b6e907fa (patch) | |
| tree | b7fc422f3f627be939d29c01fa9340a5c2b43df1 /embedserv | |
| parent | 6cadf68aefb9cf56c34f249675904bf1966786f4 (diff) | |
-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
Diffstat (limited to 'embedserv')
| -rw-r--r-- | embedserv/source/embed/ed_ipersiststr.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx index eae7ae0f555e..5bbee3515f41 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()) ); |