summaryrefslogtreecommitdiff
path: root/vcl/source/gdi
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-05-15 10:01:31 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-05-15 10:01:38 +0100
commitdd466513a9b5412f59c38bfa1786782852033c2c (patch)
treef55b72b6bb941b33a4feac7542663fec0c431c1e /vcl/source/gdi
parent346baad24a7c3795ce134092913c9aa31cddfdfd (diff)
window ftbfs: MetaActionType::TRANSPARENT->MetaActionType::Transparent
ideally camel case the rest of these for consistency Change-Id: I7f66b8051ea58963ea28d128f73900aefe5d2846
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r--vcl/source/gdi/cvtsvm.cxx2
-rw-r--r--vcl/source/gdi/gdimetafiletools.cxx2
-rw-r--r--vcl/source/gdi/gdimtf.cxx4
-rw-r--r--vcl/source/gdi/metaact.cxx8
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx2
-rw-r--r--vcl/source/gdi/print2.cxx12
6 files changed, 15 insertions, 15 deletions
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index a23dd5c0e310..ba8c530f6818 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -2164,7 +2164,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::TRANSPARENT ):
+ case( MetaActionType::Transparent ):
{
const tools::PolyPolygon& rPolyPoly = static_cast<const MetaTransparentAction*>(pAction)->GetPolyPolygon();
const sal_Int16 nTrans = static_cast<const MetaTransparentAction*>(pAction)->GetTransparence();
diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx
index 51961c8fc1af..fc8b6e91fe73 100644
--- a/vcl/source/gdi/gdimetafiletools.cxx
+++ b/vcl/source/gdi/gdimetafiletools.cxx
@@ -1017,7 +1017,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource)
// MetaActionType::TEXTALIGN
// MetaActionType::MAPMODE
// MetaActionType::FONT
- // MetaActionType::TRANSPARENT
+ // MetaActionType::Transparent
// MetaActionType::EPS
// MetaActionType::REFPOINT
// MetaActionType::TEXTLINECOLOR
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 25a3632d8a61..94be557415aa 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -1244,7 +1244,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
}
break;
- case( MetaActionType::TRANSPARENT ):
+ case( MetaActionType::Transparent ):
{
MetaTransparentAction* pAct = static_cast<MetaTransparentAction*>(pAction);
aMtf.AddAction( new MetaTransparentAction( ImplGetRotatedPolyPolygon( pAct->GetPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ),
@@ -1659,7 +1659,7 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference, Rectangle* pHai
}
break;
- case( MetaActionType::TRANSPARENT ):
+ case( MetaActionType::Transparent ):
{
MetaTransparentAction* pAct = static_cast<MetaTransparentAction*>(pAction);
Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 471fd9b4747a..9395dabdb0e9 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -86,7 +86,7 @@ meta_action_name(MetaActionType nMetaAction)
case MetaActionType::PUSH: return "PUSH";
case MetaActionType::POP: return "POP";
case MetaActionType::RASTEROP: return "RASTEROP";
- case MetaActionType::TRANSPARENT: return "TRANSPARENT";
+ case MetaActionType::Transparent: return "TRANSPARENT";
case MetaActionType::EPS: return "EPS";
case MetaActionType::REFPOINT: return "REFPOINT";
case MetaActionType::TEXTLINECOLOR: return "TEXTLINECOLOR";
@@ -252,7 +252,7 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData
case MetaActionType::PUSH: pAction = new MetaPushAction; break;
case MetaActionType::POP: pAction = new MetaPopAction; break;
case MetaActionType::RASTEROP: pAction = new MetaRasterOpAction; break;
- case MetaActionType::TRANSPARENT: pAction = new MetaTransparentAction; break;
+ case MetaActionType::Transparent: pAction = new MetaTransparentAction; break;
case MetaActionType::FLOATTRANSPARENT: pAction = new MetaFloatTransparentAction; break;
case MetaActionType::EPS: pAction = new MetaEPSAction; break;
case MetaActionType::REFPOINT: pAction = new MetaRefPointAction; break;
@@ -3230,7 +3230,7 @@ void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* )
}
MetaTransparentAction::MetaTransparentAction() :
- MetaAction ( MetaActionType::TRANSPARENT ),
+ MetaAction ( MetaActionType::Transparent ),
mnTransPercent ( 0 )
{}
@@ -3238,7 +3238,7 @@ MetaTransparentAction::~MetaTransparentAction()
{}
MetaTransparentAction::MetaTransparentAction( const tools::PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ) :
- MetaAction ( MetaActionType::TRANSPARENT ),
+ MetaAction ( MetaActionType::Transparent ),
maPolyPoly ( rPolyPoly ),
mnTransPercent ( nTransPercent )
{}
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 4ac06594e2f2..9dc93114ff95 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -388,7 +388,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
}
break;
- case( MetaActionType::TRANSPARENT ):
+ case( MetaActionType::Transparent ):
{
const MetaTransparentAction* pA = static_cast<const MetaTransparentAction*>(pAction);
m_rOuterFace.DrawTransparent( pA->GetPolyPolygon(), pA->GetTransparence() );
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index fbed7a746b67..da01c318a9b6 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -75,7 +75,7 @@ bool IsTransparentAction( const MetaAction& rAct )
{
switch( rAct.GetType() )
{
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
return true;
case MetaActionType::FLOATTRANSPARENT:
@@ -111,7 +111,7 @@ bool DoesActionHandleTransparency( const MetaAction& rAct )
// white background.
switch( rAct.GetType() )
{
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
case MetaActionType::BMPEX:
case MetaActionType::BMPEXSCALE:
case MetaActionType::BMPEXSCALEPART:
@@ -157,7 +157,7 @@ void ImplConvertTransparentAction( GDIMetaFile& o_rMtf,
const OutputDevice& rStateOutDev,
Color aBgColor )
{
- if( rAct.GetType() == MetaActionType::TRANSPARENT )
+ if( rAct.GetType() == MetaActionType::Transparent )
{
const MetaTransparentAction* pTransAct = static_cast<const MetaTransparentAction*>(&rAct);
sal_uInt16 nTransparency( pTransAct->GetTransparence() );
@@ -204,7 +204,7 @@ void ImplConvertTransparentAction( GDIMetaFile& o_rMtf,
aBmpEx = static_cast<const MetaBmpExScaleAction&>(rAct).GetBitmapEx();
break;
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
default:
OSL_FAIL("Printer::GetPreparedMetafile impossible state reached");
@@ -375,7 +375,7 @@ bool ImplIsNotTransparent( const MetaAction& rAct, const OutputDevice& rOut )
case MetaActionType::GRADIENTEX:
case MetaActionType::HATCH:
case MetaActionType::WALLPAPER:
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
case MetaActionType::FLOATTRANSPARENT:
case MetaActionType::EPS:
case MetaActionType::TEXTRECT:
@@ -546,7 +546,7 @@ Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevice& rOut
aActionBounds = static_cast<const MetaWallpaperAction&>(rAct).GetRect();
break;
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
aActionBounds = static_cast<const MetaTransparentAction&>(rAct).GetPolyPolygon().GetBoundRect();
break;