summaryrefslogtreecommitdiff
path: root/filter/source/graphicfilter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-01 16:23:59 +0200
committerNoel Grandin <noel@peralex.com>2015-04-02 09:38:29 +0200
commite9cb5577f4c1be0f59863ec5ccb68e8794a2f117 (patch)
tree9a84237851499e829442ed322ba050189943ce21 /filter/source/graphicfilter
parent1a18cafecb06a76e872f5f1a9434160ea8ffd881 (diff)
loplugin:staticmethods
Change-Id: Ibf0c73ac17ec19ed672f66907db47057920babca
Diffstat (limited to 'filter/source/graphicfilter')
-rw-r--r--filter/source/graphicfilter/egif/egif.cxx2
-rw-r--r--filter/source/graphicfilter/epbm/epbm.cxx2
-rw-r--r--filter/source/graphicfilter/epgm/epgm.cxx2
-rw-r--r--filter/source/graphicfilter/epict/epict.cxx2
-rw-r--r--filter/source/graphicfilter/eppm/eppm.cxx2
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx4
-rw-r--r--filter/source/graphicfilter/eras/eras.cxx2
-rw-r--r--filter/source/graphicfilter/etiff/etiff.cxx2
-rw-r--r--filter/source/graphicfilter/expm/expm.cxx2
-rw-r--r--filter/source/graphicfilter/icgm/bitmap.cxx2
-rw-r--r--filter/source/graphicfilter/icgm/bitmap.hxx2
-rw-r--r--filter/source/graphicfilter/ieps/ieps.cxx2
-rw-r--r--filter/source/graphicfilter/ipbm/ipbm.cxx2
-rw-r--r--filter/source/graphicfilter/ipcd/ipcd.cxx2
-rw-r--r--filter/source/graphicfilter/ipict/ipict.cxx8
-rw-r--r--filter/source/graphicfilter/ipsd/ipsd.cxx6
-rw-r--r--filter/source/graphicfilter/itga/itga.cxx2
-rw-r--r--filter/source/graphicfilter/itiff/itiff.cxx2
18 files changed, 24 insertions, 24 deletions
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 4cbbe2092955..621cf32fe43e 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -284,7 +284,7 @@ bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx )
void GIFWriter::DestroyAccess()
{
- aAccBmp.ReleaseAccess( m_pAcc );
+ Bitmap::ReleaseAccess( m_pAcc );
m_pAcc = NULL;
}
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index b9b9bfa7d085..1e1118a76c61 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -99,7 +99,7 @@ bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilterConf
if ( ImplWriteHeader() )
ImplWriteBody();
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index c27fab059bf0..71b33098678b 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -95,7 +95,7 @@ bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilterConf
{
ImplWriteBody();
}
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 93936b473a5c..e9a7568a9bbd 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -1266,7 +1266,7 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
nWrittenBitmaps++;
nActBitmapPercent = 0;
if ( pAcc )
- aBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
}
void PictWriter::WriteOpcode_EndOfFile()
diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx
index 258f0721cd90..dfd48d3bc161 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -97,7 +97,7 @@ bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilterConf
{
ImplWriteBody();
}
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 165352807024..edd7061a13d0 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -572,7 +572,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview )
nCount2--;
}
}
- aTmpBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
ImplExecMode( PS_RET );
ImplWriteLine( "%%EndPreview" );
}
@@ -2074,7 +2074,7 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi
else
ImplWriteLine( "pom" );
- aTileBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
nHeightLeft -= nHeight;
if ( nHeightLeft )
{
diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx
index 589f69802cbd..3950a40ea164 100644
--- a/filter/source/graphicfilter/eras/eras.cxx
+++ b/filter/source/graphicfilter/eras/eras.cxx
@@ -123,7 +123,7 @@ bool RASWriter::WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilterConf
m_rOStm.SetEndian( nOStmOldModus );
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index a4b2768005fb..619187cdf4b6 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -224,7 +224,7 @@ bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterCo
m_rOStm.WriteUInt16( mnTagCount );
m_rOStm.Seek( nCurPos );
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index b8e7a470302e..fca1788fa1a7 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -132,7 +132,7 @@ bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilterConf
m_rOStm.SetEndian(nOStmOldModus);
- aBmp.ReleaseAccess( mpAcc );
+ Bitmap::ReleaseAccess( mpAcc );
}
else
mbStatus = false;
diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx
index a7fcbe514313..8a6953a449d8 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -203,7 +203,7 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc )
if ( rDesc.mpAcc )
{
- rDesc.mpBitmap->ReleaseAccess( rDesc.mpAcc );
+ Bitmap::ReleaseAccess( rDesc.mpAcc );
rDesc.mpAcc = NULL;
}
if ( rDesc.mbStatus == false )
diff --git a/filter/source/graphicfilter/icgm/bitmap.hxx b/filter/source/graphicfilter/icgm/bitmap.hxx
index 3b6a80d2d7c1..732a3d41467d 100644
--- a/filter/source/graphicfilter/icgm/bitmap.hxx
+++ b/filter/source/graphicfilter/icgm/bitmap.hxx
@@ -66,7 +66,7 @@ class CGMBitmapDescriptor
~CGMBitmapDescriptor()
{
if ( mpAcc )
- mpBitmap->ReleaseAccess( mpAcc );
+ ::Bitmap::ReleaseAccess( mpAcc );
delete mpBitmap;
};
};
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 93800c536f5b..b933574f4ed8 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -697,7 +697,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* )
aGraphic = aMtf;
bHasPreview = bRetValue = true;
}
- aBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
}
}
}
diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx
index 95472946a4d0..6415066af397 100644
--- a/filter/source/graphicfilter/ipbm/ipbm.cxx
+++ b/filter/source/graphicfilter/ipbm/ipbm.cxx
@@ -131,7 +131,7 @@ bool PBMReader::ReadPBM(Graphic & rGraphic )
if ( mpAcc )
{
- maBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
+ Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL;
}
if ( mbStatus )
rGraphic = maBmp;
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 3bbdc8052ce7..d1b521749524 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -161,7 +161,7 @@ bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
ReadImage();
- aBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
+ Bitmap::ReleaseAccess( mpAcc ), mpAcc = NULL;
rGraphic = aBmp;
}
return bStatus;
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index ed4da5bab4b6..9ab206f67534 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -304,9 +304,9 @@ public:
#define BITMAPERROR \
{ \
if ( pAcc ) \
- aBitmap.ReleaseAccess( pAcc ); \
+ Bitmap::ReleaseAccess( pAcc ); \
if ( pReadAcc ) \
- aBitmap.ReleaseAccess( pReadAcc ); \
+ Bitmap::ReleaseAccess( pReadAcc ); \
return 0xffffffff; \
}
@@ -1107,8 +1107,8 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
else
BITMAPERROR;
if ( pReadAcc )
- aBitmap.ReleaseAccess( pReadAcc );
- aBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pReadAcc );
+ Bitmap::ReleaseAccess( pAcc );
rBitmap = aBitmap;
return nDataSize;
}
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index c3c767cf0e45..222f90d4a282 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -160,11 +160,11 @@ bool PSDReader::ReadPSD(Graphic & rGraphic )
else
mbStatus = false;
if ( mpWriteAcc )
- maBmp.ReleaseAccess( mpWriteAcc );
+ Bitmap::ReleaseAccess( mpWriteAcc );
if ( mpReadAcc )
- maBmp.ReleaseAccess( mpReadAcc );
+ Bitmap::ReleaseAccess( mpReadAcc );
if ( mpMaskWriteAcc )
- maMaskBmp.ReleaseAccess( mpMaskWriteAcc );
+ Bitmap::ReleaseAccess( mpMaskWriteAcc );
return mbStatus;
}
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index 29dc073303dc..1fd3df839eac 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -161,7 +161,7 @@ bool TGAReader::ReadTGA(Graphic & rGraphic)
mbStatus = false;
if ( mpAcc )
- aBitmap.ReleaseAccess ( mpAcc), mpAcc = NULL;
+ Bitmap::ReleaseAccess ( mpAcc), mpAcc = NULL;
if ( mbStatus )
rGraphic = aBitmap;
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 7bc0f03908d9..c34bc0b8aec7 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -1356,7 +1356,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
if( pAcc )
{
- aBitmap.ReleaseAccess( pAcc );
+ Bitmap::ReleaseAccess( pAcc );
if ( pMaskAcc )
{