[Libreoffice-commits] .: 3 commits - automation/source basctl/source cui/source embedserv/source extensions/source extensions/test forms/source lingucomponent/source setup_native/source UnoControls/source xmlsecurity/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sun Feb 6 04:43:41 PST 2011
UnoControls/source/base/multiplexer.cxx | 9
automation/source/server/retstrm.hxx | 4
automation/source/server/scmdstrm.hxx | 2
automation/source/server/server.cxx | 59 ---
automation/source/server/sta_list.cxx | 31 -
automation/source/server/statemnt.cxx | 39 --
automation/source/server/statemnt.hxx | 12
automation/source/testtool/comm_bas.cxx | 1
automation/source/testtool/cretstrm.hxx | 2
automation/source/testtool/objtest.hxx | 13
basctl/source/basicide/baside2.cxx | 23 -
basctl/source/basicide/baside2b.cxx | 7
basctl/source/basicide/baside3.cxx | 4
basctl/source/basicide/basides2.cxx | 37 --
basctl/source/basicide/basobj3.cxx | 10
basctl/source/basicide/brkdlg.cxx | 6
basctl/source/basicide/moduldl2.cxx | 12
basctl/source/basicide/tbxctl.hxx | 27 -
basctl/source/dlged/dlgedfunc.cxx | 19 -
basctl/source/dlged/dlgedlist.cxx | 14
basctl/source/dlged/propbrw.cxx | 6
cui/source/options/optinet2.cxx | 131 -------
cui/source/options/optjava.cxx | 20 -
cui/source/options/optlingu.cxx | 35 --
cui/source/options/optsave.cxx | 11
cui/source/tabpages/grfpage.cxx | 21 -
cui/source/tabpages/measure.cxx | 3
cui/source/tabpages/numpages.cxx | 37 --
cui/source/tabpages/paragrph.cxx | 17 -
cui/source/tabpages/swpossizetabpage.cxx | 26 -
cui/source/tabpages/tabline.cxx | 14
cui/source/tabpages/tpbitmap.cxx | 14
cui/source/tabpages/tpgradnt.cxx | 7
cui/source/tabpages/tphatch.cxx | 18 -
embedserv/source/embed/docholder.cxx | 112 ------
embedserv/source/inprocserv/advisesink.cxx | 5
embedserv/source/inprocserv/inprocembobj.cxx | 168 ----------
embedserv/source/inprocserv/smartpointer.hxx | 14
extensions/source/ole/servprov.cxx | 3
extensions/source/ole/unotypewrapper.hxx | 2
extensions/source/plugin/inc/plugin/plctrl.hxx | 1
extensions/test/ole/OleClient/clientTest.cxx | 6
extensions/test/ole/cpnt/cpnt.cxx | 150 --------
extensions/test/ole/unloading/unloadTest.cxx | 12
forms/source/component/propertybaghelper.cxx | 11
forms/source/xforms/model.cxx | 59 ---
forms/source/xforms/submission/serialization_app_xml.cxx | 11
forms/source/xforms/submission/serialization_urlencoded.cxx | 16
forms/source/xforms/submission/submission_post.cxx | 10
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 13
lingucomponent/source/languageguessing/guesslang.cxx | 37 --
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 15
setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 57 ---
setup_native/source/win32/customactions/shellextensions/layerlinks.cxx | 24 -
setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx | 11
setup_native/source/win32/stwrapper/stwrapper.cxx | 1
xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx | 5
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 6
xmlsecurity/source/xmlsec/nss/xsec_nss.cxx | 5
xmlsecurity/source/xmlsec/saxhelper.cxx | 15
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx | 6
61 files changed, 13 insertions(+), 1453 deletions(-)
New commits:
commit 03ba01048f0ad3170aa17b2e651ae1ccab86a1ac
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Feb 5 21:23:32 2011 +0100
Remove OWN_DEBUG and WRITEDEBUGINFO
diff --git a/embedserv/source/inprocserv/advisesink.cxx b/embedserv/source/inprocserv/advisesink.cxx
index 03c63bb..09b24e2 100644
--- a/embedserv/source/inprocserv/advisesink.cxx
+++ b/embedserv/source/inprocserv/advisesink.cxx
@@ -140,7 +140,6 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnDataChange( LPFORMATETC pFetc, LPSTG
{
if ( m_pListener )
{
- WRITEDEBUGINFO( "OleWrapperAdviseSink::OnDataChange():" );
m_pListener->OnDataChange( pFetc, pMedium );
}
}
@@ -149,7 +148,6 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnViewChange( DWORD dwAspect, LONG lin
{
if ( m_pListener )
{
- WRITEDEBUGINFO( "OleWrapperAdviseSink::OnViewChange():" );
m_pListener->OnViewChange( dwAspect, lindex );
}
}
@@ -158,7 +156,6 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnRename( LPMONIKER pMoniker )
{
if ( m_pListener )
{
- WRITEDEBUGINFO( "OleWrapperAdviseSink::OnRename():" );
m_pListener->OnRename( pMoniker );
}
}
@@ -167,7 +164,6 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnSave(void)
{
if ( m_pListener )
{
- WRITEDEBUGINFO( "OleWrapperAdviseSink::OnSave():" );
m_pListener->OnSave();
}
}
@@ -176,7 +172,6 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnClose(void)
{
if ( m_pListener )
{
- WRITEDEBUGINFO( "OleWrapperAdviseSink::OnClose():" );
m_pListener->OnClose();
}
diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx
index 122dcea..d984e99 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -32,33 +32,6 @@
namespace inprocserv
{
-#ifdef OWNDEBUG
-//-------------------------------------------------------------------------------
-void WriteDebugInfo( DWORD pThis, char* pString, DWORD nToWrite )
-{
- if ( nToWrite )
- {
- char pNumber[12];
- pNumber[0] = '0';
- pNumber[1] = 'x';
- for ( int nInd = 0; nInd < 8; nInd++ )
- pNumber[nInd+2] = (char)( ( pThis / ( 1 << ( 7 - nInd ) ) ) % 16 ) + 48;
- pNumber[10] = ' ';
- pNumber[11] = 0;
-
- HANDLE pFile = CreateFileA( "h:\\inproc.log", GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, 0, NULL );
- if ( pFile )
- {
- DWORD dwWritten = 0;
- SetFilePointer( pFile, 0, 0, FILE_END );
- WriteFile( pFile, pNumber, 11, &dwWritten, NULL );
- WriteFile( pFile, pString, nToWrite - 1, &dwWritten, NULL );
- CloseHandle( pFile );
- }
- }
-}
-#endif
-
//-------------------------------------------------------------------------------
BOOL StringsEqual( LPCOLESTR pszNameFromOutside, wchar_t* pOwnName )
{
@@ -113,29 +86,23 @@ void InprocEmbedDocument_Impl::SetName( LPCOLESTR pszNameFromOutside, wchar_t*&
//-------------------------------------------------------------------------------
BOOL InprocEmbedDocument_Impl::CheckDefHandler()
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
// set the own listener
if ( m_pOleAdvises[0] == NULL )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
m_pOleAdvises[0] = new OleWrapperAdviseSink();
}
else
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
if ( m_pOleAdvises[0]->IsClosed() )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
if ( m_pDefHandler )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
// deregister all the listeners
ComSmart< IOleObject > pOleObject;
HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
if ( SUCCEEDED( hr ) && pOleObject )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
for ( DWORD nInd = 0; nInd < DEFAULT_ARRAY_LEN; nInd++ )
if ( m_pOleAdvises[nInd] )
{
@@ -147,12 +114,10 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
pOleObject->SetClientSite( NULL );
}
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
ComSmart< IDataObject > pIDataObject;
hr = m_pDefHandler->QueryInterface( IID_IDataObject, (void**)&pIDataObject );
if ( SUCCEEDED( hr ) && pIDataObject )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
for ( DWORD nInd = 0; nInd < DEFAULT_ARRAY_LEN; nInd++ )
if ( m_pDataAdvises[nInd] )
{
@@ -162,23 +127,18 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
}
}
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
ComSmart< IViewObject > pIViewObject;
hr = m_pDefHandler->QueryInterface( IID_IViewObject, (void**)&pIViewObject );
if ( SUCCEEDED( hr ) && pIViewObject )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
if ( m_pViewAdvise )
pIViewObject->SetAdvise( m_pViewAdvise->GetAspect(), m_pViewAdvise->GetViewAdviseFlag(), NULL );
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
}
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
ComSmart< IPersistStorage > pPersist;
hr = m_pDefHandler->QueryInterface( IID_IPersistStorage, (void**)&pPersist );
if ( SUCCEEDED( hr ) && pPersist )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
// disconnect the old wrapper from the storage
pPersist->HandsOffStorage();
}
@@ -186,7 +146,6 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
m_pDefHandler = NULL;
}
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
m_pOleAdvises[0]->UnsetClosed();
}
}
@@ -194,19 +153,15 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
if ( m_nCallsOnStack )
return FALSE;
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
if ( !m_pDefHandler )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
// create a new default inprocess handler
HRESULT hr = OleCreateDefaultHandler( m_guid, NULL, IID_IUnknown, (void**)&m_pDefHandler );
if ( SUCCEEDED( hr ) )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
{
if ( m_nInitMode == INIT_FROM_STORAGE )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
ComSmart< IPersistStorage > pPersist;
hr = m_pDefHandler->QueryInterface( IID_IPersistStorage, (void**)&pPersist );
@@ -216,7 +171,6 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
}
else if ( m_nInitMode == LOAD_FROM_STORAGE )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
ComSmart< IPersistStorage > pPersist;
hr = m_pDefHandler->QueryInterface( IID_IPersistStorage, (void**)&pPersist );
@@ -226,7 +180,6 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
}
else if ( m_nInitMode == LOAD_FROM_FILE )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
ComSmart< IPersistFile > pPersistFile;
hr = m_pDefHandler->QueryInterface( IID_IPersistFile, (void**)&pPersistFile );
@@ -234,14 +187,11 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
if ( SUCCEEDED( hr ) && pPersistFile && m_pFileName )
hr = pPersistFile->Load( m_pFileName, m_nFileOpenMode );
}
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
}
}
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
if ( !SUCCEEDED( hr ) || !m_pDefHandler )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
m_pDefHandler = NULL;
return FALSE;
}
@@ -252,11 +202,9 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
if ( SUCCEEDED( hr ) && pOleObject )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
if ( m_pClientSite )
pOleObject->SetClientSite( m_pClientSite );
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
for ( DWORD nInd = 0; nInd < DEFAULT_ARRAY_LEN; nInd++ )
if ( m_pOleAdvises[nInd] )
{
@@ -266,36 +214,28 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
}
}
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
ComSmart< IDataObject > pIDataObject;
hr = m_pDefHandler->QueryInterface( IID_IDataObject, (void**)&pIDataObject );
if ( SUCCEEDED( hr ) && pIDataObject )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
for ( DWORD nInd = 0; nInd < DEFAULT_ARRAY_LEN; nInd++ )
if ( m_pDataAdvises[nInd] )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
DWORD nRegID = 0;
if ( SUCCEEDED( pIDataObject->DAdvise( m_pDataAdvises[nInd]->GetFormatEtc(), m_pDataAdvises[nInd]->GetDataAdviseFlag(), m_pDataAdvises[nInd], &nRegID ) ) && nRegID > 0 )
m_pDataAdvises[nInd]->SetRegID( nRegID );
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
}
}
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
ComSmart< IViewObject > pIViewObject;
hr = m_pDefHandler->QueryInterface( IID_IViewObject, (void**)&pIViewObject );
if ( SUCCEEDED( hr ) && pIViewObject )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
if ( m_pViewAdvise )
pIViewObject->SetAdvise( m_pViewAdvise->GetAspect(), m_pViewAdvise->GetViewAdviseFlag(), m_pViewAdvise );
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
}
}
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
return TRUE;
}
@@ -494,11 +434,9 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetClassID( CLSID* pClassId )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::IsDirty()
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::IsDirty()1" );
if ( m_pDefHandler == NULL || m_pOleAdvises[0] == NULL || m_pOleAdvises[0]->IsClosed() )
return S_FALSE;
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::IsDirty()2" );
if ( CheckDefHandler() )
{
ComSmart< IPersistStorage > pPersist;
@@ -515,7 +453,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::IsDirty()
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::InitNew( IStorage *pStg )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::InitNew( IStorage *pStg )" );
if ( CheckDefHandler() )
{
ComSmart< IPersistStorage > pPersist;
@@ -548,28 +485,23 @@ STDMETHODIMP InprocEmbedDocument_Impl::InitNew( IStorage *pStg )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Load( IStorage *pStg )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Load( IStorage *pStg )" );
if ( CheckDefHandler() )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Load( IStorage *pStg )" );
ComSmart< IPersistStorage > pPersist;
HRESULT hr = m_pDefHandler->QueryInterface( IID_IPersistStorage, (void**)&pPersist );
ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
if ( SUCCEEDED( hr ) && pPersist )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Load( IStorage *pStg )" );
hr = pPersist->Load( pStg );
if ( SUCCEEDED( hr ) )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Load( IStorage *pStg )" );
m_nInitMode = LOAD_FROM_STORAGE;
m_pStorage = pStg;
m_nFileOpenMode = 0;
if ( m_pFileName )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Load( IStorage *pStg )" );
delete[] m_pFileName;
m_pFileName = NULL;
}
@@ -585,11 +517,9 @@ STDMETHODIMP InprocEmbedDocument_Impl::Load( IStorage *pStg )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )" );
if ( fSameAsLoad && ( m_pDefHandler == NULL || m_pOleAdvises[0] == NULL || m_pOleAdvises[0]->IsClosed() ) )
return S_OK;
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )" );
if ( CheckDefHandler() )
{
ComSmart< IPersistStorage > pPersist;
@@ -606,7 +536,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoa
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )" );
if ( m_pDefHandler == NULL || m_pOleAdvises[0] == NULL || m_pOleAdvises[0]->IsClosed() )
{
if ( pStgNew )
@@ -615,7 +544,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )
return S_OK;
}
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )" );
if ( CheckDefHandler() )
{
ComSmart< IPersistStorage > pPersist;
@@ -627,11 +555,9 @@ STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )
hr = pPersist->SaveCompleted( pStgNew );
if ( SUCCEEDED( hr ) )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )" );
m_nInitMode = LOAD_FROM_STORAGE;
if ( pStgNew )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )" );
m_pStorage = pStgNew;
}
@@ -653,7 +579,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::HandsOffStorage()
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::HandsOffStorage()" );
if ( CheckDefHandler() )
{
ComSmart< IPersistStorage > pPersist;
@@ -666,7 +591,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::HandsOffStorage()
if ( SUCCEEDED( hr ) )
{
m_pStorage = NULL;
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::HandsOffStorage()" );
}
return hr;
@@ -680,7 +604,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::HandsOffStorage()
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD dwMode )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD dwMode )" );
if ( CheckDefHandler() && pszFileName )
{
ComSmart< IPersistFile > pPersist;
@@ -711,7 +634,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD dwMode
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRemember )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRemember )" );
if ( CheckDefHandler() )
{
ComSmart< IPersistFile > pPersist;
@@ -728,7 +650,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRememb
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )" );
if ( CheckDefHandler() )
{
ComSmart< IPersistFile > pPersist;
@@ -758,7 +679,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName )" );
if ( CheckDefHandler() )
{
ComSmart< IPersistFile > pPersist;
@@ -776,7 +696,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )" );
if ( pSite == m_pClientSite )
return S_OK;
@@ -824,7 +743,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetClientSite( IOleClientSite** pSite )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetClientSite( IOleClientSite** pSite )" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -841,7 +759,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetClientSite( IOleClientSite** pSite )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, LPCOLESTR szContainerObj )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, LPCOLESTR szContainerObj )" );
if ( CheckDefHandler() )
{
@@ -851,7 +768,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, L
ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
if ( SUCCEEDED( hr ) && pOleObject )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, LPCOLESTR szContainerObj )" );
hr = pOleObject->SetHostNames( szContainerApp, szContainerObj );
}
}
@@ -862,7 +778,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, L
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Close( DWORD dwSaveOption )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Close( DWORD dwSaveOption )" );
if ( m_pDefHandler && CheckDefHandler() )
{
// no need to close if there is no default handler.
@@ -886,7 +801,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Close( DWORD dwSaveOption )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::SetMoniker( DWORD dwWhichMoniker, IMoniker * pmk )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SetMoniker( DWORD dwWhichMoniker, IMoniker * pmk )" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -903,7 +817,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetMoniker( DWORD dwWhichMoniker, IMonike
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetMoniker( DWORD dwAssign, DWORD dwWhichMoniker, IMoniker ** ppmk )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetMoniker( DWORD dwAssign, DWORD dwWhichMoniker, IMoniker ** ppmk )" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -920,7 +833,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetMoniker( DWORD dwAssign, DWORD dwWhich
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::InitFromData( IDataObject * pDataObject, BOOL fCreation, DWORD dwReserved )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::InitFromData( IDataObject * pDataObject, BOOL fCreation, DWORD dwReserved )" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -937,7 +849,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::InitFromData( IDataObject * pDataObject,
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetClipboardData( DWORD dwReserved, IDataObject ** ppDataObject )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetClipboardData( DWORD dwReserved, IDataObject ** ppDataObject )" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -960,29 +871,22 @@ STDMETHODIMP InprocEmbedDocument_Impl::DoVerb(
HWND hWin,
LPCRECT pRect )
{
- WRITEDEBUGINFO( "DoVerb" );
if ( CheckDefHandler() )
{
- WRITEDEBUGINFO( "DoVerb" MY_STRING_LINE "n" );
ComSmart< IOleObject > pOleObject;
HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
- WRITEDEBUGINFO( "DoVerb" );
ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
- WRITEDEBUGINFO( "DoVerb" );
if ( SUCCEEDED( hr ) && pOleObject )
{
- WRITEDEBUGINFO( "DoVerb" );
hr = pOleObject->DoVerb( iVerb, pMsg, pActiveSite, nLong, hWin, pRect );
if ( SUCCEEDED( hr ) )
{
- WRITEDEBUGINFO( "DoVerb" );
}
return hr;
}
- WRITEDEBUGINFO( "DoVerb" );
}
return E_FAIL;
@@ -991,7 +895,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::DoVerb(
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::EnumVerbs( IEnumOLEVERB ** ppEnumOleVerb )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::EnumVerbs( IEnumOLEVERB ** ppEnumOleVerb )" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -1008,7 +911,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::EnumVerbs( IEnumOLEVERB ** ppEnumOleVerb
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Update()
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Update()" );
if ( m_pDefHandler && CheckDefHandler() )
{
@@ -1026,7 +928,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Update()
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::IsUpToDate()
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::IsUpToDate()" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -1043,7 +944,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::IsUpToDate()
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetUserClassID( CLSID *pClsid )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetUserClassID( CLSID *pClsid )" );
if ( pClsid )
*pClsid = m_guid;
@@ -1053,7 +953,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetUserClassID( CLSID *pClsid )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetUserType( DWORD dwFormOfType, LPOLESTR * pszUserType )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetUserType( DWORD dwFormOfType, LPOLESTR * pszUserType )" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -1070,7 +969,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetUserType( DWORD dwFormOfType, LPOLESTR
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::SetExtent( DWORD dwDrawAspect, SIZEL *psizel )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SetExtent( DWORD dwDrawAspect, SIZEL *psizel )" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -1087,7 +985,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetExtent( DWORD dwDrawAspect, SIZEL *psi
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, SIZEL * psizel )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, SIZEL * psizel )" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -1104,7 +1001,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, SIZEL * ps
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Advise( IAdviseSink *pAdvSink, DWORD *pdwConnection )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Advise( IAdviseSink *pAdvSink, DWORD *pdwConnection )" );
if ( !pdwConnection )
return E_FAIL;
@@ -1179,7 +1075,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::EnumAdvise( IEnumSTATDATA ** /*ppenumAdvi
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetMiscStatus( DWORD dwAspect, DWORD * pdwStatus )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetMiscStatus( DWORD dwAspect, DWORD * pdwStatus )" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -1196,7 +1091,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetMiscStatus( DWORD dwAspect, DWORD * pd
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::SetColorScheme( LOGPALETTE * pLogpal )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SetColorScheme( LOGPALETTE * pLogpal )" );
if ( CheckDefHandler() )
{
ComSmart< IOleObject > pOleObject;
@@ -1214,7 +1108,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetColorScheme( LOGPALETTE * pLogpal )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIUM * pMedium )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIUM * pMedium )" );
if ( CheckDefHandler() )
{
ComSmart< IDataObject > pIDataObject;
@@ -1231,7 +1124,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIU
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pMedium )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pMedium )" );
if ( CheckDefHandler() )
{
ComSmart< IDataObject > pIDataObject;
@@ -1248,7 +1140,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetDataHere( FORMATETC * pFormatetc, STGM
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )" );
if ( CheckDefHandler() )
{
ComSmart< IDataObject > pIDataObject;
@@ -1265,7 +1156,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pFormatetcIn, FORMATETC * pFormatetcOut )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pFormatetcIn, FORMATETC * pFormatetcOut )" );
if ( CheckDefHandler() )
{
ComSmart< IDataObject > pIDataObject;
@@ -1282,7 +1172,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pForma
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::SetData( FORMATETC * pFormatetc, STGMEDIUM * pMedium, BOOL fRelease )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SetData( FORMATETC * pFormatetc, STGMEDIUM * pMedium, BOOL fRelease )" );
if ( CheckDefHandler() )
{
ComSmart< IDataObject > pIDataObject;
@@ -1299,7 +1188,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetData( FORMATETC * pFormatetc, STGMEDIU
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC ** ppFormatetc )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC ** ppFormatetc )" );
if ( CheckDefHandler() )
{
ComSmart< IDataObject > pIDataObject;
@@ -1316,7 +1204,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::EnumFormatEtc( DWORD dwDirection, IEnumFO
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD * pdwConnection )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD * pdwConnection )" );
if ( !pdwConnection )
return E_FAIL;
@@ -1358,7 +1245,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::DAdvise( FORMATETC * pFormatetc, DWORD ad
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::DUnadvise( DWORD dwConnection )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::DUnadvise( DWORD dwConnection )" );
if ( m_pDefHandler && DEFAULT_ARRAY_LEN > dwConnection && dwConnection > 0 && m_pDataAdvises[dwConnection] )
{
if ( CheckDefHandler() )
@@ -1386,7 +1272,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::DUnadvise( DWORD dwConnection )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::EnumDAdvise( IEnumSTATDATA ** ppenumAdvise )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::EnumDAdvise( IEnumSTATDATA ** ppenumAdvise )" );
if ( CheckDefHandler() )
{
ComSmart< IDataObject > pIDataObject;
@@ -1404,7 +1289,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::EnumDAdvise( IEnumSTATDATA ** ppenumAdvis
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetRunningClass( LPCLSID lpClsid )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetRunningClass( LPCLSID lpClsid )" );
if ( CheckDefHandler() )
{
ComSmart< IRunnableObject > pIRunObj;
@@ -1421,7 +1305,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetRunningClass( LPCLSID lpClsid )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Run( LPBINDCTX pbc )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Run( LPBINDCTX pbc )" );
if ( CheckDefHandler() )
{
ComSmart< IRunnableObject > pIRunObj;
@@ -1438,7 +1321,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Run( LPBINDCTX pbc )
//-------------------------------------------------------------------------------
BOOL STDMETHODCALLTYPE InprocEmbedDocument_Impl::IsRunning()
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::IsRunning()" );
if ( CheckDefHandler() )
{
ComSmart< IRunnableObject > pIRunObj;
@@ -1456,7 +1338,6 @@ BOOL STDMETHODCALLTYPE InprocEmbedDocument_Impl::IsRunning()
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::LockRunning( BOOL fLock, BOOL fLastUnlockCloses )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::LockRunning( BOOL fLock, BOOL fLastUnlockCloses )" );
if ( CheckDefHandler() )
{
ComSmart< IRunnableObject > pIRunObj;
@@ -1473,7 +1354,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::LockRunning( BOOL fLock, BOOL fLastUnlock
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::SetContainedObject( BOOL fContained)
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SetContainedObject( BOOL fContained)" );
if ( CheckDefHandler() )
{
ComSmart< IRunnableObject > pIRunObj;
@@ -1492,7 +1372,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetContainedObject( BOOL fContained)
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Draw( DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, BOOL ( STDMETHODCALLTYPE *pfnContinue )( ULONG_PTR dwContinue ), ULONG_PTR dwContinue )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Draw( DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, BOOL ( STDMETHODCALLTYPE *pfnContinue )( ULONG_PTR dwContinue ), ULONG_PTR dwContinue )" );
if ( CheckDefHandler() )
{
ComSmart< IViewObject > pIViewObject;
@@ -1509,7 +1388,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Draw( DWORD dwDrawAspect, LONG lindex, vo
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetColorSet( DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetColorSet( DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet )" );
if ( CheckDefHandler() )
{
ComSmart< IViewObject > pIViewObject;
@@ -1526,7 +1404,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetColorSet( DWORD dwDrawAspect, LONG lin
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Freeze( DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Freeze( DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze )" );
if ( CheckDefHandler() )
{
ComSmart< IViewObject > pIViewObject;
@@ -1543,7 +1420,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Freeze( DWORD dwDrawAspect, LONG lindex,
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Unfreeze( DWORD dwFreeze )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Unfreeze( DWORD dwFreeze )" );
if ( CheckDefHandler() )
{
ComSmart< IViewObject > pIViewObject;
@@ -1560,7 +1436,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Unfreeze( DWORD dwFreeze )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::SetAdvise( DWORD aspects, DWORD advf, IAdviseSink *pAdvSink )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SetAdvise( DWORD aspects, DWORD advf, IAdviseSink *pAdvSink )" );
// CheckDefHandler will set the listener, avoid reusing of old listener
if ( m_pViewAdvise )
@@ -1618,7 +1493,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetAdvise( DWORD *pAspects, DWORD *pAdvf,
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, LONG lindex, DVTARGETDEVICE *ptd, LPSIZEL lpsizel )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, LONG lindex, DVTARGETDEVICE *ptd, LPSIZEL lpsizel )" );
if ( CheckDefHandler() )
{
ComSmart< IViewObject2 > pIViewObject2;
@@ -1638,7 +1512,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, LONG linde
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetWindow( HWND *phwnd )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetWindow( HWND *phwnd )" );
if ( CheckDefHandler() )
{
ComSmart< IOleWindow > pIOleWindow;
@@ -1655,7 +1528,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetWindow( HWND *phwnd )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::ContextSensitiveHelp( BOOL fEnterMode )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::ContextSensitiveHelp( BOOL fEnterMode )" );
if ( CheckDefHandler() )
{
ComSmart< IOleWindow > pIOleWindow;
@@ -1674,7 +1546,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::ContextSensitiveHelp( BOOL fEnterMode )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::InPlaceDeactivate( void )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::InPlaceDeactivate( void )" );
if ( CheckDefHandler() )
{
ComSmart< IOleInPlaceObject > pIOleInPlaceObject;
@@ -1691,7 +1562,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::InPlaceDeactivate( void )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::UIDeactivate( void )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::UIDeactivate( void )" );
if ( CheckDefHandler() )
{
ComSmart< IOleInPlaceObject > pIOleInPlaceObject;
@@ -1708,7 +1578,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::UIDeactivate( void )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::SetObjectRects( LPCRECT lprcPosRect, LPCRECT lprcClipRect )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::SetObjectRects( LPCRECT lprcPosRect, LPCRECT lprcClipRect )" );
if ( CheckDefHandler() )
{
ComSmart< IOleInPlaceObject > pIOleInPlaceObject;
@@ -1725,7 +1594,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetObjectRects( LPCRECT lprcPosRect, LPCR
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::ReactivateAndUndo( void )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::ReactivateAndUndo( void )" );
if ( CheckDefHandler() )
{
ComSmart< IOleInPlaceObject > pIOleInPlaceObject;
@@ -1744,7 +1612,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::ReactivateAndUndo( void )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetTypeInfoCount( UINT *pctinfo )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetTypeInfoCount( UINT *pctinfo )" );
if ( CheckDefHandler() )
{
ComSmart< IDispatch > pIDispatch;
@@ -1761,7 +1628,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetTypeInfoCount( UINT *pctinfo )
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo )" );
if ( CheckDefHandler() )
{
ComSmart< IDispatch > pIDispatch;
@@ -1778,7 +1644,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetTypeInfo( UINT iTInfo, LCID lcid, ITyp
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::GetIDsOfNames( REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::GetIDsOfNames( REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId )" );
if ( CheckDefHandler() )
{
ComSmart< IDispatch > pIDispatch;
@@ -1795,7 +1660,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetIDsOfNames( REFIID riid, LPOLESTR *rgs
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::Invoke( DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::Invoke( DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr )" );
if ( CheckDefHandler() )
{
ComSmart< IDispatch > pIDispatch;
@@ -1837,7 +1701,6 @@ STDMETHODIMP_(ULONG) InprocEmbedDocument_Impl::InternalCacheWrapper::Release()
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::Cache( FORMATETC *pformatetc, DWORD advf, DWORD *pdwConnection )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::InternalCacheWrapper::Cache( FORMATETC *pformatetc, DWORD advf, DWORD *pdwConnection )" );
if ( m_rOwnDocument.CheckDefHandler() )
{
ComSmart< IOleCache > pIOleCache;
@@ -1854,7 +1717,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::Cache( FORMATETC *p
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::Uncache( DWORD dwConnection )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::InternalCacheWrapper::Uncache( DWORD dwConnection )" );
if ( m_rOwnDocument.CheckDefHandler() )
{
ComSmart< IOleCache > pIOleCache;
@@ -1871,7 +1733,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::Uncache( DWORD dwCo
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::EnumCache( IEnumSTATDATA **ppenumSTATDATA )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::InternalCacheWrapper::EnumCache( IEnumSTATDATA **ppenumSTATDATA )" );
if ( m_rOwnDocument.CheckDefHandler() )
{
ComSmart< IOleCache > pIOleCache;
@@ -1888,7 +1749,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::EnumCache( IEnumSTA
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::InitCache( IDataObject *pDataObject )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::InternalCacheWrapper::InitCache( IDataObject *pDataObject )" );
if ( m_rOwnDocument.CheckDefHandler() )
{
ComSmart< IOleCache > pIOleCache;
@@ -1905,7 +1765,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::InitCache( IDataObj
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::SetData( FORMATETC *pformatetc, STGMEDIUM *pmedium, BOOL fRelease )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::InternalCacheWrapper::SetData( FORMATETC *pformatetc, STGMEDIUM *pmedium, BOOL fRelease )" );
if ( m_rOwnDocument.CheckDefHandler() )
{
ComSmart< IOleCache > pIOleCache;
@@ -1923,7 +1782,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::SetData( FORMATETC
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::UpdateCache( LPDATAOBJECT pDataObject, DWORD grfUpdf, LPVOID pReserved )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::InternalCacheWrapper::UpdateCache( LPDATAOBJECT pDataObject, DWORD grfUpdf, LPVOID pReserved )" );
if ( m_rOwnDocument.CheckDefHandler() )
{
ComSmart< IOleCache2 > pIOleCache2;
@@ -1940,7 +1798,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::UpdateCache( LPDATA
//-------------------------------------------------------------------------------
STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::DiscardCache( DWORD dwDiscardOptions )
{
- WRITEDEBUGINFO( "InprocEmbedDocument_Impl::InternalCacheWrapper::DiscardCache( DWORD dwDiscardOptions )" );
if ( m_rOwnDocument.CheckDefHandler() )
{
ComSmart< IOleCache2 > pIOleCache2;
diff --git a/embedserv/source/inprocserv/smartpointer.hxx b/embedserv/source/inprocserv/smartpointer.hxx
index cc8b458..c4f25c4 100644
--- a/embedserv/source/inprocserv/smartpointer.hxx
+++ b/embedserv/source/inprocserv/smartpointer.hxx
@@ -29,20 +29,6 @@
#ifndef _INPROCSERV_SMARTPOINTER_HXX_
#define _INPROCSERV_SMARTPOINTER_HXX_
-// #define OWNDEBUG
-
-#ifdef OWNDEBUG
-#define WRITEDEBUGINFOINTERN( x ) WriteDebugInfo( (DWORD)this, x, sizeof( x ) )
-#define WRITEDEBUGINFO( x ) WRITEDEBUGINFOINTERN( x ":" MY_STRING_LINE "\n" )
-#define TO_STRING( x ) #x
-#define MACRO_VALUE_TO_STRING( x ) TO_STRING( x )
-#define MY_STRING_LINE MACRO_VALUE_TO_STRING( __LINE__ )
-#else
-#define WRITEDEBUGINFO( x ) void()
-#define MY_STRING_LINE
-#endif
-
-
namespace inprocserv{
void WriteDebugInfo( DWORD pThis, char* pString, DWORD nToWrite );
commit 277c6210fbf8ee377621a608e475d7b21078a078
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Feb 5 21:19:33 2011 +0100
Use OSL_DEBUG_LEVEL > 1 instead of > 2
diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx
index 1d072c9..141aa36 100644
--- a/extensions/source/ole/unotypewrapper.hxx
+++ b/extensions/source/ole/unotypewrapper.hxx
@@ -35,7 +35,7 @@
#define STRICT
#define _WIN32_WINNT 0x0403
#define _WIN32_DCOM
-#if OSL_DEBUG_LEVEL > 2
+#if OSL_DEBUG_LEVEL > 1
#define _ATL_DEBUG_INTERFACES
#endif
#include <atlbase.h>
commit c710e982117b49893f1fc2be7fe96a51cc5dd6d0
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Feb 4 17:57:31 2011 +0100
Remove lots of dead code
diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx
index 59383e8..9076f6f 100644
--- a/UnoControls/source/base/multiplexer.cxx
+++ b/UnoControls/source/base/multiplexer.cxx
@@ -173,15 +173,6 @@ OMRCListenerMultiplexerHelper::operator Reference< XInterface >() const
}
//____________________________________________________________________________________________________________
-// operator
-//____________________________________________________________________________________________________________
-
-//OMRCListenerMultiplexerHelper& OMRCListenerMultiplexerHelper::operator= ( const OMRCListenerMultiplexerHelper& aCopyInstance )
-//{
-// return this ;
-//}
-
-//____________________________________________________________________________________________________________
// container method
//____________________________________________________________________________________________________________
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx
index 14440bb..8f3e622 100644
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@ -42,8 +42,6 @@ public:
~RetStream();
using CmdBaseStream::GenError;
-// void GenError( comm_ULONG nError, const comm_UniChar* aString, comm_USHORT nLenInChars ){CmdBaseStream::GenError( nError, aString, nLenInChars );}
-// new
void GenError( SmartId aUId, String aString );
using CmdBaseStream::GenReturn;
@@ -55,7 +53,6 @@ public:
void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
-// new
void GenReturn( USHORT nRet, SmartId aUId, String aString );
void GenReturn( USHORT nRet, SmartId aUId, SbxValue &aValue );
void GenReturn( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool );
@@ -72,7 +69,6 @@ public:
void Write( comm_USHORT nNr ){CmdBaseStream::Write( nNr );}
void Write( comm_ULONG nNr ){CmdBaseStream::Write( nNr );}
void Write( comm_BOOL bBool ){CmdBaseStream::Write( bBool );}
-// new
void Write( SbxValue &aValue );
// Complex Datatypes to be handled system dependent
diff --git a/automation/source/server/scmdstrm.hxx b/automation/source/server/scmdstrm.hxx
index f6ca2a6..54da7b4 100644
--- a/automation/source/server/scmdstrm.hxx
+++ b/automation/source/server/scmdstrm.hxx
@@ -49,9 +49,7 @@ public:
using CmdBaseStream::Read;
void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );}
void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );}
-// void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );}
void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
-// new
void Read ( String &aString );
void Read ( SfxPoolItem *&pItem );
void Read ( ::com::sun::star::beans::PropertyValue &rItem );
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index eb4a6a3..95b83e5 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -342,7 +342,6 @@ void ExtraIdle::Timeout()
{
#if OSL_DEBUG_LEVEL > 1
-//#define TT_NO_DECRYPT
#define TT_CODE
#else
#define TT_CODE
@@ -485,11 +484,7 @@ void ExtraIdle::Timeout()
"1EIGpcw0WfiaOul1s19ZIECoLBx-#S";
-//#if OSL_DEBUG_LEVEL > 1
-// SvFileStream aStream( "d:\\gh_writeback.jpg" , STREAM_STD_READWRITE | STREAM_TRUNC );
-//#else
SvMemoryStream aStream;
-//#endif
xub_StrLen c;
xub_StrLen cRest = 0;
@@ -529,43 +524,6 @@ void ExtraIdle::Timeout()
::svt::OStringTransfer::CopyString( CUniString("\nSorry! no bitmap"), StatementList::GetFirstDocFrame() );
}
-/***********************************************************************
-// USHORT nBC = pBmp->GetBitCount();
-// pBmp->Scale( 0.02, 0.02 );
-// nBC = pBmp->GetBitCount();
-// SvMemoryStream aStream;
- SvFileStream aStream( "d:\gh_small50.jpg", STREAM_STD_READ );
-
- aStream.Seek( 0 );
- xub_StrLen c;
- String aOut;
- String aDreierGruppe;
- xub_StrLen cRest=0;
- aStream >> c;
- while ( !aStream.IsEof() )
- {
- cRest <<= 2; // Im ersten Durchgang egal, da immer 0
- cRest |= ( c & 0x03 );
- c >>= 2;
- aDreierGruppe += aTr.GetChar( c );
-
- if ( aDreierGruppe.Len() == 3 )
- {
- aOut += aTr.GetChar( cRest );
- aOut += aDreierGruppe;
- cRest = 0;
- aDreierGruppe = "";
- }
- aStream >> c;
- }
- if ( aDreierGruppe.Len() )
- {
- aOut += cRest;
- aOut += aDreierGruppe;
- }
- ::svt::OStringTransfer::CopyString( aOut );
-**********************************************************************************/
-
new StatementSlot( StatementList::pTTProperties->nSidPaste );
return;
}
@@ -646,9 +604,6 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
#endif
StatementList *pC = StatementList::pFirst;
-// MessBox MB( pMainWin, WB_DEF_OK|WB_OK, "Pause ...", "... und Weiter" );
-// MB.Execute();
-
if ( !StatementList::bCatchGPF )
{
if (!pC->CheckWindowWait() || !pC->Execute())
@@ -697,24 +652,11 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
}
}
-/* #i46293# remove reschedules
- for (int xx = 1;xx < 20;xx++)
- StatementList::NormalReschedule();
-*/
m_bInsideExecutionLoop = FALSE;
}
StatementList::aWindowWaitUId = SmartId(); // Warten rücksetzen, da handler sowieso verlassen wird
-/* if( StatementList::pFirst && !StatementList::bReadingCommands )
- // Abfrage nötig, da andere CommandHdl aktiv sein können oder
- // neue Commands gelesen werden können
- {
- delete StatementList::pFirst; // Löscht die gesamte Liste !!
- StatementList::pFirst = NULL;
- StatementList::pCurrent = NULL; // Nur zur Sicherheit, sollte hier sowieso NULL sein
- }*/
-
#if OSL_DEBUG_LEVEL > 1
m_pDbgWin->AddText( "Leaving CommandHdl\n" );
#endif
@@ -731,7 +673,6 @@ IMPL_LINK( ImplRemoteControl, QueCommandsEvent, CommunicationLink*, pCL )
BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
{
-// return TRUE;
USHORT nId;
if( !m_bIdleInserted )
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index cfc0266..576b1cf 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -129,12 +129,6 @@ TTSettings* GetTTSettings()
#define IS_WINP_CLOSING(pWin) (pWin->GetSmartHelpId().Matches( 4321 ) && pWin->GetSmartUniqueId().Matches( 1234 ))
-/*
-UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); }
-UniString GEN_RES_STR1( ULONG nResId, const UniString &Text1 ) { return GEN_RES_STR0( nResId ).Append( ArgString( 1, Text1 ) ); }
-UniString GEN_RES_STR2( ULONG nResId, const UniString &Text1, const UniString &Text2 ) { return GEN_RES_STR1( nResId, Text1 ).Append( ArgString( 2, Text2 ) ); }
-UniString GEN_RES_STR3( ULONG nResId, const UniString &Text1, const UniString &Text2, const UniString &Text3 ) { return GEN_RES_STR2( nResId, Text1, Text2 ).Append( ArgString( 3, Text3 ) );}
-*/
StatementList::StatementList()
: nRetryCount(MAX_RETRIES)
, bStatementInQue(FALSE)
@@ -301,8 +295,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB
while ( pPParent->GET_REAL_PARENT() )
pPParent = pPParent->GET_REAL_PARENT();
-// if ( !IsFirstDocFrame( pPParent ) )
-// {
// get overlap window. Will be dialog else document itself
pBase = pBase->GetWindow( WINDOW_OVERLAP );
@@ -321,16 +313,11 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB
if ( pControl )
return pControl;
-// }
}
}
pBase = Application::GetFirstTopLevelWindow();
- // Skip FirstDocFrame
-// if ( bSearchFocusFirst && IsFirstDocFrame( pBase ) )
-// pBase = Application::GetNextTopLevelWindow( pBase );
-
while ( pBase )
{
pControl = SearchAllWin( pBase, aSearch );
@@ -338,9 +325,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB
return pControl;
pBase = Application::GetNextTopLevelWindow( pBase );
- // Skip FirstDocFrame
-// if ( bSearchFocusFirst && IsFirstDocFrame( pBase ) )
-// pBase = Application::GetNextTopLevelWindow( pBase );
}
return NULL;
}
@@ -351,9 +335,6 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB
if ( pResult )
return pResult;
-// if ( pBase->GetType() != WINDOW_BORDERWINDOW )
-// return NULL;
-
if ( !aSearch.HasSearchFlag( SEARCH_NOOVERLAP ) )
{
if ( pBase->GetWindow( WINDOW_FIRSTOVERLAP ) )
@@ -553,8 +534,6 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu )
return pBaseMenu;
USHORT i;
-// while ( pBaseMenu )
-// {
i = 0;
while ( i < pBaseMenu->GetItemCount() )
{
@@ -572,7 +551,6 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu )
else
i++;
}
-// }
}
else
{
@@ -618,7 +596,6 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu )
BOOL SearchActive::IsWinOK( Window *pWin )
{
-// return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT ) && (nRT == WINDOW_FILEDIALOG || nRT == WINDOW_PATHDIALOG || nRT == WINDOW_PRINTDIALOG || nRT == WINDOW_PRINTERSETUPDIALOG || nRT == WINDOW_COLORDIALOG || ((SystemWindow*)pWin)->IsActive());
// only matches ResID due to problems with UNIX Window Managers
return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT );
}
@@ -1147,10 +1124,6 @@ void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
}
else
{
- // DragManager* pDragManager = DragManager::GetDragManager();
- // if ( pDragManager )
- // pDragManager->MouseMove( aMEvnt, pWin );
- // else
if ( pWin->IsTracking() )
{
TrackingEvent aTEvt( aMEvnt );
@@ -1191,10 +1164,6 @@ void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
}
else
{
- // DragManager* pDragManager = DragManager::GetDragManager();
- // if ( pDragManager )
- // pDragManager->ButtonUp( aMEvnt, pWin );
- // else
if ( pWin->IsTracking() )
{
// siehe #64693 die Position ist für Toolboxen relevant
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 7d335fd..502de94 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -4155,10 +4155,6 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
if ( (pControl->GetType() == WINDOW_TOOLBOX) && pTB->IsMenuEnabled() )
{
pTB->ExecuteCustomMenu();
-/* Rectangle aRect = pTB->GetMenubuttonRect();
- AnimateMouse( pControl, aRect.Center() );
- MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT);
- ImplMouseButtonDown( pTB, aMEvnt );*/
}
else
{
@@ -4657,10 +4653,6 @@ BOOL StatementControl::Execute()
for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.Matches( aWantedID ) ; anz++ )
{
pTControl->SelectTabPage( pTControl->GetPageId(i) );
- /*if (pTControl->GetCurPageId())
- pTControl->DeactivatePage();
- pTControl->SetCurPageId( pTControl->GetPageId(i) );
- pTControl->ActivatePage();*/
aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetSmartUniqueOrHelpId();
i++;
if ( i >= pTControl->GetPageCount() )
@@ -4671,10 +4663,6 @@ BOOL StatementControl::Execute()
if ( !aID.Matches( aWantedID ) )
{
pTControl->SelectTabPage( nActive );
- /*if (pTControl->GetCurPageId())
- pTControl->DeactivatePage();
- pTControl->SetCurPageId( nActive );
- pTControl->ActivatePage();*/
ReportError( aWantedID, GEN_RES_STR1( S_TABPAGE_NOT_FOUND, MethodString( nMethodId ) ) );
}
}
@@ -5841,10 +5829,6 @@ BOOL StatementControl::Execute()
else
pRet->GenReturn ( RET_Value, aUId, comm_ULONG( pELB->getSelIndex() +1));
break;
-/* xxxcase M_SetNoSelection :
- ((ListBox*)pControl)->SetNoSelection();
- ((ListBox*)pControl)->Select();
- break; */
default:
ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "RoadMap" ) );
break;
@@ -5875,22 +5859,11 @@ BOOL StatementControl::Execute()
{
::svt::table::PTableModel pModel = pTC->GetModel();
Any aCell = pModel->getCellContent()[nNr2-1][nNr1-1];
- /* doesn't work ATM since it gets casted to SbxDATE in VCLTestTool unfortunately
- SbxVariableRef xRes = new SbxVariable( SbxVARIANT );
- unoToSbxValue( xRes, aCell );
- pRet->GenReturn ( RET_Value, aUId, *xRes );*/
Type aType = aCell.getValueType();
TypeClass eTypeClass = aType.getTypeClass();
switch( eTypeClass )
{
- /*case TypeClass_ENUM:
- {
- sal_Int32 nEnum = 0;
- enum2int( nEnum, aValue );
- pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)nEnum );
- }
- break;*/
case TypeClass_BOOLEAN:
pRet->GenReturn ( RET_Value, aUId, *(sal_Bool*)aCell.getValue() );
break;
@@ -5986,18 +5959,6 @@ BOOL StatementControl::Execute()
if ( ValueOK( aUId, CUniString("GetSelIndex"), nNr1, pTC->GetSelectedRows().size() ) )
pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRows()[nNr1-1] +1 ) );
break;
-/* case M_GetSelText :
- if ( ! (nParams & PARAM_USHORT_1) )
- nNr1 = 1;
- if ( ValueOK(aUId, CUniString("GetSelText"),nNr1,((SvLBox*)pControl)->GetSelectionCount()) )
- {
- nNr1--;
- COUNT_LBOX( FirstSelected, NextSelected, nNr1);
- GetFirstValidTextItem( pThisEntry );
- pRet->GenReturn ( RET_Value, aUId, pItem->GetText() );
- }
- break;
- */
default:
ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "TableControl" ) );
break;
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index e5b9804..a570349 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -31,12 +31,6 @@
** Es gibt immer nur eine Statementliste, die verpointert ist.
** jederzeit kann das der Anfang der Kette abgefragt werden.
**
-**
-**
-**
-**
-**
-**
***************************************************************************/
#ifndef _STATEMNT_HXX
#define _STATEMNT_HXX
@@ -117,7 +111,6 @@ BOOL IsDialog(Window *pWin); // Ist *pWin von SystemWindow abgeleitet (Kann es
BOOL IsAccessable(Window *pWin); // Ist *pWin Zugreifbar (über IsEnabled und Parents geprüft)
-//class SafePointer : CriticalSection
class SafePointer
{
SafePointer *pSelf;
@@ -125,8 +118,6 @@ public:
SafePointer() { pSelf = this; }
virtual ~SafePointer() { DBG_ASSERT(pSelf==this,"Destructor von Nicht existierendem Objekt aufgerufen");
pSelf = NULL; }
-// static BOOL IsValid( SafePointer *pThis ) { return pThis == pThis->pSelf; }
-// virtual operator -> (); { DBG_ASSERT(pMyself == this,"-> von Nicht existierendem Objekt aufgerufen"); }
};
@@ -216,7 +207,6 @@ public:
if ( pLastFocusWindow != GetpApp()->GetFocusWindow()
|| ( Application::GetModalModeCount() > nModalCount )
-// || ( DragManager::GetDragManager() && !bWasDragManager )
|| ( PopupMenu::GetActivePopupMenu() && !bWasPopupMenu )
|| ( StarBASIC::IsRunning() && !bBasicWasRunning ) )
{
@@ -256,8 +246,6 @@ protected:
USHORT GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu );
public:
-// void AddStatement( StatementList *pNewStatement );
-
virtual ~StatementList();
void Advance();
virtual BOOL Execute() = 0;
diff --git a/automation/source/testtool/comm_bas.cxx b/automation/source/testtool/comm_bas.cxx
index b33fa29..0779ecb 100644
--- a/automation/source/testtool/comm_bas.cxx
+++ b/automation/source/testtool/comm_bas.cxx
@@ -145,7 +145,6 @@ CommunicationWrapper::CommunicationWrapper( const String& rClass ) : SbxObject(
, m_bCatchOpen( FALSE )
, m_pNewLink( NULL )
{
-// SetName( CUniString("Manager") );
m_pMethods = &aManagerMethods[0];
m_pManager = new CommunicationManagerClientViaSocket;
m_pManager->SetConnectionOpenedHdl( LINK( this, CommunicationWrapper, Open ) );
diff --git a/automation/source/testtool/cretstrm.hxx b/automation/source/testtool/cretstrm.hxx
index 7aa09a3..241811e 100644
--- a/automation/source/testtool/cretstrm.hxx
+++ b/automation/source/testtool/cretstrm.hxx
@@ -45,10 +45,8 @@ public:
using CmdBaseStream::Read;
void Read ( comm_USHORT &nNr ){CmdBaseStream::Read ( nNr );}
void Read ( comm_ULONG &nNr ){CmdBaseStream::Read ( nNr );}
-// void Read ( comm_UniChar* &aString, comm_USHORT &nLenInChars ){CmdBaseStream::Read ( aString, nLenInChars );}
virtual void Read ( SmartId* &pId ){CmdBaseStream::Read ( pId );}
void Read ( comm_BOOL &bBool ){CmdBaseStream::Read ( bBool );}
-// new
void Read( String &aString );
void Read( SbxValue &aValue );
};
diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx
index 30b27a3..0b33d84 100644
--- a/automation/source/testtool/objtest.hxx
+++ b/automation/source/testtool/objtest.hxx
@@ -121,9 +121,6 @@ public:
ControlItem( const char *Name, SmartId aUIdP );
ControlItem( const String &Name, SmartId aUIdP );
-// ControlItem( const String &Name, const String &URL, const URLType aType );
-// ControlItem( const String &Name, const String &URL, const ULONG nUId );
-// ControlItem( const char *Name, const String &URL, const ULONG nUId );
ControlItem( ControlData *pDataP );
virtual ~ControlItem() {
DBG_DTOR(ControlItem,0);
@@ -131,7 +128,6 @@ DBG_DTOR(ControlItem,0);
}
virtual BOOL operator < (const ControlItem &rPar)=0;
virtual BOOL operator == (const ControlItem &rPar)=0;
-// void Write( SvStream &aStream );
};
SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10)
@@ -149,7 +145,6 @@ protected:
public:
ControlSon() : pSons( NULL ) {};
~ControlSon();
-// void Write( SvStream &aStream );
USHORT Son_Count() { return pSons->Count(); }
void Sons( CNames *pNewSons ) { pSons = pNewSons; }
@@ -162,10 +157,6 @@ public:
ControlItemSon(const char *Name, SmartId aUIdP )
: ControlItem( Name, aUIdP ) {}
ControlItemSon(const String &Name, SmartId aUIdP );
-// ControlItemSon(const String &Name, const String &URL, const URLType aType );
-// ControlItemSon(const String &Name, const String &URL, const ULONG nUId );
-// ControlItemSon(const char *Name, const String &URL, const ULONG nUId );
-// void Write( SvStream &aStream );
};
class ControlDef : public ControlItemSon
@@ -174,7 +165,6 @@ public:
ControlDef(const char *Name, SmartId aUIdP )
: ControlItemSon( Name, aUIdP ) {DBG_CTOR(ControlDef,0);}
ControlDef(const String &Name, SmartId aUIdP );
-// ControlDef(const String &Name, const String &URL, const URLType aType );
ControlDef(const String &aOldName, const String &aNewName, ControlDef *pOriginal, BOOL bWithSons = FALSE );
~ControlDef() {DBG_DTOR(ControlDef,0);}
virtual BOOL operator < (const ControlItem &rPar);
@@ -245,9 +235,6 @@ typedef std::map< String, String > Environment;
class ImplTestToolObj
{
public:
-// ImplTestToolObj()
-// ~ImplTestToolObj()
-
String ProgParam; // Parameter der zu Testenden APP; Gesetzt über Start
DirEntry aFileBase; // Grundpfad für die *.sid und *.win Dateien (Aus Configdatei)
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index d5330b1..b48bff2 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -29,10 +29,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-
#include <ide_pch.hxx>
-
#include <svtools/texteng.hxx>
#include <svtools/textview.hxx>
#include <svtools/xtextedt.hxx>
@@ -50,7 +48,6 @@
#include <sfx2/docfile.hxx>
#include <basic/basrdll.hxx>
-
#include <baside2.hrc>
#include <baside2.hxx>
#include <objdlg.hxx>
@@ -252,9 +249,7 @@ void ModulWindow::DoInit()
if ( GetVScrollBar() )
GetVScrollBar()->Hide();
GetHScrollBar()->Show();
-// GetEditorWindow().SetScrollBarRanges();
GetEditorWindow().InitScrollBars();
-// GetEditorWindow().GrabFocus();
}
@@ -460,8 +455,6 @@ BOOL ModulWindow::LoadBasic()
if ( aCurPath.Len() )
xFP->setDisplayDirectory ( aCurPath );
- //xFP->setTitle( String( IDEResId( RID_STR_OPEN ) ) );
-
Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY);
xFltMgr->appendFilter( String( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) );
xFltMgr->appendFilter( String( IDEResId( RID_STR_FILTER_ALLFILES ) ), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
@@ -522,8 +515,6 @@ BOOL ModulWindow::SaveBasicSource()
if ( aCurPath.Len() )
xFP->setDisplayDirectory ( aCurPath );
- //xFP->setTitle( String( IDEResId( RID_STR_SAVE ) ) );
-
Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY);
xFltMgr->appendFilter( String( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) );
xFltMgr->appendFilter( String( IDEResId( RID_STR_FILTER_ALLFILES ) ), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
@@ -719,8 +710,6 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic )
BOOL bMarkError = ( pBasic == GetBasic() ) ? TRUE : FALSE;
if ( bMarkError )
aXEditorWindow.GetBrkWindow().SetMarkerPos( nErrorLine, TRUE );
-// ErrorBox( this, WB_OK | WB_DEF_OK, String( aErrorTextPrefix + aErrorText ) ).Execute();
-// ErrorHandler::HandleError( pBasic->GetErrorCode() );
// #i47002#
Reference< awt::XWindow > xWindow = VCLUnoHelper::GetInterface( this );
@@ -740,9 +729,6 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic )
long ModulWindow::BasicBreakHdl( StarBASIC* pBasic )
{
DBG_CHKTHIS( ModulWindow, 0 );
- // Ein GoOnTop aktiviert da Fenster, das veraendert aber den Context fuer
- // das Programm!
-// GoOnTop();
// #i69280 Required in Window despite normal usage in next command!
(void)pBasic;
@@ -795,7 +781,6 @@ void ModulWindow::BasicAddWatch()
BOOL bAdd = TRUE;
if ( !GetEditView()->HasSelection() )
{
-// bAdd = GetEditView()->SelectCurrentWord();
TextPaM aWordStart;
String aWord = GetEditEngine()->GetWord( GetEditView()->GetSelection().GetEnd(), &aWordStart );
if ( aWord.Len() )
@@ -803,7 +788,6 @@ void ModulWindow::BasicAddWatch()
TextSelection aSel( aWordStart );
USHORT& rIndex = aSel.GetEnd().GetIndex();
rIndex = rIndex + aWord.Len();
- // aSel.GetEnd().GetIndex() += sal::static_int_cast<int>( aWord.Len() );
GetEditView()->SetSelection( aSel );
bAdd = TRUE;
}
@@ -890,9 +874,6 @@ void ModulWindow::StoreData()
// => Keine Unterbrechungen erwuenscht!
// Und bei SAVE, wenn AppBasic...
GetEditorWindow().SetSourceInBasic( TRUE );
- // Nicht das Modify loeschen, sonst wird das Basic nicht gespeichert
- // Es wird beim Speichern sowieso geloescht.
-// xModule->SetModified( FALSE );
}
BOOL ModulWindow::CanClose()
@@ -956,7 +937,6 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
MapMode eOldMapMode( pPrinter->GetMapMode() );
Font aOldFont( pPrinter->GetFont() );
-// Font aFont( GetEditEngine()->CreateFontFromItemSet( GetEditEngine()->GetEmptyItemSet() ) );
Font aFont( GetEditEngine()->GetFont() );
aFont.SetAlign( ALIGN_BOTTOM );
aFont.SetTransparent( TRUE );
@@ -1240,8 +1220,6 @@ String ModulWindow::GetTitle()
void ModulWindow::FrameWindowMoved()
{
-// if ( GetEditEngine() && GetEditEngine()->IsInSelectionMode() )
-// GetEditEngine()->StopSelectionMode();
}
@@ -1512,7 +1490,6 @@ void ModulWindowLayout::Resize()
{
// ScrollBars, etc. passiert in BasicIDEShell:Adjust...
ArrangeWindows();
-// Invalidate();
}
void ModulWindowLayout::Paint( const Rectangle& )
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 9321c84..849aefe 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -855,12 +855,6 @@ IMPL_LINK( EditorWindow, SyntaxTimerHdl, Timer *, EMPTYARG )
p = aSyntaxLineTable.Next();
}
- // MT: Removed, because of idle format now when set/remove attribs...
- // pEditView->SetAutoScroll( FALSE ); // #101043# Don't scroll because of syntax highlight
- // pEditEngine->SetUpdateMode( TRUE );
- // pEditView->ShowCursor( FALSE, TRUE );
- // pEditView->SetAutoScroll( TRUE );
-
// #i45572#
if ( pEditView )
pEditView->ShowCursor( FALSE, TRUE );
@@ -1454,7 +1448,6 @@ IMPL_LINK_INLINE_START( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
sal_Int32 nPos = 0;
USHORT nTabs = aHeaderBar.GetItemCount();
- // OSL_ASSERT( m_treelb->TabCount() == nTabs );
for( USHORT i = 1 ; i < nTabs ; ++i )
{
nPos += aHeaderBar.GetItemSize( i );
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index c29e834..7e735c8 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -29,16 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-//svdraw.hxx
-//#define _SVDRAW_HXX ***
#define _SDR_NOITEMS
#define _SDR_NOTOUCH
#define _SDR_NOTRANSFORM
#define _SDR_NOOBJECTS
-//#define _SDR_NOVIEWS ***
#define _SDR_NOVIEWMARKER
#define _SDR_NODRAGMETHODS
-//#define _SDR_NOUNDO ***
#define _SDR_NOXOUTDEV
#include <ide_pch.hxx>
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index e6ebf19..3e10227 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -67,45 +67,11 @@ IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, E
}
IMPL_LINK_INLINE_END( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )
-/*
-IMPL_LINK( BasicIDEShell, ObjectDialogInsertHdl, ObjectCatalog *, pObjCat )
-{
- if ( !pCurWin )
- return 0;
-
- if ( pCurWin->IsA( TYPE( ModulWindow ) ) )
- {
- ModulWindow* pEditWin = (ModulWindow*)pCurWin;
- pEditWin->InsertFromObjectCatalog( pObjCat );
- }
- else
- Sound::Beep();
-
- return 0;
-}
-*/
-
Reference< view::XRenderable > BasicIDEShell::GetRenderable()
{
return Reference< view::XRenderable >( new basicide::BasicRenderable( pCurWin ) );
}
-#if 0
-USHORT BasicIDEShell::Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog )
-{
- if ( pCurWin )
- {
- SfxPrinter* pPrinter = GetPrinter( TRUE );
- if ( pPrinter )
- {
- SfxViewShell::Print( rProgress, bIsAPI, pPrintDialog );
- pCurWin->PrintData( pPrinter );
- }
- }
- return 0;
-}
-#endif
-
BOOL BasicIDEShell::HasSelection( BOOL /* bText */ ) const
{
BOOL bSel = FALSE;
@@ -128,10 +94,7 @@ String BasicIDEShell::GetSelectionText( BOOL bWholeWord )
{
if ( bWholeWord && !pEditView->HasSelection() )
{
- // String aStrCurrentDelimiters = pEngine->GetWordDelimiters();
- // pEngine->SetWordDelimiters( " .,;\"'" );
aText = pEditView->GetTextEngine()->GetWord( pEditView->GetSelection().GetEnd() );
- // pEngine->SetWordDelimiters( aStrCurrentDelimiters );
}
else
{
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 42ba65d..857445c 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -102,7 +102,6 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
{
BOOL bValid = FALSE;
String aStdMacroText( RTL_CONSTASCII_USTRINGPARAM( "Macro" ) );
- //String aStdMacroText( IDEResId( RID_STR_STDMACRONAME ) );
USHORT nMacro = 1;
while ( !bValid )
{
@@ -386,15 +385,6 @@ void BasicStopped( BOOL* pbAppWindowDisabled,
*pnWaitCount = nWait;
}
- /*
- // Interactive = FALSE ?
- if ( SFX_APP()->IsDispatcherLocked() )
- {
- SFX_APP()->LockDispatcher( FALSE );
- if ( pbDispatcherLocked )
- *pbDispatcherLocked = TRUE;
- } */
-
Window* pDefParent = Application::GetDefDialogParent();
if ( pDefParent && !pDefParent->IsEnabled() )
{
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index fdbe970..57a55d8 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -33,7 +33,6 @@
#include <vcl/sound.hxx>
-// #define ITEMID_SEARCH SID_SEARCH_ITEM
#define _SVX_NOIDERESIDS
#include <brkdlg.hxx>
#include <brkdlg.hrc>
@@ -96,7 +95,6 @@ BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList
aOKButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
aNewButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
aDelButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
-// aShowButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
aCheckBox.SetClickHdl( LINK( this, BreakPointDialog, CheckBoxHdl ) );
aComboBox.SetSelectHdl( LINK( this, BreakPointDialog, ComboBoxHighlightHdl ) );
@@ -247,10 +245,6 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton )
}
CheckButtons();
}
-// else if ( pButton == &aShowButton )
-// {
-// ;
-// }
return 0;
}
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index dce29af..223e56b 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -29,14 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-
#define GLOBALOVERFLOW
#include <ide_pch.hxx>
#include <svtools/filedlg.hxx>
-
#include <sot/storinfo.hxx>
#include <moduldlg.hrc>
@@ -331,16 +329,6 @@ BOOL BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
// TODO: check if library is reference/link
- // Prueffen, ob Referenz...
- /*
- USHORT nLib = pBasMgr->GetLibId( GetEntryText( pEntry, 0 ) );
- DBG_ASSERT( nLib != LIB_NOTFOUND, "LibId ?!" );
- if ( pBasMgr->IsReference( nLib ) )
- {
- ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_CANNOTCHANGENAMEREFLIB ) ) ).Execute();
- return FALSE;
- }
- */
return TRUE;
}
diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx
index 5ed5d67..a18ed1b 100644
--- a/basctl/source/basicide/tbxctl.hxx
+++ b/basctl/source/basicide/tbxctl.hxx
@@ -31,33 +31,6 @@
#include <sfx2/tbxctrl.hxx>
#include <com/sun/star/frame/XLayoutManager.hpp>
-/*
-#ifdef _BASIDE_POPUPWINDOWTBX
-
-// class PopupWindowTbx --------------------------------------------------
-
-class PopupWindowTbx : public SfxPopupWindow
-{
-private:
- SfxToolBoxManager aTbx;
- Link aSelectLink;
-
- DECL_LINK( SelectHdl, void* );
-
-public:
- PopupWindowTbx( USHORT nId, WindowAlign eAlign,
- ResId aRIdWin, ResId aRIdTbx, SfxBindings& rBind );
- ~PopupWindowTbx();
-
- void StartSelection()
- { aTbx.GetToolBox().StartSelection(); }
- void Update();
-
- virtual SfxPopupWindow* Clone() const;
- virtual void PopupModeEnd();
-};
-#endif
-*/
//-------------------
// class TbxControls
//-------------------
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 702af3c..07b02db 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -580,28 +580,9 @@ BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
if (pView->IsAction() )
{
pView->EndAction();
- //if( bMarkAction )
- //pParent->UnmarkDialog();
}
}
-// USHORT nClicks = rMEvt.GetClicks();
-// if (nClicks == 2)
-// {
-// if ( pView->AreObjectsMarked() )
-// {
-// const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-//
-// if (rMarkList.GetMarkCount() == 1)
-// {
-// SdrMark* pMark = rMarkList.GetMark(0);
-// SdrObject* pObj = pMark->GetMarkedSdrObj();
-//
-// // edit objects here
-// }
-// }
-// }
-
bMarkAction = FALSE;
pWindow->SetPointer( pView->GetPreferedPointer( aPnt, pWindow, nHitLog ) );
diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx
index ff34ca8..e49277d 100644
--- a/basctl/source/dlged/dlgedlist.cxx
+++ b/basctl/source/dlged/dlgedlist.cxx
@@ -53,13 +53,6 @@ DlgEdPropListenerImpl::~DlgEdPropListenerImpl()
void SAL_CALL DlgEdPropListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException)
{
- /*
- // disconnect the listener
- if (pDlgEdObj)
- {
- (pDlgEdObj->m_xPropertyChangeListener).clear();
- }
- */
}
// XPropertyChangeListener
@@ -94,13 +87,6 @@ DlgEdEvtContListenerImpl::~DlgEdEvtContListenerImpl()
void SAL_CALL DlgEdEvtContListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException)
{
- /*
- // disconnect the listener
- if (pDlgEdObj)
- {
- (pDlgEdObj->m_xContainerListener).clear();
- }
- */
}
// XContainerListener
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index cd89d3b..6309e00 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -483,12 +483,6 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
{
aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_NO_PROPERTIES)));
}
- // #i73075 Handled in implSetNewObjectSequence
- //else // multiselection
- //{
- // aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES)));
- // aName += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT)));
- //}
return aName;
}
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 1478044..7fee678 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -156,23 +156,6 @@ String lcl_MakeTabEntry(const SfxFilter* pFilter)
BOOL IsJavaInstalled_Impl( /*!!!SfxIniManager* pIniMgr*/ )
{
BOOL bRet = FALSE;
-/*!!! (pb) needs new implementation
- String aIniEntry;
- String aFullName = Config::GetConfigName( pIniMgr->Get( SFX_KEY_USERCONFIG_PATH ),
- String::CreateFromAscii("java") );
- INetURLObject aIniFileObj( aFullName, INET_PROT_FILE );
- String aIniPath = aIniFileObj.getName();
- if ( pIniMgr->SearchFile( aIniPath ) )
- {
- Config aJavaCfg( aIniPath );
- aJavaCfg.SetGroup( "Java" );
- ByteString sTemp = aJavaCfg.ReadKey( ByteString(::rtl::OUStringToOString(pIniMgr->GetKeyName( SFX_KEY_JAVA_SYSTEMCLASSPATH ),RTL_TEXTENCODING_UTF8)) );
- String aJavaSystemClassPath = ::rtl::OStringToOUString(sTemp,RTL_TEXTENCODING_UTF8);
- String aJavaRuntimeLib = ::rtl::OStringToOUString(aJavaCfg.ReadKey( "RuntimeLib" ),RTL_TEXTENCODING_UTF8);
- if ( aJavaSystemClassPath.Len() && aJavaRuntimeLib.Len() )
- bRet = TRUE;
- }
-*/
return bRet;
}
@@ -216,12 +199,9 @@ void SvxNoSpaceEdit::Modify()
}
/********************************************************************/
-/********************************************************************/
/* */
/* SvxProxyTabPage */
/* */
-/* */
-/********************************************************************/
/********************************************************************/
SvxProxyTabPage::SvxProxyTabPage(Window* pParent, const SfxItemSet& rSet ) :
@@ -683,12 +663,9 @@ IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
/********************************************************************/
-/********************************************************************/
/* */
/* SvxSearchTabPage */
/* */
-/* */
-/********************************************************************/
/********************************************************************/
SvxSearchTabPage::SvxSearchTabPage(Window* pParent, const SfxItemSet& rSet ) :
@@ -1099,104 +1076,6 @@ IMPL_LINK( SvxSearchTabPage, SearchPartHdl_Impl, RadioButton *, EMPTYARG )
return 0;
}
-// -----------------------------------------------------------------------
-
-/********************************************************************/
-/********************************************************************/
-/* */
-/* SvxOtherTabPage */
-/* */
-/********************************************************************/
-/********************************************************************/
-
-/*
-SvxPatternField::SvxPatternField( Window* pParent, const ResId& rResId ) :
-
- PatternField( pParent, rResId ),
-
- sMsg233 ( ResId( ST_MSG_233 ) ),
- sMsg255 ( ResId( ST_MSG_255 ) )
-
-{
- FreeResource();
- SelectFixedFont();
-} */
-
-/*void SvxPatternField::KeyInput( const KeyEvent& rKEvt )
-{
- PatternField::KeyInput( rKEvt );
- BOOL bDelete = ( rKEvt.GetKeyCode().GetCode() == KEY_DELETE );
- String sEntry( GetText() );
- sEntry[(USHORT)3] = '.';
- sEntry[(USHORT)7] = '.';
- sEntry[(USHORT)11] = '.';
- Selection aSelection( GetSelection() );
- String sPart( sEntry.GetToken( 0, '.' ) );
- USHORT i, nPart( sPart.EraseLeadingChars() );
- BOOL bSet = FALSE;
-
- if ( sPart.Len() && ( !nPart || nPart > 255 ) )
- {
- // der erste Part darf nicht 0 und nicht gr"osser 255 sein
- String sMsg( sPart );
- sMsg += ' ';
- sMsg += sMsg233;
- InfoBox( this, sMsg ).Execute();
-
- if ( nPart == 0 )
- sPart = " 1";
- else
- sPart = "255";
- sEntry.SetToken( 0, '.', sPart );
- bSet = TRUE;
- };
-
- for ( i = 1; i < 4; i++ )
- {
- // die anderen Parts d"urfen nicht gr"osser 255 sein
- sPart = sEntry.GetToken( i, '.' );
- nPart = sPart.EraseLeadingChars();
-
- if ( nPart > 255 )
- {
- String sMsg( sPart );
- sMsg += ' ';
- sMsg += sMsg255;
- InfoBox( this, sMsg ).Execute();
-
- if ( nPart == 0 )
- sPart = " 1";
- else
- sPart = "255";
- sEntry.SetToken( i, '.', sPart );
- bSet = TRUE;
- };
- }
-
- if ( bSet )
- {
- SetText( sEntry );
- SetSelection( aSelection );
- }
-}
-*/
-// -----------------------------------------------------------------------
-#if 0
-long SvxPatternField::Notify( NotifyEvent& rNEvt )
-{
- return PatternField::Notify( rNEvt );
-/*! long nHandled = 0;
-
- if ( rNEvt.GetType() == EVENT_KEYUP )
- {
- const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
- KeyInput( *pKEvt );
- nHandled = 1;
- }
- return nHandled;*/
-}
-#endif
-
// class JavaScriptDisableQueryBox_Impl --------------------------------------
class JavaScriptDisableQueryBox_Impl : public ModalDialog
@@ -1607,18 +1486,9 @@ int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet )
namespace
{
-/* bool Enable( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt, Control& _rCtrl, FixedImage& _rImg )
- {
- bool b = _rOpt.IsOptionEnabled( _eOpt );
- _rCtrl.Enable( b );
- _Img.Show( !b );
- return b;
- }
-*/
bool EnableAndSet( const SvtSecurityOptions& _rOpt, SvtSecurityOptions::EOption _eOpt,
CheckBox& _rCtrl, FixedImage& _rImg )
{
-// bool b = Enable( _rOpt, _eOpt, _rCtrl, _rImg );
bool b = _rOpt.IsOptionEnabled( _eOpt );
_rCtrl.Enable( b );
_rImg.Show( !b );
@@ -1729,7 +1599,6 @@ inline bool getDllURL(rtl::OString * path)
return false;
}
dirPath = dirPath.copy(0, dirPath.lastIndexOf('/'));
-// osl::FileBase::getAbsoluteFileURL(dirPath, libPath, dllPath);
::rtl::OUString sysDirPath;
osl::FileBase::getSystemPathFromFileURL(dirPath, sysDirPath);
*path = OUStringToOString(sysDirPath, RTL_TEXTENCODING_ASCII_US);
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index e7bc189..1012903 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -82,16 +82,6 @@ SvxJavaTable::~SvxJavaTable()
void SvxJavaTable::SetTabs()
{
SvxSimpleTable::SetTabs();
-/*
- USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT | SV_LBOXTAB_ADJUST_LEFT |
- SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_ADJUST_NUMERIC | SV_LBOXTAB_FORCE;
- if ( aTabs.Count() > 0 )
- {
- SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(0);
- pTab->nFlags &= ~nAdjust;
- pTab->nFlags |= SV_LBOXTAB_PUSHABLE | SV_LBOXTAB_ADJUST_CENTER | SV_LBOXTAB_FORCE;
- }
-*/
}
void SvxJavaTable::MouseButtonUp( const MouseEvent& _rMEvt )
@@ -181,8 +171,6 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
m_aResetTimer.SetTimeoutHdl( LINK( this, SvxJavaOptionsPage, ResetHdl_Impl ) );
m_aResetTimer.SetTimeout( RESET_TIMEOUT );
-//! m_aJavaList.EnableCheckButton( new SvLBoxButtonData( &m_aJavaList, true ) );
-
static long aStaticTabs[]=
{
5, 0, 15, 90, 130, 300
@@ -243,13 +231,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
JavaInfo* pInfo = *pIter;
jfw_freeJavaInfo( pInfo );
}
-/*
- rtl_uString** pParamArr = m_parParameters;
- for ( sal_Int32 i = 0; i < m_nParamSize; ++i )
- rtl_uString_release( *pParamArr++ );
- rtl_freeMemory( m_parParameters );
- rtl_uString_release( m_pClassPath );
-*/
+
jfw_unlock();
}
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index fabe1f6..28c0a9d 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -294,7 +294,6 @@ void lcl_SetCheckButton( SvLBoxEntry* pEntry, BOOL bCheck )
pItem->SetStateChecked();
else
pItem->SetStateUnchecked();
- //InvalidateEntry( pEntry );
}
}
@@ -451,7 +450,6 @@ void OptionsUserData::SetChecked( BOOL bVal )
void OptionsUserData::SetNumericValue( BYTE nNumVal )
{
-// DBG_ASSERT( nNumVal < 256, "value out of range" );
if (HasNumericValue() && (GetNumericValue() != nNumVal))
{
nVal &= 0xffffff00;
@@ -492,8 +490,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT,
Font aFont( aOldFont );
aFont.SetWeight( WEIGHT_BOLD );
-// BOOL bFett = TRUE;
-// USHORT nPos = 0;
//??? das untere byte aus dem user data in string wandeln
OptionsUserData aData( (ULONG) pEntry->GetUserData() );
if(aData.HasNumericValue())
@@ -504,9 +500,6 @@ void BrwString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT,
rDev.DrawText( aNewPos, sTxt );
}
-// if( STRING_NOTFOUND != nPos )
-// aNewPos.X() += rDev.GetTextWidth( sTxt );
-
rDev.SetFont( aOldFont );
}
}
@@ -1328,7 +1321,6 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
for (ULONG i = 0; i < nEntries; ++i)
{
INT32 nDics = aDics.getLength();
-// const uno::Reference< XDictionary > *pDic = aDics.getConstArray();
aActiveDics.realloc( nDics );
OUString *pActiveDic = aActiveDics.getArray();
@@ -1356,7 +1348,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
}
}
}
- //
+
aActiveDics.realloc( nActiveDics );
Any aTmp;
aTmp <<= aActiveDics;
@@ -1430,11 +1422,9 @@ ULONG SvxLinguTabPage::GetDicUserData( const uno::Reference< XDictionary > &rxDi
{
uno::Reference< frame::XStorable > xStor( rxDic, UNO_QUERY );
-// ULONG nUserData = 0;
BOOL bChecked = rxDic->isActive();
BOOL bEditable = !xStor.is() || !xStor->isReadonly();
BOOL bDeletable = bEditable;
-// BOOL bNegativ = rxDic->getDictionaryType() == DictionaryType_NEGATIVE;
nRes = DicUserData( nIdx,
bChecked, bEditable, bDeletable ).GetUserData();
@@ -1548,9 +1538,6 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
pEntry = CreateEntry( sGrammarAuto, CBCOL_FIRST );
aLngCfg.GetProperty( C2U(UPN_IS_GRAMMAR_AUTO) ) >>= bVal;
-// const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK );
-// if (pItem)
-// bVal = ((SfxBoolItem *) pItem)->GetValue();
nUserData = OptionsUserData( EID_GRAMMAR_AUTO, FALSE, 0, TRUE, bVal).GetUserData();
pEntry->SetUserData( (void *)nUserData );
pModel->Insert( pEntry );
@@ -1958,7 +1945,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
aLinguModulesFT.GetPosPixel().Y();
DBG_ASSERT( nDeltaY >= 0, "move/resize value is negative" );
Point aPos;
- //
+
aPos = aLinguDicsFT.GetPosPixel();
aPos.Y() -= nDeltaY;
aLinguDicsFT.SetPosPixel( aPos );
@@ -1974,7 +1961,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
aPos = aLinguDicsDelPB.GetPosPixel();
aPos.Y() -= nDeltaY;
aLinguDicsDelPB.SetPosPixel( aPos );
- //
+
aPos = aLinguOptionsFT.GetPosPixel();
aPos.Y() -= nDeltaY;
aLinguOptionsFT.SetPosPixel( aPos );
@@ -1984,7 +1971,7 @@ void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
aPos = aLinguOptionsEditPB.GetPosPixel();
aPos.Y() -= nDeltaY;
aLinguOptionsEditPB.SetPosPixel( aPos );
- //
+
Size aSize( aLinguOptionsCLB.GetSizePixel() );
aSize.Height() += nDeltaY;
aLinguOptionsCLB.SetSizePixel( aSize );
@@ -2146,8 +2133,6 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox )
IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
{
-// if (pBox == (SvTreeListBox *) &aModulesCLB)
-// {
pBox = &aModulesCLB;
SvLBoxEntry *pCurEntry = pBox->GetCurEntry();
if (pCurEntry)
@@ -2173,7 +2158,6 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
}
}
}
-// }
return 0;
}
@@ -2197,7 +2181,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
Locale aCurLocale;
SvxLanguageToLocale(aCurLocale, eCurLanguage);
SvLBoxTreeList *pModel = aModulesCLB.GetModel();
-// uno::Reference<XLinguServiceManager>& xMgr = rLinguData.GetManager();
if (pBox)
{
@@ -2263,8 +2246,6 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
aModulesCLB.Clear();
if(LANGUAGE_DONTKNOW != eCurLanguage)
{
-// sal_Int32 nEntryPos = 1;
-
ULONG n;
ServiceInfo_Impl* pInfo;
@@ -2276,7 +2257,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
String(), TRUE, FALSE, TYPE_SPELL, 0 );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list