summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-03-23 10:31:27 +0200
committerNoel Grandin <noel@peralex.com>2016-03-23 11:22:33 +0200
commitdbf54937c46051b65605822407158b073132b927 (patch)
tree5ff1fc8319f522dc0010f0abad2220c84dc9120a /filter
parentbeb2c3bed1a6973f02fafa7831b9ab5e51e7badc (diff)
loplugin:constantparam in filter
Change-Id: I383770bc8bd75e5b5325e133587eda2fe28f9fdd
Diffstat (limited to 'filter')
-rw-r--r--filter/source/graphicfilter/idxf/dxf2mtf.cxx4
-rw-r--r--filter/source/graphicfilter/idxf/dxfreprd.cxx64
-rw-r--r--filter/source/graphicfilter/idxf/dxfreprd.hxx2
-rw-r--r--filter/source/msfilter/eschesdo.cxx17
-rw-r--r--filter/source/msfilter/eschesdo.hxx5
-rw-r--r--filter/source/svg/svgwriter.cxx80
-rw-r--r--filter/source/svg/svgwriter.hxx10
7 files changed, 77 insertions, 105 deletions
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index fb732c8e3afc..72af29d269f4 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -427,7 +427,7 @@ void DXF2GDIMetaFile::DrawTextEntity(const DXFTextEntity & rE, const DXFTransfor
aT.TransDir(DXFVector(1,0,0),aV);
if ( SetFontAttribute( rE,nAng, nHeight, aV. Abs() ) )
{
- OUString const aUString(pDXF->ToOUString(rE.m_sText, true));
+ OUString const aUString(pDXF->ToOUString(rE.m_sText));
aT.Transform( DXFVector( 0, 0, 0 ), aPt );
pVirDev->DrawText( aPt, aUString );
}
@@ -485,7 +485,7 @@ void DXF2GDIMetaFile::DrawAttribEntity(const DXFAttribEntity & rE, const DXFTran
aT.TransDir(DXFVector(1,0,0),aV);
if (SetFontAttribute(rE,nAng,nHeight,aV.Abs()))
{
- OUString const aUString(pDXF->ToOUString(rE.m_sText, true));
+ OUString const aUString(pDXF->ToOUString(rE.m_sText));
aT.Transform( DXFVector( 0, 0, 0 ), aPt );
pVirDev->DrawText( aPt, aUString );
}
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 6c1993e91997..f33fdef6164a 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -400,44 +400,42 @@ namespace {
}
}
-OUString DXFRepresentation::ToOUString(const OString& s, bool bSpecials) const
+OUString DXFRepresentation::ToOUString(const OString& s) const
{
OUString result = OStringToOUString(s, getTextEncoding());
- if (bSpecials) {
- result = result.replaceAll("%%o", "") // Overscore - simply remove
- .replaceAll("%%u", "") // Underscore - simply remove
- .replaceAll("%%d", OUString(sal_Unicode(L'\u00B0'))) // Degrees symbol ()
- .replaceAll("%%p", OUString(sal_Unicode(L'\u00B1'))) // Tolerance symbol ()
- .replaceAll("%%c", OUString(sal_Unicode(L'\u2205'))) // Diameter symbol
- .replaceAll("%%%", "%"); // Percent symbol
-
- sal_Int32 pos = result.indexOf("%%"); // %%nnn, where nnn - 3-digit decimal ASCII code
- while (pos != -1 && pos <= result.getLength() - 5) {
- OUString asciiNum = result.copy(pos + 2, 3);
- if (lcl_isDec(asciiNum[0]) &&
- lcl_isDec(asciiNum[1]) &&
- lcl_isDec(asciiNum[2]))
- {
- char ch = static_cast<char>(asciiNum.toUInt32());
- OUString codePt(&ch, 1, mEnc);
- result = result.replaceAll(result.copy(pos, 5), codePt, pos);
- }
- pos = result.indexOf("%%", pos + 1);
+ result = result.replaceAll("%%o", "") // Overscore - simply remove
+ .replaceAll("%%u", "") // Underscore - simply remove
+ .replaceAll("%%d", OUString(sal_Unicode(L'\u00B0'))) // Degrees symbol (°)
+ .replaceAll("%%p", OUString(sal_Unicode(L'\u00B1'))) // Tolerance symbol (±)
+ .replaceAll("%%c", OUString(sal_Unicode(L'\u2205'))) // Diameter symbol
+ .replaceAll("%%%", "%"); // Percent symbol
+
+ sal_Int32 pos = result.indexOf("%%"); // %%nnn, where nnn - 3-digit decimal ASCII code
+ while (pos != -1 && pos <= result.getLength() - 5) {
+ OUString asciiNum = result.copy(pos + 2, 3);
+ if (lcl_isDec(asciiNum[0]) &&
+ lcl_isDec(asciiNum[1]) &&
+ lcl_isDec(asciiNum[2]))
+ {
+ char ch = static_cast<char>(asciiNum.toUInt32());
+ OUString codePt(&ch, 1, mEnc);
+ result = result.replaceAll(result.copy(pos, 5), codePt, pos);
}
+ pos = result.indexOf("%%", pos + 1);
+ }
- pos = result.indexOf("\\U+"); // \U+XXXX, where XXXX - 4-digit hex unicode
- while (pos != -1 && pos <= result.getLength() - 7) {
- OUString codePtNum = result.copy(pos + 3, 4);
- if (lcl_isHex(codePtNum[0]) &&
- lcl_isHex(codePtNum[1]) &&
- lcl_isHex(codePtNum[2]) &&
- lcl_isHex(codePtNum[3]))
- {
- OUString codePt(static_cast<sal_Unicode>(codePtNum.toUInt32(16)));
- result = result.replaceAll(result.copy(pos, 7), codePt, pos);
- }
- pos = result.indexOf("\\U+", pos + 1);
+ pos = result.indexOf("\\U+"); // \U+XXXX, where XXXX - 4-digit hex unicode
+ while (pos != -1 && pos <= result.getLength() - 7) {
+ OUString codePtNum = result.copy(pos + 3, 4);
+ if (lcl_isHex(codePtNum[0]) &&
+ lcl_isHex(codePtNum[1]) &&
+ lcl_isHex(codePtNum[2]) &&
+ lcl_isHex(codePtNum[3]))
+ {
+ OUString codePt(static_cast<sal_Unicode>(codePtNum.toUInt32(16)));
+ result = result.replaceAll(result.copy(pos, 7), codePt, pos);
}
+ pos = result.indexOf("\\U+", pos + 1);
}
return result;
}
diff --git a/filter/source/graphicfilter/idxf/dxfreprd.hxx b/filter/source/graphicfilter/idxf/dxfreprd.hxx
index 93d78a3a161f..a7ad7531f975 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.hxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.hxx
@@ -99,7 +99,7 @@ public:
rtl_TextEncoding getTextEncoding() const;
void setTextEncoding(rtl_TextEncoding aEnc);
- OUString ToOUString(const OString& s, bool bSpecials=false) const;
+ OUString ToOUString(const OString& s) const;
double getGlobalLineTypeScale() const;
void setGlobalLineTypeScale(double fGlobalLineTypeScale);
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 6e94cb526c7b..7ba2f6a335ed 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -154,7 +154,7 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty
sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
EscherSolverContainer& rSolverContainer,
- ImplEESdrPageType ePageType, const bool bOOxmlExport )
+ const bool bOOxmlExport )
{
sal_uInt32 nShapeID = 0;
sal_uInt16 nShapeType = 0;
@@ -216,7 +216,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
if( aObj.IsValid() )
{
aObj.SetOOXML(bOOxmlExport);
- ImplWriteShape( aObj, rSolverContainer, ePageType, bOOxmlExport );
+ ImplWriteShape( aObj, rSolverContainer, bOOxmlExport );
}
}
mpEscherEx->LeaveGroup();
@@ -518,7 +518,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
mpEscherEx->OpenContainer( ESCHER_SpContainer );
// a GraphicObject can also be a ClickMe element
- if( rObj.IsEmptyPresObj() && ( ePageType == NORMAL ) )
+ if( rObj.IsEmptyPresObj() )
{
ADD_SHAPE( ESCHER_ShpInst_Rectangle, 0x220 ); // Flags: HaveAnchor | HaveMaster
sal_uInt32 nTxtBxId = mpEscherEx->QueryTextID( rObj.GetShapeRef(),
@@ -584,7 +584,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
else if ( rObj.GetType() == "drawing.OLE2" )
{
mpEscherEx->OpenContainer( ESCHER_SpContainer );
- if( rObj.IsEmptyPresObj() && ( ePageType == NORMAL ) )
+ if( rObj.IsEmptyPresObj() )
{
ADD_SHAPE( ESCHER_ShpInst_Rectangle, 0x220 ); // Flags: HaveAnchor | HaveMaster
sal_uInt32 nTxtBxId = mpEscherEx->QueryTextID( rObj.GetShapeRef(),
@@ -821,8 +821,7 @@ bool ImplEESdrWriter::ImplInitPageValues()
}
void ImplEESdrWriter::ImplWritePage(
- EscherSolverContainer& rSolverContainer,
- ImplEESdrPageType ePageType )
+ EscherSolverContainer& rSolverContainer )
{
ImplInitPageValues();
@@ -844,7 +843,7 @@ void ImplEESdrWriter::ImplWritePage(
mXShapes->getByIndex( n ).getValue()) );
if( aObj.IsValid() )
{
- ImplWriteShape( aObj, rSolverContainer, ePageType );
+ ImplWriteShape( aObj, rSolverContainer );
}
}
mnPagesWritten++;
@@ -934,14 +933,14 @@ void ImplEscherExSdr::ImplFlushSolverContainer()
void ImplEscherExSdr::ImplWriteCurrentPage()
{
assert(mpSolverContainer && "ImplEscherExSdr::ImplWriteCurrentPage: no SolverContainer");
- ImplWritePage( *mpSolverContainer, NORMAL );
+ ImplWritePage( *mpSolverContainer );
ImplExitPage();
}
sal_uInt32 ImplEscherExSdr::ImplWriteTheShape( ImplEESdrObject& rObj , bool ooxmlExport )
{
assert(mpSolverContainer && "ImplEscherExSdr::ImplWriteShape: no SolverContainer");
- return ImplWriteShape( rObj, *mpSolverContainer, NORMAL, ooxmlExport );
+ return ImplWriteShape( rObj, *mpSolverContainer, ooxmlExport );
}
void EscherEx::AddSdrPage( const SdrPage& rPage )
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index 7473676cae91..448df68982e2 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -140,12 +140,11 @@ protected:
bool ImplInitPageValues();
void ImplWritePage(
- EscherSolverContainer& rSolver,
- ImplEESdrPageType ePageType );
+ EscherSolverContainer& rSolver );
sal_uInt32 ImplWriteShape( ImplEESdrObject& rObj,
EscherSolverContainer& rSolver,
- ImplEESdrPageType ePageType, const bool bOOxmlExport = false ); // returns ShapeID
+ const bool bOOxmlExport = false ); // returns ShapeID
static void ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherPropertyContainer& rPropOpt );
void ImplWriteAdditionalText(
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 67bc12b837ae..33d250109848 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1563,14 +1563,14 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
if( true || !bTextSpecial )
{
- implWriteTextPortion( rPos, rText, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ implWriteTextPortion( rPos, rText, mpVDev->GetTextColor() );
}
else
{
// to be implemented
}
#else
- implWriteTextPortion( rPos, rText, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ implWriteTextPortion( rPos, rText, mpVDev->GetTextColor() );
#endif
if( bStandAloneTextPortion )
@@ -1582,8 +1582,7 @@ void SVGTextWriter::writeTextPortion( const Point& rPos,
void SVGTextWriter::implWriteTextPortion( const Point& rPos,
const OUString& rText,
- Color aTextColor,
- bool bApplyMapping )
+ Color aTextColor )
{
Point aPos;
Point aBaseLinePos( rPos );
@@ -1595,10 +1594,7 @@ void SVGTextWriter::implWriteTextPortion( const Point& rPos,
else if( rFont.GetAlignment() == ALIGN_BOTTOM )
aBaseLinePos.Y() -= aMetric.GetDescent();
- if( bApplyMapping )
- implMap( rPos, aPos );
- else
- aPos = rPos;
+ implMap( rPos, aPos );
if( mbPositioningNeeded )
{
@@ -1858,20 +1854,12 @@ BitmapChecksum SVGActionWriter::GetChecksum( const MetaAction* pAction )
void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2,
- const Color* pLineColor, bool bApplyMapping )
+ const Color* pLineColor )
{
Point aPt1, aPt2;
- if( bApplyMapping )
- {
- ImplMap( rPt1, aPt1 );
- ImplMap( rPt2, aPt2 );
- }
- else
- {
- aPt1 = rPt1;
- aPt2 = rPt2;
- }
+ ImplMap( rPt1, aPt1 );
+ ImplMap( rPt2, aPt2 );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX1, OUString::number( aPt1.X() ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY1, OUString::number( aPt1.Y() ) );
@@ -1890,15 +1878,11 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2,
}
-void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nRadY,
- bool bApplyMapping )
+void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nRadY )
{
Rectangle aRect;
- if( bApplyMapping )
- ImplMap( rRect, aRect );
- else
- aRect = rRect;
+ ImplMap( rRect, aRect );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrX, OUString::number( aRect.Left() ) );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrY, OUString::number( aRect.Top() ) );
@@ -1906,14 +1890,12 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, OUString::number( aRect.GetHeight() ) );
if( nRadX )
- mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::number( bApplyMapping ? ImplMap( nRadX ) : nRadX ) );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRX, OUString::number( ImplMap( nRadX ) ) );
if( nRadY )
- mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::number( bApplyMapping ? ImplMap( nRadY ) : nRadY ) );
+ mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrRY, OUString::number( ImplMap( nRadY ) ) );
- {
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, true, true );
- }
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, true, true );
}
@@ -2394,7 +2376,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
if( !bTextSpecial )
{
- ImplWriteText( rPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
}
else
{
@@ -2422,8 +2404,8 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
aPos += aOffset;
}
- ImplWriteText( aPos, rText, pDXArray, nWidth, aReliefColor, true/*bApplyMapping*/ );
- ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor, true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, aReliefColor );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor );
}
else
{
@@ -2441,34 +2423,34 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
Point aPos( rPos );
aPos += Point( nOff, nOff );
- ImplWriteText( aPos, rText, pDXArray, nWidth, aShadowColor, true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, aShadowColor );
if( !aMetric.IsOutline() )
{
- ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor, true/*bApplyMapping*/ );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, aTextColor );
}
}
if( aMetric.IsOutline() )
{
Point aPos = rPos + Point( -6, -6 );
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( +6, +6);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( -6, +0);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( -6, +6);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( +0, +6);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( +0, -6);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( +6, -1);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
aPos = rPos + Point( +6, +0);
- ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor(), true/*bApplyMapping*/ );
+ ImplWriteText( aPos, rText, pDXArray, nWidth, mpVDev->GetTextColor() );
- ImplWriteText( rPos, rText, pDXArray, nWidth, Color( COL_WHITE ), true/*bApplyMapping*/ );
+ ImplWriteText( rPos, rText, pDXArray, nWidth, Color( COL_WHITE ) );
}
}
}
@@ -2477,7 +2459,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
const long* pDXArray, long nWidth,
- Color aTextColor, bool bApplyMapping )
+ Color aTextColor )
{
sal_Int32 nLen = rText.getLength();
Size aNormSize;
@@ -2491,10 +2473,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
else if( rFont.GetAlignment() == ALIGN_BOTTOM )
aBaseLinePos.Y() -= aMetric.GetDescent();
- if( bApplyMapping )
- ImplMap( rPos, aPos );
- else
- aPos = rPos;
+ ImplMap( rPos, aPos );
std::unique_ptr<long[]> xTmpArray(new long[nLen]);
// get text sizes
@@ -2604,8 +2583,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const OUString& rText,
{
// #118796# do NOT access pDXArray, it may be zero (!)
sal_Int32 nDXWidth = pDX[ nCurPos - 1 ];
- if ( bApplyMapping )
- nDXWidth = ImplMap( nDXWidth );
+ nDXWidth = ImplMap( nDXWidth );
nX = aPos.X() + nDXWidth;
}
}
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 5c0107700be4..132d93b110a0 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -215,7 +215,7 @@ class SVGTextWriter
void implWriteEmbeddedBitmaps();
void writeTextPortion( const Point& rPos, const OUString& rText );
void implWriteTextPortion( const Point& rPos, const OUString& rText,
- Color aTextColor, bool bApplyMapping );
+ Color aTextColor );
void setVirtualDevice( VirtualDevice* pVDev, MapMode& rTargetMapMode )
{
@@ -298,10 +298,8 @@ private:
tools::Polygon& ImplMap( const tools::Polygon& rPoly, tools::Polygon& rDstPoly ) const;
tools::PolyPolygon& ImplMap( const tools::PolyPolygon& rPolyPoly, tools::PolyPolygon& rDstPolyPoly ) const;
- void ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = nullptr,
- bool bApplyMapping = true );
- void ImplWriteRect( const Rectangle& rRect, long nRadX = 0, long nRadY = 0,
- bool bApplyMapping = true );
+ void ImplWriteLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor = nullptr );
+ void ImplWriteRect( const Rectangle& rRect, long nRadX = 0, long nRadY = 0 );
void ImplWriteEllipse( const Point& rCenter, long nRadX, long nRadY );
void ImplWritePattern( const tools::PolyPolygon& rPolyPoly, const Hatch* pHatch, const Gradient* pGradient, sal_uInt32 nWriteFlags );
void ImplAddLineAttr( const LineInfo &rAttrs );
@@ -315,7 +313,7 @@ private:
static Color ImplGetGradientColor( const Color& rStartColor, const Color& rEndColor, double fOffset );
void ImplWriteMask( GDIMetaFile& rMtf, const Point& rDestPt, const Size& rDestSize, const Gradient& rGradient, sal_uInt32 nWriteFlags );
void ImplWriteText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth );
- void ImplWriteText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor, bool bApplyMapping );
+ void ImplWriteText( const Point& rPos, const OUString& rText, const long* pDXArray, long nWidth, Color aTextColor );
void ImplWriteBmp( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& rSrcPt, const Size& rSrcSz );
void ImplWriteActions( const GDIMetaFile& rMtf,