[Libreoffice-commits] .: binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_sw binfilter/bf_xmloff filter/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Jan 25 22:53:11 PST 2011
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx | 82 --
binfilter/bf_so3/source/ole/socont.cxx | 281 ----------
binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx | 14
binfilter/bf_sw/source/core/doc/sw_docsort.cxx | 132 ----
binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx | 55 -
binfilter/bf_sw/source/core/doc/sw_swserv.cxx | 17
binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx | 29 -
binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx | 17
binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx | 26
binfilter/bf_xmloff/source/text/xmloff_txtsecte.cxx | 24
filter/source/msfilter/msocximex.cxx | 34 -
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 1
12 files changed, 17 insertions(+), 695 deletions(-)
New commits:
commit e0def00c172fc8ee664994a80af7033b08662918
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Jan 25 23:45:22 2011 +0100
Remove some dead code.
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index 8c8d2ef..383638a 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
@@ -410,8 +410,6 @@ namespace binfilter {
/*?*/ delete pTempDir;
/*N*/ }
-//================================================================
-
//------------------------------------------------------------------
/*N*/ void SfxMedium::ResetError()
/*N*/ {
@@ -796,12 +794,6 @@ namespace binfilter {
/*N*/ {
/*N*/ if( SotStorage::IsStorageFile( pInStream ) )
/*N*/ {
-/*N*/ /* if ( IsReadOnly() && ::utl::LocalFileHelper::IsLocalFile( aLogicName ) )
- {
- CreateTempFile();
- aStorage = new SvStorage( bUCBStorage, aName, nStorOpenMode, bDirect ? 0 : STORAGE_TRANSACTED );
- }
- else */
/*N*/ {
/*N*/ if ( bUCBStorage && !UCBStorage::IsStorageFile( pInStream ) )
/*N*/ return NULL;
@@ -834,11 +826,6 @@ namespace binfilter {
/*N*/ if ( aStorage->GetError() == SVSTREAM_OK )
/*N*/ GetVersionList();
/*N*/
-/*N*/ // ???? wird das noch gebraucht?
-/*N*/ // GetMedium_Impl();
-/*N*/ // if ( !aStorage.Is() )
-/*N*/ // CreateFileStream();
-/*N*/
/*N*/ SFX_ITEMSET_ARG( pSet, pVersion, SfxInt16Item, SID_VERSION, sal_False);
/*N*/
/*N*/ BOOL bResetStorage = FALSE;
@@ -1003,11 +990,6 @@ namespace binfilter {
/*N*/ rOutStream->writeBytes ( aSequence );
/*N*/ }
/*N*/ while ( nRead == nBufferSize );
-/*N*/
-/*N*/ // remove temporary file
-/*N*/ // pImp->pTempFile->EnableKillingFile( sal_True );
-/*N*/ // delete pImp->pTempFile;
-/*N*/ // pImp->pTempFile = NULL;
/*N*/ }
/*N*/ catch( Exception& )
/*N*/ {}
@@ -1208,22 +1190,20 @@ namespace binfilter {
/*N*/ }
//------------------------------------------------------------------
-
/*N*/ void SfxMedium::SetUpdatePickList(sal_Bool bVal)
/*N*/ {
/*N*/ if(!pImp)
/*?*/ pImp = new SfxMedium_Impl( this );
/*N*/ pImp->bUpdatePickList = bVal;
/*N*/ }
-//------------------------------------------------------------------
+//------------------------------------------------------------------
/*N*/ void SfxMedium::SetDoneLink( const Link& rLink )
/*N*/ {
/*N*/ pImp->aDoneLink = rLink;
/*N*/ }
//----------------------------------------------------------------
-
/*N*/ void SfxMedium::SetDataAvailableLink( const Link& rLink )
/*N*/ {
/*N*/ pImp->aAvailableLink = rLink;
@@ -1313,15 +1293,14 @@ namespace binfilter {
/*N*/ {
/*N*/ Init_Impl();
/*N*/ }
-//------------------------------------------------------------------
+//------------------------------------------------------------------
/*N*/ void SfxMedium::UseInteractionHandler( BOOL bUse )
/*N*/ {
/*N*/ pImp->bAllowDefaultIntHdl = bUse;
/*N*/ }
//------------------------------------------------------------------
-
/*N*/ ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >
/*N*/ SfxMedium::GetInteractionHandler()
/*N*/ {
@@ -1358,20 +1337,19 @@ namespace binfilter {
/*N*/ }
//------------------------------------------------------------------
-
/*N*/ void SfxMedium::SetFilter( const SfxObjectFactory& rFact, const String & rFilter )
/*N*/ {
/*N*/ SetFilter( rFact.GetFilterContainer()->GetFilter(rFilter) );
/*N*/ }
-//----------------------------------------------------------------
+//----------------------------------------------------------------
/*N*/ void SfxMedium::SetFilter( const SfxFilter* pFilterP, sal_Bool /*bResetOrig*/ )
/*N*/ {
/*N*/ pFilter = pFilterP;
/*N*/ pImp->nFileVersion = 0;
/*N*/ }
-//----------------------------------------------------------------
+//----------------------------------------------------------------
/*N*/ void SfxMedium::Close()
/*N*/ {
/*N*/ if ( aStorage.Is() )
@@ -1411,8 +1389,6 @@ namespace binfilter {
/*N*/ }
//------------------------------------------------------------------
-
-
/*N*/ void SfxMedium::SetIsRemote_Impl()
/*N*/ {
/*N*/ INetURLObject aObj( GetName() );
@@ -1424,7 +1400,6 @@ namespace binfilter {
/*N*/ case INET_PROT_POP3:
/*N*/ case INET_PROT_NEWS:
/*N*/ case INET_PROT_IMAP:
-/*N*/ // case INET_PROT_OUT:
/*N*/ case INET_PROT_VIM:
/*N*/ bRemote = TRUE; break;
/*N*/ default:
@@ -1438,9 +1413,6 @@ namespace binfilter {
/*N*/ nStorOpenMode |= STREAM_READ;
/*N*/ }
-
-
-
//----------------------------------------------------------------
/*N*/ const String& SfxMedium::GetOrigURL() const
/*N*/ {
@@ -1448,15 +1420,10 @@ namespace binfilter {
/*N*/ }
//----------------------------------------------------------------
-
/*N*/ void SfxMedium::SetPhysicalName_Impl( const String& /*rNameP*/ )
/*N*/ {DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-//----------------------------------------------------------------
-
-//------------------------------------------------------------------
-
//------------------------------------------------------------------
/*N*/ sal_Bool SfxMedium::IsTemporary() const
/*N*/ {
@@ -1464,7 +1431,6 @@ namespace binfilter {
/*N*/ }
//------------------------------------------------------------------
-
/*N*/ void SfxMedium::ReOpen()
/*N*/ {
/*N*/ BOOL bUseInteractionHandler = pImp->bUseInteractionHandler;
@@ -1504,8 +1470,8 @@ namespace binfilter {
/*N*/ bDirect = bDirectP;
/*N*/ Init_Impl();
/*N*/ }
-//------------------------------------------------------------------
+//------------------------------------------------------------------
/*N*/ SfxMedium::SfxMedium( SvStorage *pStorage, sal_Bool bRootP )
/*?*/ : eError( SVSTREAM_OK )
/*?*/ , bDirect( sal_False )
@@ -1548,7 +1514,6 @@ namespace binfilter {
/*N*/ }
//------------------------------------------------------------------
-
/*N*/ SfxMedium::~SfxMedium()
/*N*/ {
/*N*/ /* Attention
@@ -1582,8 +1547,8 @@ namespace binfilter {
/*N*/ delete pURLObj;
/*N*/ delete pImp;
/*N*/ }
-//------------------------------------------------------------------
+//------------------------------------------------------------------
/*N*/ const INetURLObject& SfxMedium::GetURLObject() const
/*N*/ {
/*N*/ if( !pURLObj )
@@ -1598,50 +1563,36 @@ namespace binfilter {
/*N*/ }
//----------------------------------------------------------------
-
-//----------------------------------------------------------------
-
/*N*/ sal_uInt32 SfxMedium::GetMIMEAndRedirect( String & /*rName*/ )
/*N*/ {
/*N*/ return 0;
/*N*/ }
//----------------------------------------------------------------
-
/*N*/ void SfxMedium::SetUsesCache( sal_Bool bUse )
/*N*/ {
/*N*/ pImp->bUsesCache = bUse;
/*N*/ }
-//----------------------------------------------------------------
+//----------------------------------------------------------------
/*N*/ sal_Bool SfxMedium::UsesCache() const
/*N*/ {
/*N*/ return pImp->bUsesCache;
/*N*/ }
-//----------------------------------------------------------------
//----------------------------------------------------------------
-
/*N*/ void SfxMedium::SetReferer( const String& rRefer )
/*N*/ {
/*N*/ pImp->aReferer = rRefer;
/*N*/ }
-//----------------------------------------------------------------
//----------------------------------------------------------------
-
/*N*/ void SfxMedium::SetTransferPriority( sal_uInt16 nPrio )
/*N*/ {
/*N*/ pImp->nPrio = nPrio;
/*N*/ }
-//----------------------------------------------------------------
-
-//----------------------------------------------------------------
-
-//----------------------------------------------------------------
//----------------------------------------------------------------
-
/*N*/ void SfxMedium::ForceSynchronStream_Impl( sal_Bool bForce )
/*N*/ {
/*N*/ if( pInStream )
@@ -1681,7 +1632,6 @@ namespace binfilter {
/*N*/ }
//----------------------------------------------------------------
-
/*N*/ SfxItemSet* SfxMedium::GetItemSet() const
/*N*/ {
/*N*/ if( !pSet ) ((SfxMedium*)this)->pSet =
@@ -1715,8 +1665,8 @@ namespace binfilter {
/*N*/
/*N*/ return pImp->xAttributes;
/*N*/ }
-//----------------------------------------------------------------
+//----------------------------------------------------------------
/*N*/ SvCompatWeakHdl* SfxMedium::GetHdl()
/*N*/ {
/*N*/ return pImp->GetHdl();
@@ -1728,7 +1678,6 @@ namespace binfilter {
/*N*/ }
//----------------------------------------------------------------
-
/*N*/ void SfxMedium::SetDontCreateCancellable( )
/*N*/ {
/*N*/ pImp->bDontCreateCancellable = sal_True;
@@ -1773,20 +1722,10 @@ namespace binfilter {
/*N*/ return pImp->pVersions;
/*N*/ }
-
-
-
-
-
-
//----------------------------------------------------------------
/*N*/ sal_Bool SfxMedium::IsReadOnly()
/*N*/ {
/*N*/ sal_Bool bReadOnly = !( GetOpenMode() & STREAM_WRITE );
-/*(dv) if ( bReadOnly && pURLObj && CntAnchor::IsViewURL( pURLObj->GetMainURL( INetURLObject::NO_DECODE ) ) )
- // Chaos-Storages sind niemals als readonly anzusehen!
- return sal_False;
-*/
/*N*/ if ( !bReadOnly )
/*N*/ {
/*N*/ // logisch readonly ge"offnet
@@ -1799,8 +1738,6 @@ namespace binfilter {
/*N*/ }
//----------------------------------------------------------------
-
-//----------------------------------------------------------------
/*N*/ void SfxMedium::CreateTempFile()
/*N*/ {
/*N*/ if ( pImp->pTempFile )
@@ -1898,9 +1835,6 @@ void SfxVersionTableDtor::DelDtor()
maList.clear();
}
-
-//----------------------------------------------------------------
-//----------------------------------------------------------------
//----------------------------------------------------------------
SfxVersionInfo::SfxVersionInfo()
{
diff --git a/binfilter/bf_so3/source/ole/socont.cxx b/binfilter/bf_so3/source/ole/socont.cxx
index 10cfbe5..85b1a37 100644
--- a/binfilter/bf_so3/source/ole/socont.cxx
+++ b/binfilter/bf_so3/source/ole/socont.cxx
@@ -124,7 +124,6 @@ void RectConvertMappings(LPRECT pRect, HDC hDC, WIN_BOOL fToDevice)
{
hDC=GetDC(NULL);
SetMapMode(hDC, MM_HIMETRIC);
- //SetMapMode(hDC, MM_LOMETRIC);
fSysDC=TRUE;
}
@@ -155,7 +154,6 @@ void RectConvertMappings(LPRECT pRect, HDC hDC, WIN_BOOL fToDevice)
*/
CSO_Cont::CSO_Cont(DWORD dwID, HWND hWnd, SvOutPlaceObject * pPG)
-//CSO_Cont::CSO_Cont(DWORD dwID, HWND hWnd, PCPages pPG)
{
m_hWnd=hWnd;
m_dwID=dwID;
@@ -170,7 +168,6 @@ CSO_Cont::CSO_Cont(DWORD dwID, HWND hWnd, SvOutPlaceObject * pPG)
m_clsID=CLSID_NULL;
m_fSetExtent=FALSE;
- //CHAPTER17MOD
m_cRef=0;
m_pIOleObject=NULL;
m_pIViewObject2=NULL;
@@ -180,27 +177,22 @@ CSO_Cont::CSO_Cont(DWORD dwID, HWND hWnd, SvOutPlaceObject * pPG)
m_pImpIAdviseSink=NULL;
m_fRepaintEnabled=TRUE;
- //End CHAPTER17MOD
+
return;
}
CSO_Cont::~CSO_Cont(void)
{
- //CHAPTER17MOD
//Object pointers cleaned up in Close.
-
DeleteInterfaceImp(m_pImpIAdviseSink);
DeleteInterfaceImp(m_pImpIOleClientSite);
- //End CHAPTER17MOD
return;
}
-
-//CHAPTER17MOD
/*
* CSO_Cont::QueryInterface
* CSO_Cont::AddRef
@@ -247,10 +239,6 @@ STDMETHODIMP_(ULONG) CSO_Cont::Release(void)
return 0;
}
-//End CHAPTER17MOD
-
-
-
/*
@@ -278,7 +266,6 @@ DWORD CSO_Cont::GetID(void)
* UINT Number of characters stored.
*/
-//UINT CSO_Cont::GetStorageName(LPOLESTR pszName)
String CSO_Cont::GetStorageName()
{
// used in SvOutPlaceObject too, don't change name
@@ -286,41 +273,6 @@ String CSO_Cont::GetStorageName()
}
-
-//CHAPTER17MOD
-/*
- * CSO_Cont::StorageGet
- *
- * Purpose:
- * Returns the IStorage pointer maintained by this tenant,
- * AddRef'd of course.
- *
- * Parameters:
- * ppStg LPSTORAGE * in which to return the pointer.
- *
- * Return Value:
- * None
- */
-
-/* MM ???
-void CSO_Cont::StorageGet(LPSTORAGE *ppStg)
- {
- if (NULL==ppStg)
- return;
-
- *ppStg=m_pIStorage;
-
- if (NULL!=*ppStg)
- (*ppStg)->AddRef();
-
- return;
- }
-*/
-//End CHAPTER17MOD
-
-
-
-
/*
* CSO_Cont::Create
*
@@ -352,14 +304,10 @@ void CSO_Cont::StorageGet(LPSTORAGE *ppStg)
UINT CSO_Cont::Create(TENANTTYPE tType, LPVOID pvType
, LPFORMATETC pFE, PPOINTL pptl, LPSIZEL pszl
, SotStorage * pIStorage, PPATRONOBJECT ppo, DWORD dwData)
-// , LPSTORAGE pIStorage, PPATRONOBJECT ppo, DWORD dwData)
{
HRESULT hr;
LPUNKNOWN pObj = NULL;
UINT uRet=CREATE_GRAPHICONLY;
- //CHAPTER17MOD
- //Some things moves to ObjectInitialize
- //End CHAPTER17MOD
if (NULL==pvType || NULL==pIStorage)
return CREATE_FAILED;
@@ -519,8 +467,6 @@ WIN_BOOL CSO_Cont::Save(SotStorage *pIStorage)
xStm->SetSize( 0 );
ULONG nMaxLen = GlobalSize( hGlobal );
xStm->Write( pMem, nMaxLen );
-//SvFileStream aFS( "d:\\temp\\test.ttt", STREAM_STD_READWRITE );
-//aFS.Write( pMem, nMaxLen );
GlobalUnlock( hGlobal );
return TRUE;
@@ -577,7 +523,6 @@ WIN_BOOL CSO_Cont::Load(SotStorage *pIStorage, DWORD dwAspect, WIN_BOOL fSetExte
if (NULL!=m_pIViewObject2)
{
m_pIViewObject2->SetAdvise(dwAspect, 0, NULL);
-// m_pIViewObject2->SetAdvise(m_fe.dwAspect, 0, NULL);
ReleaseInterface(m_pIViewObject2);
}
@@ -604,18 +549,13 @@ WIN_BOOL CSO_Cont::Load(SotStorage *pIStorage, DWORD dwAspect, WIN_BOOL fSetExte
return FALSE;
}
- //CHAPTER17MOD
m_fSetExtent=fSetExtent;
- //m_fSetExtent=pti->fSetExtent;
ObjectInitialize(pObj, dwAspect, NULL);
- //ObjectInitialize(pObj, &pti->fe, NULL);
//Restore the original state before reloading.
m_dwState=dwState;
- //End CHAPTER17MOD
RectSet(&rcl, FALSE, FALSE);
- //RectSet(&pti->rcl, FALSE, FALSE);
return TRUE;
}
@@ -635,28 +575,12 @@ WIN_BOOL CSO_Cont::Load(SotStorage *pIStorage, DWORD dwAspect, WIN_BOOL fSetExte
* None
*/
-//void CSO_Cont::GetInfo(PTENANTINFO pti)
void CSO_Cont::GetInfo(DWORD& rAspect, WIN_BOOL & rSetExtend )
{
rAspect = dwAspect;
rSetExtend = m_fSetExtent;
- /*
- if (NULL!=pti)
- {
- pti->dwID=m_dwID;
- pti->rcl=m_rcl;
- pti->fe=m_fe;
- pti->fSetExtent=m_fSetExtent;
- }
-
- return;
- */
}
-
-
-
-//CHAPTER17MOD
/*
* CSO_Cont::ObjectInitialize
* (Protected)
@@ -675,22 +599,15 @@ void CSO_Cont::GetInfo(DWORD& rAspect, WIN_BOOL & rSetExtend )
* WIN_BOOL TRUE if the function succeeded, FALSE otherwise.
*/
-//WIN_BOOL CSO_Cont::ObjectInitialize(LPUNKNOWN pObj, LPFORMATETC pFE, DWORD dwData)
WIN_BOOL CSO_Cont::ObjectInitialize(LPUNKNOWN pObj, DWORD dwAspect_, DWORD dwData)
{
HRESULT hr;
LPPERSIST pIPersist=NULL;
DWORD dw;
- //PCDocument pDoc;
TCHAR szFile[CCHPATHMAX];
- //if (NULL==pObj || NULL==pFE)
- // return FALSE;
-
m_pObj=pObj;
dwAspect = dwAspect_;
- //m_fe=*pFE;
- //m_fe.ptd=NULL;
m_dwState=TENANTSTATE_DEFAULT;
/*
@@ -724,7 +641,6 @@ WIN_BOOL CSO_Cont::ObjectInitialize(LPUNKNOWN pObj, DWORD dwAspect_, DWORD dwDat
return FALSE;
m_pIViewObject2->SetAdvise(dwAspect, 0, m_pImpIAdviseSink);
- //m_pIViewObject2->SetAdvise(m_fe.dwAspect, 0, m_pImpIAdviseSink);
IOleCache* pIOleCache = NULL;
if ( SUCCEEDED(m_pIViewObject2->QueryInterface(IID_IOleCache, (PPVOID)&pIOleCache)) && pIOleCache )
@@ -753,15 +669,6 @@ WIN_BOOL CSO_Cont::ObjectInitialize(LPUNKNOWN pObj, DWORD dwAspect_, DWORD dwDat
DWORD nConn;
FORMATETC aFormat = { 0, 0, ASPECT_CONTENT, -1, TYMED_MFPICT };
hr = pIOleCache->Cache( &aFormat, /*ADVFCACHE_FORCEBUILTIN*/ /*ADVF_PRIMEFIRST*/ ADVFCACHE_ONSAVE, &nConn );
-/*
- IDataObject* pIDataObject = NULL;
- if ( SUCCEEDED(pObj->QueryInterface(IID_IDataObject, (PPVOID)&pIDataObject)) && pIDataObject )
- {
- pIOleCache->InitCache( pIDataObject );
- pIDataObject->Release();
- pIDataObject = NULL;
- }
-*/
}
pIOleCache->Release();
@@ -788,11 +695,9 @@ WIN_BOOL CSO_Cont::ObjectInitialize(LPUNKNOWN pObj, DWORD dwAspect_, DWORD dwDat
* remember to draw it properly and do extents right.
*/
m_pIOleObject->GetMiscStatus(dwAspect, &m_grfMisc);
- //m_pIOleObject->GetMiscStatus(m_fe.dwAspect, &m_grfMisc);
if (OLEMISC_ONLYICONIC & m_grfMisc)
dwAspect=DVASPECT_ICON;
- //m_fe.dwAspect=DVASPECT_ICON;
/*
* We could pass m_pImpIOleClientSite in an OleCreate* call, but
@@ -814,14 +719,6 @@ WIN_BOOL CSO_Cont::ObjectInitialize(LPUNKNOWN pObj, DWORD dwAspect_, DWORD dwDat
* Roundabout, but it works.
*/
- /* MM ???
- pDoc=(PCDocument)SendMessage(GetParent(m_hWnd), DOCM_PDOCUMENT
- , 0, 0L);
-
- if (NULL!=pDoc)
- pDoc->FilenameGet(szFile, CCHPATHMAX);
- else
- */
szFile[0]=0;
NotifyOfRename(szFile, NULL);
@@ -838,7 +735,6 @@ WIN_BOOL CSO_Cont::ObjectInitialize(LPUNKNOWN pObj, DWORD dwAspect_, DWORD dwDat
* a view advise.
*/
- //if (DVASPECT_ICON & m_fe.dwAspect)
if (DVASPECT_ICON & dwAspect)
{
DWORD dw=DVASPECT_CONTENT;
@@ -853,9 +749,6 @@ WIN_BOOL CSO_Cont::ObjectInitialize(LPUNKNOWN pObj, DWORD dwAspect_, DWORD dwDat
return TRUE;
}
-//End CHAPTER17MOD
-
-
/*
@@ -878,16 +771,8 @@ WIN_BOOL CSO_Cont::ObjectInitialize(LPUNKNOWN pObj, DWORD dwAspect_, DWORD dwDat
* WIN_BOOL TRUE if opening succeeds, FALSE otherwise.
*/
-//WIN_BOOL CSO_Cont::Open(LPSTORAGE pIStorage)
WIN_BOOL CSO_Cont::Open(SotStorage * pIStorage)
{
- /*
- HRESULT hr=NOERROR;
- DWORD dwMode=STGM_TRANSACTED | STGM_READWRITE
- | STGM_SHARE_EXCLUSIVE;
- OLECHAR szTemp[32];
- */
-
if (NULL==m_pIStorage)
{
if (NULL==pIStorage)
@@ -899,8 +784,6 @@ WIN_BOOL CSO_Cont::Open(SotStorage * pIStorage)
* IStorage that we either save in pPage or release.
*/
-// StgCreateDocfile( "d:\\temp\\test.ttt", STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, &m_pIStorage );
-
SotStorageStreamRef xStm;
String szTemp = GetStorageName();
if( pIStorage->IsContained( szTemp ) )
@@ -956,20 +839,6 @@ WIN_BOOL CSO_Cont::Open(SotStorage * pIStorage)
&m_pIStorage //Indirect pointer to the new storage object
);
}
-
- /* MM ??? StgOpenStorage
- GetStorageName(szTemp);
- hr=pIStorage->OpenStorage(szTemp, NULL, dwMode, NULL, 0
- , &m_pIStorage);
-
- if (FAILED(hr))
- {
- hr=pIStorage->CreateStorage(szTemp, dwMode, 0, 0
- , &m_pIStorage);
- }
- if (FAILED(hr))
- return FALSE;
- */
}
else
{
@@ -980,7 +849,6 @@ WIN_BOOL CSO_Cont::Open(SotStorage * pIStorage)
m_cOpens++;
- //CHAPTER17MOD
//Create these if we don't have them already.
if (NULL==m_pImpIOleClientSite && NULL==m_pImpIAdviseSink)
{
@@ -990,7 +858,6 @@ WIN_BOOL CSO_Cont::Open(SotStorage * pIStorage)
if (NULL==m_pImpIOleClientSite || NULL==m_pImpIAdviseSink)
return FALSE;
}
- //End CHAPTER17MOD
return TRUE;
}
@@ -1030,7 +897,6 @@ void CSO_Cont::Close(WIN_BOOL fCommit)
* We can't use a zero reference count to know when to NULL
* this since other things might have AddRef'd the storage.
*/
- //CHAPTER17MOD
if (0==--m_cOpens)
{
m_pIStorage=NULL;
@@ -1047,13 +913,11 @@ void CSO_Cont::Close(WIN_BOOL fCommit)
if (NULL!=m_pIViewObject2)
{
m_pIViewObject2->SetAdvise(dwAspect, 0, NULL);
- //m_pIViewObject2->SetAdvise(m_fe.dwAspect, 0, NULL);
ReleaseInterface(m_pIViewObject2);
}
ReleaseInterface(m_pObj);
}
- //End CHAPTER17MOD
}
return;
@@ -1075,7 +939,6 @@ void CSO_Cont::Close(WIN_BOOL fCommit)
* WIN_BOOL TRUE if the object is open, FALSE otherwise.
*/
-//WIN_BOOL CSO_Cont::Update(void)
WIN_BOOL CSO_Cont::Update()
{
Save( m_pPG->GetWorkingStorage());
@@ -1106,15 +969,12 @@ WIN_BOOL CSO_Cont::Update()
* None
*/
-//void CSO_Cont::Destroy(LPSTORAGE pIStorage)
void CSO_Cont::Destroy(SotStorage * pIStorage)
{
if (NULL!=pIStorage)
{
- //CHAPTER17MOD
if (NULL!=m_pIOleObject)
m_pIOleObject->Close(OLECLOSE_NOSAVE);
- //End CHAPTER17MOD
if (NULL!=m_pIStorage)
{
@@ -1129,8 +989,6 @@ void CSO_Cont::Destroy(SotStorage * pIStorage)
String szTemp = GetStorageName();
pIStorage->Remove(szTemp);
- //GetStorageName(szTemp);
- //pIStorage->DestroyElement(szTemp);
m_pIStorage=NULL;
pTmpStorage = NULL;
@@ -1178,21 +1036,8 @@ void CSO_Cont::Select(WIN_BOOL fSelect)
RECTFROMRECTL(rc, m_rcl);
RectConvertMappings(&rc, NULL, TRUE);
- /* MM ???
- OffsetRect(&rc, -(int)m_pPG->m_xPos, -(int)m_pPG->m_yPos);
-
- hDC=GetDC(m_hWnd);
-
- UIDrawHandles(&rc, hDC, UI_HANDLES_INSIDE
- | UI_HANDLES_NOBORDER | UI_HANDLES_USEINVERSE
- , CXYHANDLE, !fWasSelected);
-
- ReleaseDC(m_hWnd, hDC);
- */
-
if (fSelect)
m_pPG->SetModified();
- //m_pPG->m_fDirty=TRUE;
return;
}
@@ -1200,7 +1045,6 @@ void CSO_Cont::Select(WIN_BOOL fSelect)
-//CHAPTER17MOD
/*
* CSO_Cont::ShowAsOpen
*
@@ -1230,13 +1074,6 @@ void CSO_Cont::ShowAsOpen(WIN_BOOL fOpen)
{
RECTFROMRECTL(rc, m_rcl);
RectConvertMappings(&rc, NULL, TRUE);
- /* MM ???
- OffsetRect(&rc, -(int)m_pPG->m_xPos, -(int)m_pPG->m_yPos);
-
- hDC=GetDC(m_hWnd);
- UIDrawShading(&rc, hDC, UI_SHADE_FULLRECT, 0);
- ReleaseDC(m_hWnd, hDC);
- */
}
if (fWasOpen && !fOpen)
@@ -1286,27 +1123,6 @@ void CSO_Cont::ShowYourself(void)
//Get the window rectangle offset for the current scroll pos.
GetClientRect(m_hWnd, &rc);
- /* MM ???
- OffsetRect(&rc, m_pPG->m_xPos, m_pPG->m_yPos);
-
- //Check if the object is already visible. (macro in bookguid.h)
- SETPOINT(pt1, (int)rcl.left, (int)rcl.top);
- SETPOINT(pt2, (int)rcl.right, (int)rcl.bottom);
-
- if (PtInRect(&rc, pt1) && PtInRect(&rc, pt2))
- return;
-
- //Check if the upper left is within the upper left quadrant
- if (((int)rcl.left > rc.left
- && (int)rcl.left < ((rc.right+rc.left)/2))
- && ((int)rcl.top > rc.top
- && (int)rcl.top < ((rc.bottom+rc.top)/2)))
- return;
-
- //These are macros in INC\BOOK1632.H
- SendScrollPosition(m_hWnd, WM_HSCROLL, rcl.left-8);
- SendScrollPosition(m_hWnd, WM_VSCROLL, rcl.top-8);
- */
return;
}
@@ -1329,19 +1145,6 @@ void CSO_Cont::ShowYourself(void)
void CSO_Cont::AddVerbMenu(HMENU, UINT)
{
- /* MM ???
- HMENU hMenuTemp;
- LPOLEOBJECT pObj=m_pIOleObject;
-
- //If we're static, say we have no object.
- if (TENANTTYPE_STATIC==m_tType)
- pObj=NULL;
-
- OleUIAddVerbMenu(pObj, NULL, hMenu, iPos, IDM_VERBMIN
- , IDM_VERBMAX, TRUE, IDM_EDITCONVERT, &hMenuTemp);
-
- return;
- */
}
@@ -1506,13 +1309,11 @@ void CSO_Cont::NotifyOfRename(LPTSTR pszFile, LPVOID)
{
// MM ???
lstrcpyn( szObj, "untitled", SAL_N_ELEMENTS(szObj) );
- //LoadString(m_pPG->m_hInst, IDS_UNTITLED, szObj, sizeof(szObj));
}
else
{
// MM ???
lstrcpyn( szObj, "untitled", SAL_N_ELEMENTS(szObj) );
- //GetFileTitle(pszFile, szObj, sizeof(szObj));
#ifndef WIN32
//Force filenames to uppercase in DOS versions.
@@ -1522,7 +1323,6 @@ void CSO_Cont::NotifyOfRename(LPTSTR pszFile, LPVOID)
// MM ???
lstrcpyn( szApp, "app name", SAL_N_ELEMENTS(szApp) );
- //LoadString(m_pPG->m_hInst, IDS_CAPTION, szApp, sizeof(szApp));
#ifdef WIN32ANSI
OLECHAR szObjW[40], szAppW[40];
@@ -1535,11 +1335,6 @@ void CSO_Cont::NotifyOfRename(LPTSTR pszFile, LPVOID)
return;
}
-//End CHAPTER17MOD
-
-
-
-
/*
* CSO_Cont::Activate
@@ -1558,9 +1353,7 @@ void CSO_Cont::NotifyOfRename(LPTSTR pszFile, LPVOID)
WIN_BOOL CSO_Cont::Activate(LONG iVerb, HWND hParent )
{
- //CHAPTER17MOD
RECT rc, rcH;
- //CHourglass *pHour;
SIZEL szl;
//Can't activate statics.
@@ -1574,8 +1367,6 @@ WIN_BOOL CSO_Cont::Activate(LONG iVerb, HWND hParent )
RectConvertMappings(&rc, NULL, TRUE);
SO_MetricRectInPixelsToHimetric( &rc, &rcH);
- //pHour=new CHourglass;
-
//Get the server running first, then do a SetExtent, then show it
OleRun(m_pIOleObject);
@@ -1583,7 +1374,6 @@ WIN_BOOL CSO_Cont::Activate(LONG iVerb, HWND hParent )
{
SETSIZEL(szl, rcH.right-rcH.left, rcH.top-rcH.bottom);
m_pIOleObject->SetExtent(dwAspect, &szl);
- //m_pIOleObject->SetExtent(m_fe.dwAspect, &szl);
m_fSetExtent=FALSE;
}
@@ -1596,7 +1386,6 @@ WIN_BOOL CSO_Cont::Activate(LONG iVerb, HWND hParent )
//If object changes, IAdviseSink::OnViewChange will see it.
return SUCCEEDED( hr );
- //End CHAPTER17MOD
}
@@ -1662,15 +1451,6 @@ void CSO_Cont::Draw(HDC hDC, DVTARGETDEVICE *ptd, HDC hIC
RECTL rcl = { 0, 0, xOff, -yOff };
UINT uMM;
- //CHAPTER17MOD
- //We hold IViewObject2 all the time now, so no QueryInterface
- //End CHAPTER17MOD
-
- //RECTFROMRECTL(rc, m_rcl);
- //OffsetRect(&rc, -xOff, -yOff);
- //RECTLFROMRECT(rcl, rc);
-
- //CHAPTER17MOD
//Repaint erases the rectangle to insure full object cleanup
if (!fNoColor && !fPrinter)
@@ -1684,9 +1464,6 @@ void CSO_Cont::Draw(HDC hDC, DVTARGETDEVICE *ptd, HDC hIC
//We have to use Draw since we have a target device and IC.
hr=m_pIViewObject2->Draw(dwAspect, -1, NULL, ptd, hIC, hDC, NULL, &rcl, NULL, 0);
- //hr=m_pIViewObject2->Draw(dwAspect, -1, NULL, ptd, hIC, hDC, &rcl, NULL, NULL, 0);
-
- //End CHAPTER17MOD
/*
* If Draw failed, then perhaps it couldn't work for the device,
@@ -1695,9 +1472,7 @@ void CSO_Cont::Draw(HDC hDC, DVTARGETDEVICE *ptd, HDC hIC
*/
if (FAILED(hr))
OleDraw(m_pObj, dwAspect, hDC, &rc);
- //OleDraw(m_pObj, m_fe.dwAspect, hDC, &rc);
- //CHAPTER17MOD
if (!fPrinter
&& (TENANTSTATE_SELECTED | TENANTSTATE_OPEN) & m_dwState)
{
@@ -1721,7 +1496,6 @@ void CSO_Cont::Draw(HDC hDC, DVTARGETDEVICE *ptd, HDC hIC
uMM=SetMapMode(hDC, uMM);
}
- //End CHAPTER17MOD
return;
}
@@ -1748,7 +1522,6 @@ void CSO_Cont::Draw(HDC hDC, DVTARGETDEVICE *ptd, HDC hIC
void CSO_Cont::Repaint(void)
{
- //CHAPTER17MOD
/*
* We might be asked to repaint from
* IOleClientSite::OnShowWindow after we've switched pages if
@@ -1756,18 +1529,7 @@ void CSO_Cont::Repaint(void)
*/
if (0==m_cOpens || !m_fRepaintEnabled)
return;
- //End CHAPTER17MOD
-
- /* MM ???
- hDC=GetDC(m_hWnd);
- SetRect(&rc, m_pPG->m_xPos, m_pPG->m_yPos, 0, 0);
- RectConvertMappings(&rc, NULL, FALSE);
- SetMapMode(hDC, MM_LOMETRIC);
- Draw(hDC, NULL, NULL, rc.left, rc.top, FALSE, FALSE);
-
- ReleaseDC(m_hWnd, hDC);
- */
return;
}
@@ -1780,18 +1542,12 @@ void CSO_Cont::Invalidate(void)
RectGet(&rcl, TRUE);
RECTFROMRECTL(rc, rcl);
- /* MMM ???
- OffsetRect(&rc, -(int)m_pPG->m_xPos, -(int)m_pPG->m_yPos);
- InvalidateRect(m_hWnd, &rc, FALSE);
- */
-
return;
}
-//CHAPTER17MOD
/*
* CSO_Cont::ObjectClassFormatAndIcon
*
@@ -1925,12 +1681,10 @@ WIN_BOOL CSO_Cont::SwitchOrUpdateAspect(HGLOBAL hMetaIcon
WIN_BOOL fUpdate=FALSE;
//Nothing to do if we're content already and there's no icon.
- //if (NULL==hMetaIcon && DVASPECT_CONTENT==m_fe.dwAspect)
if (NULL==hMetaIcon && DVASPECT_CONTENT==dwAspect)
return FALSE;
//If we're iconic already, just cache the new icon
- //if (NULL!=hMetaIcon && DVASPECT_ICON==m_fe.dwAspect)
if (NULL!=hMetaIcon && DVASPECT_ICON==dwAspect)
hr=StarObject_SetIconInCache(m_pIOleObject, hMetaIcon);
else
@@ -1944,14 +1698,12 @@ WIN_BOOL CSO_Cont::SwitchOrUpdateAspect(HGLOBAL hMetaIcon
*/
hr=StarObject_SwitchDisplayAspect(m_pIOleObject
, &dwAspect, dwAspect, hMetaIcon, !fPreserve
- //, &m_fe.dwAspect, dwAspect, hMetaIcon, !fPreserve
, TRUE, m_pImpIAdviseSink, &fUpdate);
if (SUCCEEDED(hr))
{
//Update MiscStatus for the new aspect
m_pIOleObject->GetMiscStatus(dwAspect, &m_grfMisc);
- //m_pIOleObject->GetMiscStatus(m_fe.dwAspect, &m_grfMisc);
if (fUpdate)
m_pIOleObject->Update(); //This repaints.
@@ -1964,15 +1716,11 @@ WIN_BOOL CSO_Cont::SwitchOrUpdateAspect(HGLOBAL hMetaIcon
SIZEL szl;
m_pIOleObject->GetExtent(dwAspect, &szl);
- //m_pIOleObject->GetExtent(m_fe.dwAspect, &szl);
if (0 > szl.cy)
szl.cy=-szl.cy;
//Convert HIMETRIC absolute units to our LOMETRIC mapping
- //if (0!=szl.cx && 0!=szl.cy)
- // SETSIZEL(szl, szl.cx/10, -szl.cy/10);
-
Invalidate(); //Remove old aspect
SizeSet(&szl, FALSE, FALSE); //Change size
Repaint(); //Paint the new one
@@ -2003,13 +1751,6 @@ void CSO_Cont::EnableRepaint(WIN_BOOL fEnable)
m_fRepaintEnabled=fEnable;
return;
}
-//End CHAPTER17MOD
-
-
-
-
-
-
/*
@@ -2061,9 +1802,7 @@ void CSO_Cont::FormatEtcGet(LPFORMATETC pFE, WIN_BOOL fPresentation)
if (NULL!=pFE)
{
SETDefFormatEtc(*pFE, 0, TYMED_NULL);
- //*pFE=m_fe;
- //CHAPTER17MOD
//If there is no format, use metafile (for embedded objects)
if (fPresentation || 0==pFE->cfFormat)
{
@@ -2071,7 +1810,6 @@ void CSO_Cont::FormatEtcGet(LPFORMATETC pFE, WIN_BOOL fPresentation)
pFE->cfFormat=CF_METAFILEPICT;
pFE->tymed=TYMED_MFPICT;
}
- //End CHAPTER17MOD
}
return;
@@ -2082,7 +1820,6 @@ void CSO_Cont::FormatEtcGet(LPFORMATETC pFE, WIN_BOOL fPresentation)
WIN_BOOL CSO_Cont::GetExtent(LPSIZEL pszl)
{
- //SETSIZEL((*pszl), 2*LOMETRIC_PER_INCH, 2*LOMETRIC_PER_INCH);
SETSIZEL((*pszl), 2*HIMETRIC_PER_INCH, 2*HIMETRIC_PER_INCH);
SIZEL szl = SIZEL();
HRESULT hr=ResultFromScode(E_FAIL);
@@ -2091,19 +1828,15 @@ WIN_BOOL CSO_Cont::GetExtent(LPSIZEL pszl)
if (NULL!=m_pIViewObject2)
{
hr = m_pIViewObject2->GetExtent(dwAspect, -1, NULL, &szl);
- //hr=m_pIViewObject2->GetExtent(m_fe.dwAspect, -1, NULL, &szl);
}
else
{
if (NULL!=m_pIOleObject)
hr = m_pIOleObject->GetExtent(dwAspect, &szl);
- //hr=m_pIOleObject->GetExtent(m_fe.dwAspect, &szl);
}
if (SUCCEEDED(hr))
{
*pszl = szl;
- //Convert HIMETRIC to our LOMETRIC mapping
- //SETSIZEL((*pszl), szl.cx/10, szl.cy/10);
}
return SUCCEEDED( hr );
@@ -2155,9 +1888,7 @@ void CSO_Cont::SizeGet(LPSIZEL pszl, WIN_BOOL fDevice)
return;
}
-//CHAPTER17MOD
void CSO_Cont::SizeSet(LPSIZEL pszl, WIN_BOOL fDevice, WIN_BOOL fInformObj)
-//End CHAPTER17MOD
{
SIZEL szl;
@@ -2182,15 +1913,11 @@ void CSO_Cont::SizeSet(LPSIZEL pszl, WIN_BOOL fDevice, WIN_BOOL fInformObj)
//Tell OLE that this object was resized.
- //CHAPTER17MOD
if (NULL!=m_pIOleObject && fInformObj)
{
HRESULT hr;
WIN_BOOL fRun=FALSE;
- //Convert our LOMETRIC into HIMETRIC by *=10
- //szl.cx*=10;
- //szl.cy*=-10; //Our size is stored negative.
if( szl.cy < 0 )
szl.cy *= -1;
@@ -2212,7 +1939,6 @@ void CSO_Cont::SizeSet(LPSIZEL pszl, WIN_BOOL fDevice, WIN_BOOL fInformObj)
}
hr=m_pIOleObject->SetExtent(dwAspect, &szl);
- //hr=m_pIOleObject->SetExtent(m_fe.dwAspect, &szl);
/*
* If the object is not running and it does not have
@@ -2236,7 +1962,6 @@ void CSO_Cont::SizeSet(LPSIZEL pszl, WIN_BOOL fDevice, WIN_BOOL fInformObj)
m_fSetExtent=TRUE;
}
}
- //End CHAPTER17MOD
return;
}
@@ -2259,9 +1984,7 @@ void CSO_Cont::RectGet(LPRECTL prcl, WIN_BOOL fDevice)
}
-//CHAPTER17MOD
void CSO_Cont::RectSet(LPRECTL prcl, WIN_BOOL fDevice, WIN_BOOL fInformObj)
-//End CHAPTER17MOD
{
SIZEL szl;
LONG cx, cy;
@@ -2287,9 +2010,7 @@ void CSO_Cont::RectSet(LPRECTL prcl, WIN_BOOL fDevice, WIN_BOOL fInformObj)
if ((m_rcl.right-m_rcl.left)!=cx || (m_rcl.bottom-m_rcl.top)!=cy)
{
SETSIZEL(szl, m_rcl.right-m_rcl.left, m_rcl.bottom-m_rcl.top);
- //CHAPTER17MOD
SizeSet(&szl, FALSE, fInformObj);
- //End CHAPTER17MOD
}
return;
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
index 7678964..f6c7daa 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
@@ -403,20 +403,6 @@ namespace binfilter {
/*N*/ CHECK;
/*N*/ }
-/*
-
-
-void SwCache::Delete( const void *pOwner, const USHORT nIndex )
-{
- INCREMENT( nDelete );
- SwCacheObj *pObj;
- if ( 0 != (pObj = Get( pOwner, nIndex, FALSE )) )
- DeleteObj( pObj );
-}
-*/
-
-
-
/*N*/ void SwCache::Delete( const void *pOwner )
/*N*/ {
/*N*/ INCREMENT( nDelete );
diff --git a/binfilter/bf_sw/source/core/doc/sw_docsort.cxx b/binfilter/bf_sw/source/core/doc/sw_docsort.cxx
index a8418aa..9b34b3b 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docsort.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docsort.cxx
@@ -26,87 +26,22 @@
*
************************************************************************/
-
#ifdef _MSC_VER
#pragma hdrstop
#endif
-
-
-
#include <horiornt.hxx>
#include <errhdl.hxx>
-
#include <doc.hxx>
-#if OSL_DEBUG_LEVEL > 1
-//nur zum debugen
-#endif
+
namespace binfilter {
using namespace ::com::sun::star::lang;
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Ein Sortierelement fuers Sort konstruieren
- --------------------------------------------------------------------*/
-
-
-
-
-
-
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Operatoren zum Vergleichen
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Kleiner-Operator fuers sortieren
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: SortierElemente fuer Text
- --------------------------------------------------------------------*/
-
-
-
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Key ermitteln
- --------------------------------------------------------------------*/
-
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Sortier-Elemente fuer Tabellen
- --------------------------------------------------------------------*/
-
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Schluessel zu einer Zelle ermitteln
- --------------------------------------------------------------------*/
-
-
-
-
/*--------------------------------------------------------------------
Beschreibung: Text sortieren im Document
--------------------------------------------------------------------*/
-
/*N*/ BOOL SwDoc::SortText(const SwPaM& /*rPaM*/, const SwSortOptions& /*rOpt*/)
/*N*/ {
/*N*/ DBG_BF_ASSERT(0, "STRIP");
@@ -123,71 +58,6 @@ using namespace ::com::sun::star::lang;
/*N*/ return TRUE;
/*N*/ }
-/*--------------------------------------------------------------------
- Beschreibung: Zeilenweise verschieben
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Spaltenweise verschieben
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Eine einzelne Zelle verschieben
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Zweidimensionales Array aus FndBoxes generieren
- --------------------------------------------------------------------*/
-
-
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Alle Lines einer Box muessen gleichviel Boxen haben
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Box auf Symmetrie pruefen
- Alle Boxen einer Line muessen gleichviele Lines haben
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: max Anzahl der Spalten (Boxes)
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: max Anzahl der Zeilen (Lines)
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: lineares Array aus atomaren FndBoxes erzeugen
- --------------------------------------------------------------------*/
-
-
-
-/*--------------------------------------------------------------------
- Beschreibung: Zugriff auf eine bestimmte Zelle
- --------------------------------------------------------------------*/
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
index bd22d75..1c264b9 100644
--- a/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx
@@ -26,19 +26,13 @@
*
************************************************************************/
-
#ifdef _MSC_VER
#pragma hdrstop
#endif
#include <hintids.hxx>
-
-
-
#include <horiornt.hxx>
-
#include <vcl/window.hxx>
-
#include <fmtsrnd.hxx>
#include <frmfmt.hxx>
#include <errhdl.hxx>
@@ -72,16 +66,6 @@ namespace binfilter {
extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
-
-
-
-
-
-
-
-
-
-
/*************************************************************************
|*
|* SwGrfFrm::SwGrfFrm(ViewShell * const,SwGrfNode *)
@@ -133,17 +117,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
/*************************************************************************
|*
-|* void SwNoTxtFrm::Modify( SwHint * pOld, SwHint * pNew )
-|*
-*************************************************************************/
-
-
-
-
-
-
-/*************************************************************************
-|*
|* void SwNoTxtFrm::Paint()
|*
*************************************************************************/
@@ -154,32 +127,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
/*************************************************************************
|*
-|* void lcl_CalcRect( Point & aPt, Size & aDim,
-|* USHORT nMirror )
-|*
-|* Beschreibung Errechne die Position und die Groesse der Grafik im
-|* Frame, entsprechen der aktuellen Grafik-Attribute
-|*
-|* Parameter Point& die Position im Frame ( auch Return-Wert )
-|* Size& die Groesse der Grafik ( auch Return-Wert )
-|* MirrorGrf akt. Spiegelungs-Attribut
-|*
-*************************************************************************/
-
-
-
-/*************************************************************************
-|*
-|* void SwNoTxtFrm::GetGrfArea()
-|*
-|* Beschreibung Errechne die Position und die Groesse der Bitmap
-|* innerhalb des uebergebenem Rechtecks.
-|*
-*************************************************************************/
-
-
-/*************************************************************************
-|*
|* Size SwNoTxtFrm::GetSize()
|*
|* Beschreibung Gebe die Groesse des umgebenen FLys und
@@ -393,8 +340,6 @@ extern void ClrContourCache( const SdrObject *pObj ); // TxtFly.Cxx
/*N*/ return pGrfNd && pGrfNd->IsAnimated();
/*N*/ }
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
index 251a5ef..ec7192f 100644
--- a/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_swserv.cxx
@@ -53,15 +53,6 @@ namespace binfilter {
/*N*/ {
/*N*/ }
-
-
-
-
-
-
-
-
-
/*N*/ BOOL SwServerObject::IsLinkInServer( const SwBaseLink* pChkLnk ) const
/*N*/ {
/*N*/ ULONG nSttNd = 0, nEndNd = 0;
@@ -139,23 +130,18 @@ namespace binfilter {
/*N*/ }
/*N*/ }
/*N*/ if( !pChkLnk )
-/*N*/ // *((int*)&eType) = eSave;
/*?*/ ((SwServerObject*)this)->eType = eSave;
/*N*/ }
/*N*/
/*N*/ return FALSE;
/*N*/ }
-/* */
-
-
/*N*/ SwDataChanged::SwDataChanged( const SwPaM& rPam, USHORT nTyp )
/*N*/ : pPam( &rPam ), nType( nTyp ), pDoc( rPam.GetDoc() ), pPos( 0 )
/*N*/ {
/*N*/ nNode = rPam.GetPoint()->nNode.GetIndex();
/*N*/ nCntnt = rPam.GetPoint()->nContent.GetIndex();
/*N*/ }
-
/*N*/ SwDataChanged::SwDataChanged( SwDoc* pDoc, const SwPosition& rPos, USHORT nTyp )
/*N*/ : pPam( 0 ), nType( nTyp ), pDoc( pDoc ), pPos( &rPos )
@@ -194,9 +180,6 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
index 1b9a814..ec0cf31 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
@@ -29,19 +29,9 @@
#include "xmlexpit.hxx"
#include <bf_xmloff/xmluconv.hxx>
-
-
-
-
-
-
-
#include <bf_xmloff/nmspmap.hxx>
-
#include <bf_xmloff/xmlnmspe.hxx>
-
#include <bf_svx/xmlcnitm.hxx>
-
#include <bf_xmloff/xmlexp.hxx>
#ifndef _SVSTDARR_USHORTS
@@ -49,40 +39,23 @@
#include <bf_svtools/svstdarr.hxx>
#endif
-
-
#include "hintids.hxx"
-
#include "unomid.h"
-
#include <bf_svx/lrspitem.hxx>
-
#include <bf_svx/ulspitem.hxx>
-
#include <bf_svx/shaditem.hxx>
-
#include <bf_svx/boxitem.hxx>
-
#include <bf_svx/brkitem.hxx>
-
#include <bf_svx/keepitem.hxx>
-
#include "fmtpdsc.hxx"
-
#include <horiornt.hxx>
-
#include "fmtornt.hxx"
-
#include "fmtfsize.hxx"
-
#include "fmtlsplt.hxx"
-
-
-
-
#include "xmlithlp.hxx"
+
namespace binfilter {
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
index a141bbc..3349886 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLImageMapContext.cxx
@@ -30,35 +30,20 @@
#include <com/sun/star/uno/Reference.h>
-
-
-
#include <com/sun/star/container/XIndexContainer.hpp>
-
-
-
#include <com/sun/star/document/XEventsSupplier.hpp>
-
-
#include "xmlimp.hxx"
-
-
#include "xmlnmspe.hxx"
-
#include "nmspmap.hxx"
-
#include "xmluconv.hxx"
-
#include "xexptran.hxx"
-
#include "xmlerror.hxx"
-
#include "XMLEventsImportContext.hxx"
-
#include "XMLStringBufferImportContext.hxx"
#include <tools/debug.hxx>
+
namespace binfilter {
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx b/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx
index b948851..8f67a89 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_ximp3dobject.cxx
@@ -30,30 +30,17 @@
#pragma hdrstop
#endif
-
#include "ximp3dobject.hxx"
-
-
#include "xmluconv.hxx"
-
-
-
-
-
-
-
-
#include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
-
#include <com/sun/star/drawing/DoubleSequence.hpp>
+
namespace binfilter {
using namespace ::rtl;
using namespace ::com::sun::star;
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXML3DObjectContext, SdXMLShapeContext );
@@ -127,8 +114,6 @@ void SdXML3DObjectContext::EndElement()
SdXMLShapeContext::EndElement();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXML3DCubeObjectShapeContext, SdXML3DObjectContext);
@@ -237,8 +222,6 @@ void SdXML3DCubeObjectShapeContext::EndElement()
SdXML3DObjectContext::EndElement();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXML3DSphereObjectShapeContext, SdXML3DObjectContext);
@@ -344,8 +327,6 @@ void SdXML3DSphereObjectShapeContext::EndElement()
SdXML3DObjectContext::EndElement();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXML3DPolygonBasedShapeContext, SdXML3DObjectContext );
@@ -464,8 +445,6 @@ void SdXML3DPolygonBasedShapeContext::EndElement()
SdXML3DObjectContext::EndElement();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXML3DLatheObjectShapeContext, SdXML3DPolygonBasedShapeContext);
@@ -507,8 +486,6 @@ void SdXML3DLatheObjectShapeContext::EndElement()
SdXML3DPolygonBasedShapeContext::EndElement();
}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
TYPEINIT1( SdXML3DExtrudeObjectShapeContext, SdXML3DPolygonBasedShapeContext);
@@ -549,7 +526,6 @@ void SdXML3DExtrudeObjectShapeContext::EndElement()
SdXML3DPolygonBasedShapeContext::EndElement();
}
-// EOF
}//end of namespace binfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtsecte.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtsecte.cxx
index 2bec7b0..13f4d6b 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtsecte.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtsecte.cxx
@@ -26,39 +26,17 @@
*
************************************************************************/
-
-
-
-
#include <vector>
-
-
-
-
-
#include <com/sun/star/beans/PropertyValues.hpp>
-
-
-
#include <com/sun/star/text/XTextSection.hpp>
-
-
-
-
-
-
-
#include "xmlexp.hxx"
-
-
#include "XMLTextNumRuleInfo.hxx"
-
#include "XMLSectionExport.hxx"
-
#include "XMLRedlineExport.hxx"
#include "MultiPropertySetHelper.hxx"
+
namespace binfilter {
using namespace ::com::sun::star;
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index 5ee4c1f..871af26 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -4207,19 +4207,7 @@ sal_Bool OCX_Label::Export(SvStorageRef &rObj,
xStor2->Write(aOCXNAME,sizeof(aOCXNAME));
DBG_ASSERT((xStor2.Is() && (SVSTREAM_OK == xStor2->GetError())),"damn");
}
-/*
- static sal_uInt8 const aTest[] = {
- 0x00, 0x02, 0x20, 0x00, 0x2B, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00,
- 0x06, 0x00, 0x00, 0x80, 0x4C, 0x61, 0x62, 0x65,
- 0x6C, 0x31, 0x18, 0x00, 0xEC, 0x09, 0x00, 0x00,
- 0x7B, 0x02, 0x00, 0x00, 0x00, 0x02, 0x20, 0x00,
- 0x35, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x80,
- 0xC3, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00,
- 0x54, 0x69, 0x6D, 0x65, 0x73, 0x20, 0x4E, 0x65,
- 0x77, 0x20, 0x52, 0x6F, 0x6D, 0x61, 0x6E, 0x00,
- };
-*/
+
SvStorageStreamRef xContents( rObj->OpenSotStream( C2S("contents")));
return WriteContents(xContents, rPropSet, rSize);
}
@@ -4786,22 +4774,7 @@ sal_Bool OCX_CheckBox::Export(SvStorageRef &rObj,
xStor2->Write(aOCXNAME,sizeof(aOCXNAME));
DBG_ASSERT((xStor2.Is() && (SVSTREAM_OK == xStor2->GetError())),"damn");
}
-/*
- static sal_uInt8 const aTest[] = {
- 0x00, 0x02, 0x34, 0x00, 0x46, 0x01, 0xC0, 0x80,
- 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
- 0x01, 0x00, 0x00, 0x80, 0x09, 0x00, 0x00, 0x80,
- 0xE2, 0x0E, 0x00, 0x00, 0x95, 0x02, 0x00, 0x00,
- 0x30, 0x69, 0x1D, 0x00, 0x43, 0x68, 0x65, 0x63,
- 0x6B, 0x42, 0x6F, 0x78, 0x31, 0x20, 0x52, 0x6F,
- 0x00, 0x02, 0x20, 0x00, 0x35, 0x00, 0x00, 0x00,
- 0x0F, 0x00, 0x00, 0x80, 0xC3, 0x00, 0x00, 0x00,
- 0x00, 0x02, 0x00, 0x00, 0x54, 0x69, 0x6D, 0x65,
- 0x73, 0x20, 0x4E, 0x65, 0x77, 0x20, 0x52, 0x6F,
- 0x6D, 0x61, 0x6E, 0x00,
- };
-*/
+
SvStorageStreamRef xContents( rObj->OpenSotStream( C2S("contents")));
return WriteContents(xContents, rPropSet, rSize);
}
@@ -5489,7 +5462,6 @@ sal_Bool OCX_Image::WriteContents(SvStorageStreamRef &rContents,
}
aTmp = rPropSet->getPropertyValue(WW8_ASCII2STR("ImageURL"));
-// OUString *pStr = (OUString *)aTmp.getValue();
/*Magically fetch that image and turn it into something that
*we can store in ms controls, wmf,png,jpg are almost certainly
*the options we have for export...*/
@@ -6124,7 +6096,7 @@ sal_Bool OCX_ParentControl::Import(uno::Reference<beans::XPropertySet>& rProps
return sal_False;
}
CtrlIterator aEnd = mpControls.end();
-// int count = 0;
+
for (CtrlIterator aIter = mpControls.begin(); aIter != aEnd; ++ aIter )
{
uno::Reference< container::XNameContainer > xNameContainer( rProps, uno::UNO_QUERY );
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index be28185..d804d68 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -53,7 +53,6 @@
#include "xmlfiltersettingsdialog.hxx"
-//using namespace ::comphelper;
using namespace ::rtl;
using namespace ::cppu;
using namespace ::osl;
More information about the Libreoffice-commits
mailing list