Skip to content

C
core
Kaydet (Commit) 852ae6de authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin
Dosyalara gözat
Seçenekler

com::sun::star->css in basegfx 

Change-Id: I27f28e6a09e8bc9e90f0b60a7ac8519b2ab41860
Reviewed-on: https://gerrit.libreoffice.org/17166Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 7410217b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
basegfx/source/polygon/b2dlinegeometry.cxx
Dosyayı görüntüle @ 852ae6de
...@@ -783,7 +783,7 @@ namespace basegfx ...@@ -783,7 +783,7 @@ namespace basegfx
const B2DPolygon& rCandidate, const B2DPolygon& rCandidate,
double fHalfLineWidth, double fHalfLineWidth,
B2DLineJoin eJoin, B2DLineJoin eJoin,
com::sun::star::drawing::LineCap eCap, css::drawing::LineCap eCap,
double fMaxAllowedAngle, double fMaxAllowedAngle,
double fMaxPartOfEdge, double fMaxPartOfEdge,
double fMiterMinimumAngle) double fMiterMinimumAngle)
...@@ -828,7 +828,7 @@ namespace basegfx ...@@ -828,7 +828,7 @@ namespace basegfx
B2DPolyPolygon aRetval; B2DPolyPolygon aRetval;
const bool bIsClosed(aCandidate.isClosed()); const bool bIsClosed(aCandidate.isClosed());
const sal_uInt32 nEdgeCount(bIsClosed ? nPointCount : nPointCount - 1); const sal_uInt32 nEdgeCount(bIsClosed ? nPointCount : nPointCount - 1);
const bool bLineCap(!bIsClosed && com::sun::star::drawing::LineCap_BUTT != eCap); const bool bLineCap(!bIsClosed && css::drawing::LineCap_BUTT != eCap);
if(nEdgeCount) if(nEdgeCount)
{ {
...@@ -926,10 +926,10 @@ namespace basegfx ...@@ -926,10 +926,10 @@ namespace basegfx
createAreaGeometryForEdge( createAreaGeometryForEdge(
aEdge, aEdge,
fHalfLineWidth, fHalfLineWidth,
bFirst && com::sun::star::drawing::LineCap_ROUND == eCap, bFirst && css::drawing::LineCap_ROUND == eCap,
bLast && com::sun::star::drawing::LineCap_ROUND == eCap, bLast && css::drawing::LineCap_ROUND == eCap,
bFirst && com::sun::star::drawing::LineCap_SQUARE == eCap, bFirst && css::drawing::LineCap_SQUARE == eCap,
bLast && com::sun::star::drawing::LineCap_SQUARE == eCap)); bLast && css::drawing::LineCap_SQUARE == eCap));
} }
else else
{ {
......
basegfx/source/polygon/b2dpolypolygontools.cxx
Dosyayı görüntüle @ 852ae6de
...@@ -645,15 +645,15 @@ namespace basegfx ...@@ -645,15 +645,15 @@ namespace basegfx
return aRes; return aRes;
} }
// converters for com::sun::star::drawing::PointSequence // converters for css::drawing::PointSequence
B2DPolyPolygon UnoPointSequenceSequenceToB2DPolyPolygon( B2DPolyPolygon UnoPointSequenceSequenceToB2DPolyPolygon(
const com::sun::star::drawing::PointSequenceSequence& rPointSequenceSequenceSource, const css::drawing::PointSequenceSequence& rPointSequenceSequenceSource,
bool bCheckClosed) bool bCheckClosed)
{ {
B2DPolyPolygon aRetval; B2DPolyPolygon aRetval;
const com::sun::star::drawing::PointSequence* pPointSequence = rPointSequenceSequenceSource.getConstArray(); const css::drawing::PointSequence* pPointSequence = rPointSequenceSequenceSource.getConstArray();
const com::sun::star::drawing::PointSequence* pPointSeqEnd = pPointSequence + rPointSequenceSequenceSource.getLength(); const css::drawing::PointSequence* pPointSeqEnd = pPointSequence + rPointSequenceSequenceSource.getLength();
for(;pPointSequence != pPointSeqEnd; pPointSequence++) for(;pPointSequence != pPointSeqEnd; pPointSequence++)
{ {
...@@ -666,14 +666,14 @@ namespace basegfx ...@@ -666,14 +666,14 @@ namespace basegfx
void B2DPolyPolygonToUnoPointSequenceSequence( void B2DPolyPolygonToUnoPointSequenceSequence(
const B2DPolyPolygon& rPolyPolygon, const B2DPolyPolygon& rPolyPolygon,
com::sun::star::drawing::PointSequenceSequence& rPointSequenceSequenceRetval) css::drawing::PointSequenceSequence& rPointSequenceSequenceRetval)
{ {
const sal_uInt32 nCount(rPolyPolygon.count()); const sal_uInt32 nCount(rPolyPolygon.count());
if(nCount) if(nCount)
{ {
rPointSequenceSequenceRetval.realloc(nCount); rPointSequenceSequenceRetval.realloc(nCount);
com::sun::star::drawing::PointSequence* pPointSequence = rPointSequenceSequenceRetval.getArray(); css::drawing::PointSequence* pPointSequence = rPointSequenceSequenceRetval.getArray();
for(sal_uInt32 a(0); a < nCount; a++) for(sal_uInt32 a(0); a < nCount; a++)
{ {
...@@ -689,10 +689,10 @@ namespace basegfx ...@@ -689,10 +689,10 @@ namespace basegfx
} }
} }
// converters for com::sun::star::drawing::PolyPolygonBezierCoords (curved polygons) // converters for css::drawing::PolyPolygonBezierCoords (curved polygons)
B2DPolyPolygon UnoPolyPolygonBezierCoordsToB2DPolyPolygon( B2DPolyPolygon UnoPolyPolygonBezierCoordsToB2DPolyPolygon(
const com::sun::star::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsSource, const css::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsSource,
bool bCheckClosed) bool bCheckClosed)
{ {
B2DPolyPolygon aRetval; B2DPolyPolygon aRetval;
...@@ -702,8 +702,8 @@ namespace basegfx ...@@ -702,8 +702,8 @@ namespace basegfx
{ {
OSL_ENSURE(nSequenceCount == (sal_uInt32)rPolyPolygonBezierCoordsSource.Flags.getLength(), OSL_ENSURE(nSequenceCount == (sal_uInt32)rPolyPolygonBezierCoordsSource.Flags.getLength(),
"UnoPolyPolygonBezierCoordsToB2DPolyPolygon: unequal number of Points and Flags (!)"); "UnoPolyPolygonBezierCoordsToB2DPolyPolygon: unequal number of Points and Flags (!)");
const com::sun::star::drawing::PointSequence* pPointSequence = rPolyPolygonBezierCoordsSource.Coordinates.getConstArray(); const css::drawing::PointSequence* pPointSequence = rPolyPolygonBezierCoordsSource.Coordinates.getConstArray();
const com::sun::star::drawing::FlagSequence* pFlagSequence = rPolyPolygonBezierCoordsSource.Flags.getConstArray(); const css::drawing::FlagSequence* pFlagSequence = rPolyPolygonBezierCoordsSource.Flags.getConstArray();
for(sal_uInt32 a(0); a < nSequenceCount; a++) for(sal_uInt32 a(0); a < nSequenceCount; a++)
{ {
...@@ -723,7 +723,7 @@ namespace basegfx ...@@ -723,7 +723,7 @@ namespace basegfx
void B2DPolyPolygonToUnoPolyPolygonBezierCoords( void B2DPolyPolygonToUnoPolyPolygonBezierCoords(
const B2DPolyPolygon& rPolyPolygon, const B2DPolyPolygon& rPolyPolygon,
com::sun::star::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsRetval) css::drawing::PolyPolygonBezierCoords& rPolyPolygonBezierCoordsRetval)
{ {
const sal_uInt32 nCount(rPolyPolygon.count()); const sal_uInt32 nCount(rPolyPolygon.count());
...@@ -734,8 +734,8 @@ namespace basegfx ...@@ -734,8 +734,8 @@ namespace basegfx
rPolyPolygonBezierCoordsRetval.Flags.realloc((sal_Int32)nCount); rPolyPolygonBezierCoordsRetval.Flags.realloc((sal_Int32)nCount);
// get pointers to arrays // get pointers to arrays
com::sun::star::drawing::PointSequence* pPointSequence = rPolyPolygonBezierCoordsRetval.Coordinates.getArray(); css::drawing::PointSequence* pPointSequence = rPolyPolygonBezierCoordsRetval.Coordinates.getArray();
com::sun::star::drawing::FlagSequence* pFlagSequence = rPolyPolygonBezierCoordsRetval.Flags.getArray(); css::drawing::FlagSequence* pFlagSequence = rPolyPolygonBezierCoordsRetval.Flags.getArray();
for(sal_uInt32 a(0); a < nCount; a++) for(sal_uInt32 a(0); a < nCount; a++)
{ {
......
basegfx/source/polygon/b3dpolypolygontools.cxx
Dosyayı görüntüle @ 852ae6de
...@@ -482,9 +482,9 @@ namespace basegfx ...@@ -482,9 +482,9 @@ namespace basegfx
} }
} }
/// converters for com::sun::star::drawing::PolyPolygonShape3D /// converters for css::drawing::PolyPolygonShape3D
B3DPolyPolygon UnoPolyPolygonShape3DToB3DPolyPolygon( B3DPolyPolygon UnoPolyPolygonShape3DToB3DPolyPolygon(
const com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygonShape3DSource, const css::drawing::PolyPolygonShape3D& rPolyPolygonShape3DSource,
bool bCheckClosed) bool bCheckClosed)
{ {
B3DPolyPolygon aRetval; B3DPolyPolygon aRetval;
...@@ -496,9 +496,9 @@ namespace basegfx ...@@ -496,9 +496,9 @@ namespace basegfx
&& nOuterSequenceCount == rPolyPolygonShape3DSource.SequenceZ.getLength(), && nOuterSequenceCount == rPolyPolygonShape3DSource.SequenceZ.getLength(),
"UnoPolyPolygonShape3DToB3DPolygon: Not all double sequences have the same length (!)"); "UnoPolyPolygonShape3DToB3DPolygon: Not all double sequences have the same length (!)");
const com::sun::star::drawing::DoubleSequence* pInnerSequenceX = rPolyPolygonShape3DSource.SequenceX.getConstArray(); const css::drawing::DoubleSequence* pInnerSequenceX = rPolyPolygonShape3DSource.SequenceX.getConstArray();
const com::sun::star::drawing::DoubleSequence* pInnerSequenceY = rPolyPolygonShape3DSource.SequenceY.getConstArray(); const css::drawing::DoubleSequence* pInnerSequenceY = rPolyPolygonShape3DSource.SequenceY.getConstArray();
const com::sun::star::drawing::DoubleSequence* pInnerSequenceZ = rPolyPolygonShape3DSource.SequenceZ.getConstArray(); const css::drawing::DoubleSequence* pInnerSequenceZ = rPolyPolygonShape3DSource.SequenceZ.getConstArray();
for(sal_Int32 a(0); a < nOuterSequenceCount; a++) for(sal_Int32 a(0); a < nOuterSequenceCount; a++)
{ {
...@@ -537,7 +537,7 @@ namespace basegfx ...@@ -537,7 +537,7 @@ namespace basegfx
void B3DPolyPolygonToUnoPolyPolygonShape3D( void B3DPolyPolygonToUnoPolyPolygonShape3D(
const B3DPolyPolygon& rPolyPolygonSource, const B3DPolyPolygon& rPolyPolygonSource,
com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygonShape3DRetval) css::drawing::PolyPolygonShape3D& rPolyPolygonShape3DRetval)
{ {
const sal_uInt32 nPolygonCount(rPolyPolygonSource.count()); const sal_uInt32 nPolygonCount(rPolyPolygonSource.count());
...@@ -547,9 +547,9 @@ namespace basegfx ...@@ -547,9 +547,9 @@ namespace basegfx
rPolyPolygonShape3DRetval.SequenceY.realloc(nPolygonCount); rPolyPolygonShape3DRetval.SequenceY.realloc(nPolygonCount);
rPolyPolygonShape3DRetval.SequenceZ.realloc(nPolygonCount); rPolyPolygonShape3DRetval.SequenceZ.realloc(nPolygonCount);
com::sun::star::drawing::DoubleSequence* pOuterSequenceX = rPolyPolygonShape3DRetval.SequenceX.getArray(); css::drawing::DoubleSequence* pOuterSequenceX = rPolyPolygonShape3DRetval.SequenceX.getArray();
com::sun::star::drawing::DoubleSequence* pOuterSequenceY = rPolyPolygonShape3DRetval.SequenceY.getArray(); css::drawing::DoubleSequence* pOuterSequenceY = rPolyPolygonShape3DRetval.SequenceY.getArray();
com::sun::star::drawing::DoubleSequence* pOuterSequenceZ = rPolyPolygonShape3DRetval.SequenceZ.getArray(); css::drawing::DoubleSequence* pOuterSequenceZ = rPolyPolygonShape3DRetval.SequenceZ.getArray();
for(sal_uInt32 a(0); a < nPolygonCount; a++) for(sal_uInt32 a(0); a < nPolygonCount; a++)
{ {
......
basegfx/source/tools/canvastools.cxx
Dosyayı görüntüle @ 852ae6de
...@@ -334,7 +334,7 @@ namespace basegfx ...@@ -334,7 +334,7 @@ namespace basegfx
return output; return output;
} }
::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& input ) ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::css::geometry::AffineMatrix3D& input )
{ {
::basegfx::B3DHomMatrix output; ::basegfx::B3DHomMatrix output;
......
basegfx/source/tools/keystoplerp.cxx
Dosyayı görüntüle @ 852ae6de
...@@ -50,7 +50,7 @@ namespace basegfx ...@@ -50,7 +50,7 @@ namespace basegfx
validateInput(maKeyStops); validateInput(maKeyStops);
} }
KeyStopLerp::KeyStopLerp( const ::com::sun::star::uno::Sequence<double>& rKeyStops ) : KeyStopLerp::KeyStopLerp( const ::css::uno::Sequence<double>& rKeyStops ) :
maKeyStops(rKeyStops.getLength()), maKeyStops(rKeyStops.getLength()),
mnLastIndex(0) mnLastIndex(0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment