[Libreoffice-commits] .: binfilter/bf_xmloff binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Fri Jan 21 07:18:07 PST 2011
binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx | 430 ++++++++++----------
binfilter/inc/bf_xmloff/xexptran.hxx | 18
2 files changed, 225 insertions(+), 223 deletions(-)
New commits:
commit 7728d3714f604a9a20d27374a63fd5db74dfaa29
Author: Joseph Powers <jpowers27 at cox.net>
Date: Fri Jan 21 07:17:05 2011 -0800
Remove DECLARE_LIST(ImpSdXMLExpTransObj2DBaseList, ImpSdXMLExpTransObj2DBase*)
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx b/binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx
index aa761cc..542d9aa 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,6 @@
#include "xexptran.hxx"
-
#include <rtl/ustrbuf.hxx>
#include "xmluconv.hxx"
@@ -62,28 +61,28 @@ void Imp_CalcVectorValues(Vector2D& aVec1, Vector2D& aVec2, sal_Bool& bSameLengt
// parsing help functions for simple chars
void Imp_SkipSpaces(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen)
{
- while(rPos < nLen
+ while(rPos < nLen
&& sal_Unicode(' ') == rStr[rPos])
rPos++;
}
void Imp_SkipSpacesAndOpeningBraces(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen)
{
- while(rPos < nLen
+ while(rPos < nLen
&& (sal_Unicode(' ') == rStr[rPos] || sal_Unicode('(') == rStr[rPos]))
rPos++;
}
void Imp_SkipSpacesAndCommas(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen)
{
- while(rPos < nLen
+ while(rPos < nLen
&& (sal_Unicode(' ') == rStr[rPos] || sal_Unicode(',') == rStr[rPos]))
rPos++;
}
void Imp_SkipSpacesAndClosingBraces(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen)
{
- while(rPos < nLen
+ while(rPos < nLen
&& (sal_Unicode(' ') == rStr[rPos] || sal_Unicode(')') == rStr[rPos]))
rPos++;
}
@@ -127,7 +126,7 @@ void Imp_SkipNumber(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen)
}
}
-void Imp_SkipNumberAndSpacesAndCommas(const OUString& rStr, sal_Int32& rPos,
+void Imp_SkipNumberAndSpacesAndCommas(const OUString& rStr, sal_Int32& rPos,
const sal_Int32 nLen)
{
Imp_SkipNumber(rStr, rPos, nLen);
@@ -135,7 +134,7 @@ void Imp_SkipNumberAndSpacesAndCommas(const OUString& rStr, sal_Int32& rPos,
}
// #100617# Allow to skip doubles, too.
-void Imp_SkipDoubleAndSpacesAndCommas(const OUString& rStr, sal_Int32& rPos,
+void Imp_SkipDoubleAndSpacesAndCommas(const OUString& rStr, sal_Int32& rPos,
const sal_Int32 nLen)
{
Imp_SkipDouble(rStr, rPos, nLen);
@@ -178,7 +177,7 @@ void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen)
if(sal_Unicode('e') == aChar || sal_Unicode('E') == aChar)
{
aChar = rStr[++rPos];
-
+
if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
aChar = rStr[++rPos];
@@ -189,7 +188,7 @@ void Imp_SkipDouble(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen)
}
}
-double Imp_GetDoubleChar(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen,
+double Imp_GetDoubleChar(const OUString& rStr, sal_Int32& rPos, const sal_Int32 nLen,
const SvXMLUnitConverter& rConv, double fRetval, BOOL bLookForUnits = FALSE)
{
sal_Unicode aChar(rStr[rPos]);
@@ -212,7 +211,7 @@ double Imp_GetDoubleChar(const OUString& rStr, sal_Int32& rPos, const sal_Int32
{
sNumberString.append(rStr[rPos]);
aChar = rStr[++rPos];
-
+
if(sal_Unicode('+') == aChar || sal_Unicode('-') == aChar)
{
sNumberString.append(rStr[rPos]);
@@ -232,7 +231,7 @@ double Imp_GetDoubleChar(const OUString& rStr, sal_Int32& rPos, const sal_Int32
while(rPos < nLen && Imp_IsOnUnitChar(rStr, rPos))
sNumberString.append(rStr[rPos++]);
}
-
+
if(sNumberString.getLength())
{
if(bLookForUnits)
@@ -244,7 +243,7 @@ double Imp_GetDoubleChar(const OUString& rStr, sal_Int32& rPos, const sal_Int32
return fRetval;
}
-void Imp_PutDoubleChar(OUString& rStr, const SvXMLUnitConverter& rConv, double fValue,
+void Imp_PutDoubleChar(OUString& rStr, const SvXMLUnitConverter& rConv, double fValue,
BOOL bConvertUnits = FALSE)
{
OUStringBuffer sStringBuffer;
@@ -264,7 +263,7 @@ void Imp_PutDoubleChar(OUString& rStr, const SvXMLUnitConverter& rConv, double f
struct ImpSdXMLExpTransObj2DBase
{
sal_uInt16 mnType;
- ImpSdXMLExpTransObj2DBase(sal_uInt16 nType)
+ ImpSdXMLExpTransObj2DBase(sal_uInt16 nType)
: mnType(nType) {}
};
@@ -284,37 +283,37 @@ struct ImpSdXMLExpTransObj2DBase
struct ImpSdXMLExpTransObj2DRotate : public ImpSdXMLExpTransObj2DBase
{
double mfRotate;
- ImpSdXMLExpTransObj2DRotate(double fVal)
+ ImpSdXMLExpTransObj2DRotate(double fVal)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_ROTATE), mfRotate(fVal) {}
};
struct ImpSdXMLExpTransObj2DScale : public ImpSdXMLExpTransObj2DBase
{
Vector2D maScale;
- ImpSdXMLExpTransObj2DScale(const Vector2D& rNew)
+ ImpSdXMLExpTransObj2DScale(const Vector2D& rNew)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_SCALE), maScale(rNew) {}
};
struct ImpSdXMLExpTransObj2DTranslate : public ImpSdXMLExpTransObj2DBase
{
Vector2D maTranslate;
- ImpSdXMLExpTransObj2DTranslate(const Vector2D& rNew)
+ ImpSdXMLExpTransObj2DTranslate(const Vector2D& rNew)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE), maTranslate(rNew) {}
};
struct ImpSdXMLExpTransObj2DSkewX : public ImpSdXMLExpTransObj2DBase
{
double mfSkewX;
- ImpSdXMLExpTransObj2DSkewX(double fVal)
+ ImpSdXMLExpTransObj2DSkewX(double fVal)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_SKEWX), mfSkewX(fVal) {}
};
struct ImpSdXMLExpTransObj2DSkewY : public ImpSdXMLExpTransObj2DBase
{
double mfSkewY;
- ImpSdXMLExpTransObj2DSkewY(double fVal)
+ ImpSdXMLExpTransObj2DSkewY(double fVal)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_SKEWY), mfSkewY(fVal) {}
};
struct ImpSdXMLExpTransObj2DMatrix : public ImpSdXMLExpTransObj2DBase
{
Matrix3D maMatrix;
- ImpSdXMLExpTransObj2DMatrix(const Matrix3D& rNew)
+ ImpSdXMLExpTransObj2DMatrix(const Matrix3D& rNew)
: ImpSdXMLExpTransObj2DBase(IMP_SDXMLEXP_TRANSOBJ2D_MATRIX), maMatrix(rNew) {}
};
@@ -324,20 +323,21 @@ struct ImpSdXMLExpTransObj2DMatrix : public ImpSdXMLExpTransObj2DBase
void SdXMLImExTransform2D::EmptyList()
{
- while(maList.Count())
+ for ( size_t i = maList.size(); i > 0; )
{
- ImpSdXMLExpTransObj2DBase* pObj = maList.Remove(maList.Count() - 1);
+ ImpSdXMLExpTransObj2DBase* pObj = maList[ --i ];
switch(pObj->mnType)
{
- case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE : delete (ImpSdXMLExpTransObj2DRotate*)pObj; break;
- case IMP_SDXMLEXP_TRANSOBJ2D_SCALE : delete (ImpSdXMLExpTransObj2DScale*)pObj; break;
- case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE : delete (ImpSdXMLExpTransObj2DTranslate*)pObj; break;
- case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX : delete (ImpSdXMLExpTransObj2DSkewX*)pObj; break;
- case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY : delete (ImpSdXMLExpTransObj2DSkewY*)pObj; break;
- case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX : delete (ImpSdXMLExpTransObj2DMatrix*)pObj; break;
- default : DBG_ERROR("SdXMLImExTransform2D: impossible entry!"); break;
+ case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE : delete (ImpSdXMLExpTransObj2DRotate*)pObj; break;
+ case IMP_SDXMLEXP_TRANSOBJ2D_SCALE : delete (ImpSdXMLExpTransObj2DScale*)pObj; break;
+ case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE : delete (ImpSdXMLExpTransObj2DTranslate*)pObj; break;
+ case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX : delete (ImpSdXMLExpTransObj2DSkewX*)pObj; break;
+ case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY : delete (ImpSdXMLExpTransObj2DSkewY*)pObj; break;
+ case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX : delete (ImpSdXMLExpTransObj2DMatrix*)pObj; break;
+ default : DBG_ERROR("SdXMLImExTransform2D: impossible entry!"); break;
}
}
+ maList.clear();
}
//////////////////////////////////////////////////////////////////////////////
@@ -346,19 +346,19 @@ void SdXMLImExTransform2D::EmptyList()
void SdXMLImExTransform2D::AddRotate(double fNew)
{
if(fNew != 0.0)
- maList.Insert(new ImpSdXMLExpTransObj2DRotate(fNew), LIST_APPEND);
+ maList.push_back( new ImpSdXMLExpTransObj2DRotate(fNew) );
}
void SdXMLImExTransform2D::AddTranslate(const Vector2D& rNew)
{
if(rNew.X() != 0.0 || rNew.Y() != 0.0)
- maList.Insert(new ImpSdXMLExpTransObj2DTranslate(rNew), LIST_APPEND);
+ maList.push_back( new ImpSdXMLExpTransObj2DTranslate(rNew) );
}
void SdXMLImExTransform2D::AddSkewX(double fNew)
{
if(fNew != 0.0)
- maList.Insert(new ImpSdXMLExpTransObj2DSkewX(fNew), LIST_APPEND);
+ maList.push_back( new ImpSdXMLExpTransObj2DSkewX(fNew) );
}
//////////////////////////////////////////////////////////////////////////////
@@ -368,20 +368,20 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
OUString aNewString;
OUString aClosingBrace(sal_Unicode(')'));
OUString aEmptySpace(sal_Unicode(' '));
-
- for(sal_uInt32 a(0L); a < maList.Count(); a++)
+
+ for( size_t a = 0; a < maList.size(); a++ )
{
- ImpSdXMLExpTransObj2DBase* pObj = maList.GetObject(a);
+ ImpSdXMLExpTransObj2DBase* pObj = maList[ a ];
switch(pObj->mnType)
{
- case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE :
+ case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "rotate (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DRotate*)pObj)->mfRotate);
aNewString += aClosingBrace;
break;
}
- case IMP_SDXMLEXP_TRANSOBJ2D_SCALE :
+ case IMP_SDXMLEXP_TRANSOBJ2D_SCALE :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "scale (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.X());
@@ -390,7 +390,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
aNewString += aClosingBrace;
break;
}
- case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE :
+ case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "translate (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.X(), TRUE);
@@ -399,21 +399,21 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
aNewString += aClosingBrace;
break;
}
- case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX :
+ case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "skewX (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewX*)pObj)->mfSkewX);
aNewString += aClosingBrace;
break;
}
- case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY :
+ case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "skewY (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewY*)pObj)->mfSkewY);
aNewString += aClosingBrace;
break;
}
- case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX :
+ case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "matrix (" ));
@@ -447,10 +447,10 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
}
// if not the last entry, add one space to next tag
- if(a+1 != maList.Count())
+ if( a+1 != maList.size() )
aNewString += aEmptySpace;
}
-
+
// fill string form OUString
msString = aNewString;
@@ -488,71 +488,71 @@ void SdXMLImExTransform2D::SetString(const OUString& rNew, const SvXMLUnitConver
if(nPos < nLen)
{
if(nPos == aStr.indexOf(aString_rotate, nPos))
- {
+ {
double fValue(0.0);
- nPos += 6;
+ nPos += 6;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
fValue = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, fValue);
if(fValue != 0.0)
- maList.Insert(new ImpSdXMLExpTransObj2DRotate(fValue), LIST_APPEND);
+ maList.push_back( new ImpSdXMLExpTransObj2DRotate(fValue) );
Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen);
}
else if(nPos == aStr.indexOf(aString_scale, nPos))
- {
+ {
Vector2D aValue(1.0, 1.0);
- nPos += 5;
+ nPos += 5;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
aValue.X() = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, aValue.X());
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
aValue.Y() = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, aValue.Y());
if(aValue.X() != 1.0 || aValue.Y() != 1.0)
- maList.Insert(new ImpSdXMLExpTransObj2DScale(aValue), LIST_APPEND);
+ maList.push_back( new ImpSdXMLExpTransObj2DScale(aValue) );
Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen);
}
else if(nPos == aStr.indexOf(aString_translate, nPos))
- {
+ {
Vector2D aValue;
- nPos += 9;
+ nPos += 9;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
aValue.X() = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, aValue.X(), TRUE);
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
aValue.Y() = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, aValue.Y(), TRUE);
if(aValue.X() != 0.0 || aValue.Y() != 0.0)
- maList.Insert(new ImpSdXMLExpTransObj2DTranslate(aValue), LIST_APPEND);
+ maList.push_back( new ImpSdXMLExpTransObj2DTranslate(aValue) );
Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen);
}
else if(nPos == aStr.indexOf(aString_skewX, nPos))
- {
+ {
double fValue(0.0);
- nPos += 5;
+ nPos += 5;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
fValue = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, fValue);
if(fValue != 0.0)
- maList.Insert(new ImpSdXMLExpTransObj2DSkewX(fValue), LIST_APPEND);
+ maList.push_back( new ImpSdXMLExpTransObj2DSkewX(fValue) );
Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen);
}
else if(nPos == aStr.indexOf(aString_skewY, nPos))
- {
+ {
double fValue(0.0);
- nPos += 5;
+ nPos += 5;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
fValue = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, fValue);
if(fValue != 0.0)
- maList.Insert(new ImpSdXMLExpTransObj2DSkewY(fValue), LIST_APPEND);
+ maList.push_back( new ImpSdXMLExpTransObj2DSkewY(fValue) );
Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen);
}
else if(nPos == aStr.indexOf(aString_matrix, nPos))
- {
+ {
Matrix3D aValue;
- nPos += 6;
+ nPos += 6;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
// a
@@ -579,7 +579,7 @@ void SdXMLImExTransform2D::SetString(const OUString& rNew, const SvXMLUnitConver
aValue[1][2] = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, aValue[1][2], TRUE);
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
- maList.Insert(new ImpSdXMLExpTransObj2DMatrix(aValue), LIST_APPEND);
+ maList.push_back( new ImpSdXMLExpTransObj2DMatrix(aValue) );
Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen);
}
else
@@ -593,31 +593,31 @@ void SdXMLImExTransform2D::GetFullTransform(Matrix3D& rFullTrans)
{
rFullTrans.Identity();
- for(sal_uInt32 a(0L); a < maList.Count(); a++)
+ for( size_t a = 0; a < maList.size(); a++ )
{
- ImpSdXMLExpTransObj2DBase* pObj = maList.GetObject(a);
+ ImpSdXMLExpTransObj2DBase* pObj = maList[ a ];
switch(pObj->mnType)
{
- case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE :
- rFullTrans.Rotate(((ImpSdXMLExpTransObj2DRotate*)pObj)->mfRotate);
+ case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE :
+ rFullTrans.Rotate(((ImpSdXMLExpTransObj2DRotate*)pObj)->mfRotate);
break;
- case IMP_SDXMLEXP_TRANSOBJ2D_SCALE :
- rFullTrans.Scale(((ImpSdXMLExpTransObj2DScale*)pObj)->maScale);
+ case IMP_SDXMLEXP_TRANSOBJ2D_SCALE :
+ rFullTrans.Scale(((ImpSdXMLExpTransObj2DScale*)pObj)->maScale);
break;
- case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE :
- rFullTrans.Translate(((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate);
+ case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE :
+ rFullTrans.Translate(((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate);
break;
- case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX :
- rFullTrans.ShearX(tan(((ImpSdXMLExpTransObj2DSkewX*)pObj)->mfSkewX));
+ case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX :
+ rFullTrans.ShearX(tan(((ImpSdXMLExpTransObj2DSkewX*)pObj)->mfSkewX));
break;
- case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY :
- rFullTrans.ShearY(tan(((ImpSdXMLExpTransObj2DSkewY*)pObj)->mfSkewY));
+ case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY :
+ rFullTrans.ShearY(tan(((ImpSdXMLExpTransObj2DSkewY*)pObj)->mfSkewY));
break;
- case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX :
- rFullTrans *= ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix;
+ case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX :
+ rFullTrans *= ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix;
break;
- default :
- DBG_ERROR("SdXMLImExTransform2D: impossible entry!");
+ default :
+ DBG_ERROR("SdXMLImExTransform2D: impossible entry!");
break;
}
}
@@ -630,7 +630,7 @@ void SdXMLImExTransform2D::GetFullTransform(Matrix3D& rFullTrans)
struct ImpSdXMLExpTransObj3DBase
{
sal_uInt16 mnType;
- ImpSdXMLExpTransObj3DBase(sal_uInt16 nType)
+ ImpSdXMLExpTransObj3DBase(sal_uInt16 nType)
: mnType(nType) {}
};
@@ -650,37 +650,37 @@ struct ImpSdXMLExpTransObj3DBase
struct ImpSdXMLExpTransObj3DRotateX : public ImpSdXMLExpTransObj3DBase
{
double mfRotateX;
- ImpSdXMLExpTransObj3DRotateX(double fVal)
+ ImpSdXMLExpTransObj3DRotateX(double fVal)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X), mfRotateX(fVal) {}
};
struct ImpSdXMLExpTransObj3DRotateY : public ImpSdXMLExpTransObj3DBase
{
double mfRotateY;
- ImpSdXMLExpTransObj3DRotateY(double fVal)
+ ImpSdXMLExpTransObj3DRotateY(double fVal)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y), mfRotateY(fVal) {}
};
struct ImpSdXMLExpTransObj3DRotateZ : public ImpSdXMLExpTransObj3DBase
{
double mfRotateZ;
- ImpSdXMLExpTransObj3DRotateZ(double fVal)
+ ImpSdXMLExpTransObj3DRotateZ(double fVal)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z), mfRotateZ(fVal) {}
};
struct ImpSdXMLExpTransObj3DScale : public ImpSdXMLExpTransObj3DBase
{
Vector3D maScale;
- ImpSdXMLExpTransObj3DScale(const Vector3D& rNew)
+ ImpSdXMLExpTransObj3DScale(const Vector3D& rNew)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_SCALE), maScale(rNew) {}
};
struct ImpSdXMLExpTransObj3DTranslate : public ImpSdXMLExpTransObj3DBase
{
Vector3D maTranslate;
- ImpSdXMLExpTransObj3DTranslate(const Vector3D& rNew)
+ ImpSdXMLExpTransObj3DTranslate(const Vector3D& rNew)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE), maTranslate(rNew) {}
};
struct ImpSdXMLExpTransObj3DMatrix : public ImpSdXMLExpTransObj3DBase
{
Matrix4D maMatrix;
- ImpSdXMLExpTransObj3DMatrix(const Matrix4D& rNew)
+ ImpSdXMLExpTransObj3DMatrix(const Matrix4D& rNew)
: ImpSdXMLExpTransObj3DBase(IMP_SDXMLEXP_TRANSOBJ3D_MATRIX), maMatrix(rNew) {}
};
@@ -712,8 +712,8 @@ void SdXMLImExTransform3D::EmptyList()
void SdXMLImExTransform3D::AddMatrix(const Matrix4D& rNew)
{
if(rNew[0][0] != 1.0 || rNew[1][1] != 1.0 || rNew[2][2] != 1.0
- || rNew[0][1] != 0.0 || rNew[0][2] != 0.0 || rNew[0][3] != 0.0
- || rNew[1][0] != 0.0 || rNew[1][2] != 0.0 || rNew[1][3] != 0.0
+ || rNew[0][1] != 0.0 || rNew[0][2] != 0.0 || rNew[0][3] != 0.0
+ || rNew[1][0] != 0.0 || rNew[1][2] != 0.0 || rNew[1][3] != 0.0
|| rNew[2][0] != 0.0 || rNew[2][1] != 0.0 || rNew[2][3] != 0.0)
maList.Insert(new ImpSdXMLExpTransObj3DMatrix(rNew), LIST_APPEND);
}
@@ -745,34 +745,34 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
OUString aNewString;
OUString aClosingBrace(sal_Unicode(')'));
OUString aEmptySpace(sal_Unicode(' '));
-
+
for(sal_uInt32 a(0L); a < maList.Count(); a++)
{
ImpSdXMLExpTransObj3DBase* pObj = maList.GetObject(a);
switch(pObj->mnType)
{
- case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X :
+ case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "rotatex (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateX*)pObj)->mfRotateX);
aNewString += aClosingBrace;
break;
}
- case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y :
+ case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "rotatey (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateY*)pObj)->mfRotateY);
aNewString += aClosingBrace;
break;
}
- case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z :
+ case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "rotatez (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateZ*)pObj)->mfRotateZ);
aNewString += aClosingBrace;
break;
}
- case IMP_SDXMLEXP_TRANSOBJ3D_SCALE :
+ case IMP_SDXMLEXP_TRANSOBJ3D_SCALE :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "scale (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.X());
@@ -783,7 +783,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
aNewString += aClosingBrace;
break;
}
- case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE :
+ case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "translate (" ));
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.X(), TRUE);
@@ -794,54 +794,54 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
aNewString += aClosingBrace;
break;
}
- case IMP_SDXMLEXP_TRANSOBJ3D_MATRIX :
+ case IMP_SDXMLEXP_TRANSOBJ3D_MATRIX :
{
aNewString += OUString( RTL_CONSTASCII_USTRINGPARAM( "matrix (" ));
// a
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[0][0]);
aNewString += aEmptySpace;
-
+
// b
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[1][0]);
aNewString += aEmptySpace;
-
+
// c
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[2][0]);
aNewString += aEmptySpace;
-
+
// d
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[0][1]);
aNewString += aEmptySpace;
-
+
// e
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[1][1]);
aNewString += aEmptySpace;
-
+
// f
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[2][1]);
aNewString += aEmptySpace;
-
+
// g
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[0][2]);
aNewString += aEmptySpace;
-
+
// h
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[1][2]);
aNewString += aEmptySpace;
-
+
// i
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[2][2]);
aNewString += aEmptySpace;
-
+
// j
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[0][3], TRUE);
aNewString += aEmptySpace;
-
+
// k
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[1][3], TRUE);
aNewString += aEmptySpace;
-
+
// l
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix[2][3], TRUE);
@@ -855,7 +855,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
if(a+1 != maList.Count())
aNewString += aEmptySpace;
}
-
+
// fill string form OUString
msString = aNewString;
@@ -887,7 +887,7 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver
const OUString aString_scale(OUString( RTL_CONSTASCII_USTRINGPARAM( "scale" )));
const OUString aString_translate(OUString( RTL_CONSTASCII_USTRINGPARAM( "translate" )));
const OUString aString_matrix(OUString( RTL_CONSTASCII_USTRINGPARAM( "matrix" )));
-
+
sal_Int32 nPos(0);
while(nPos < nLen)
@@ -899,10 +899,10 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver
if(nPos < nLen)
{
if(nPos == aStr.indexOf(aString_rotatex, nPos))
- {
+ {
double fValue(0.0);
- nPos += 7;
+ nPos += 7;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
fValue = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, fValue);
if(fValue != 0.0)
@@ -911,10 +911,10 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver
Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen);
}
else if(nPos == aStr.indexOf(aString_rotatey, nPos))
- {
+ {
double fValue(0.0);
- nPos += 7;
+ nPos += 7;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
fValue = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, fValue);
if(fValue != 0.0)
@@ -923,10 +923,10 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver
Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen);
}
else if(nPos == aStr.indexOf(aString_rotatez, nPos))
- {
+ {
double fValue(0.0);
- nPos += 7;
+ nPos += 7;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
fValue = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, fValue);
if(fValue != 0.0)
@@ -935,10 +935,10 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver
Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen);
}
else if(nPos == aStr.indexOf(aString_scale, nPos))
- {
+ {
Vector3D aValue(1.0, 1.0, 1.0);
- nPos += 5;
+ nPos += 5;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
aValue.X() = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, aValue.X());
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
@@ -952,10 +952,10 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver
Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen);
}
else if(nPos == aStr.indexOf(aString_translate, nPos))
- {
+ {
Vector3D aValue;
- nPos += 9;
+ nPos += 9;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
aValue.X() = Imp_GetDoubleChar(aStr, nPos, nLen, rConv, aValue.X(), TRUE);
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
@@ -969,10 +969,10 @@ void SdXMLImExTransform3D::SetString(const OUString& rNew, const SvXMLUnitConver
Imp_SkipSpacesAndClosingBraces(aStr, nPos, nLen);
}
else if(nPos == aStr.indexOf(aString_matrix, nPos))
- {
+ {
Matrix4D aValue;
- nPos += 6;
+ nPos += 6;
Imp_SkipSpacesAndOpeningBraces(aStr, nPos, nLen);
// a
@@ -1039,8 +1039,8 @@ BOOL SdXMLImExTransform3D::GetFullHomogenTransform( ::com::sun::star::drawing::H
GetFullTransform(aFullTransform);
if(aFullTransform[0][0] != 1.0 || aFullTransform[1][1] != 1.0 || aFullTransform[2][2] != 1.0
- || aFullTransform[0][1] != 0.0 || aFullTransform[0][2] != 0.0 || aFullTransform[0][3] != 0.0
- || aFullTransform[1][0] != 0.0 || aFullTransform[1][2] != 0.0 || aFullTransform[1][3] != 0.0
+ || aFullTransform[0][1] != 0.0 || aFullTransform[0][2] != 0.0 || aFullTransform[0][3] != 0.0
+ || aFullTransform[1][0] != 0.0 || aFullTransform[1][2] != 0.0 || aFullTransform[1][3] != 0.0
|| aFullTransform[2][0] != 0.0 || aFullTransform[2][1] != 0.0 || aFullTransform[2][3] != 0.0)
{
xHomMat.Line1.Column1 = aFullTransform[0][0];
@@ -1078,17 +1078,17 @@ void SdXMLImExTransform3D::GetFullTransform(Matrix4D& rFullTrans)
ImpSdXMLExpTransObj3DBase* pObj = maList.GetObject(a);
switch(pObj->mnType)
{
- case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X :
+ case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X :
rFullTrans.RotateX(((ImpSdXMLExpTransObj3DRotateX*)pObj)->mfRotateX); break;
- case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y :
+ case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y :
rFullTrans.RotateY(((ImpSdXMLExpTransObj3DRotateY*)pObj)->mfRotateY); break;
- case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z :
+ case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z :
rFullTrans.RotateZ(((ImpSdXMLExpTransObj3DRotateZ*)pObj)->mfRotateZ); break;
- case IMP_SDXMLEXP_TRANSOBJ3D_SCALE :
+ case IMP_SDXMLEXP_TRANSOBJ3D_SCALE :
rFullTrans.Scale(((ImpSdXMLExpTransObj3DScale*)pObj)->maScale); break;
- case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE :
+ case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE :
rFullTrans.Translate(((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate); break;
- case IMP_SDXMLEXP_TRANSOBJ3D_MATRIX :
+ case IMP_SDXMLEXP_TRANSOBJ3D_MATRIX :
rFullTrans *= ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix; break;
default : DBG_ERROR("SdXMLImExTransform3D: impossible entry!"); break;
}
@@ -1122,25 +1122,25 @@ SdXMLImExViewBox::SdXMLImExViewBox(const OUString& rNew, const SvXMLUnitConverte
// skip starting spaces
Imp_SkipSpaces(aStr, nPos, nLen);
-
+
// get mX, #100617# be prepared for doubles
mnX = FRound(Imp_GetDoubleChar(aStr, nPos, nLen, rConv, (double)mnX));
// skip spaces and commas
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
-
+
// get mY, #100617# be prepared for doubles
mnY = FRound(Imp_GetDoubleChar(aStr, nPos, nLen, rConv, (double)mnY));
// skip spaces and commas
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
-
+
// get mW, #100617# be prepared for doubles
mnW = FRound(Imp_GetDoubleChar(aStr, nPos, nLen, rConv, (double)mnW));
// skip spaces and commas
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
-
+
// get mH, #100617# be prepared for doubles
mnH = FRound(Imp_GetDoubleChar(aStr, nPos, nLen, rConv, (double)mnH));
}
@@ -1153,13 +1153,13 @@ const OUString& SdXMLImExViewBox::GetExportString(const SvXMLUnitConverter& rCon
Imp_PutNumberChar(aNewString, rConv, mnX);
aNewString += aEmptySpace;
-
+
Imp_PutNumberChar(aNewString, rConv, mnY);
aNewString += aEmptySpace;
-
+
Imp_PutNumberChar(aNewString, rConv, mnW);
aNewString += aEmptySpace;
-
+
Imp_PutNumberChar(aNewString, rConv, mnH);
// set new string
@@ -1171,7 +1171,7 @@ const OUString& SdXMLImExViewBox::GetExportString(const SvXMLUnitConverter& rCon
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
-SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints,
+SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints,
const SdXMLImExViewBox& rViewBox,
const awt::Point& rObjectPos,
const awt::Size& rObjectSize,
@@ -1197,7 +1197,7 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints,
nCnt--;
// object size and ViewBox size different?
- sal_Bool bScale(rObjectSize.Width != rViewBox.GetWidth()
+ sal_Bool bScale(rObjectSize.Width != rViewBox.GetWidth()
|| rObjectSize.Height != rViewBox.GetHeight());
sal_Bool bTranslate(rViewBox.GetX() != 0L || rViewBox.GetY() != 0L);
@@ -1238,7 +1238,7 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(drawing::PointSequence* pPoints,
}
// #100617# svg:polyline or svg:polygon values may be double precision.
-SdXMLImExPointsElement::SdXMLImExPointsElement(const OUString& rNew,
+SdXMLImExPointsElement::SdXMLImExPointsElement(const OUString& rNew,
const SdXMLImExViewBox& rViewBox,
const awt::Point& rObjectPos,
const awt::Size& rObjectSize,
@@ -1263,7 +1263,7 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(const OUString& rNew,
// skip spaces and commas
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
-
+
// skip number, #100617# be prepared for doubles
Imp_SkipDouble(aStr, nPos, nLen);
@@ -1284,13 +1284,13 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(const OUString& rNew,
awt::Point* pInnerSequence = pOuterSequence->getArray();
// object size and ViewBox size different?
- sal_Bool bScale(rObjectSize.Width != rViewBox.GetWidth()
+ sal_Bool bScale(rObjectSize.Width != rViewBox.GetWidth()
|| rObjectSize.Height != rViewBox.GetHeight());
sal_Bool bTranslate(rViewBox.GetX() != 0L || rViewBox.GetY() != 0L);
// skip starting spaces
Imp_SkipSpaces(aStr, nPos, nLen);
-
+
while(nPos < nLen)
{
// prepare new parameter pair
@@ -1302,7 +1302,7 @@ SdXMLImExPointsElement::SdXMLImExPointsElement(const OUString& rNew,
// skip spaces and commas
Imp_SkipSpacesAndCommas(aStr, nPos, nLen);
-
+
// get mY, #100617# be prepared for doubles
nY = FRound(Imp_GetDoubleChar(aStr, nPos, nLen, rConv, (double)nY));
@@ -1346,10 +1346,10 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const SdXMLImExViewBox& rViewBox)
{
}
-void Imp_GetPrevPos(awt::Point*& pPrevPos1,
- drawing::PolygonFlags& aPrevFlag1,
- const BOOL bClosed, awt::Point* pPoints,
- drawing::PolygonFlags* pFlags, const sal_Int32 nPos,
+void Imp_GetPrevPos(awt::Point*& pPrevPos1,
+ drawing::PolygonFlags& aPrevFlag1,
+ const BOOL bClosed, awt::Point* pPoints,
+ drawing::PolygonFlags* pFlags, const sal_Int32 nPos,
const sal_Int32 nCnt, const sal_Int32 nAdd)
{
if(bClosed)
@@ -1366,9 +1366,9 @@ void Imp_GetPrevPos(awt::Point*& pPrevPos1,
pPrevPos1 = 0L;
}
-void Imp_PrepareCoorExport(sal_Int32& nX, sal_Int32& nY,
+void Imp_PrepareCoorExport(sal_Int32& nX, sal_Int32& nY,
const awt::Point* pPointArray, const awt::Point& rObjectPos,
- const awt::Size& rObjectSize, const SdXMLImExViewBox& mrViewBox,
+ const awt::Size& rObjectSize, const SdXMLImExViewBox& mrViewBox,
const BOOL bScale, const BOOL bTranslate)
{
nX = pPointArray->X - rObjectPos.X;
@@ -1398,11 +1398,11 @@ static BOOL bDoTestHere(TRUE);
#endif // TEST_QUADRATIC_CURVES
void SdXMLImExSvgDElement::AddPolygon(
- drawing::PointSequence* pPoints,
+ drawing::PointSequence* pPoints,
drawing::FlagSequence* pFlags,
const awt::Point& rObjectPos,
const awt::Size& rObjectSize,
- const SvXMLUnitConverter& rConv,
+ const SvXMLUnitConverter& rConv,
sal_Bool bClosed, sal_Bool bRelative)
{
DBG_ASSERT(pPoints, "Empty PointSequence handed over to SdXMLImExSvgDElement(!)");
@@ -1441,7 +1441,7 @@ void SdXMLImExSvgDElement::AddPolygon(
}
// object size and ViewBox size different?
- sal_Bool bScale(rObjectSize.Width != mrViewBox.GetWidth()
+ sal_Bool bScale(rObjectSize.Width != mrViewBox.GetWidth()
|| rObjectSize.Height != mrViewBox.GetHeight());
sal_Bool bTranslate(mrViewBox.GetX() != 0L || mrViewBox.GetY() != 0L);
@@ -1487,7 +1487,7 @@ void SdXMLImExSvgDElement::AddPolygon(
awt::Point* pPrevPos1;
drawing::PolygonFlags aPrevFlag1;
- Imp_GetPrevPos(pPrevPos1, aPrevFlag1, bClosed, pPoints->getArray(),
+ Imp_GetPrevPos(pPrevPos1, aPrevFlag1, bClosed, pPoints->getArray(),
pFlags->getArray(), a, nCnt, 1);
if(pPrevPos1 && drawing::PolygonFlags_CONTROL == aPrevFlag1)
@@ -1496,7 +1496,7 @@ void SdXMLImExSvgDElement::AddPolygon(
awt::Point* pPrevPos2;
drawing::PolygonFlags aPrevFlag2;
- Imp_GetPrevPos(pPrevPos2, aPrevFlag2, bClosed, pPoints->getArray(),
+ Imp_GetPrevPos(pPrevPos2, aPrevFlag2, bClosed, pPoints->getArray(),
pFlags->getArray(), a, nCnt, 2);
if(pPrevPos2 && drawing::PolygonFlags_CONTROL == aPrevFlag2)
@@ -1506,7 +1506,7 @@ void SdXMLImExSvgDElement::AddPolygon(
awt::Point* pPrevPos3;
drawing::PolygonFlags aPrevFlag3;
- Imp_GetPrevPos(pPrevPos3, aPrevFlag3, bClosed, pPoints->getArray(),
+ Imp_GetPrevPos(pPrevPos3, aPrevFlag3, bClosed, pPoints->getArray(),
pFlags->getArray(), a, nCnt, 3);
if(pPrevPos3)
@@ -1514,7 +1514,7 @@ void SdXMLImExSvgDElement::AddPolygon(
// prepare coordinates
sal_Int32 nX, nY;
- Imp_PrepareCoorExport(nX, nY, pPointArray, rObjectPos, rObjectSize,
+ Imp_PrepareCoorExport(nX, nY, pPointArray, rObjectPos, rObjectSize,
mrViewBox, bScale, bTranslate);
// #100617# test if this curve segment may be written as
@@ -1531,7 +1531,7 @@ void SdXMLImExSvgDElement::AddPolygon(
sal_Int32 nPX_R(FRound((double)((3 * pPrevPos1->X) - pPointArray->X) / 2.0));
sal_Int32 nPY_R(FRound((double)((3 * pPrevPos1->Y) - pPointArray->Y) / 2.0));
sal_Int32 nDist(0);
-
+
if(nPX_L != nPX_R)
{
nDist += abs(nPX_L - nPX_R);
@@ -1541,7 +1541,7 @@ void SdXMLImExSvgDElement::AddPolygon(
{
nDist += abs(nPY_L - nPY_R);
}
-
+
if(nDist <= BORDER_INTEGERS_ARE_EQUAL)
{
if(bEnableSaveQuadratic)
@@ -1573,7 +1573,7 @@ void SdXMLImExSvgDElement::AddPolygon(
awt::Point* pPrevPos4;
drawing::PolygonFlags aPrevFlag4;
- Imp_GetPrevPos(pPrevPos4, aPrevFlag4, bClosed, pPoints->getArray(),
+ Imp_GetPrevPos(pPrevPos4, aPrevFlag4, bClosed, pPoints->getArray(),
pFlags->getArray(), a, nCnt, 4);
if(drawing::PolygonFlags_CONTROL == aPrevFlag4)
@@ -1612,10 +1612,10 @@ void SdXMLImExSvgDElement::AddPolygon(
{
// prepare coordinates
sal_Int32 nX1, nY1;
-
- Imp_PrepareCoorExport(nX1, nY1, pPrevPos1, rObjectPos, rObjectSize,
+
+ Imp_PrepareCoorExport(nX1, nY1, pPrevPos1, rObjectPos, rObjectSize,
mrViewBox, bScale, bTranslate);
-
+
// write a quadratic curveto entry (Q)
if(bRelative)
{
@@ -1655,7 +1655,7 @@ void SdXMLImExSvgDElement::AddPolygon(
awt::Point* pPrevPos4;
drawing::PolygonFlags aPrevFlag4;
- Imp_GetPrevPos(pPrevPos4, aPrevFlag4, bClosed, pPoints->getArray(),
+ Imp_GetPrevPos(pPrevPos4, aPrevFlag4, bClosed, pPoints->getArray(),
pFlags->getArray(), a, nCnt, 4);
if(drawing::PolygonFlags_CONTROL == aPrevFlag4)
@@ -1704,10 +1704,10 @@ void SdXMLImExSvgDElement::AddPolygon(
{
// prepare coordinates
sal_Int32 nX1, nY1;
-
- Imp_PrepareCoorExport(nX1, nY1, &aNewPoint, rObjectPos, rObjectSize,
+
+ Imp_PrepareCoorExport(nX1, nY1, &aNewPoint, rObjectPos, rObjectSize,
mrViewBox, bScale, bTranslate);
-
+
// write a quadratic curveto entry (Q)
if(bRelative)
{
@@ -1748,7 +1748,7 @@ void SdXMLImExSvgDElement::AddPolygon(
awt::Point* pPrevPos4;
drawing::PolygonFlags aPrevFlag4;
- Imp_GetPrevPos(pPrevPos4, aPrevFlag4, bClosed, pPoints->getArray(),
+ Imp_GetPrevPos(pPrevPos4, aPrevFlag4, bClosed, pPoints->getArray(),
pFlags->getArray(), a, nCnt, 4);
if(drawing::PolygonFlags_CONTROL == aPrevFlag4)
@@ -1762,7 +1762,7 @@ void SdXMLImExSvgDElement::AddPolygon(
// prepare coordinates
sal_Int32 nX2, nY2;
- Imp_PrepareCoorExport(nX2, nY2, pPrevPos1, rObjectPos, rObjectSize,
+ Imp_PrepareCoorExport(nX2, nY2, pPrevPos1, rObjectPos, rObjectSize,
mrViewBox, bScale, bTranslate);
if(bPrevPointIsSymmetric)
@@ -1797,8 +1797,8 @@ void SdXMLImExSvgDElement::AddPolygon(
{
// prepare coordinates
sal_Int32 nX1, nY1;
-
- Imp_PrepareCoorExport(nX1, nY1, pPrevPos2, rObjectPos, rObjectSize,
+
+ Imp_PrepareCoorExport(nX1, nY1, pPrevPos2, rObjectPos, rObjectSize,
mrViewBox, bScale, bTranslate);
// write a curveto entry (C)
@@ -1820,7 +1820,7 @@ void SdXMLImExSvgDElement::AddPolygon(
{
if(aLastCommand != sal_Unicode('C'))
aNewString += OUString(sal_Unicode('C'));
-
+
Imp_PutNumberCharWithSpace(aNewString, rConv, nX1);
Imp_PutNumberCharWithSpace(aNewString, rConv, nY1);
Imp_PutNumberCharWithSpace(aNewString, rConv, nX2);
@@ -1849,8 +1849,8 @@ void SdXMLImExSvgDElement::AddPolygon(
{
// current point not yet written, prepare coordinates
sal_Int32 nX, nY;
-
- Imp_PrepareCoorExport(nX, nY, pPointArray, rObjectPos, rObjectSize,
+
+ Imp_PrepareCoorExport(nX, nY, pPointArray, rObjectPos, rObjectSize,
mrViewBox, bScale, bTranslate);
if(bDidWriteStart)
@@ -1975,7 +1975,7 @@ void SdXMLImExSvgDElement::AddPolygon(
// #100617# Linear double reader
double Imp_ImportDoubleAndSpaces(
- double fRetval, const OUString& rStr, sal_Int32& rPos,
+ double fRetval, const OUString& rStr, sal_Int32& rPos,
const sal_Int32 nLen, const SvXMLUnitConverter& rConv)
{
fRetval = Imp_GetDoubleChar(rStr, rPos, nLen, rConv, fRetval);
@@ -1987,7 +1987,7 @@ double Imp_ImportDoubleAndSpaces(
// the usage of Imp_ImportDoubleAndSpaces(...). For now, this is sufficient
// since the interface cannot transport doubles.
sal_Int32 Imp_ImportNumberAndSpaces(
- sal_Int32 nRetval, const OUString& rStr, sal_Int32& rPos,
+ sal_Int32 nRetval, const OUString& rStr, sal_Int32& rPos,
const sal_Int32 nLen, const SvXMLUnitConverter& rConv)
{
nRetval = FRound(Imp_ImportDoubleAndSpaces(double(nRetval), rStr, rPos, nLen, rConv));
@@ -1995,8 +1995,8 @@ sal_Int32 Imp_ImportNumberAndSpaces(
return nRetval;
}
-void Imp_PrepareCoorImport(sal_Int32& nX, sal_Int32& nY,
- const awt::Point& rObjectPos, const awt::Size& rObjectSize,
+void Imp_PrepareCoorImport(sal_Int32& nX, sal_Int32& nY,
+ const awt::Point& rObjectPos, const awt::Size& rObjectSize,
const SdXMLImExViewBox& rViewBox, const BOOL bScale, const BOOL bTranslate)
{
if(bTranslate)
@@ -2015,7 +2015,7 @@ void Imp_PrepareCoorImport(sal_Int32& nX, sal_Int32& nY,
nY += rObjectPos.Y;
}
-void Imp_AddExportPoints(sal_Int32 nX, sal_Int32 nY,
+void Imp_AddExportPoints(sal_Int32 nX, sal_Int32 nY,
awt::Point* pPoints, drawing::PolygonFlags* pFlags,
const sal_Int32 nInnerIndex,
drawing::PolygonFlags eFlag)
@@ -2031,7 +2031,7 @@ void Imp_CalcVectorValues(Vector2D& aVec1, Vector2D& aVec2, sal_Bool& bSameLengt
{
sal_Int32 nLen1 = (sal_Int32)(aVec1.GetLength() + 0.5);
sal_Int32 nLen2 = (sal_Int32)(aVec2.GetLength() + 0.5);
- aVec1.Normalize();
+ aVec1.Normalize();
aVec2.Normalize();
aVec1 += aVec2;
sal_Int32 nLen3 = (sal_Int32)((aVec1.GetLength() * ((nLen1 + nLen2) / 2.0))+ 0.5);
@@ -2104,7 +2104,7 @@ void Imp_CorrectPolygonFlag(const sal_uInt32 nInnerIndex, const awt::Point* cons
}
}
-SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
+SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
const SdXMLImExViewBox& rViewBox,
const awt::Point& rObjectPos,
const awt::Size& rObjectSize,
@@ -2126,7 +2126,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
sal_Bool bEllipticalArc(FALSE);
// object size and ViewBox size different?
- sal_Bool bScale(rObjectSize.Width != mrViewBox.GetWidth()
+ sal_Bool bScale(rObjectSize.Width != mrViewBox.GetWidth()
|| rObjectSize.Height != mrViewBox.GetHeight());
sal_Bool bTranslate(mrViewBox.GetX() != 0L || mrViewBox.GetY() != 0L);
@@ -2138,27 +2138,27 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
switch(aStr[nPos++])
{
case 'Z' :
- case 'z' :
- {
- break;
+ case 'z' :
+ {
+ break;
}
case 'M' :
- case 'm' :
- {
- nNumPolys++;
- break;
+ case 'm' :
+ {
+ nNumPolys++;
+ break;
}
case 'S' :
case 's' :
case 'C' :
- case 'c' :
+ case 'c' :
case 'Q' :
case 'q' :
case 'T' :
case 't' :
- {
- mbIsCurve = TRUE;
- break;
+ {
+ mbIsCurve = TRUE;
+ break;
}
case 'L' :
case 'l' :
@@ -2213,7 +2213,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
// #104076# remember closed state of current polygon
mbIsClosed = TRUE;
-
+
break;
}
case 'm' :
@@ -2231,20 +2231,20 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
pOuterSequence->realloc(nPointCount);
pOuterSequence++;
-
+
if(pOuterFlags)
{
pOuterFlags->realloc(nPointCount);
pOuterFlags++;
}
-
+
// reset point count for next polygon
nPointCount = 0L;
}
-
+
// #104076# reset closed flag for next to be started polygon
mbIsClosed = FALSE;
-
+
// NO break, continue in next case
}
case 'L' :
@@ -2324,7 +2324,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
Imp_SkipDoubleAndSpacesAndCommas(aStr, nPos, nLen);
Imp_SkipDoubleAndSpacesAndCommas(aStr, nPos, nLen);
Imp_SkipDoubleAndSpacesAndCommas(aStr, nPos, nLen);
-
+
// use three points since quadratic is imported as cubic
nPointCount += 3;
}
@@ -2342,7 +2342,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
{
Imp_SkipDoubleAndSpacesAndCommas(aStr, nPos, nLen);
Imp_SkipDoubleAndSpacesAndCommas(aStr, nPos, nLen);
-
+
// use three points since quadratic is imported as cubic
nPointCount += 3;
}
@@ -2432,10 +2432,10 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
// sal_Int32 nX(pInnerSequence[0].X);
// sal_Int32 nY(pInnerSequence[0].Y);
// Imp_AddExportPoints(nX, nY, pInnerSequence, pInnerFlags, nInnerIndex++, drawing::PolygonFlags_NORMAL);
-
+
break;
}
-
+
case 'm' :
{
bRelative = TRUE;
@@ -2486,7 +2486,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
// set last position
mnLastX = nX;
mnLastY = nY;
-
+
// calc transform and add point and flag
Imp_PrepareCoorImport(nX, nY, rObjectPos, rObjectSize, mrViewBox, bScale, bTranslate);
Imp_AddExportPoints(nX, nY, pInnerSequence, pInnerFlags, nInnerIndex++, drawing::PolygonFlags_NORMAL);
@@ -2502,7 +2502,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
{
nPos++;
Imp_SkipSpaces(aStr, nPos, nLen);
-
+
while(nPos < nLen && Imp_IsOnNumberChar(aStr, nPos))
{
sal_Int32 nX(Imp_ImportNumberAndSpaces(0L, aStr, nPos, nLen, rConv));
@@ -2517,14 +2517,14 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
// set last position
mnLastX = nX;
mnLastY = nY;
-
+
// calc transform and add point and flag
Imp_PrepareCoorImport(nX, nY, rObjectPos, rObjectSize, mrViewBox, bScale, bTranslate);
Imp_AddExportPoints(nX, nY, pInnerSequence, pInnerFlags, nInnerIndex++, drawing::PolygonFlags_NORMAL);
}
break;
}
-
+
case 'h' :
{
bRelative = TRUE;
@@ -2544,14 +2544,14 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
// set last position
mnLastX = nX;
-
+
// calc transform and add point and flag
Imp_PrepareCoorImport(nX, nY, rObjectPos, rObjectSize, mrViewBox, bScale, bTranslate);
Imp_AddExportPoints(nX, nY, pInnerSequence, pInnerFlags, nInnerIndex++, drawing::PolygonFlags_NORMAL);
}
break;
}
-
+
case 'v' :
{
bRelative = TRUE;
@@ -2571,14 +2571,14 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
// set last position
mnLastY = nY;
-
+
// calc transform and add point and flag
Imp_PrepareCoorImport(nX, nY, rObjectPos, rObjectSize, mrViewBox, bScale, bTranslate);
Imp_AddExportPoints(nX, nY, pInnerSequence, pInnerFlags, nInnerIndex++, drawing::PolygonFlags_NORMAL);
}
break;
}
-
+
case 's' :
{
bRelative = TRUE;
@@ -2641,7 +2641,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
}
break;
}
-
+
case 'c' :
{
bRelative = TRUE;
@@ -2689,7 +2689,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
}
break;
}
-
+
// #100617# quadratic beziers are imported as cubic
case 'q' :
{
@@ -2722,7 +2722,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
// calc transform for new points
Imp_PrepareCoorImport(nXX, nYY, rObjectPos, rObjectSize, mrViewBox, bScale, bTranslate);
Imp_PrepareCoorImport(nX, nY, rObjectPos, rObjectSize, mrViewBox, bScale, bTranslate);
-
+
// calculate X1,X2
awt::Point aPPrev1 = (nInnerIndex) ? pInnerSequence[nInnerIndex-1] : pInnerSequence[0];
sal_Int32 nX1 = FRound((double)((nXX * 2) + aPPrev1.X) / 3.0);
@@ -2732,7 +2732,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
// correct polygon flag for previous point
Imp_CorrectPolygonFlag(nInnerIndex, pInnerSequence, pInnerFlags, nX1, nY1);
-
+
// add new points and set flags
Imp_AddExportPoints(nX1, nY1, pInnerSequence, pInnerFlags, nInnerIndex++, drawing::PolygonFlags_CONTROL);
Imp_AddExportPoints(nX2, nY2, pInnerSequence, pInnerFlags, nInnerIndex++, drawing::PolygonFlags_CONTROL);
@@ -2740,7 +2740,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
}
break;
}
-
+
// #100617# relative quadratic beziers are imported as cubic
case 't' :
{
@@ -2776,7 +2776,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
nXX = nX;
nYY = nY;
awt::Point aPPrev1 = pInnerSequence[0];
-
+
if(nInnerIndex)
{
aPPrev1 = pInnerSequence[nInnerIndex - 1];
@@ -2801,7 +2801,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
// correct polygon flag for previous point
Imp_CorrectPolygonFlag(nInnerIndex, pInnerSequence, pInnerFlags, nX1, nY1);
-
+
// add new points and set flags
Imp_AddExportPoints(nX1, nY1, pInnerSequence, pInnerFlags, nInnerIndex++, drawing::PolygonFlags_CONTROL);
Imp_AddExportPoints(nX2, nY2, pInnerSequence, pInnerFlags, nInnerIndex++, drawing::PolygonFlags_CONTROL);
@@ -2871,7 +2871,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
sal_Int32 nInnerCnt(pOuterSequence->getLength());
while( nInnerCnt >= 2
- && ((pInnerSequence + (nInnerCnt - 2))->X == (pInnerSequence + (nInnerCnt - 1))->X)
+ && ((pInnerSequence + (nInnerCnt - 2))->X == (pInnerSequence + (nInnerCnt - 1))->X)
&& ((pInnerSequence + (nInnerCnt - 2))->Y == (pInnerSequence + (nInnerCnt - 1))->Y)
&& drawing::PolygonFlags_CONTROL != *(pInnerFlags + (nInnerCnt - 2)))
{
@@ -2928,7 +2928,7 @@ SdXMLImExSvgDElement::SdXMLImExSvgDElement(const OUString& rNew,
}
}
}
-
+
// switch to next Polygon
pOuterSequence++;
pOuterFlags++;
diff --git a/binfilter/inc/bf_xmloff/xexptran.hxx b/binfilter/inc/bf_xmloff/xexptran.hxx
index 3dbabfe..64ce815 100644
--- a/binfilter/inc/bf_xmloff/xexptran.hxx
+++ b/binfilter/inc/bf_xmloff/xexptran.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -45,6 +45,8 @@
#include <com/sun/star/drawing/HomogenMatrix.hpp>
+#include <vector>
+
namespace binfilter {
class Vector3D;
class Matrix4D;
@@ -58,7 +60,7 @@ class SvXMLUnitConverter;
//////////////////////////////////////////////////////////////////////////////
-DECLARE_LIST(ImpSdXMLExpTransObj2DBaseList, ImpSdXMLExpTransObj2DBase*)//STRIP007 ;
+typedef ::std::vector< ImpSdXMLExpTransObj2DBase* > ImpSdXMLExpTransObj2DBaseList;
DECLARE_LIST(ImpSdXMLExpTransObj3DBaseList, ImpSdXMLExpTransObj3DBase*)//STRIP007 ;
//////////////////////////////////////////////////////////////////////////////
@@ -78,7 +80,7 @@ public:
void AddTranslate(const Vector2D& rNew);
void AddSkewX(double fNew);
- sal_Bool NeedsAction() const { return (sal_Bool)(maList.Count() > 0L); }
+ sal_Bool NeedsAction() const { return (sal_Bool)!maList.empty(); }
void GetFullTransform(Matrix3D& rFullTrans);
const ::rtl::OUString& GetExportString(const SvXMLUnitConverter& rConv);
void SetString(const ::rtl::OUString& rNew, const SvXMLUnitConverter& rConv);
@@ -137,14 +139,14 @@ class SdXMLImExPointsElement
::com::sun::star::drawing::PointSequenceSequence maPoly;
public:
- SdXMLImExPointsElement( ::com::sun::star::drawing::PointSequence* pPoints,
+ SdXMLImExPointsElement( ::com::sun::star::drawing::PointSequence* pPoints,
const SdXMLImExViewBox& rViewBox,
const ::com::sun::star::awt::Point& rObjectPos,
const ::com::sun::star::awt::Size& rObjectSize,
const SvXMLUnitConverter& rConv,
// #96328#
const sal_Bool bClosed = sal_True);
- SdXMLImExPointsElement(const ::rtl::OUString& rNew,
+ SdXMLImExPointsElement(const ::rtl::OUString& rNew,
const SdXMLImExViewBox& rViewBox,
const ::com::sun::star::awt::Point& rObjectPos,
const ::com::sun::star::awt::Size& rObjectSize,
@@ -171,18 +173,18 @@ class SdXMLImExSvgDElement
public:
SdXMLImExSvgDElement(const SdXMLImExViewBox& rViewBox);
- SdXMLImExSvgDElement(const ::rtl::OUString& rNew,
+ SdXMLImExSvgDElement(const ::rtl::OUString& rNew,
const SdXMLImExViewBox& rViewBox,
const ::com::sun::star::awt::Point& rObjectPos,
const ::com::sun::star::awt::Size& rObjectSize,
const SvXMLUnitConverter& rConv);
void AddPolygon(
- ::com::sun::star::drawing::PointSequence* pPoints,
+ ::com::sun::star::drawing::PointSequence* pPoints,
::com::sun::star::drawing::FlagSequence* pFlags,
const ::com::sun::star::awt::Point& rObjectPos,
const ::com::sun::star::awt::Size& rObjectSize,
- const SvXMLUnitConverter& rConv,
+ const SvXMLUnitConverter& rConv,
sal_Bool bClosed = FALSE, sal_Bool bRelative = TRUE);
const ::rtl::OUString& GetExportString() const { return msString; }
More information about the Libreoffice-commits
mailing list