summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-07-03 08:53:24 +0200
committerDavid Tardon <dtardon@redhat.com>2012-07-03 17:47:18 +0200
commit9bd1acd164a9f8f4188ca06527ccc0fece7d0c19 (patch)
treeea82824dfc4c591d502ae28d5d1efed206f2090e /slideshow
parentfddd006495f0c8584c85ff22ad0041094ea9a8cd (diff)
sprinkle explicit over constructors
Change-Id: I6599147a74e5c99f964b08935ec7c77f2d4cadef
Diffstat (limited to 'slideshow')
-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
4 files changed, 13 insertions, 13 deletions
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 );
}