Index: source/doc/doctempl.cxx =================================================================== RCS file: /cvs/framework/sfx2/source/doc/doctempl.cxx,v retrieving revision 1.51 diff -u -r1.51 doctempl.cxx --- source/doc/doctempl.cxx 14 Nov 2002 14:21:07 -0000 1.51 +++ source/doc/doctempl.cxx 6 Feb 2004 06:52:24 -0000 @@ -252,7 +252,7 @@ namespace DocTempl { -class EntryData_Impl +class DocTempl_EntryData_Impl { RegionData_Impl* mpParent; SfxObjectShellLock mxObjShell; @@ -267,7 +267,7 @@ RegionData_Impl* GetParent() const { return mpParent; } public: - EntryData_Impl( RegionData_Impl* pParent, + DocTempl_EntryData_Impl( RegionData_Impl* pParent, const OUString& rTitle ); const OUString& GetTitle() const { return maTitle; } @@ -288,14 +288,14 @@ using namespace ::DocTempl; -DECLARE_LIST( EntryList_Impl, EntryData_Impl* ); +DECLARE_LIST( DocTempl_EntryList_Impl, DocTempl_EntryData_Impl* ); // ------------------------------------------------------------------------ class RegionData_Impl { const SfxDocTemplate_Impl* mpParent; - EntryList_Impl maEntries; + DocTempl_EntryList_Impl maEntries; OUString maTitle; OUString maOwnURL; OUString maTargetURL; @@ -313,9 +313,9 @@ void SetTargetURL( const OUString& rURL ) { maTargetURL = rURL; } void SetHierarchyURL( const OUString& rURL) { maOwnURL = rURL; } - EntryData_Impl* GetEntry( ULONG nIndex ) const; - EntryData_Impl* GetEntry( const OUString& rName ) const; - EntryData_Impl* GetByTargetURL( const OUString& rName ) const; + DocTempl_EntryData_Impl* GetEntry( ULONG nIndex ) const; + DocTempl_EntryData_Impl* GetEntry( const OUString& rName ) const; + DocTempl_EntryData_Impl* GetByTargetURL( const OUString& rName ) const; const OUString& GetTitle() const { return maTitle; } const OUString& GetTargetURL(); @@ -635,7 +635,7 @@ if ( pImp->Construct() ) { - EntryData_Impl *pEntry = NULL; + DocTempl_EntryData_Impl *pEntry = NULL; RegionData_Impl *pRegion = pImp->GetRegion( nRegion ); if ( pRegion ) @@ -671,7 +671,7 @@ if ( !pImp->Construct() ) return String(); - EntryData_Impl *pEntry = NULL; + DocTempl_EntryData_Impl *pEntry = NULL; RegionData_Impl *pRegion = pImp->GetRegion( nRegion ); if ( pRegion ) @@ -710,7 +710,7 @@ if ( !pImp->Construct() ) return String(); - EntryData_Impl *pEntry = NULL; + DocTempl_EntryData_Impl *pEntry = NULL; RegionData_Impl *pRegion = pImp->GetRegion( nRegion ); if ( pRegion ) @@ -745,7 +745,7 @@ if ( !pImp->Construct() ) return String(); - EntryData_Impl *pEntry = NULL; + DocTempl_EntryData_Impl *pEntry = NULL; RegionData_Impl *pRegion = pImp->GetRegion( nRegion ); if ( pRegion ) @@ -799,7 +799,7 @@ // group // --**-- perhaps we have to create it ??? RegionData_Impl *pRegion = pImp->GetRegion( 0L ); - EntryData_Impl *pEntry = NULL; + DocTempl_EntryData_Impl *pEntry = NULL; if ( pRegion ) pEntry = pRegion->GetEntry( rLongName ); @@ -893,7 +893,7 @@ if ( ! pImp->Construct() ) return; - EntryData_Impl *pEntry; + DocTempl_EntryData_Impl *pEntry; RegionData_Impl *pRegion = pImp->GetRegion( nRegion ); // do nothing if there is no region with that index @@ -983,7 +983,7 @@ if ( !pSourceRgn ) return FALSE; - EntryData_Impl *pSource = pSourceRgn->GetEntry( nSourceIdx ); + DocTempl_EntryData_Impl *pSource = pSourceRgn->GetEntry( nSourceIdx ); if ( !pSource ) return FALSE; @@ -1133,7 +1133,7 @@ if ( !pSourceRgn ) return FALSE; - EntryData_Impl *pSource = pSourceRgn->GetEntry( nIdx ); + DocTempl_EntryData_Impl *pSource = pSourceRgn->GetEntry( nIdx ); if ( !pSource ) return FALSE; @@ -1383,7 +1383,7 @@ } else { - EntryData_Impl *pEntry = pRegion->GetEntry( nIdx ); + DocTempl_EntryData_Impl *pEntry = pRegion->GetEntry( nIdx ); if ( !pEntry ) return FALSE; @@ -1479,7 +1479,7 @@ return FALSE; RegionData_Impl *pRegion = pImp->GetRegion( nRegion ); - EntryData_Impl *pEntry = NULL; + DocTempl_EntryData_Impl *pEntry = NULL; if ( !pRegion ) return FALSE; @@ -1589,7 +1589,7 @@ return NULL; RegionData_Impl *pRegion = pImp->GetRegion( nRegion ); - EntryData_Impl *pEntry = NULL; + DocTempl_EntryData_Impl *pEntry = NULL; if ( pRegion ) pEntry = pRegion->GetEntry( nIdx ); @@ -1632,7 +1632,7 @@ return TRUE; RegionData_Impl *pRegion = pImp->GetRegion( nRegion ); - EntryData_Impl *pEntry = NULL; + DocTempl_EntryData_Impl *pEntry = NULL; if ( pRegion ) pEntry = pRegion->GetEntry( nIdx ); @@ -1680,7 +1680,7 @@ if ( ! pImp->Construct() ) return FALSE; - EntryData_Impl* pEntry = NULL; + DocTempl_EntryData_Impl* pEntry = NULL; const USHORT nCount = GetRegionCount(); for ( USHORT i = 0; i < nCount; ++i ) @@ -1744,7 +1744,7 @@ OUString aPathTo = aFullPath.GetMainURL( INetURLObject::NO_DECODE ); RegionData_Impl *pData = NULL; - EntryData_Impl *pEntry = NULL; + DocTempl_EntryData_Impl *pEntry = NULL; sal_Bool bFound = sal_False; ULONG nCount = GetRegionCount(); @@ -1842,7 +1842,7 @@ // ----------------------------------------------------------------------- // ----------------------------------------------------------------------- // ----------------------------------------------------------------------- -EntryData_Impl::EntryData_Impl( RegionData_Impl* pParent, +DocTempl_EntryData_Impl::DocTempl_EntryData_Impl( RegionData_Impl* pParent, const OUString& rTitle ) { mpParent = pParent; @@ -1852,13 +1852,13 @@ } // ----------------------------------------------------------------------- -int EntryData_Impl::Compare( const OUString& rTitle ) const +int DocTempl_EntryData_Impl::Compare( const OUString& rTitle ) const { return maTitle.compareTo( rTitle ); } //------------------------------------------------------------------------ -SfxObjectShellRef EntryData_Impl::CreateObjectShell() +SfxObjectShellRef DocTempl_EntryData_Impl::CreateObjectShell() { if( ! mxObjShell.Is() ) { @@ -1928,7 +1928,7 @@ } //------------------------------------------------------------------------ -BOOL EntryData_Impl::DeleteObjectShell() +BOOL DocTempl_EntryData_Impl::DeleteObjectShell() { BOOL bRet = TRUE; @@ -1963,7 +1963,7 @@ } // ----------------------------------------------------------------------- -const OUString& EntryData_Impl::GetHierarchyURL() +const OUString& DocTempl_EntryData_Impl::GetHierarchyURL() { if ( !maOwnURL.getLength() ) { @@ -1981,7 +1981,7 @@ } // ----------------------------------------------------------------------- -const OUString& EntryData_Impl::GetTargetURL() +const OUString& DocTempl_EntryData_Impl::GetTargetURL() { if ( !maTargetURL.getLength() ) { @@ -2017,7 +2017,7 @@ // ----------------------------------------------------------------------- RegionData_Impl::~RegionData_Impl() { - EntryData_Impl *pData = maEntries.First(); + DocTempl_EntryData_Impl *pData = maEntries.First(); while ( pData ) { @@ -2036,7 +2036,7 @@ for ( i=0; iCompare( rTitle ) == 0 ) { @@ -2057,7 +2057,7 @@ long nEnd = maEntries.Count() - 1; long nMid; - EntryData_Impl* pMid; + DocTempl_EntryData_Impl* pMid; rFound = sal_False; @@ -2099,7 +2099,7 @@ INetURLObject::ENCODE_ALL ); OUString aLinkURL = aLinkObj.GetMainURL( INetURLObject::NO_DECODE ); - EntryData_Impl *pEntry; + DocTempl_EntryData_Impl *pEntry; sal_Bool bFound = sal_False; long nPos = GetEntryPos( rTitle, bFound ); @@ -2112,7 +2112,7 @@ if ( pPos ) nPos = *pPos; - pEntry = new EntryData_Impl( this, rTitle ); + pEntry = new DocTempl_EntryData_Impl( this, rTitle ); pEntry->SetTargetURL( rTargetURL ); pEntry->SetHierarchyURL( aLinkURL ); maEntries.Insert( pEntry, nPos ); @@ -2167,7 +2167,7 @@ } // ----------------------------------------------------------------------- -EntryData_Impl* RegionData_Impl::GetEntry( const OUString& rName ) const +DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( const OUString& rName ) const { sal_Bool bFound = sal_False; long nPos = GetEntryPos( rName, bFound ); @@ -2179,9 +2179,9 @@ } // ----------------------------------------------------------------------- -EntryData_Impl* RegionData_Impl::GetByTargetURL( const OUString& rName ) const +DocTempl_EntryData_Impl* RegionData_Impl::GetByTargetURL( const OUString& rName ) const { - EntryData_Impl *pEntry; + DocTempl_EntryData_Impl *pEntry; ULONG nCount = maEntries.Count(); @@ -2196,7 +2196,7 @@ } // ----------------------------------------------------------------------- -EntryData_Impl* RegionData_Impl::GetEntry( ULONG nIndex ) const +DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( ULONG nIndex ) const { return maEntries.GetObject( nIndex ); } @@ -2204,7 +2204,7 @@ // ----------------------------------------------------------------------- void RegionData_Impl::DeleteEntry( ULONG nIndex ) { - EntryData_Impl *pEntry = maEntries.GetObject( nIndex ); + DocTempl_EntryData_Impl *pEntry = maEntries.GetObject( nIndex ); if ( pEntry ) { @@ -2457,7 +2457,7 @@ OUString aId = xContentAccess->queryContentIdentifierString(); - EntryData_Impl* pEntry = pRegion->GetByTargetURL( aId ); + DocTempl_EntryData_Impl* pEntry = pRegion->GetByTargetURL( aId ); if ( ! pEntry ) { Index: source/doc/doctemplates.cxx =================================================================== RCS file: /cvs/framework/sfx2/source/doc/doctemplates.cxx,v retrieving revision 1.21.256.1 diff -u -r1.21.256.1 doctemplates.cxx --- source/doc/doctemplates.cxx 15 Jan 2004 14:22:05 -0000 1.21.256.1 +++ source/doc/doctemplates.cxx 6 Feb 2004 06:52:24 -0000 @@ -219,7 +219,7 @@ class Updater_Impl; class GroupList_Impl; -class EntryData_Impl; +class DocTemplates_EntryData_Impl; class GroupData_Impl; //============================================================================= @@ -277,14 +277,14 @@ void addFsysGroup( GroupList_Impl& rList, const OUString& rTitle, const OUString& rOwnURL ); - void removeFromHierarchy( EntryData_Impl *pData ); + void removeFromHierarchy( DocTemplates_EntryData_Impl *pData ); void addToHierarchy( GroupData_Impl *pGroup, - EntryData_Impl *pData ); + DocTemplates_EntryData_Impl *pData ); void removeFromHierarchy( GroupData_Impl *pGroup ); void addGroupToHierarchy( GroupData_Impl *pGroup ); - void updateData( EntryData_Impl *pData ); + void updateData( DocTemplates_EntryData_Impl *pData ); public: SfxDocTplService_Impl( Reference< XMultiServiceFactory > xFactory ); @@ -336,7 +336,7 @@ //============================================================================= -class EntryData_Impl +class DocTemplates_EntryData_Impl { OUString maTitle; OUString maType; @@ -349,7 +349,7 @@ sal_Bool mbUpdateLink : 1; public: - EntryData_Impl( const OUString& rTitle ); + DocTemplates_EntryData_Impl( const OUString& rTitle ); void setInUse() { mbInUse = sal_True; } void setHierarchy( sal_Bool bInHierarchy ) { mbInHierarchy = bInHierarchy; } @@ -371,18 +371,18 @@ void setType( const OUString& rType ) { maType = rType; } }; -DECLARE_LIST( EntryList_Impl, EntryData_Impl* ); +DECLARE_LIST( DocTemplates_EntryList_Impl, DocTemplates_EntryData_Impl* ); //============================================================================= class GroupData_Impl { - EntryList_Impl maEntries; - OUString maTitle; - OUString maHierarchyURL; - OUString maTargetURL; - sal_Bool mbInUse : 1; - sal_Bool mbInHierarchy : 1; + DocTemplates_EntryList_Impl maEntries; + OUString maTitle; + OUString maHierarchyURL; + OUString maTargetURL; + sal_Bool mbInUse : 1; + sal_Bool mbInHierarchy : 1; public: GroupData_Impl( const OUString& rTitle ); @@ -399,12 +399,12 @@ const OUString& getTargetURL() const { return maTargetURL; } const OUString& getTitle() const { return maTitle; } - EntryData_Impl* addEntry( const OUString& rTitle, + DocTemplates_EntryData_Impl* addEntry( const OUString& rTitle, const OUString& rTargetURL, const OUString& rType, const OUString& rHierURL ); ULONG count() { return maEntries.Count(); } - EntryData_Impl* getEntry( ULONG nPos ) { return maEntries.GetObject( nPos ); } + DocTemplates_EntryData_Impl* getEntry( ULONG nPos ) { return maEntries.GetObject( nPos ); } }; DECLARE_LIST( GroupList_Impl, GroupData_Impl* ); @@ -948,7 +948,7 @@ ULONG nCount = pGroup->count(); for ( ULONG i=0; igetEntry( i ); + DocTemplates_EntryData_Impl *pData = pGroup->getEntry( i ); if ( ! pData->getInUse() ) { if ( pData->getInHierarchy() ) @@ -1817,7 +1817,7 @@ while ( xResultSet->next() ) { BOOL bUpdateType = sal_False; - EntryData_Impl *pData; + DocTemplates_EntryData_Impl *pData; OUString aTitle( xRow->getString( 1 ) ); OUString aTargetDir( xRow->getString( 2 ) ); @@ -1961,7 +1961,7 @@ } //----------------------------------------------------------------------------- -void SfxDocTplService_Impl::removeFromHierarchy( EntryData_Impl *pData ) +void SfxDocTplService_Impl::removeFromHierarchy( DocTemplates_EntryData_Impl *pData ) { Content aTemplate; @@ -1973,7 +1973,7 @@ //----------------------------------------------------------------------------- void SfxDocTplService_Impl::addToHierarchy( GroupData_Impl *pGroup, - EntryData_Impl *pData ) + DocTemplates_EntryData_Impl *pData ) { Content aGroup, aTemplate; @@ -1999,7 +1999,7 @@ } //----------------------------------------------------------------------------- -void SfxDocTplService_Impl::updateData( EntryData_Impl *pData ) +void SfxDocTplService_Impl::updateData( DocTemplates_EntryData_Impl *pData ) { Content aTemplate; @@ -2042,7 +2042,7 @@ ULONG nCount = pGroup->count(); for ( ULONG i=0; igetEntry( i ); + DocTemplates_EntryData_Impl *pData = pGroup->getEntry( i ); addToHierarchy( pGroup, pData ); // add entry to hierarchy } } @@ -2072,7 +2072,7 @@ // ----------------------------------------------------------------------- GroupData_Impl::~GroupData_Impl() { - EntryData_Impl *pData = maEntries.First(); + DocTemplates_EntryData_Impl *pData = maEntries.First(); while ( pData ) { delete pData; @@ -2081,19 +2081,19 @@ } // ----------------------------------------------------------------------- -EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, +DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, const OUString& rTargetURL, const OUString& rType, const OUString& rHierURL ) { - EntryData_Impl *pData = maEntries.First(); + DocTemplates_EntryData_Impl *pData = maEntries.First(); while ( pData && pData->getTitle() != rTitle ) pData = maEntries.Next(); if ( !pData ) { - pData = new EntryData_Impl( rTitle ); + pData = new DocTemplates_EntryData_Impl( rTitle ); pData->setTargetURL( rTargetURL ); pData->setType( rType ); if ( rHierURL.getLength() ) @@ -2119,7 +2119,7 @@ // ----------------------------------------------------------------------- // ----------------------------------------------------------------------- // ----------------------------------------------------------------------- -EntryData_Impl::EntryData_Impl( const OUString& rTitle ) +DocTemplates_EntryData_Impl::DocTemplates_EntryData_Impl( const OUString& rTitle ) { maTitle = rTitle; mbInUse = sal_False;