diff options
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/activex/main/SOActiveX.cpp | 7 | ||||
| -rw-r--r-- | extensions/source/nsplugin/source/so_main.cxx | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/extensions/source/activex/main/SOActiveX.cpp b/extensions/source/activex/main/SOActiveX.cpp index 73130b4fd6c2..5283fde3edbc 100644 --- a/extensions/source/activex/main/SOActiveX.cpp +++ b/extensions/source/activex/main/SOActiveX.cpp @@ -244,7 +244,9 @@ HRESULT CSOActiveX::TerminateOffice() { // create desktop CComPtr<IDispatch> pdispDesktop; - HRESULT hr = GetIDispByFunc( mpDispFactory, L"createInstance", &CComVariant( L"com.sun.star.frame.Desktop" ), 1, pdispDesktop ); + CComVariant aDesktopServiceName( L"com.sun.star.frame.Desktop" ); + + HRESULT hr = GetIDispByFunc( mpDispFactory, L"createInstance", &aDesktopServiceName, 1, pdispDesktop ); if( !pdispDesktop || !SUCCEEDED( hr ) ) return hr; // create tree of frames @@ -253,7 +255,8 @@ HRESULT CSOActiveX::TerminateOffice() if( !pdispChildren || !SUCCEEDED( hr ) ) return hr; CComVariant aFrames; - hr = ExecuteFunc( pdispChildren, L"queryFrames", &CComVariant( 4 ), 1, &aFrames ); + CComVariant nFlag( 4 ); + hr = ExecuteFunc( pdispChildren, L"queryFrames", &nFlag, 1, &aFrames ); if ( SUCCEEDED( hr ) ) { if ( ( aFrames.vt == ( VT_ARRAY | VT_DISPATCH ) || aFrames.vt == ( VT_ARRAY | VT_VARIANT ) ) diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx index 6d69896180a0..5fda585d342c 100644 --- a/extensions/source/nsplugin/source/so_main.cxx +++ b/extensions/source/nsplugin/source/so_main.cxx @@ -388,6 +388,7 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f _exit(255); } #else + (void) read_fd; /* avoid warning about unused parameter */ Security sec; oslProcess hProcess = 0; rtl_uString * ar_args [] = { |