summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basegfx/inc/basegfx/color/bcolor.hxx2
-rw-r--r--basegfx/inc/basegfx/curve/b2dbeziertools.hxx2
-rw-r--r--basegfx/inc/basegfx/point/b2dpoint.hxx2
-rw-r--r--basegfx/inc/basegfx/range/basicbox.hxx2
-rw-r--r--basegfx/inc/basegfx/range/basicrange.hxx2
-rw-r--r--basegfx/inc/basegfx/vector/b2dvector.hxx2
-rw-r--r--basegfx/source/inc/hommatrixtemplate.hxx2
-rw-r--r--basegfx/source/polygon/b2dpolygontriangulator.cxx2
-rw-r--r--basegfx/source/polygon/b2dpolypolygon.cxx2
-rw-r--r--basegfx/source/polygon/b2dpolypolygoncutter.cxx4
-rw-r--r--basegfx/source/polygon/b2dtrapezoid.cxx2
-rw-r--r--basegfx/source/polygon/b3dpolypolygon.cxx2
-rw-r--r--basegfx/source/range/b2drange.cxx4
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx6
-rw-r--r--slideshow/source/engine/slideshowimpl.cxx4
-rw-r--r--slideshow/source/engine/transitions/slidechangebase.cxx10
-rw-r--r--slideshow/source/engine/transitions/slidetransitionfactory.cxx6
17 files changed, 28 insertions, 28 deletions
diff --git a/basegfx/inc/basegfx/color/bcolor.hxx b/basegfx/inc/basegfx/color/bcolor.hxx
index 1a1c6eaf8ffd..452731001c4b 100644
--- a/basegfx/inc/basegfx/color/bcolor.hxx
+++ b/basegfx/inc/basegfx/color/bcolor.hxx
@@ -81,7 +81,7 @@ namespace basegfx
@param fLuminosity
The parameter is used to initialize the red, green and blue intensities of the color
*/
- BColor(double fLuminosity)
+ explicit BColor(double fLuminosity)
: B3DTuple(fLuminosity, fLuminosity, fLuminosity)
{}
diff --git a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
index 821cc33c723f..a6eda0a2a759 100644
--- a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
+++ b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
@@ -52,7 +52,7 @@ namespace basegfx
sal_uInt32 mnEdgeCount;
public:
- B2DCubicBezierHelper(const B2DCubicBezier& rBase, sal_uInt32 nDivisions = 9);
+ explicit B2DCubicBezierHelper(const B2DCubicBezier& rBase, sal_uInt32 nDivisions = 9);
double getLength() const { if(!maLengthArray.empty()) return maLengthArray[maLengthArray.size() - 1]; else return 0.0; }
double distanceToRelative(double fDistance) const;
diff --git a/basegfx/inc/basegfx/point/b2dpoint.hxx b/basegfx/inc/basegfx/point/b2dpoint.hxx
index c5b69b8c01d3..9c8056abe7d9 100644
--- a/basegfx/inc/basegfx/point/b2dpoint.hxx
+++ b/basegfx/inc/basegfx/point/b2dpoint.hxx
@@ -87,7 +87,7 @@ namespace basegfx
@param rPoint
The 2D Point which will be copied.
*/
- B2DPoint(const ::basegfx::B2IPoint& rPoint)
+ explicit B2DPoint(const ::basegfx::B2IPoint& rPoint)
: B2DTuple(rPoint)
{}
diff --git a/basegfx/inc/basegfx/range/basicbox.hxx b/basegfx/inc/basegfx/range/basicbox.hxx
index 8e2e0efb90b7..4b000b582f3c 100644
--- a/basegfx/inc/basegfx/range/basicbox.hxx
+++ b/basegfx/inc/basegfx/range/basicbox.hxx
@@ -47,7 +47,7 @@ namespace basegfx
public:
BasicBox() {}
- BasicBox( sal_Int32 nValue ) :
+ explicit BasicBox( sal_Int32 nValue ) :
Base( nValue )
{
}
diff --git a/basegfx/inc/basegfx/range/basicrange.hxx b/basegfx/inc/basegfx/range/basicrange.hxx
index daf552f56daf..d9fded6b46e7 100644
--- a/basegfx/inc/basegfx/range/basicrange.hxx
+++ b/basegfx/inc/basegfx/range/basicrange.hxx
@@ -52,7 +52,7 @@ namespace basegfx
{
}
- BasicRange( T nValue ) :
+ explicit BasicRange( T nValue ) :
mnMinimum(nValue),
mnMaximum(nValue)
{
diff --git a/basegfx/inc/basegfx/vector/b2dvector.hxx b/basegfx/inc/basegfx/vector/b2dvector.hxx
index 109f64602c24..4c003ebf18c4 100644
--- a/basegfx/inc/basegfx/vector/b2dvector.hxx
+++ b/basegfx/inc/basegfx/vector/b2dvector.hxx
@@ -86,7 +86,7 @@ namespace basegfx
@param rVec
The 2D Vector which will be copied.
*/
- B2DVector(const ::basegfx::B2IVector& rVec)
+ explicit B2DVector(const ::basegfx::B2IVector& rVec)
: B2DTuple(rVec)
{}
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx
index d1e461f952c1..6342677c5216 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/basegfx/source/inc/hommatrixtemplate.hxx
@@ -48,7 +48,7 @@ namespace basegfx
{
}
- ImplMatLine(sal_uInt16 nRow, ImplMatLine< RowSize >* pToBeCopied = 0L)
+ explicit ImplMatLine(sal_uInt16 nRow, ImplMatLine< RowSize >* pToBeCopied = 0L)
{
if(pToBeCopied)
{
diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx
index 121211d2501b..d2e6ef0e786b 100644
--- a/basegfx/source/polygon/b2dpolygontriangulator.cxx
+++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx
@@ -138,7 +138,7 @@ namespace basegfx
void createTriangle(const B2DPoint& rA, const B2DPoint& rB, const B2DPoint& rC);
public:
- Triangulator(const B2DPolyPolygon& rCandidate);
+ explicit Triangulator(const B2DPolyPolygon& rCandidate);
~Triangulator();
const B2DPolygon getResult() const { return maResult; }
diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx
index 3ec0ed824347..02dce17b5adf 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.cxx
@@ -50,7 +50,7 @@ public:
{
}
- ImplB2DPolyPolygon(const basegfx::B2DPolygon& rToBeCopied) :
+ explicit ImplB2DPolyPolygon(const basegfx::B2DPolygon& rToBeCopied) :
maPolygons(1,rToBeCopied)
{
}
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index 522bc3701556..05e555f213ba 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -466,7 +466,7 @@ namespace basegfx
}
public:
- solver(const B2DPolygon& rOriginal)
+ explicit solver(const B2DPolygon& rOriginal)
: maOriginal(B2DPolyPolygon(rOriginal)),
mbIsCurve(false),
mbChanged(false)
@@ -501,7 +501,7 @@ namespace basegfx
}
}
- solver(const B2DPolyPolygon& rOriginal)
+ explicit solver(const B2DPolyPolygon& rOriginal)
: maOriginal(rOriginal),
mbIsCurve(false),
mbChanged(false)
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index fc2a43ba81da..4185f19673f8 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -449,7 +449,7 @@ namespace basegfx
}
public:
- TrapezoidSubdivider(
+ explicit TrapezoidSubdivider(
const B2DPolyPolygon& rSourcePolyPolygon)
: mnInitialEdgeEntryCount(0),
maTrDeEdgeEntries(),
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx
index f4bcf80fc24c..b19a691236a0 100644
--- a/basegfx/source/polygon/b3dpolypolygon.cxx
+++ b/basegfx/source/polygon/b3dpolypolygon.cxx
@@ -49,7 +49,7 @@ public:
{
}
- ImplB3DPolyPolygon(const ::basegfx::B3DPolygon& rToBeCopied) :
+ explicit ImplB3DPolyPolygon(const ::basegfx::B3DPolygon& rToBeCopied) :
maPolygons(1,rToBeCopied)
{
}
diff --git a/basegfx/source/range/b2drange.cxx b/basegfx/source/range/b2drange.cxx
index fbdf44923830..80a837414c3c 100644
--- a/basegfx/source/range/b2drange.cxx
+++ b/basegfx/source/range/b2drange.cxx
@@ -30,8 +30,8 @@ namespace basegfx
{
if( !rRange.isEmpty() )
{
- maRangeX = rRange.getMinX();
- maRangeY = rRange.getMinY();
+ maRangeX = MyBasicRange(rRange.getMinX());
+ maRangeY = MyBasicRange(rRange.getMinY());
maRangeX.expand(rRange.getMaxX());
maRangeY.expand(rRange.getMaxY());
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index cdc164271923..92bdaaf94fd6 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -388,7 +388,7 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >& xDra
xComponentContext ),
mrCursorManager( rCursorManager ),
maAnimations( maContext,
- getSlideSizeImpl() ),
+ basegfx::B2DSize( getSlideSizeImpl() ) ),
maPolygons(rPolyPolygonVector),
maUserPaintColor(aUserPaintColor),
mdUserPaintStrokeWidth(dUserPaintStrokeWidth),
@@ -659,7 +659,7 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r
SlideBitmapSharedPtr& rBitmap( aIter->second.at( meAnimationState ));
const ::basegfx::B2ISize& rSlideSize(
- getSlideSizePixel( getSlideSize(),
+ getSlideSizePixel( ::basegfx::B2DSize( getSlideSize() ),
rView ));
// is the bitmap valid (actually existent, and of correct
@@ -1092,7 +1092,7 @@ bool SlideImpl::applyInitialShapeAttributes(
extractValue( bVisible,
rShapeProps[j].Value,
pShape,
- getSlideSize() ))
+ ::basegfx::B2DSize( getSlideSize() ) ))
{
pAttrShape->setVisibility( bVisible );
}
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 238cee28156b..8e2ffb4fea41 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -886,7 +886,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
0.0,
0.0,
ShapeSharedPtr(),
- rEnteringSlide->getSlideSize() ),
+ basegfx::B2DSize( rEnteringSlide->getSlideSize() ) ),
pTransition,
true ));
}
@@ -1132,7 +1132,7 @@ void SlideShowImpl::displaySlide(
{
basegfx::B2DSize oldSlideSize;
if( mpPreviousSlide )
- oldSlideSize = mpPreviousSlide->getSlideSize();
+ oldSlideSize = basegfx::B2DSize( mpPreviousSlide->getSlideSize() );
basegfx::B2DSize const slideSize( mpCurrentSlide->getSlideSize() );
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx
index 41fd445c678a..211616d5bc8a 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -107,7 +107,7 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr&
// create empty, black-filled bitmap
const basegfx::B2ISize slideSizePixel(
- getSlideSizePixel( mpEnteringSlide->getSlideSize(),
+ getSlideSizePixel( basegfx::B2DSize( mpEnteringSlide->getSlideSize() ),
rView ));
cppcanvas::CanvasSharedPtr pCanvas( rView->getCanvas() );
@@ -151,7 +151,7 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr&
::basegfx::B2ISize SlideChangeBase::getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const
{
- return getSlideSizePixel( mpEnteringSlide->getSlideSize(),
+ return getSlideSizePixel( basegfx::B2DSize( mpEnteringSlide->getSlideSize() ),
pView );
}
@@ -496,7 +496,7 @@ void SlideChangeBase::addSprites( ViewEntry& rEntry )
getLeavingBitmap( rEntry )->getSize() );
rEntry.mpOutSprite = createSprite( rEntry.mpView,
- leavingSlideSizePixel,
+ basegfx::B2DSize( leavingSlideSizePixel ),
100 );
}
@@ -504,11 +504,11 @@ void SlideChangeBase::addSprites( ViewEntry& rEntry )
{
// create entering sprite:
const basegfx::B2ISize enteringSlideSizePixel(
- getSlideSizePixel( mpEnteringSlide->getSlideSize(),
+ getSlideSizePixel( basegfx::B2DSize( mpEnteringSlide->getSlideSize() ),
rEntry.mpView ));
rEntry.mpInSprite = createSprite( rEntry.mpView,
- enteringSlideSizePixel,
+ basegfx::B2DSize( enteringSlideSizePixel ),
101 );
}
}
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index c76527fbc67c..a88dbaf68c96 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -369,7 +369,7 @@ void ClippedSlideChange::performIn(
// of the view transformation (e.g. rotation) from the transition.
rSprite->setClipPixel(
maClippingFunctor( t,
- getEnteringSlideSizePixel(rViewEntry.mpView) ) );
+ ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) ) );
}
void ClippedSlideChange::performOut(
@@ -464,7 +464,7 @@ void FadingSlideChange::performOut(
// clear page to given fade color. 'Leaving' slide is
// painted atop of that, but slowly fading out.
fillPage( rDestinationCanvas,
- getEnteringSlideSizePixel( rViewEntry.mpView ),
+ ::basegfx::B2DSize( getEnteringSlideSizePixel( rViewEntry.mpView ) ),
*maFadeColor );
}
@@ -550,7 +550,7 @@ void CutSlideChange::performOut(
// clear page to given fade color. 'Leaving' slide is
// painted atop of that
fillPage( rDestinationCanvas,
- getEnteringSlideSizePixel( rViewEntry.mpView ),
+ ::basegfx::B2DSize( getEnteringSlideSizePixel( rViewEntry.mpView ) ),
maFadeColor );
}