Kaydet (Commit) 7304f974 authored tarafından Chris Sherlock's avatar Chris Sherlock

vcl: remove unnecessary typedef VCLXGraphicsList_impl

Change-Id: Iaaf2f0edf721567f88ffc948501548fddd648428
üst 471ce7b5
...@@ -242,8 +242,6 @@ namespace vcl { ...@@ -242,8 +242,6 @@ namespace vcl {
class FontInfo; class FontInfo;
} }
typedef ::std::vector< VCLXGraphics* > VCLXGraphicsList_impl;
sal_uLong AdjustTwoRect( SalTwoRect& rTwoRect, const Size& rSizePix ); sal_uLong AdjustTwoRect( SalTwoRect& rTwoRect, const Size& rSizePix );
void AdjustTwoRect( SalTwoRect& rTwoRect, const Rectangle& rValidSrcRect ); void AdjustTwoRect( SalTwoRect& rTwoRect, const Rectangle& rValidSrcRect );
...@@ -275,7 +273,7 @@ private: ...@@ -275,7 +273,7 @@ private:
mutable ImplGetDevSizeList* mpGetDevSizeList; mutable ImplGetDevSizeList* mpGetDevSizeList;
boost::ptr_deque<OutDevState>* mpOutDevStateStack; boost::ptr_deque<OutDevState>* mpOutDevStateStack;
ImplOutDevData* mpOutDevData; ImplOutDevData* mpOutDevData;
VCLXGraphicsList_impl* mpUnoGraphicsList; std::vector< VCLXGraphics* >* mpUnoGraphicsList;
vcl::PDFWriterImpl* mpPDFWriter; vcl::PDFWriterImpl* mpPDFWriter;
vcl::ExtOutDevData* mpExtOutDevData; vcl::ExtOutDevData* mpExtOutDevData;
...@@ -406,8 +404,8 @@ public: ...@@ -406,8 +404,8 @@ public:
css::uno::Reference< css::awt::XGraphics > css::uno::Reference< css::awt::XGraphics >
CreateUnoGraphics(); CreateUnoGraphics();
VCLXGraphicsList_impl* GetUnoGraphicsList() const { return mpUnoGraphicsList; } std::vector< VCLXGraphics* > *GetUnoGraphicsList() const { return mpUnoGraphicsList; }
VCLXGraphicsList_impl* CreateUnoGraphicsList(); std::vector< VCLXGraphics* > *CreateUnoGraphicsList();
protected: protected:
......
...@@ -66,10 +66,10 @@ VCLXGraphics::VCLXGraphics() ...@@ -66,10 +66,10 @@ VCLXGraphics::VCLXGraphics()
VCLXGraphics::~VCLXGraphics() VCLXGraphics::~VCLXGraphics()
{ {
VCLXGraphicsList_impl* pLst = mpOutputDevice ? mpOutputDevice->GetUnoGraphicsList() : NULL; std::vector< VCLXGraphics* > *pLst = mpOutputDevice ? mpOutputDevice->GetUnoGraphicsList() : NULL;
if ( pLst ) if ( pLst )
{ {
for( VCLXGraphicsList_impl::iterator it = pLst->begin(); it != pLst->end(); ++it ) for( std::vector< VCLXGraphics* >::iterator it = pLst->begin(); it != pLst->end(); ++it )
{ {
if( *it == this ) { if( *it == this ) {
pLst->erase( it ); pLst->erase( it );
...@@ -97,7 +97,7 @@ void VCLXGraphics::Init( OutputDevice* pOutDev ) ...@@ -97,7 +97,7 @@ void VCLXGraphics::Init( OutputDevice* pOutDev )
mpClipRegion = NULL; mpClipRegion = NULL;
// Register at OutputDevice // Register at OutputDevice
VCLXGraphicsList_impl* pLst = mpOutputDevice->GetUnoGraphicsList(); std::vector< VCLXGraphics* > *pLst = mpOutputDevice->GetUnoGraphicsList();
if ( !pLst ) if ( !pLst )
pLst = mpOutputDevice->CreateUnoGraphicsList(); pLst = mpOutputDevice->CreateUnoGraphicsList();
pLst->push_back( this ); pLst->push_back( this );
......
...@@ -194,7 +194,7 @@ void UnoWrapper::SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno ...@@ -194,7 +194,7 @@ void UnoWrapper::SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno
void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev ) void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev )
{ {
VCLXGraphicsList_impl* pLst = pOutDev->GetUnoGraphicsList(); std::vector< VCLXGraphics* > *pLst = pOutDev->GetUnoGraphicsList();
if ( pLst ) if ( pLst )
{ {
for ( size_t n = 0; n < pLst->size(); n++ ) for ( size_t n = 0; n < pLst->size(); n++ )
......
...@@ -379,9 +379,9 @@ css::uno::Reference< css::awt::XGraphics > OutputDevice::CreateUnoGraphics() ...@@ -379,9 +379,9 @@ css::uno::Reference< css::awt::XGraphics > OutputDevice::CreateUnoGraphics()
return pWrapper ? pWrapper->CreateGraphics( this ) : css::uno::Reference< css::awt::XGraphics >(); return pWrapper ? pWrapper->CreateGraphics( this ) : css::uno::Reference< css::awt::XGraphics >();
} }
VCLXGraphicsList_impl* OutputDevice::CreateUnoGraphicsList() std::vector< VCLXGraphics* > *OutputDevice::CreateUnoGraphicsList()
{ {
mpUnoGraphicsList = new VCLXGraphicsList_impl(); mpUnoGraphicsList = new std::vector< VCLXGraphics* >();
return mpUnoGraphicsList; return mpUnoGraphicsList;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment