strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i10000# Avoid warnings

Browse source
This commit is contained in:
Rüdiger Timm 2008-12-19 07:49:15 +00:00
parent 1d68dbefec
commit 612e509ba2
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
extensions/source/activex/main/SOActiveX.cpp
View file

@ -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 ) )

1
extensions/source/nsplugin/source/so_main.cxx
View file

@ -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 [] = {