include/vcl/outdev.hxx | 8 +++----- toolkit/source/awt/vclxgraphics.cxx | 6 +++--- toolkit/source/helper/unowrapper.cxx | 2 +- vcl/source/outdev/outdev.cxx | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-)
New commits: commit 7304f974d8ef60433662da92c2e172e45ca64bd5 Author: Chris Sherlock <[email protected]> Date: Sat Nov 22 21:53:22 2014 +1100 vcl: remove unnecessary typedef VCLXGraphicsList_impl Change-Id: Iaaf2f0edf721567f88ffc948501548fddd648428 diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index f99d8c2..50e9151 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -242,8 +242,6 @@ namespace vcl { class FontInfo; } -typedef ::std::vector< VCLXGraphics* > VCLXGraphicsList_impl; - sal_uLong AdjustTwoRect( SalTwoRect& rTwoRect, const Size& rSizePix ); void AdjustTwoRect( SalTwoRect& rTwoRect, const Rectangle& rValidSrcRect ); @@ -275,7 +273,7 @@ private: mutable ImplGetDevSizeList* mpGetDevSizeList; boost::ptr_deque<OutDevState>* mpOutDevStateStack; ImplOutDevData* mpOutDevData; - VCLXGraphicsList_impl* mpUnoGraphicsList; + std::vector< VCLXGraphics* >* mpUnoGraphicsList; vcl::PDFWriterImpl* mpPDFWriter; vcl::ExtOutDevData* mpExtOutDevData; @@ -406,8 +404,8 @@ public: css::uno::Reference< css::awt::XGraphics > CreateUnoGraphics(); - VCLXGraphicsList_impl* GetUnoGraphicsList() const { return mpUnoGraphicsList; } - VCLXGraphicsList_impl* CreateUnoGraphicsList(); + std::vector< VCLXGraphics* > *GetUnoGraphicsList() const { return mpUnoGraphicsList; } + std::vector< VCLXGraphics* > *CreateUnoGraphicsList(); protected: diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index 3dc4246..1b11197 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -66,10 +66,10 @@ VCLXGraphics::VCLXGraphics() VCLXGraphics::~VCLXGraphics() { - VCLXGraphicsList_impl* pLst = mpOutputDevice ? mpOutputDevice->GetUnoGraphicsList() : NULL; + std::vector< VCLXGraphics* > *pLst = mpOutputDevice ? mpOutputDevice->GetUnoGraphicsList() : NULL; 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 ) { pLst->erase( it ); @@ -97,7 +97,7 @@ void VCLXGraphics::Init( OutputDevice* pOutDev ) mpClipRegion = NULL; // Register at OutputDevice - VCLXGraphicsList_impl* pLst = mpOutputDevice->GetUnoGraphicsList(); + std::vector< VCLXGraphics* > *pLst = mpOutputDevice->GetUnoGraphicsList(); if ( !pLst ) pLst = mpOutputDevice->CreateUnoGraphicsList(); pLst->push_back( this ); diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index 1a1b224..6087476 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -194,7 +194,7 @@ void UnoWrapper::SetWindowInterface( vcl::Window* pWindow, ::com::sun::star::uno void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev ) { - VCLXGraphicsList_impl* pLst = pOutDev->GetUnoGraphicsList(); + std::vector< VCLXGraphics* > *pLst = pOutDev->GetUnoGraphicsList(); if ( pLst ) { for ( size_t n = 0; n < pLst->size(); n++ ) diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index 78eaddc..b5a59ad 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -379,9 +379,9 @@ css::uno::Reference< css::awt::XGraphics > OutputDevice::CreateUnoGraphics() 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; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
