diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 15:15:39 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2003-04-15 15:15:39 +0000 |
commit | 0a8a48012a5c14fdefe2ca44e9204a8a97f3fd13 (patch) | |
tree | 30817ea6a19734d7fe63b85ea62ce2e96a094ae5 /extensions | |
parent | dad8998b07e19c5e0e07d603c79472082db4fd6b (diff) |
INTEGRATION: CWS dbgmacros1 (1.6.68); FILE MERGED
2003/04/09 10:54:42 kso 1.6.68.1: #108413# - debug macro unification.
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/activex/main/SOActiveX.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/extensions/source/activex/main/SOActiveX.cpp b/extensions/source/activex/main/SOActiveX.cpp index 4a81b0773a92..16d8d0d89ddb 100644 --- a/extensions/source/activex/main/SOActiveX.cpp +++ b/extensions/source/activex/main/SOActiveX.cpp @@ -204,14 +204,14 @@ STDMETHODIMP CSOActiveX::Load( LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog ) IPropertyBag2* pPropBag2; HRESULT hr = pPropBag->QueryInterface( IID_IPropertyBag2, (void**)&pPropBag2 ); - ATLASSERT( hr >= 0 ); + //ATLASSERT( hr >= 0 ); if( !SUCCEEDED( hr ) ) return hr; unsigned long aNum; hr = pPropBag2->CountProperties( &aNum ); - ATLASSERT( hr >= 0 ); + //ATLASSERT( hr >= 0 ); if( !SUCCEEDED( hr ) ) return hr; @@ -222,7 +222,7 @@ STDMETHODIMP CSOActiveX::Load( LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog ) aNum, aPropNames, &aReaded ); - ATLASSERT( hr >= 0 ); + //ATLASSERT( hr >= 0 ); if( !SUCCEEDED( hr ) ) { delete[] aPropNames; @@ -236,7 +236,7 @@ STDMETHODIMP CSOActiveX::Load( LPPROPERTYBAG pPropBag, LPERRORLOG pErrorLog ) NULL, aVal, hvs ); - ATLASSERT( hr >= 0 ); + //ATLASSERT( hr >= 0 ); if( !SUCCEEDED( hr ) ) { delete[] hvs; @@ -732,7 +732,7 @@ STDMETHODIMP CSOActiveX::SetClientSite( IOleClientSite* aClientSite ) if( !aClientSite ) { - ATLASSERT( mWebBrowser2 ); + //ATLASSERT( mWebBrowser2 ); if( mWebBrowser2 ) AtlUnadvise( mWebBrowser2, DIID_DWebBrowserEvents2, mCookie ); return hr; @@ -740,19 +740,19 @@ STDMETHODIMP CSOActiveX::SetClientSite( IOleClientSite* aClientSite ) CComPtr<IOleContainer> aContainer; m_spClientSite->GetContainer( &aContainer ); - ATLASSERT( aContainer ); +// ATLASSERT( aContainer ); if( SUCCEEDED( hr ) && aContainer ) { CComQIPtr<IServiceProvider, &IID_IServiceProvider> aServiceProvider( aContainer ); - ATLASSERT( aServiceProvider ); + //ATLASSERT( aServiceProvider ); if( aServiceProvider ) { aServiceProvider->QueryService( SID_SInternetExplorer, IID_IWebBrowser, (void**)&mWebBrowser2 ); - ATLASSERT( mWebBrowser2 ); +// ATLASSERT( mWebBrowser2 ); if( mWebBrowser2 ) AtlAdvise( mWebBrowser2, GetUnknown(), DIID_DWebBrowserEvents2, &mCookie ); } |