strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove DECLARE_LIST( SfxInPlaceClientList, SfxInPlaceClient* )

Browse source
This commit is contained in:
Joseph Powers 2011-01-02 15:16:17 -08:00
parent 136a78c0e3
commit f65cc11190
2 changed files with 39 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sfx2/inc/sfx2/viewsh.hxx
View file

@ -43,6 +43,8 @@
#include <tools/gen.hxx>
#include <tools/errcode.hxx>
#include <vcl/jobset.hxx>
#include <vector>
class SfxBaseController;
class Size;
class Fraction;
@ -142,7 +144,7 @@ public: \
Factory().RegisterViewFactory( ViewShellClass::Factory() )
class SfxInPlaceClient;
DECLARE_LIST( SfxInPlaceClientList, SfxInPlaceClient* )
typedef ::std::vector< SfxInPlaceClient* > SfxInPlaceClientList;
// -----------------------------------------------------------------------
class SFX2_DLLPUBLIC SfxViewShell: public SfxShell, public SfxListener
@ -302,9 +304,8 @@ public:
SAL_DLLPRIVATE bool GlobalKeyInput_Impl( const KeyEvent &rKeyEvent );
SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient )
{ GetIPClientList_Impl(TRUE)->Insert(pIPClient); }
SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient )
{ GetIPClientList_Impl(TRUE)->Remove(pIPClient); }
{ GetIPClientList_Impl(TRUE)->push_back(pIPClient); }
SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient );
SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( BOOL bCreate = TRUE ) const;
SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP );
SAL_DLLPRIVATE void DiscardClients_Impl();

50
sfx2/source/view/viewsh.cxx
View file

@ -362,6 +362,24 @@ enum ETypeFamily
return ::rtl::OUString();
}
//--------------------------------------------------------------------
SAL_DLLPRIVATE void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient )
{
SfxInPlaceClientList* pClientList = GetIPClientList_Impl(TRUE);
for( SfxInPlaceClientList::iterator it = pClientList->begin(); it < pClientList->end(); ++it )
{
if ( *it == pIPClient )
{
pClientList->erase( it );
break;
}
}
}
//--------------------------------------------------------------------
void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
@ -711,9 +729,9 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
SfxInPlaceClientList *pClients = pView->GetIPClientList_Impl(FALSE);
if ( pClients )
{
for (USHORT n=0; n < pClients->Count(); n++)
for ( size_t n = 0; n < pClients->size(); n++)
{
SfxInPlaceClient* pIPClient = pClients->GetObject(n);
SfxInPlaceClient* pIPClient = pClients->at( n );
if ( pIPClient )
pView->CheckIPClient_Impl( pIPClient, aVisArea );
}
@ -930,9 +948,9 @@ SfxInPlaceClient* SfxViewShell::FindIPClient
if( !pObjParentWin )
pObjParentWin = GetWindow();
for (USHORT n=0; n < pClients->Count(); n++)
for ( size_t n = 0; n < pClients->size(); n++)
{
SfxInPlaceClient *pIPClient = (SfxInPlaceClient*) pClients->GetObject(n);
SfxInPlaceClient *pIPClient = (SfxInPlaceClient*) pClients->at( n );
if ( pIPClient->GetObject() == xObj && pIPClient->GetEditWin() == pObjParentWin )
return pIPClient;
}
@ -956,9 +974,9 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const
if ( !pClients )
return 0;
for (USHORT n=0; n < pClients->Count(); n++)
for ( size_t n = 0; n < pClients->size(); n++)
{
SfxInPlaceClient* pIPClient = pClients->GetObject(n);
SfxInPlaceClient* pIPClient = pClients->at( n );
if ( pIPClient->IsUIActive() )
return pIPClient;
}
@ -972,9 +990,9 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const
if ( !pClients )
return 0;
for (USHORT n=0; n < pClients->Count(); n++)
for ( size_t n = 0; n < pClients->size(); n++)
{
SfxInPlaceClient* pIPClient = pClients->GetObject(n);
SfxInPlaceClient* pIPClient = pClients->at( n );
if ( pIPClient->IsObjectUIActive() )
return pIPClient;
}
@ -1763,9 +1781,9 @@ void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP )
if ( !pClients )
return;
for ( USHORT n=0; n < pClients->Count(); n++ )
for ( size_t n = 0; n < pClients->size(); n++ )
{
SfxInPlaceClient* pIPClient = pClients->GetObject(n);
SfxInPlaceClient* pIPClient = pClients->at( n );
if( pIPClient != pIP )
pIPClient->ResetObject();
}
@ -1779,9 +1797,9 @@ void SfxViewShell::DisconnectAllClients()
if ( !pClients )
return;
for ( USHORT n=0; n<pClients->Count(); )
for ( size_t n = 0; n < pClients->size(); )
// clients will remove themselves from the list
delete pClients->GetObject(n);
delete pClients->at( n );
}
//--------------------------------------------------------------------
@ -1806,9 +1824,9 @@ void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/)
if ( !pClients )
return;
for (USHORT n=0; n < pClients->Count(); n++)
for ( size_t n = 0; n < pClients->size(); n++)
{
SfxInPlaceClient* pIPClient = pClients->GetObject(n);
SfxInPlaceClient* pIPClient = pClients->at( n );
if ( pIPClient->IsObjectInPlaceActive() )
// client is active, notify client that the VisArea might have changed
pIPClient->VisAreaChanged();
@ -1875,8 +1893,8 @@ void SfxViewShell::DiscardClients_Impl()
if ( !pClients )
return;
for (USHORT n=0; n < pClients->Count(); )
delete pClients->GetObject(n);
for ( size_t n = 0; n < pClients->size(); )
delete pClients->at( n );
}
//--------------------------------------------------------------------