summaryrefslogtreecommitdiff
path: root/sd/source/filter/eppt
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-23 15:34:44 +0200
committerNoel Grandin <noel@peralex.com>2015-05-05 09:30:39 +0200
commitd3b5038cbbe4adf642b3906da111a9f0d2c918a7 (patch)
tree9f025e613c8d33bfebcc08d89f7313817bd38bd6 /sd/source/filter/eppt
parent0c58017468abb0ebee3088336e7e7a074e53edee (diff)
loplugin:staticmethods
Change-Id: Iea68c4e466dd8e1cb7164959a680e5e52542166b
Diffstat (limited to 'sd/source/filter/eppt')
-rw-r--r--sd/source/filter/eppt/eppt.cxx2
-rw-r--r--sd/source/filter/eppt/epptso.cxx8
2 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index b57b35e76b16..7ce4bf48d9f4 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1221,7 +1221,7 @@ void PPTWriter::ImplWriteBackground( ::com::sun::star::uno::Reference< ::com::su
{
if ( ImplGetPropertyValue( rXPropSet, OUString( "FillColor" ) ) )
{
- nFillColor = mpPptEscherEx->GetColor( *static_cast<sal_uInt32 const *>(mAny.getValue()) );
+ nFillColor = EscherEx::GetColor( *static_cast<sal_uInt32 const *>(mAny.getValue()) );
nFillBackColor = nFillColor ^ 0xffffff;
}
} // PASSTHROUGH INTENDED
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index ed18ae002de8..5f1d5bbb2a1e 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -844,7 +844,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
case ::com::sun::star::drawing::FillStyle_SOLID :
{
if ( PropValue::GetPropertyValue( aAny, mXPropSet, OUString( "FillColor" ) ) )
- nBackgroundColor = mpPptEscherEx->GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) );
+ nBackgroundColor = EscherEx::GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) );
}
break;
case ::com::sun::star::drawing::FillStyle_NONE :
@@ -867,7 +867,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
case ::com::sun::star::drawing::FillStyle_SOLID :
{
if ( PropValue::GetPropertyValue( aAny, mXBackgroundPropSet, OUString( "FillColor" ) ) )
- nBackgroundColor = mpPptEscherEx->GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) );
+ nBackgroundColor = EscherEx::GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) );
}
break;
default:
@@ -902,7 +902,7 @@ void PPTWriter::ImplWritePortions( SvStream& rOut, TextObj& rTextObj )
if ( PropValue::GetPropertyValue( aAny, aPropSetOfNextShape,
OUString( "FillColor" ), true ) )
{
- if ( nCharColor == mpPptEscherEx->GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) ) )
+ if ( nCharColor == EscherEx::GetColor( *static_cast<sal_uInt32 const *>(aAny.getValue()) ) )
{
nCharAttr |= 0x200;
}
@@ -1891,7 +1891,7 @@ void PPTWriter::ImplWriteObjectEffect( SvStream& rSt,
if ( bDimHide )
nAfterEffect |= 2;
if ( ImplGetPropertyValue( OUString( "DimColor" ) ) )
- nDimColor = mpPptEscherEx->GetColor( *static_cast<sal_uInt32 const *>(mAny.getValue()) ) | 0xfe000000;
+ nDimColor = EscherEx::GetColor( *static_cast<sal_uInt32 const *>(mAny.getValue()) ) | 0xfe000000;
rSt.WriteUInt32( nDimColor ).WriteUInt32( nFlags ).WriteUInt32( nSoundRef ).WriteUInt32( nDelayTime )
.WriteUInt16( nOrder ) // order of build ( 1.. )