summaryrefslogtreecommitdiff
path: root/embedserv
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-02-04 17:57:31 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-02-06 13:43:35 +0100
commit50c26300e5b5ae9671f18a9e449516604d16105f (patch)
treee4f0cf83c41bbd70bbe6021f85b8e97815134f42 /embedserv
parente78706a8bf35d8471982e36c4543f2db8a35f1c2 (diff)
Remove lots of dead code
Diffstat (limited to 'embedserv')
-rw-r--r--embedserv/source/embed/docholder.cxx112
-rw-r--r--embedserv/source/inprocserv/inprocembobj.cxx25
2 files changed, 0 insertions, 137 deletions
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 4efa9f6db750..3bafde9e67ae 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -496,17 +496,7 @@ void DocumentHolder::InPlaceDeactivate(void)
m_xLayoutManager->setVisible(false);
if (NULL!=m_pIOleIPSite)
- {
- // The following workaround should let the object be stored in case of inplace editing
-// CComPtr< IOleClientSite > pClientSite;
-//
-// m_pIOleIPSite->QueryInterface(
-// IID_IOleClientSite, (void**)&pClientSite );
-// if ( pClientSite )
-// pClientSite->SaveObject();
-
m_pIOleIPSite->OnInPlaceDeactivate();
- }
if(m_pIOleIPFrame) m_pIOleIPFrame->Release(); m_pIOleIPFrame = 0;
if(m_pIOleIPUIWindow) m_pIOleIPUIWindow->Release(); m_pIOleIPUIWindow = 0;
@@ -1162,62 +1152,6 @@ IDispatch* DocumentHolder::GetIDispatch()
return m_pIDispatch;
}
-#if 0
-HRESULT DocumentHolder::SetVisArea( const RECTL *pRect )
-{
- if ( pRect && m_xDocument.is() )
- {
- uno::Sequence< beans::PropertyValue > aArgs = m_xDocument->getArgs();
- for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ )
- if ( aArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "WinExtent" ) ) )
- {
- // should allways be there
- uno::Sequence< sal_Int32 > aRect(4);
-
- aRect[0] = pRect->left;
- aRect[1] = pRect->top;
- aRect[2] = pRect->right;
- aRect[3] = pRect->bottom;
-
- aArgs[nInd].Value <<= aRect;
-
- m_xDocument->attachResource( m_xDocument->getURL(), aArgs );
- return S_OK;
- }
-
- OSL_ENSURE( sal_False, "WinExtent seems not to be implemented!\n" );
- }
-
- return E_FAIL;
-}
-
-HRESULT DocumentHolder::GetVisArea( RECTL *pRect )
-{
- if ( pRect && m_xDocument.is() )
- {
- uno::Sequence< beans::PropertyValue > aArgs = m_xDocument->getArgs();
- for ( sal_Int32 nInd = 0; nInd < aArgs.getLength(); nInd++ )
- if ( aArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "WinExtent" ) ) )
- {
- uno::Sequence< sal_Int32 > aRect;
- if ( ( aArgs[nInd].Value >>= aRect ) && aRect.getLength() == 4 )
- {
- pRect->left = aRect[0];
- pRect->top = aRect[1];
- pRect->right = aRect[2];
- pRect->bottom = aRect[3];
-
- return S_OK;
- }
-
- break;
- }
- }
-
- return E_FAIL;
-}
-#endif
-
HRESULT DocumentHolder::GetDocumentBorder( RECT *pRect )
{
if ( pRect && m_xDocument.is() )
@@ -1589,52 +1523,6 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& /*aEvent*/ )
}
}
-
-
-// if(m_pOLEInterface->GetGUID() == OID_WriterTextServer) {
-// // edit group
-// CopyToOLEMenu(m_nMenuHandle,1,hMenu,(WORD)mgw.width[0]);
-// CopyToOLEMenu(m_nMenuHandle,2,hMenu,1+(WORD)mgw.width[0]);
-// CopyToOLEMenu(m_nMenuHandle,3,hMenu,2+(WORD)mgw.width[0]);
-// CopyToOLEMenu(m_nMenuHandle,4,hMenu,3+(WORD)mgw.width[0]);
-// mgw.width[1]=4;
-
-// // object group
-// CopyToOLEMenu(
-// m_nMenuHandle,5,
-// hMenu,4+(WORD)mgw.width[0]+(WORD)mgw.width[2]);
-// mgw.width[3]=1;
-
-// // help group
-// CopyToOLEMenu(
-// m_nMenuHandle,7,
-// hMenu,5+(WORD)mgw.width[0]+(WORD)mgw.width[2]+(WORD)mgw.width[4]);
-// mgw.width[5]=1;
-// }
-// else if(m_pOLEInterface->GetGUID() == OID_CalcServer) {
-// // edit group
-// CopyToOLEMenu(m_nMenuHandle,1,hMenu,(WORD)mgw.width[0]);
-// CopyToOLEMenu(m_nMenuHandle,2,hMenu,1+(WORD)mgw.width[0]);
-// CopyToOLEMenu(m_nMenuHandle,3,hMenu,2+(WORD)mgw.width[0]);
-// CopyToOLEMenu(m_nMenuHandle,4,hMenu,3+(WORD)mgw.width[0]);
-// mgw.width[1]=4;
-
-// // object group
-// CopyToOLEMenu(
-// m_nMenuHandle,5,
-// hMenu,4+(WORD)mgw.width[0]+(WORD)mgw.width[2]);
-// CopyToOLEMenu(
-// m_nMenuHandle,6,
-// hMenu,5+(WORD)mgw.width[0]+(WORD)mgw.width[2]);
-// mgw.width[3]=2;
-
-// // help group
-// CopyToOLEMenu(
-// m_nMenuHandle,8,
-// hMenu,6+(WORD)mgw.width[0]+(WORD)mgw.width[2]+(WORD)mgw.width[4]);
-// mgw.width[5]=1;
-// }
-
// Fix strange warnings about some
// ATL::CAxHostWindow::QueryInterface|AddRef|Releae functions.
// warning C4505: 'xxx' : unreferenced local function has been removed
diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx
index 32ea696554f5..06ad62be62f1 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -203,19 +203,7 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
if ( SUCCEEDED( hr ) )
{
WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
-// // reinit the handler
-// ComSmart< IRunnableObject > pIRunObj;
-// hr = m_pDefHandler->QueryInterface( IID_IRunnableObject, (void**)&pIRunObj );
-//
-// if ( SUCCEEDED( hr ) && pIRunObj )
{
-// {
-// ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
-// hr = pIRunObj->Run( NULL );
-// }
-//
-// if ( SUCCEEDED( hr ) )
- {
if ( m_nInitMode == INIT_FROM_STORAGE )
{
WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
@@ -247,7 +235,6 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
hr = pPersistFile->Load( m_pFileName, m_nFileOpenMode );
}
WRITEDEBUGINFO( "InprocEmbedDocument_Impl::CheckDefHandler()" );
- }
}
}
@@ -1187,18 +1174,6 @@ STDMETHODIMP InprocEmbedDocument_Impl::Unadvise( DWORD dwConnection )
STDMETHODIMP InprocEmbedDocument_Impl::EnumAdvise( IEnumSTATDATA ** /*ppenumAdvise*/ )
{
return E_NOTIMPL;
-
-// if ( CheckDefHandler() )
-// {
-// ComSmart< IOleObject > pOleObject;
-// HRESULT hr = m_pDefHandler->QueryInterface( IID_IOleObject, (void**)&pOleObject );
-//
-// ULONGGuard aGuard( &m_nCallsOnStack ); // avoid reentrance problem
-// if ( SUCCEEDED( hr ) && pOleObject )
-// return pOleObject->EnumAdvise( ppenumAdvise );
-// }
-//
-// return E_FAIL;
}
//-------------------------------------------------------------------------------