diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-13 17:50:05 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-13 17:54:26 +0200 |
commit | dfb908c07ba950f91b766dfa0d7a9b203b955239 (patch) | |
tree | 31e4e8ef95a01a17dd0b693d58a6085e4ddf5874 | |
parent | 2c4494df10eaf0198d8bf4c0dcdef5988d97b0e6 (diff) |
loplugin:staticcall
Change-Id: I447500c4695b45afe86a8b8d6b6294507f58cd3f
-rw-r--r-- | filter/source/graphicfilter/egif/egif.cxx | 2 | ||||
-rw-r--r-- | filter/source/graphicfilter/eos2met/eos2met.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/eps/eps.cxx | 6 | ||||
-rw-r--r-- | filter/source/graphicfilter/ieps/ieps.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/eschesdo.cxx | 2 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 14 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 8 |
8 files changed, 21 insertions, 21 deletions
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 4a897c8b8803..fff040548a79 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -106,7 +106,7 @@ bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterConfi bool bLogSize = ( aMap.GetMapUnit() != MAP_PIXEL ); if( bLogSize ) - aSize100 = Application::GetDefaultDevice()->LogicToLogic( rGraphic.GetPrefSize(), aMap, MAP_100TH_MM ); + aSize100 = OutputDevice::LogicToLogic( rGraphic.GetPrefSize(), aMap, MAP_100TH_MM ); bStatus = true; nLastPercent = 0; diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 54654c6ab4c7..5927744a6a43 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -356,7 +356,7 @@ void METWriter::WriteBigEndianLong(sal_uInt32 nLong) void METWriter::WritePoint(Point aPt) { - Point aNewPt = pCompDev->LogicToLogic( aPt, aPictureMapMode, aTargetMapMode ); + Point aNewPt = OutputDevice::LogicToLogic( aPt, aPictureMapMode, aTargetMapMode ); pMET->WriteInt32( (sal_Int32) ( aNewPt.X() - aPictureRect.Left() ) ) .WriteInt32( (sal_Int32) ( aPictureRect.Bottom() - aNewPt.Y() ) ); @@ -1164,7 +1164,7 @@ void METWriter::METBitBlt(Point aPt, Size aSize, const Size& rBmpSizePixel) void METWriter::METSetAndPushLineInfo( const LineInfo& rLineInfo ) { - sal_Int32 nWidth = pCompDev->LogicToLogic( Size( rLineInfo.GetWidth(),0 ), aPictureMapMode, aTargetMapMode ).Width(); + sal_Int32 nWidth = OutputDevice::LogicToLogic( Size( rLineInfo.GetWidth(),0 ), aPictureMapMode, aTargetMapMode ).Width(); WillWriteOrder( 8 ); // set stroke linewidth pMET ->WriteUChar( (sal_uInt8)0x15 ) diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 5778c34f4b48..d0f0802e5cf4 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -505,7 +505,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview ) mpPS->WriteCharPtr( "%%BoundingBox: " ); // BoundingBox ImplWriteLong( 0 ); ImplWriteLong( 0 ); - Size aSizePoint = Application::GetDefaultDevice()->LogicToLogic( pMTF->GetPrefSize(), + Size aSizePoint = OutputDevice::LogicToLogic( pMTF->GetPrefSize(), pMTF->GetPrefMapMode(), MAP_POINT ); ImplWriteLong( aSizePoint.Width() ); ImplWriteLong( aSizePoint.Height() ,PS_RET ); @@ -1202,8 +1202,8 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) Size aSize = ( (const MetaEPSAction*) pMA )->GetSize(); MapMode aMapMode( aSubstitute.GetPrefMapMode() ); - Size aOutSize( rVDev.LogicToLogic( aSize, rVDev.GetMapMode(), aMapMode ) ); - Point aOrigin( rVDev.LogicToLogic( aPoint, rVDev.GetMapMode(), aMapMode ) ); + Size aOutSize( OutputDevice::LogicToLogic( aSize, rVDev.GetMapMode(), aMapMode ) ); + Point aOrigin( OutputDevice::LogicToLogic( aPoint, rVDev.GetMapMode(), aMapMode ) ); aOrigin.Y() += aOutSize.Height(); aMapMode.SetOrigin( aOrigin ); aMapMode.SetScaleX( aOutSize.Width() / ( nBoundingBox[ 2 ] - nBoundingBox[ 0 ] ) ); diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index c361bc2c9a32..003a52b73b97 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -133,7 +133,7 @@ static void MakeAsMeta(Graphic &rGraphic) aSize = Application::GetDefaultDevice()->PixelToLogic( aBmp.GetSizePixel(), MAP_100TH_MM ); else - aSize = Application::GetDefaultDevice()->LogicToLogic( aSize, + aSize = OutputDevice::LogicToLogic( aSize, aBmp.GetPrefMapMode(), MAP_100TH_MM ); aVDev.EnableOutput( false ); @@ -657,7 +657,7 @@ GraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) if( !aSize.Width() || !aSize.Height() ) aSize = Application::GetDefaultDevice()->PixelToLogic( aBitmap.GetSizePixel(), MAP_100TH_MM ); else - aSize = Application::GetDefaultDevice()->LogicToLogic( aSize, aBitmap.GetPrefMapMode(), MAP_100TH_MM ); + aSize = OutputDevice::LogicToLogic( aSize, aBitmap.GetPrefMapMode(), MAP_100TH_MM ); aVDev.DrawBitmap( Point(), aSize, aBitmap ); aMtf.Stop(); aMtf.WindStart(); diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 84d512b8a6cb..299e85198d69 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1139,7 +1139,7 @@ static Size lcl_SizeToEmu(Size aPrefSize, MapMode aPrefMapMode) if (aPrefMapMode == MAP_PIXEL) aRetSize = Application::GetDefaultDevice()->PixelToLogic( aPrefSize, MAP_100TH_MM ); else - aRetSize = Application::GetDefaultDevice()->LogicToLogic( aPrefSize, aPrefMapMode, MAP_100TH_MM ); + aRetSize = OutputDevice::LogicToLogic( aPrefSize, aPrefMapMode, MAP_100TH_MM ); return aRetSize; } diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx index c39a0f208211..35fd7308d4aa 100644 --- a/filter/source/msfilter/eschesdo.cxx +++ b/filter/source/msfilter/eschesdo.cxx @@ -287,7 +287,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj, sal_uInt32 nMirrorFlags; OUString sCustomShapeType; - MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( rObj.GetShapeRef(), nMirrorFlags, sCustomShapeType, rObj.GetOOXML() ); + MSO_SPT eShapeType = EscherPropertyContainer::GetCustomShapeType( rObj.GetShapeRef(), nMirrorFlags, sCustomShapeType, rObj.GetOOXML() ); if ( sCustomShapeType == "col-502ad400" || sCustomShapeType == "col-60da8460" ) { ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 ); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index bb25efe38435..e397e3b4a24c 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3635,7 +3635,7 @@ static Size lcl_GetPrefSize(const Graphic& rGraf, MapMode aWanted) } else { - aRetSize = Application::GetDefaultDevice()->LogicToLogic( + aRetSize = OutputDevice::LogicToLogic( rGraf.GetPrefSize(), rGraf.GetPrefMapMode(), aWanted); } return aRetSize; @@ -5733,7 +5733,7 @@ void SvxMSDffManager::GetCtrlData( sal_uInt32 nOffsDgg_ ) sal_uInt16 nInst; sal_uInt16 nFbt; sal_uInt32 nLength; - if( !this->ReadCommonRecordHeader( rStCtrl, nVer, nInst, nFbt, nLength ) ) return; + if( !ReadCommonRecordHeader( rStCtrl, nVer, nInst, nFbt, nLength ) ) return; bool bOk; sal_uLong nPos = nOffsDggL + DFF_COMMON_RECORD_HEADER_SIZE; @@ -5790,7 +5790,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe // search for a BStore Container do { - if(!this->ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return; + if(!ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return; nRead += DFF_COMMON_RECORD_HEADER_SIZE + nLength; if( DFF_msofbtBstoreContainer == nFbt ) { @@ -5814,7 +5814,7 @@ void SvxMSDffManager::GetDrawingGroupContainerData( SvStream& rSt, sal_uLong nLe nRead = 0; do { - if(!this->ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return; + if(!ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return; nRead += DFF_COMMON_RECORD_HEADER_SIZE + nLength; if( DFF_msofbtBSE == nFbt ) { @@ -5874,7 +5874,7 @@ void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, sal_uLong nLenDg, // we now have to iterate through all contained shape group containers do { - if(!this->ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return; + if(!ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return; nReadDg += DFF_COMMON_RECORD_HEADER_SIZE; // Patriarch found (the upmost shape group container) ? if( DFF_msofbtSpgrContainer == nFbt ) @@ -5906,7 +5906,7 @@ bool SvxMSDffManager::GetShapeGroupContainerData( SvStream& rSt, sal_uLong nReadSpGrCont = 0; do { - if( !this->ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength ) ) + if( !ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength ) ) return false; nReadSpGrCont += DFF_COMMON_RECORD_HEADER_SIZE; // Shape Container? @@ -5963,7 +5963,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, do { - if(!this->ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return false; + if(!ReadCommonRecordHeader( rSt, nVer, nInst, nFbt, nLength)) return false; nReadSpCont += DFF_COMMON_RECORD_HEADER_SIZE; // FSP ? if( ( DFF_msofbtSp == nFbt ) && ( 4 <= nLength ) ) diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 913f2523664a..8b223c656231 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -460,7 +460,7 @@ const OUString & SVGTextWriter::implGetValidIDFromInterface( const Reference< XI void SVGTextWriter::implMap( const Size& rSz, Size& rDstSz ) const { if( mpVDev && mpTargetMapMode ) - rDstSz = mpVDev->LogicToLogic( rSz, mpVDev->GetMapMode(), *mpTargetMapMode ); + rDstSz = OutputDevice::LogicToLogic( rSz, mpVDev->GetMapMode(), *mpTargetMapMode ); else OSL_FAIL( "SVGTextWriter::implMap: invalid virtual device or map mode." ); } @@ -468,7 +468,7 @@ void SVGTextWriter::implMap( const Size& rSz, Size& rDstSz ) const void SVGTextWriter::implMap( const Point& rPt, Point& rDstPt ) const { if( mpVDev && mpTargetMapMode ) - rDstPt = mpVDev->LogicToLogic( rPt, mpVDev->GetMapMode(), *mpTargetMapMode ); + rDstPt = OutputDevice::LogicToLogic( rPt, mpVDev->GetMapMode(), *mpTargetMapMode ); else OSL_FAIL( "SVGTextWriter::implMap: invalid virtual device or map mode." ); } @@ -1666,12 +1666,12 @@ long SVGActionWriter::ImplMap( sal_Int32 nVal ) const Point& SVGActionWriter::ImplMap( const Point& rPt, Point& rDstPt ) const { - return( rDstPt = mpVDev->LogicToLogic( rPt, mpVDev->GetMapMode(), maTargetMapMode ) ); + return( rDstPt = OutputDevice::LogicToLogic( rPt, mpVDev->GetMapMode(), maTargetMapMode ) ); } Size& SVGActionWriter::ImplMap( const Size& rSz, Size& rDstSz ) const { - return( rDstSz = mpVDev->LogicToLogic( rSz, mpVDev->GetMapMode(), maTargetMapMode ) ); + return( rDstSz = OutputDevice::LogicToLogic( rSz, mpVDev->GetMapMode(), maTargetMapMode ) ); } Rectangle& SVGActionWriter::ImplMap( const Rectangle& rRect, Rectangle& rDstRect ) const |