summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/gdi
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-13 14:15:02 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-14 07:36:00 +0000
commit4ef21de5138532b92a23eb17517130780386a67c (patch)
tree7408f08de078b63b2cc7e75e3c3534ac793081ae /vcl/unx/generic/gdi
parent4faf8c24ecb1fd3cbc6c3a510bfa448c8cf6fc47 (diff)
drop ScopedPic
Diffstat (limited to 'vcl/unx/generic/gdi')
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx1
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.hxx36
2 files changed, 0 insertions, 37 deletions
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index bac2f1b78f76..05c575a5b893 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -894,7 +894,6 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR,
rTR.mnSrcX, rTR.mnSrcY, 0, 0,
rTR.mnDestX, rTR.mnDestY, rTR.mnDestWidth, rTR.mnDestHeight );
- // TODO: used ScopedPic
rPeer.FreePicture( aAlphaPic );
XFreePixmap(pXDisplay, aAlphaPM);
rPeer.FreePicture( aSrcPic );
diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index 75b6e28c0191..57c8d3e922b2 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -85,24 +85,6 @@ public:
//=====================================================================
-class ScopedPic
-{
-public:
- ScopedPic( XRenderPeer& rPeer, Picture& rPic );
- ~ScopedPic();
- Picture& Get();
-
-private:
- XRenderPeer& mrRenderPeer;
- Picture maPicture;
-
-private: // prevent copy and assignmet
- ScopedPic( const ScopedPic& );
- void operator=( const ScopedPic& );
-};
-
-//=====================================================================
-
inline XRenderPictFormat* XRenderPeer::GetStandardFormatA8() const
{
return mpStandardFormatA8;
@@ -216,24 +198,6 @@ inline void XRenderPeer::AddTraps( Picture aDst, int nXOfs, int nYOfs,
//=====================================================================
-inline ScopedPic::ScopedPic( XRenderPeer& rPeer, Picture& rPic )
-: mrRenderPeer( rPeer)
-, maPicture( rPic )
-{}
-
-inline ScopedPic::~ScopedPic()
-{
- if( maPicture )
- mrRenderPeer.FreePicture( maPicture );
-}
-
-inline Picture& ScopedPic::Get()
-{
- return maPicture;
-}
-
-//=====================================================================
-
inline XRenderColor GetXRenderColor( const SalColor& rSalColor, double fTransparency = 0.0 )
{
XRenderColor aRetVal;