diff options
Diffstat (limited to 'extensions/source/activex')
| -rw-r--r-- | extensions/source/activex/main/SOActionsApproval.cpp | 2 | ||||
| -rw-r--r-- | extensions/source/activex/main/SOActionsApproval.h | 2 | ||||
| -rw-r--r-- | extensions/source/activex/main/SOActiveX.cpp | 42 | ||||
| -rw-r--r-- | extensions/source/activex/main/SOActiveX.h | 42 | ||||
| -rw-r--r-- | extensions/source/activex/main/SOComWindowPeer.cpp | 2 | ||||
| -rw-r--r-- | extensions/source/activex/main/SODispatchInterceptor.cpp | 16 | ||||
| -rw-r--r-- | extensions/source/activex/main/SODispatchInterceptor.h | 8 | ||||
| -rw-r--r-- | extensions/source/activex/main/com_uno_helper.h | 28 | ||||
| -rw-r--r-- | extensions/source/activex/main/resource.h | 2 | ||||
| -rw-r--r-- | extensions/source/activex/main/so_activex.cpp | 104 | ||||
| -rw-r--r-- | extensions/source/activex/msidl/so_activex.idl | 44 |
11 files changed, 146 insertions, 146 deletions
diff --git a/extensions/source/activex/main/SOActionsApproval.cpp b/extensions/source/activex/main/SOActionsApproval.cpp index b795b92fcf76..fd4abb170959 100644 --- a/extensions/source/activex/main/SOActionsApproval.cpp +++ b/extensions/source/activex/main/SOActionsApproval.cpp @@ -11,7 +11,7 @@ STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid) { - static const IID* arr[] = + static const IID* arr[] = { &IID_ISOActionsApproval, }; diff --git a/extensions/source/activex/main/SOActionsApproval.h b/extensions/source/activex/main/SOActionsApproval.h index a5570312864d..097d7b97a29f 100644 --- a/extensions/source/activex/main/SOActionsApproval.h +++ b/extensions/source/activex/main/SOActionsApproval.h @@ -51,7 +51,7 @@ DECLARE_REGISTRY_RESOURCEID(IDR_SODOCUMENTEVENTLISTENER) STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid); // ISOActionsApproval - virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE approveAction( + virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE approveAction( /* [in] */ long nActionID, /* [retval][out] */ boolean *pbApproval) { diff --git a/extensions/source/activex/main/SOActiveX.cpp b/extensions/source/activex/main/SOActiveX.cpp index f95e42772185..3468337a0e80 100644 --- a/extensions/source/activex/main/SOActiveX.cpp +++ b/extensions/source/activex/main/SOActiveX.cpp @@ -61,7 +61,7 @@ HRESULT ExecuteFunc( IDispatch* idispUnoObject, // for debugging purposes // USES_CONVERSION; // if ( !SUCCEEDED( hr ) ) - // ::MessageBox( NULL, OLE2A( myInfo.bstrDescription ), OLE2A( myInfo.bstrSource ), MB_OK | MB_ICONINFORMATION ); + // ::MessageBox( NULL, OLE2A( myInfo.bstrDescription ), OLE2A( myInfo.bstrSource ), MB_OK | MB_ICONINFORMATION ); return hr; } @@ -142,16 +142,16 @@ CSOActiveX::CSOActiveX() if( !SUCCEEDED( hr ) ) OutputError_Impl( NULL, hr ); - mPWinClass.style = CS_HREDRAW|CS_VREDRAW; - mPWinClass.lpfnWndProc = ::DefWindowProc; - mPWinClass.cbClsExtra = 0; - mPWinClass.cbWndExtra = 0; - mPWinClass.hInstance = (HINSTANCE) GetModuleHandle(NULL); //myInstance; - mPWinClass.hIcon = NULL; - mPWinClass.hCursor = NULL; - mPWinClass.hbrBackground = (HBRUSH) COLOR_BACKGROUND; - mPWinClass.lpszMenuName = NULL; - mPWinClass.lpszClassName = STAROFFICE_WINDOWCLASS; + mPWinClass.style = CS_HREDRAW|CS_VREDRAW; + mPWinClass.lpfnWndProc = ::DefWindowProc; + mPWinClass.cbClsExtra = 0; + mPWinClass.cbWndExtra = 0; + mPWinClass.hInstance = (HINSTANCE) GetModuleHandle(NULL); //myInstance; + mPWinClass.hIcon = NULL; + mPWinClass.hCursor = NULL; + mPWinClass.hbrBackground = (HBRUSH) COLOR_BACKGROUND; + mPWinClass.lpszMenuName = NULL; + mPWinClass.lpszClassName = STAROFFICE_WINDOWCLASS; RegisterClass(&mPWinClass); } @@ -260,7 +260,7 @@ HRESULT CSOActiveX::TerminateOffice() hr = ExecuteFunc( pdispChildren, L"queryFrames", &nFlag, 1, &aFrames ); if ( SUCCEEDED( hr ) ) { - if ( ( aFrames.vt == ( VT_ARRAY | VT_DISPATCH ) || aFrames.vt == ( VT_ARRAY | VT_VARIANT ) ) + if ( ( aFrames.vt == ( VT_ARRAY | VT_DISPATCH ) || aFrames.vt == ( VT_ARRAY | VT_VARIANT ) ) && ( !aFrames.parray || aFrames.parray->cDims == 1 && aFrames.parray->rgsabound[0].cElements == 0 ) ) { // there is no frames open @@ -269,7 +269,7 @@ HRESULT CSOActiveX::TerminateOffice() hr = ExecuteFunc( pdispDesktop, L"terminate", NULL, 0, &dummyResult ); } } - + return hr; } @@ -372,7 +372,7 @@ STDMETHODIMP CSOActiveX::Load( LPPROPERTYBAG pPropBag, LPERRORLOG /*pErrorLog*/ hr = CBindStatusCallback<CSOActiveX>::Download( this, &CSOActiveX::CallbackCreateXInputStream, mCurFileUrl, m_spClientSite, FALSE ); if ( hr == MK_S_ASYNCHRONOUS ) hr = S_OK; - + if ( !SUCCEEDED( hr ) ) { // trigger initialization without stream @@ -574,7 +574,7 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int width, int height ) long nInitInd = 0; CComVariant pFrameVariant( mpDispFrame ); SafeArrayPutElement( pInitVals, &nInitInd, &pFrameVariant ); - + // the second sequence element nInitInd = 1; CComVariant pStrArr( 1L ); @@ -615,7 +615,7 @@ HRESULT CSOActiveX::CallLoadComponentFromURL1PBool( OLECHAR* sUrl, OLECHAR* sArg HRESULT hr = GetUnoStruct( L"com.sun.star.beans.PropertyValue", pdispPropVal ); if( !SUCCEEDED( hr ) ) return hr; - OLECHAR* sPropMemberNames[2] = { L"Name", L"Value" }; + OLECHAR* sPropMemberNames[2] = { L"Name", L"Value" }; CComVariant pPropVar[2]; pPropVar[0] = CComVariant( sArgName ); pPropVar[1].vt = VT_BOOL; pPropVar[1].boolVal = sArgVal ? VARIANT_TRUE : VARIANT_FALSE ; @@ -666,7 +666,7 @@ HRESULT CSOActiveX::CallDispatchMethod( OLECHAR* sUrl, hr = GetUnoStruct( L"com.sun.star.beans.PropertyValue", pdispPropVal ); if( !SUCCEEDED( hr ) ) return hr; - OLECHAR* sPropMemberNames[2] = { L"Name", L"Value" }; + OLECHAR* sPropMemberNames[2] = { L"Name", L"Value" }; CComVariant pPropVar[2]; pPropVar[0] = aArgNames[ix]; pPropVar[1] = aArgVals[ix]; @@ -719,7 +719,7 @@ void CSOActiveX::CallbackCreateXInputStream( CBindStatusCallback<CSOActiveX>* /* if( SUCCEEDED( hr ) && mpDispTempFile ) { SAFEARRAY FAR* pDataArray = SafeArrayCreateVector( VT_I1, 0, dwSize ); - + if ( pDataArray ) { hr = SafeArrayLock( pDataArray ); @@ -951,7 +951,7 @@ HRESULT CSOActiveX::OnDrawAdvanced( ATL_DRAWINFO& di ) if ( mbDrawLocked ) return S_OK; LockingGuard aGuard( mbDrawLocked ); - + if( m_spInPlaceSite && mCurFileUrl && mbReadyForActivation ) { HWND hwnd; @@ -1084,7 +1084,7 @@ STDMETHODIMP CSOActiveX::SetClientSite( IOleClientSite* aClientSite ) CComPtr<IOleContainer> aContainer; m_spClientSite->GetContainer( &aContainer ); -// ATLASSERT( aContainer ); +// ATLASSERT( aContainer ); if( SUCCEEDED( hr ) && aContainer ) { @@ -1096,7 +1096,7 @@ STDMETHODIMP CSOActiveX::SetClientSite( IOleClientSite* aClientSite ) aServiceProvider->QueryService( SID_SInternetExplorer, IID_IWebBrowser, (void**)&mWebBrowser2 ); -// ATLASSERT( mWebBrowser2 ); +// ATLASSERT( mWebBrowser2 ); if( mWebBrowser2 ) AtlAdvise( mWebBrowser2, GetUnknown(), DIID_DWebBrowserEvents2, &mCookie ); } diff --git a/extensions/source/activex/main/SOActiveX.h b/extensions/source/activex/main/SOActiveX.h index fea95d09c9b9..4b589090b6aa 100644 --- a/extensions/source/activex/main/SOActiveX.h +++ b/extensions/source/activex/main/SOActiveX.h @@ -50,38 +50,38 @@ class ATL_NO_VTABLE CSOActiveX : public IOleInPlaceActiveObjectImpl<CSOActiveX>, public IViewObjectExImpl<CSOActiveX>, public IOleInPlaceObjectWindowlessImpl<CSOActiveX>, -// public IConnectionPointContainerImpl<CSOActiveX>, +// public IConnectionPointContainerImpl<CSOActiveX>, public CComCoClass<CSOActiveX, &CLSID_SOActiveX>, -// public CProxy_ItryPluginEvents< CSOActiveX >, +// public CProxy_ItryPluginEvents< CSOActiveX >, public IPersistPropertyBagImpl< CSOActiveX >, - public IProvideClassInfo2Impl< &CLSID_SOActiveX, + public IProvideClassInfo2Impl< &CLSID_SOActiveX, &DIID__ISOActiveXEvents, &LIBID_SO_ACTIVEXLib >, public IObjectSafetyImpl< CSOActiveX, INTERFACESAFE_FOR_UNTRUSTED_DATA > { protected: - CComPtr<IWebBrowser2> mWebBrowser2; - DWORD mCookie; - - CComPtr<IDispatch> mpDispFactory; - CComPtr<IDispatch> mpDispFrame; - CComPtr<IDispatch> mpInstanceLocker; - CComPtr<IDispatch> mpDispWin; - OLECHAR* mCurFileUrl; - BOOL mbLoad; - BOOL mbViewOnly; + CComPtr<IWebBrowser2> mWebBrowser2; + DWORD mCookie; + + CComPtr<IDispatch> mpDispFactory; + CComPtr<IDispatch> mpDispFrame; + CComPtr<IDispatch> mpInstanceLocker; + CComPtr<IDispatch> mpDispWin; + OLECHAR* mCurFileUrl; + BOOL mbLoad; + BOOL mbViewOnly; WNDCLASS mPWinClass; - HWND mParentWin; - HWND mOffWin; + HWND mParentWin; + HWND mOffWin; SODispatchInterceptor* mpDispatchInterceptor; - SOVersion mnVersion; + SOVersion mnVersion; - BOOL mbReadyForActivation; - CComPtr<IDispatch> mpDispTempFile; + BOOL mbReadyForActivation; + CComPtr<IDispatch> mpDispTempFile; - BOOL mbDrawLocked; + BOOL mbDrawLocked; public: CSOActiveX(); @@ -105,7 +105,7 @@ BEGIN_COM_MAP(CSOActiveX) COM_INTERFACE_ENTRY(IOleObject) COM_INTERFACE_ENTRY(IPersistStreamInit) COM_INTERFACE_ENTRY2(IPersist, IPersistStreamInit) -// COM_INTERFACE_ENTRY(IConnectionPointContainer) +// COM_INTERFACE_ENTRY(IConnectionPointContainer) COM_INTERFACE_ENTRY(IProvideClassInfo) COM_INTERFACE_ENTRY(IProvideClassInfo2) COM_INTERFACE_ENTRY(IPersistPropertyBag) @@ -162,7 +162,7 @@ public: HRESULT CallDispatchMethod( OLECHAR* sUrl, CComVariant* sArgNames, CComVariant* sArgVal, unsigned int count ); HRESULT CallLoadComponentFromURL1PBool( OLECHAR* sUrl, OLECHAR* sArgName, BOOL sArgVal ); HRESULT GetUrlStruct( OLECHAR* sUrl, CComPtr<IDispatch>& pdispUrl ); - HRESULT Cleanup(); + HRESULT Cleanup(); HRESULT TerminateOffice(); HRESULT GetURL( const OLECHAR* url, const OLECHAR* target ); diff --git a/extensions/source/activex/main/SOComWindowPeer.cpp b/extensions/source/activex/main/SOComWindowPeer.cpp index 6ae1c805fa39..b6c0986c0ab2 100644 --- a/extensions/source/activex/main/SOComWindowPeer.cpp +++ b/extensions/source/activex/main/SOComWindowPeer.cpp @@ -10,7 +10,7 @@ STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) { - static const IID* arr[] = + static const IID* arr[] = { &IID_ISOComWindowPeer, }; diff --git a/extensions/source/activex/main/SODispatchInterceptor.cpp b/extensions/source/activex/main/SODispatchInterceptor.cpp index 5a4455265b97..eadce51085e8 100644 --- a/extensions/source/activex/main/SODispatchInterceptor.cpp +++ b/extensions/source/activex/main/SODispatchInterceptor.cpp @@ -13,7 +13,7 @@ STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid) { - static const IID* arr[] = + static const IID* arr[] = { &IID_ISODispatchInterceptor, }; @@ -71,7 +71,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL, aArgs[0] = CComVariant( nSearchFlags ); aArgs[1] = CComVariant( aTargetFrameName ); aArgs[2] = CComVariant( aURL ); - + hr = ExecuteFunc( m_xSlave, L"queryDispatch", aArgs, 3, &aResult ); if( !SUCCEEDED( hr ) || aResult.vt != VT_DISPATCH || aResult.pdispVal == NULL ) { @@ -91,9 +91,9 @@ STDMETHODIMP SODispatchInterceptor::queryDispatch( IDispatch FAR* aURL, STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts, SAFEARRAY FAR* FAR* retVal) { - if ( !aDescripts || !retVal || SafeArrayGetDim( aDescripts ) != 1 ) + if ( !aDescripts || !retVal || SafeArrayGetDim( aDescripts ) != 1 ) return E_FAIL; - + long nLB, nUB; HRESULT hr = SafeArrayGetLBound( aDescripts, 1, &nLB ); @@ -128,7 +128,7 @@ STDMETHODIMP SODispatchInterceptor::queryDispatches( SAFEARRAY FAR* aDescripts, return S_OK; } - + STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR* aArgs) { // get url from aURL @@ -185,19 +185,19 @@ STDMETHODIMP SODispatchInterceptor::dispatch( IDispatch FAR* aURL, SAFEARRAY FAR return S_OK; } - + STDMETHODIMP SODispatchInterceptor::addStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/) { // not implemented return S_OK; } - + STDMETHODIMP SODispatchInterceptor::removeStatusListener( IDispatch FAR* /*xControl*/, IDispatch FAR* /*aURL*/) { // not implemented return S_OK; } - + STDMETHODIMP SODispatchInterceptor::getInterceptedURLs( SAFEARRAY FAR* FAR* pVal ) { *pVal = SafeArrayCreateVector( VT_BSTR, 0, 3 ); diff --git a/extensions/source/activex/main/SODispatchInterceptor.h b/extensions/source/activex/main/SODispatchInterceptor.h index 538b12f24d2e..1a9b7e38cd6a 100644 --- a/extensions/source/activex/main/SODispatchInterceptor.h +++ b/extensions/source/activex/main/SODispatchInterceptor.h @@ -33,10 +33,10 @@ class SODispatchInterceptor : public CComObjectRoot, public CComCoClass<SODispatchInterceptor,&CLSID_SODispatchInterceptor> { - CComPtr<IDispatch> m_xMaster; - CComPtr<IDispatch> m_xSlave; - CSOActiveX* m_xParentControl; - CRITICAL_SECTION mMutex; + CComPtr<IDispatch> m_xMaster; + CComPtr<IDispatch> m_xSlave; + CSOActiveX* m_xParentControl; + CRITICAL_SECTION mMutex; public: SODispatchInterceptor() : m_xParentControl( NULL ) { InitializeCriticalSection(&mMutex); } virtual ~SODispatchInterceptor() { ATLASSERT( !m_xParentControl ); DeleteCriticalSection(&mMutex); } diff --git a/extensions/source/activex/main/com_uno_helper.h b/extensions/source/activex/main/com_uno_helper.h index 230fc63a6e77..94573c645d16 100644 --- a/extensions/source/activex/main/com_uno_helper.h +++ b/extensions/source/activex/main/com_uno_helper.h @@ -1,26 +1,26 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #include "stdafx2.h" -HRESULT ExecuteFunc( IDispatch* idispUnoObject, - OLECHAR* sFuncName, - CComVariant* params, - unsigned int count, +HRESULT ExecuteFunc( IDispatch* idispUnoObject, + OLECHAR* sFuncName, + CComVariant* params, + unsigned int count, CComVariant* pResult ); -HRESULT GetIDispByFunc( IDispatch* idispUnoObject, - OLECHAR* sFuncName, - CComVariant* params, - unsigned int count, +HRESULT GetIDispByFunc( IDispatch* idispUnoObject, + OLECHAR* sFuncName, + CComVariant* params, + unsigned int count, CComPtr<IDispatch>& pdispResult ); -HRESULT PutPropertiesToIDisp( IDispatch* pdispObject, - OLECHAR** sMemberNames, - CComVariant* pVariant, +HRESULT PutPropertiesToIDisp( IDispatch* pdispObject, + OLECHAR** sMemberNames, + CComVariant* pVariant, unsigned int count ); -HRESULT GetPropertiesFromIDisp( IDispatch* pdispObject, - OLECHAR** sMemberNames, - CComVariant* pVariant, +HRESULT GetPropertiesFromIDisp( IDispatch* pdispObject, + OLECHAR** sMemberNames, + CComVariant* pVariant, unsigned int count ); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/activex/main/resource.h b/extensions/source/activex/main/resource.h index fe74853c6d15..a80234031fb0 100644 --- a/extensions/source/activex/main/resource.h +++ b/extensions/source/activex/main/resource.h @@ -15,7 +15,7 @@ // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 201 diff --git a/extensions/source/activex/main/so_activex.cpp b/extensions/source/activex/main/so_activex.cpp index 43e49b6b3345..a681d18f6ffa 100644 --- a/extensions/source/activex/main/so_activex.cpp +++ b/extensions/source/activex/main/so_activex.cpp @@ -3,7 +3,7 @@ // Note: Proxy/Stub Information -// To build a separate proxy/stub DLL, +// To build a separate proxy/stub DLL, // run nmake -f so_activexps.mk in the project directory. #include "stdio.h" @@ -30,14 +30,14 @@ END_OBJECT_MAP() #define X32_LIB_NAME "so_activex.dll" // 06.11.2009 tkr: to provide windows xp as build systems for mingw we need to define KEY_WOW64_64KEY -// in mingw 3.13 KEY_WOW64_64KEY isn't available < Win2003 systems. +// in mingw 3.13 KEY_WOW64_64KEY isn't available < Win2003 systems. // Also defined in setup_native\source\win32\customactions\reg64\reg64.cxx,source\win32\customactions\shellextensions\shellextensions.cxx and // extensions\source\activex\main\so_activex.cpp #ifndef KEY_WOW64_64KEY - #define KEY_WOW64_64KEY (0x0100) + #define KEY_WOW64_64KEY (0x0100) #endif #ifndef KEY_WOW64_32KEY - #define KEY_WOW64_32KEY (0x0200) + #define KEY_WOW64_32KEY (0x0200) #endif const REGSAM n64KeyAccess = KEY_ALL_ACCESS | KEY_WOW64_64KEY; @@ -53,7 +53,7 @@ const BOOL bX64 = FALSE; // 10.11.2009 tkr: MinGW doesn't know anything about RegDeleteKeyExA if WINVER < 0x0502. extern "C" { -WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY,LPCSTR,REGSAM,DWORD); +WINADVAPI LONG WINAPI RegDeleteKeyExA(HKEY,LPCSTR,REGSAM,DWORD); } ///////////////////////////////////////////////////////////////////////////// @@ -102,14 +102,14 @@ const char* aFileExt[] = { ".vor", const char* aMimeType[] = { "application/vnd.stardivision.writer", - "application/vnd.stardivision.chart", + "application/vnd.stardivision.chart", "application/vnd.stardivision.draw", "application/vnd.stardivision.impress", "application/vnd.stardivision.impress-packed", "application/vnd.stardivision.calc", "application/vnd.stardivision.writer", "application/vnd.stardivision.math", - + MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII, MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII, MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII, @@ -164,27 +164,27 @@ const char* aLocalPrefix = "Software\\Classes\\"; BOOL createKey( HKEY hkey, const char* aKeyToCreate, REGSAM nKeyAccess, - const char* aValue = NULL, - const char* aChildName = NULL, + const char* aValue = NULL, + const char* aChildName = NULL, const char* aChildValue = NULL ) { HKEY hkey1; - - return ( ERROR_SUCCESS == RegCreateKeyExA( hkey, aKeyToCreate, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) - && ( !aValue || ERROR_SUCCESS == RegSetValueExA( hkey1, - "", - 0, - REG_SZ, - (const BYTE*)aValue, + + return ( ERROR_SUCCESS == RegCreateKeyExA( hkey, aKeyToCreate, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) + && ( !aValue || ERROR_SUCCESS == RegSetValueExA( hkey1, + "", + 0, + REG_SZ, + (const BYTE*)aValue, strlen( aValue ) ) ) - && ( !aChildName || ERROR_SUCCESS == RegSetValueExA( hkey1, - aChildName, - 0, - REG_SZ, - (const BYTE*)aChildValue, + && ( !aChildName || ERROR_SUCCESS == RegSetValueExA( hkey1, + aChildName, + 0, + REG_SZ, + (const BYTE*)aChildValue, strlen( aChildValue ) ) ) && ERROR_SUCCESS == RegCloseKey( hkey1 ) ); - + } STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ); @@ -204,7 +204,7 @@ STDAPI DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAc char pActiveXPath[1124]; char pActiveXPath101[1124]; - + // In case SO7 is installed for this user he can have local registry entries that will prevent him from // using SO8 ActiveX control. The fix is just to clean up the local entries related to ActiveX control. // Unfortunately it can be done only for the user who installs the office. @@ -222,7 +222,7 @@ STDAPI DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAc { wsprintfA( aSubKey, "%sCLSID\\%s", aPrefix, aClassID ); - aResult = + aResult = ( ERROR_SUCCESS == RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey , NULL ) && ERROR_SUCCESS == RegSetValueExA( hkey, "", 0, REG_SZ, (const BYTE*)"SOActiveX Class", 17 ) && createKey( hkey, "Control", nKeyAccess ) @@ -291,22 +291,22 @@ STDAPI DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAc { wsprintfA( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMimeType[ind] ); if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) -// || ERROR_SUCCESS != RegSetValueExA(hkey, "Extension", 0, REG_SZ, +// || ERROR_SUCCESS != RegSetValueExA(hkey, "Extension", 0, REG_SZ, // (const BYTE *)aFileExt[ind], strlen( aFileExt[ind] ) ) || ERROR_SUCCESS != RegSetValueExA(hkey, "CLSID", 0, REG_SZ, (const BYTE *)aClassID, strlen(aClassID)) ) aResult = FALSE; - - if( hkey ) + + if( hkey ) RegCloseKey(hkey),hkey= NULL; /* wsprintfA( aSubKey, "%s%s", aPrefix, aFileExt[ind] ); - if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) + if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) || ERROR_SUCCESS != RegSetValueExA(hkey, "Content Type", 0, REG_SZ, (const BYTE *)aMimeType[ind], strlen( aMimeType[ind] ) ) ) aResult = FALSE; - if( hkey ) + if( hkey ) RegCloseKey(hkey),hkey= NULL; */ } @@ -320,7 +320,7 @@ STDAPI DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAc wsprintfA( aSubKey, "EnableFullPage\\%s", aFileExt[ind] ); if ( ERROR_SUCCESS != RegCreateKeyExA( hkey, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey1 , NULL ) ) aResult = FALSE; - + if ( hkey1 ) RegCloseKey(hkey1),hkey1= NULL; } @@ -375,7 +375,7 @@ STDAPI DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKey BOOL fErr = FALSE; char aSubKey[513]; const char* aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix; - + for( int ind = 0; ind < SUPPORTED_EXT_NUM; ind++ ) { if( nForModes[ind] & nMode ) @@ -388,7 +388,7 @@ STDAPI DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKey { if ( ERROR_SUCCESS != RegDeleteValue( hkey, "CLSID" ) ) fErr = TRUE; - + if ( ERROR_SUCCESS != RegQueryInfoKey( hkey, NULL, NULL, NULL, &nSubKeys, NULL, NULL, &nValues, NULL, NULL, NULL, NULL ) ) @@ -396,14 +396,14 @@ STDAPI DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKey RegCloseKey( hkey ), hkey = NULL; fErr = TRUE; } - else + else { RegCloseKey( hkey ), hkey = NULL; if ( !nSubKeys && !nValues ) DeleteKeyTree( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, nKeyAccess ); } } - + wsprintfA( aSubKey, "%s%s", aPrefix, aFileExt[ind] ); if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) ) fErr = TRUE; @@ -416,7 +416,7 @@ STDAPI DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKey RegCloseKey( hkey ), hkey = NULL; fErr = TRUE; } - else + else { RegCloseKey( hkey ), hkey = NULL; if ( !nSubKeys && !nValues ) @@ -472,12 +472,12 @@ STDAPI DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ) #define SUPPORTED_MSEXT_NUM 7 const char* aMSFileExt[] = { ".dot", ".doc", ".xlt", ".xls", ".pot", ".ppt", ".pps" }; -const char* aMSMimeType[] = { "application/msword", - "application/msword", - "application/msexcell", - "application/msexcell", - "application/mspowerpoint", - "application/mspowerpoint", +const char* aMSMimeType[] = { "application/msword", + "application/msword", + "application/msexcell", + "application/msexcell", + "application/mspowerpoint", + "application/mspowerpoint", "application/mspowerpoint" }; const int nForMSModes[] = { 1, 1, 2, 2, 4, 4, 4 }; @@ -504,22 +504,22 @@ STDAPI DllRegisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAcces { wsprintfA( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMSMimeType[ind] ); if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) - || ERROR_SUCCESS != RegSetValueExA(hkey, "Extension", 0, REG_SZ, + || ERROR_SUCCESS != RegSetValueExA(hkey, "Extension", 0, REG_SZ, (const BYTE *)aMSFileExt[ind], strlen( aMSFileExt[ind] ) ) || ERROR_SUCCESS != RegSetValueExA(hkey, "CLSID", 0, REG_SZ, (const BYTE *)aClassID, strlen(aClassID)) ) aResult = FALSE; - - if( hkey ) + + if( hkey ) RegCloseKey(hkey),hkey= NULL; - + wsprintfA( aSubKey, "%s%s", aPrefix, aMSFileExt[ind] ); - if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) + if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) || ERROR_SUCCESS != RegSetValueExA(hkey, "Content Type", 0, REG_SZ, (const BYTE *)aMSMimeType[ind], strlen( aMSMimeType[ind] ) ) ) aResult = FALSE; - - if( hkey ) + + if( hkey ) RegCloseKey(hkey),hkey= NULL; } } @@ -572,13 +572,13 @@ STDAPI DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAcc BOOL fErr = FALSE; char aSubKey[513]; const char* aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix; - + for( int ind = 0; ind < SUPPORTED_MSEXT_NUM; ind++ ) { if( nForMSModes[ind] & nMode ) { DWORD nSubKeys = 0, nValues = 0; - + wsprintfA( aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMSMimeType[ind] ); if ( ERROR_SUCCESS != RegCreateKeyExA( bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, aSubKey, 0, NULL, REG_OPTION_NON_VOLATILE, nKeyAccess, NULL, &hkey, NULL ) ) fErr = TRUE; @@ -597,7 +597,7 @@ STDAPI DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAcc RegCloseKey( hkey ), hkey = NULL; fErr = TRUE; } - else + else { RegCloseKey( hkey ), hkey = NULL; if ( !nSubKeys && !nValues ) @@ -620,7 +620,7 @@ STDAPI DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAcc RegCloseKey( hkey ), hkey = NULL; fErr = TRUE; } - else + else { RegCloseKey( hkey ), hkey = NULL; if ( !nSubKeys && !nValues ) diff --git a/extensions/source/activex/msidl/so_activex.idl b/extensions/source/activex/msidl/so_activex.idl index d1a7d9936eed..ff396f5f9008 100644 --- a/extensions/source/activex/msidl/so_activex.idl +++ b/extensions/source/activex/msidl/so_activex.idl @@ -29,36 +29,36 @@ import "ocidl.idl"; ] interface ISOComWindowPeer : IDispatch { - [id(1), helpstring("method getWindowHandle")] + [id(1), helpstring("method getWindowHandle")] HRESULT getWindowHandle( [in] SAFEARRAY(VARIANT) procId, [in] short s, [out,retval] long* ret); - [id(2), helpstring("method getToolkit")] + [id(2), helpstring("method getToolkit")] HRESULT getToolkit( [out,retval] IDispatch** retVal ); - [id(3), helpstring("method setPointer")] + [id(3), helpstring("method setPointer")] HRESULT setPointer( [in] IDispatch* xPointer ); - [id(4), helpstring("method setBackground")] + [id(4), helpstring("method setBackground")] HRESULT setBackground( [in] int nColor ); - [id(5), helpstring("method invalidate")] + [id(5), helpstring("method invalidate")] HRESULT invalidate( [in] short ); - [id(6), helpstring("method invalidateRect")] + [id(6), helpstring("method invalidateRect")] HRESULT invalidateRect( [in] IDispatch* aRect, [in] short nFlags ); - [id(7), helpstring("method dispose")] + [id(7), helpstring("method dispose")] HRESULT dispose(); - [id(8), helpstring("method addEventListener")] + [id(8), helpstring("method addEventListener")] HRESULT addEventListener( [in] IDispatch* xListener ); - [id(9), helpstring("method removeEventListener")] + [id(9), helpstring("method removeEventListener")] HRESULT removeEventListener( [in] IDispatch* xListener ); - [propget, id(10), helpstring("property_implementedInterfaces")] + [propget, id(10), helpstring("property_implementedInterfaces")] HRESULT Bridge_implementedInterfaces([out, retval] SAFEARRAY(BSTR) *pVal); }; @@ -71,20 +71,20 @@ interface ISOComWindowPeer : IDispatch ] interface ISODispatchInterceptor : IDispatch { -//com.sun.star.frame.XDispatchProviderInterceptor +//com.sun.star.frame.XDispatchProviderInterceptor [id(1), helpstring("method getSlaveDispatchProvider")] HRESULT getSlaveDispatchProvider( [out,retval] IDispatch** retVal ); - [id(2), helpstring("method setSlaveDispatchProvider")] + [id(2), helpstring("method setSlaveDispatchProvider")] HRESULT setSlaveDispatchProvider( [in] IDispatch* xNewDispatchProvider ); - [id(3), helpstring("method getMasterDispatchProvider")] + [id(3), helpstring("method getMasterDispatchProvider")] HRESULT getMasterDispatchProvider( [out,retval] IDispatch** retVal ); - [id(4), helpstring("method setMasterDispatchProvider")] + [id(4), helpstring("method setMasterDispatchProvider")] HRESULT setMasterDispatchProvider( [in] IDispatch* xNewSupplier ); - + // com.sun.star.frame.XDispatchProvider [id(5), helpstring("method queryDispatch")] @@ -93,7 +93,7 @@ interface ISODispatchInterceptor : IDispatch [in] long nSearchFlags, [out,retval] IDispatch** retVal ); - [id(6), helpstring("method queryDispatches")] + [id(6), helpstring("method queryDispatches")] HRESULT queryDispatches( [in] SAFEARRAY(IDispatch*) aDescripts, [out,retval] SAFEARRAY(VARIANT)* retVal ); @@ -104,14 +104,14 @@ interface ISODispatchInterceptor : IDispatch HRESULT dispatch( [in] IDispatch* aURL, [in] SAFEARRAY(VARIANT) aArgs ); - [id(8), helpstring("method addStatusListener")] + [id(8), helpstring("method addStatusListener")] HRESULT addStatusListener( [in] IDispatch* xControl, [in] IDispatch* aURL ); - [id(9), helpstring("method removeStatusListener")] + [id(9), helpstring("method removeStatusListener")] HRESULT removeStatusListener( [in] IDispatch* xControl, [in] IDispatch* aURL ); - + // com.sun.star.frame.XInterceptorInfo @@ -119,7 +119,7 @@ interface ISODispatchInterceptor : IDispatch HRESULT getInterceptedURLs( [out,retval] SAFEARRAY(BSTR)* pVal ); // the common UNO-COM staff - [propget, id(11), helpstring("property_implementedInterfaces")] + [propget, id(11), helpstring("property_implementedInterfaces")] HRESULT Bridge_implementedInterfaces([out, retval] SAFEARRAY(BSTR) *pVal); }; @@ -138,12 +138,12 @@ interface ISOActionsApproval : IDispatch { //com.sun.star.embed.XActionsApproval - [id(1), helpstring("method approveAction")] + [id(1), helpstring("method approveAction")] HRESULT approveAction( [in] long aActionID, [out,retval] boolean* pbApproval ); // the common UNO-COM staff - [propget, id(2), helpstring("property_implementedInterfaces")] + [propget, id(2), helpstring("property_implementedInterfaces")] HRESULT Bridge_implementedInterfaces([out, retval] SAFEARRAY(BSTR) *pVal); }; |