INTEGRATION: CWS fwk20 (1.4.486); FILE MERGED

2005/08/01 14:58:22 mav 1.4.486.1: #i19510# Let MSIE download the stream
This commit is contained in:
Jens-Heiner Rechtien
2005-09-23 14:38:53 +00:00
parent ea69fe6d92
commit fd73fd45df

View File

@@ -66,6 +66,9 @@ protected:
SODispatchInterceptor* mpDispatchInterceptor; SODispatchInterceptor* mpDispatchInterceptor;
SOVersion mnVersion; SOVersion mnVersion;
BOOL mbReadyForActivation;
CComPtr<IDispatch> mpDispTempFile;
public: public:
CSOActiveX(); CSOActiveX();
~CSOActiveX(); ~CSOActiveX();
@@ -136,7 +139,7 @@ public:
STDMETHOD(Load) ( LPSTREAM pStm ); STDMETHOD(Load) ( LPSTREAM pStm );
STDMETHOD(InitNew) (); STDMETHOD(InitNew) ();
HRESULT OnDrawAdvanced(ATL_DRAWINFO& di); HRESULT OnDrawAdvanced(ATL_DRAWINFO& di);
HRESULT OnDraw(ATL_DRAWINFO& di) { return S_OK; } HRESULT OnDraw(ATL_DRAWINFO& di);
HRESULT CreateFrameOldWay( HWND hwnd, int width, int height ); HRESULT CreateFrameOldWay( HWND hwnd, int width, int height );
HRESULT GetUnoStruct( OLECHAR* sStructName, CComPtr<IDispatch>& pdispResult ); HRESULT GetUnoStruct( OLECHAR* sStructName, CComPtr<IDispatch>& pdispResult );
@@ -148,6 +151,9 @@ public:
HRESULT CSOActiveX::GetURL( const OLECHAR* url, HRESULT CSOActiveX::GetURL( const OLECHAR* url,
const OLECHAR* target ); const OLECHAR* target );
void CallbackCreateXInputStream( CBindStatusCallback<CSOActiveX>* pbsc, BYTE* pBytes, DWORD dwSize );
SOVersion GetVersionConnected(); SOVersion GetVersionConnected();
}; };