cppcanvas/source/mtfrenderer/implrenderer.cxx | 8 ++++----
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 2 +-
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 2 +-
filter/source/flash/swfwriter1.cxx | 2 +-
filter/source/graphicfilter/eos2met/eos2met.cxx | 2 +-
filter/source/graphicfilter/epict/epict.cxx | 2 +-
filter/source/graphicfilter/eps/eps.cxx | 2 +-
filter/source/svg/svgwriter.cxx | 2 +-
include/vcl/metaactiontypes.hxx | 2 +-
svtools/source/graphic/grfcache.cxx | 2 +-
svtools/source/graphic/grfmgr2.cxx | 2 +-
svx/source/svdraw/svdfmtf.cxx | 2 +-
test/source/mtfxmldump.cxx | 2 +-
vcl/source/filter/wmf/emfwr.cxx | 2 +-
vcl/source/filter/wmf/wmfwr.cxx | 2 +-
vcl/source/gdi/cvtsvm.cxx | 2 +-
vcl/source/gdi/gdimetafiletools.cxx | 2 +-
vcl/source/gdi/gdimtf.cxx | 4 ++--
vcl/source/gdi/metaact.cxx | 8 ++++----
vcl/source/gdi/pdfwriter_impl2.cxx | 2 +-
vcl/source/gdi/print2.cxx | 12 ++++++------
21 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit dd466513a9b5412f59c38bfa1786782852033c2c
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri May 15 10:01:31 2015 +0100
window ftbfs: MetaActionType::TRANSPARENT->MetaActionType::Transparent
ideally camel case the rest of these for consistency
Change-Id: I7f66b8051ea58963ea28d128f73900aefe5d2846
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index dcdbf5e..99c76b2 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -99,7 +99,7 @@ namespace
// force alpha part of color to
// opaque. transparent painting is done
- // explicitly via MetaActionType::TRANSPARENT
+ // explicitly via MetaActionType::Transparent
aColor.SetTransparency(0);
//aColor.SetTransparency(128);
@@ -1242,7 +1242,7 @@ namespace cppcanvas
// execute every action, to keep VDev state up-to-date
// currently used only for
// - the map mode
- // - the line/fill color when processing a
MetaActionType::TRANSPARENT
+ // - the line/fill color when processing a
MetaActionType::Transparent
// - SetFont to process font metric specific actions
pCurrAct->Execute( &rVDev );
@@ -1431,7 +1431,7 @@ namespace cppcanvas
// force alpha part of color to
// opaque. transparent painting is done
- // explicitly via MetaActionType::TRANSPARENT
+ // explicitly via MetaActionType::Transparent
aColor.SetTransparency(0);
rStates.getState().textColor =
@@ -2408,7 +2408,7 @@ namespace cppcanvas
// TODO(F2): NYI
break;
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
{
const OutDevState& rState( rStates.getState() );
if( rState.lineColor.getLength() ||
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index b83f9a5..cd274b3 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -311,7 +311,7 @@ namespace cppcanvas
case MetaActionType::MASKSCALEPART:
case MetaActionType::GRADIENTEX:
case MetaActionType::WALLPAPER:
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
case MetaActionType::FLOATTRANSPARENT:
case MetaActionType::TEXT:
case MetaActionType::TEXTARRAY:
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 6deb31e..100d2f3 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -2833,7 +2833,7 @@ namespace
break;
}
- case MetaActionType::TRANSPARENT :
+ case MetaActionType::Transparent :
{
/** CHECKED, WORKS WELL */
const MetaTransparentAction* pA = static_cast<const
MetaTransparentAction*>(pAction);
diff --git a/filter/source/flash/swfwriter1.cxx
b/filter/source/flash/swfwriter1.cxx
index 2dcaf36..1ffdd48 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1543,7 +1543,7 @@ void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
}
break;
- case( MetaActionType::TRANSPARENT ):
+ case( MetaActionType::Transparent ):
{
const MetaTransparentAction* pA = static_cast<const
MetaTransparentAction*>(pAction);
const tools::PolyPolygon& rPolyPoly =
pA->GetPolyPolygon();
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx
b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 903973e..abda124 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -2267,7 +2267,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
}
break;
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
{
if( aGDIFillColor != Color( COL_TRANSPARENT ) )
{
diff --git a/filter/source/graphicfilter/epict/epict.cxx
b/filter/source/graphicfilter/epict/epict.cxx
index 9a9ea84..9610b37 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -2073,7 +2073,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
}
break;
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
{
const tools::PolyPolygon& rPolyPoly = static_cast<const
MetaTransparentAction*>(pMA)->GetPolyPolygon();
diff --git a/filter/source/graphicfilter/eps/eps.cxx
b/filter/source/graphicfilter/eps/eps.cxx
index 57007fa..177fa35 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -1218,7 +1218,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf,
VirtualDevice& rVDev )
}
break;
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
{
// ImplLine( ( (const MetaTransparentAction*) pMA
)->GetPolyPolygon() );
}
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index f9d8bce..16f3fc9 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2907,7 +2907,7 @@ void SVGActionWriter::ImplWriteActions( const
GDIMetaFile& rMtf,
}
break;
- case( MetaActionType::TRANSPARENT ):
+ case( MetaActionType::Transparent ):
{
if( nWriteFlags & SVGWRITER_WRITE_FILL )
{
diff --git a/include/vcl/metaactiontypes.hxx b/include/vcl/metaactiontypes.hxx
index 8fcdf1a..96eeb0a 100644
--- a/include/vcl/metaactiontypes.hxx
+++ b/include/vcl/metaactiontypes.hxx
@@ -65,7 +65,7 @@ enum class MetaActionType
PUSH = 139,
POP = 140,
RASTEROP = 141,
- TRANSPARENT = 142,
+ Transparent = 142,
EPS = 143,
REFPOINT = 144,
TEXTLINECOLOR = 145,
diff --git a/svtools/source/graphic/grfcache.cxx
b/svtools/source/graphic/grfcache.cxx
index a747380..808cd5d 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -703,7 +703,7 @@ bool GraphicDisplayCacheEntry::IsCacheableAsBitmap( const
GDIMetaFile& rMtf,
case MetaActionType::WALLPAPER:
// FALLTHROUGH intended
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
// FALLTHROUGH intended
case MetaActionType::EPS:
// FALLTHROUGH intended
diff --git a/svtools/source/graphic/grfmgr2.cxx
b/svtools/source/graphic/grfmgr2.cxx
index fae2331..5570b0c 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -1334,7 +1334,7 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
case MetaActionType::WALLPAPER:
// FALLTHROUGH intended
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
// FALLTHROUGH intended
case MetaActionType::EPS:
// FALLTHROUGH intended
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 03ae0f1..002559e 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -186,7 +186,7 @@ void ImpSdrGDIMetaFileImport::DoLoopActions(GDIMetaFile&
rMtf, SvdProgressInfo*
case MetaActionType::MASKSCALEPART :
DoAction(static_cast<MetaMaskScalePartAction&>(*pAct)); break;
case MetaActionType::GRADIENT :
DoAction(static_cast<MetaGradientAction&>(*pAct)); break;
case MetaActionType::WALLPAPER :
DoAction(static_cast<MetaWallpaperAction&>(*pAct)); break;
- case MetaActionType::TRANSPARENT :
DoAction(static_cast<MetaTransparentAction&>(*pAct)); break;
+ case MetaActionType::Transparent :
DoAction(static_cast<MetaTransparentAction&>(*pAct)); break;
case MetaActionType::EPS :
DoAction(static_cast<MetaEPSAction&>(*pAct)); break;
case MetaActionType::REFPOINT :
DoAction(static_cast<MetaRefPointAction&>(*pAct)); break;
case MetaActionType::TEXTLINECOLOR :
DoAction(static_cast<MetaTextLineColorAction&>(*pAct)); break;
diff --git a/test/source/mtfxmldump.cxx b/test/source/mtfxmldump.cxx
index 45bb012..3df33b9 100644
--- a/test/source/mtfxmldump.cxx
+++ b/test/source/mtfxmldump.cxx
@@ -199,7 +199,7 @@ OString convertLineStyleToString(const MetaActionType
nActionType)
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::FLOATTRANSPARENT: return "floattransparent";
case MetaActionType::EPS: return "eps";
case MetaActionType::REFPOINT: return "refpoint";
diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx
index c4ab01f..86ad5de 100644
--- a/vcl/source/filter/wmf/emfwr.cxx
+++ b/vcl/source/filter/wmf/emfwr.cxx
@@ -1206,7 +1206,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
}
break;
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
{
const tools::PolyPolygon& rPolyPoly = static_cast<const
MetaTransparentAction*>(pAction)->GetPolyPolygon();
if( rPolyPoly.Count() )
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 468479d..8e6040f 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -1552,7 +1552,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
}
break;
- case MetaActionType::TRANSPARENT:
+ case MetaActionType::Transparent:
{
aSrcLineInfo = LineInfo();
SetLineAndFillAttr();
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index a23dd5c..ba8c530 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 51961c8..fc8b6e9 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 25a3632..94be557 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 471fd9b..9395dab 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 4ac0659..9dc9311 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 fbed7a7..da01c31 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;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
