basegfx: replace typedef with a class B2DSize based on Size2D

Change-Id: Id8b3c2bcf0bf4be5aba2812b0edda479bc20c6a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139683
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

20 files changed, 95 insertions, 93 deletions

diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx
index 615eb693e175..1720a1e6e54c 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -79,8 +79,8 @@ namespace slideshow::internal
             // aLinearTransform.translate(), since, as said above, the
             // last column of aLinearTransform is assumed [0 0 1]
             ::basegfx::B2DHomMatrix aLinearTransform( mpViewLayer->getTransformation() );
-            aLinearTransform.set( 0, 2, maContentPixelOffset.getX() );
-            aLinearTransform.set( 1, 2, maContentPixelOffset.getY() );
+            aLinearTransform.set( 0, 2, maContentPixelOffset.getWidth() );
+            aLinearTransform.set( 1, 2, maContentPixelOffset.getHeight() );
 
             // apply linear part of canvas view transformation to sprite canvas
             pContentCanvas->setTransformation( aLinearTransform );
@@ -102,19 +102,19 @@ namespace slideshow::internal
             ::basegfx::B2DSize  aNewSize( maEffectiveSpriteSizePixel );
             bool                bNeedResize( false );
 
-            if( rSpriteSizePixel.getX() > maEffectiveSpriteSizePixel.getX() ||
-                rSpriteSizePixel.getX() < 0.5*maEffectiveSpriteSizePixel.getX() )
+            if( rSpriteSizePixel.getWidth() > maEffectiveSpriteSizePixel.getWidth() ||
+                rSpriteSizePixel.getWidth() < 0.5 * maEffectiveSpriteSizePixel.getWidth() )
             {
                 // enlarge or shrink width
-                aNewSize.setX( ::canvas::tools::nextPow2( ::basegfx::fround(rSpriteSizePixel.getX()) ) );
+                aNewSize.setWidth( ::canvas::tools::nextPow2( ::basegfx::fround(rSpriteSizePixel.getWidth()) ) );
                 bNeedResize = true;
             }
 
-            if( rSpriteSizePixel.getY() > maEffectiveSpriteSizePixel.getY() ||
-                rSpriteSizePixel.getY() < 0.5*maEffectiveSpriteSizePixel.getY() )
+            if( rSpriteSizePixel.getHeight() > maEffectiveSpriteSizePixel.getHeight() ||
+                rSpriteSizePixel.getHeight() < 0.5*maEffectiveSpriteSizePixel.getHeight() )
             {
                 // enlarge or shrink height, by doubling it
-                aNewSize.setY( ::canvas::tools::nextPow2( ::basegfx::fround(rSpriteSizePixel.getY()) ) );
+                aNewSize.setHeight( ::canvas::tools::nextPow2( ::basegfx::fround(rSpriteSizePixel.getHeight()) ) );
                 bNeedResize = true;
             }
 
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index 6ed7dc882969..081984144cc6 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -137,13 +137,12 @@ namespace slideshow::internal
                     ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape,
                                        "TupleAnimation::operator(): Invalid ShapeAttributeLayer" );
 
-                    ValueT aValue( rValue.getX(),
-                                   rValue.getY() );
+                    ValueT aValue(rValue.getX(), rValue.getY());
 
                     // Activities get values from the expression parser,
                     // which returns _relative_ sizes/positions.
                     // Convert back relative to reference coordinate system
-                    aValue *= maReferenceSize;
+                    aValue *= basegfx::B2DPoint(maReferenceSize);
 
                     ((*mpAttrLayer).*mpSetValueFunc)( aValue );
 
@@ -163,19 +162,20 @@ namespace slideshow::internal
                     // deviated from the (*shared_ptr).*mpFuncPtr
                     // notation here, since gcc does not seem to parse
                     // that as a member function call anymore.
+                    basegfx::B2DPoint aPoint(maDefaultValue);
                     aRetVal.setX( (mpAttrLayer.get()->*mpIs1stValidFunc)() ?
                                   (mpAttrLayer.get()->*mpGet1stValueFunc)() :
-                                  maDefaultValue.getX() );
+                                  aPoint.getX() );
                     aRetVal.setY( (mpAttrLayer.get()->*mpIs2ndValidFunc)() ?
                                   (mpAttrLayer.get()->*mpGet2ndValueFunc)() :
-                                  maDefaultValue.getY() );
+                                  aPoint.getY() );
 
                     // Activities get values from the expression
                     // parser, which returns _relative_
                     // sizes/positions.  Convert start value to the
                     // same coordinate space (i.e. relative to given
                     // reference size).
-                    aRetVal /= maReferenceSize;
+                    aRetVal /= basegfx::B2DPoint(maReferenceSize);
 
                     return aRetVal;
                 }
@@ -211,7 +211,7 @@ namespace slideshow::internal
                     mpShape(),
                     mpAttrLayer(),
                     mpShapeManager( rShapeManager ),
-                    maPageSize( rSlideSize ),
+                    maPageSize( rSlideSize.getX(), rSlideSize.getY() ),
                     maShapeOrig(),
                     mnFlags( nFlags ),
                     mbAnimationStarted( false ),
@@ -311,7 +311,7 @@ namespace slideshow::internal
                     // absolute, or shape-relative.
 
                     // interpret path as page-relative. Scale up with page size
-                    rOutPos *= maPageSize;
+                    rOutPos *= basegfx::B2DPoint(maPageSize);
 
                     // TODO(F1): Determine whether the path origin is
                     // absolute, or shape-relative.
@@ -425,7 +425,7 @@ namespace slideshow::internal
                     {
                         mbAnimationStarted = true;
 
-                        mpBox2DWorld->alertPhysicsAnimationStart(maPageSize, mpShapeManager);
+                        mpBox2DWorld->alertPhysicsAnimationStart(basegfx::B2DVector(maPageSize.getWidth(), maPageSize.getHeight()), mpShapeManager);
                         mpBox2DBody = mpBox2DWorld->makeShapeDynamic( mpShape->getXShape(), maStartVelocity, mfDensity, mfBounciness );
 
                         if( !(mnFlags & AnimationFactory::FLAG_NO_SPRITE) )
@@ -1334,8 +1334,8 @@ namespace slideshow::internal
                             // Theoretically, our AttrLayer is way down the stack, and
                             // we only have to consider _that_ value, not the one from
                             // the top of the stack as returned by Shape::getBounds()
-                            rBounds.getRange(),
-                            rBounds.getRange(),
+                            basegfx::B2DSize(rBounds.getRange().getX(), rBounds.getRange().getY()),
+                            basegfx::B2DSize(rBounds.getRange().getX(), rBounds.getRange().getY()),
                             &ShapeAttributeLayer::getWidth,
                             &ShapeAttributeLayer::getHeight,
                             &ShapeAttributeLayer::setSize );
@@ -1351,7 +1351,7 @@ namespace slideshow::internal
                             // we only have to consider _that_ value, not the one from
                             // the top of the stack as returned by Shape::getBounds()
                             rBounds.getCenter(),
-                            rSlideSize,
+                            basegfx::B2DSize(rSlideSize.getX(), rSlideSize.getY()),
                             &ShapeAttributeLayer::getPosX,
                             &ShapeAttributeLayer::getPosY,
                             &ShapeAttributeLayer::setPosition );
diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx
index 142c18ba12e4..50f4421add5c 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -107,7 +107,7 @@ void PointerSymbol::viewAdded( const UnoViewSharedPtr& rView )
     try
     {
         const geometry::IntegerSize2D spriteSize( mxBitmap->getSize() );
-        sprite = rView->createSprite( basegfx::B2DVector( spriteSize.Width,
+        sprite = rView->createSprite( basegfx::B2DSize( spriteSize.Width,
                                                           spriteSize.Height ),
                                       1000.0 ); // sprite should be in front of all
                                                 // other sprites
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 976c33eefe0b..67c18f8d7f14 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -319,8 +319,8 @@ basegfx::B2DRange RehearseTimingsActivity::calcSpriteRectangle( UnoViewSharedPtr
     spriteSize *= transformation;
     return basegfx::B2DRange(
         spritePos.getX(), spritePos.getY(),
-        spritePos.getX() + spriteSize.getX(),
-        spritePos.getY() + spriteSize.getY() );
+        spritePos.getX() + spriteSize.getWidth(),
+        spritePos.getY() + spriteSize.getHeight() );
 }
 
 void RehearseTimingsActivity::viewAdded( const UnoViewSharedPtr& rView )
diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx
index 6ddbbb513abd..c17c858d0855 100644
--- a/slideshow/source/engine/shapeattributelayer.cxx
+++ b/slideshow/source/engine/shapeattributelayer.cxx
@@ -259,7 +259,7 @@ namespace slideshow::internal
         double ShapeAttributeLayer::getWidth() const
         {
             return calcValue< double >(
-                maSize.getX(),
+                maSize.getWidth(),
                 mbWidthValid,
                 &ShapeAttributeLayer::isWidthValid,
                 &ShapeAttributeLayer::getWidth );
@@ -270,7 +270,7 @@ namespace slideshow::internal
             ENSURE_OR_THROW( std::isfinite(rNewWidth),
                               "ShapeAttributeLayer::setWidth(): Invalid width" );
 
-            maSize.setX( rNewWidth );
+            maSize.setWidth( rNewWidth );
             mbWidthValid = true;
             ++mnTransformationState;
         }
@@ -283,7 +283,7 @@ namespace slideshow::internal
         double ShapeAttributeLayer::getHeight() const
         {
             return calcValue< double >(
-                maSize.getY(),
+                maSize.getHeight(),
                 mbHeightValid,
                 &ShapeAttributeLayer::isHeightValid,
                 &ShapeAttributeLayer::getHeight );
@@ -294,15 +294,15 @@ namespace slideshow::internal
             ENSURE_OR_THROW( std::isfinite(rNewHeight),
                               "ShapeAttributeLayer::setHeight(): Invalid height" );
 
-            maSize.setY( rNewHeight );
+            maSize.setHeight( rNewHeight );
             mbHeightValid = true;
             ++mnTransformationState;
         }
 
         void ShapeAttributeLayer::setSize( const ::basegfx::B2DSize& rNewSize )
         {
-            ENSURE_OR_THROW( std::isfinite(rNewSize.getX()) &&
-                              std::isfinite(rNewSize.getY()),
+            ENSURE_OR_THROW( std::isfinite(rNewSize.getWidth()) &&
+                              std::isfinite(rNewSize.getHeight()),
                               "ShapeAttributeLayer::setSize(): Invalid size" );
 
             maSize = rNewSize;
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index 19d35e8f1790..ba6f2b0cbfb2 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -749,19 +749,19 @@ namespace slideshow::internal
                         {
                             const ::basegfx::B2DSize rShapeBorder( rViewShape->getAntialiasingBorder() );
 
-                            aAABorder.setX( ::std::max(
-                                    rShapeBorder.getX(),
-                                    aAABorder.getX() ) );
-                            aAABorder.setY( ::std::max(
-                                    rShapeBorder.getY(),
-                                    aAABorder.getY() ) );
+                            aAABorder.setWidth( ::std::max(
+                                    rShapeBorder.getWidth(),
+                                    aAABorder.getWidth() ) );
+                            aAABorder.setWidth( ::std::max(
+                                    rShapeBorder.getHeight(),
+                                    aAABorder.getHeight() ) );
                         }
 
                         // add calculated AA border to aBounds
-                        aBounds = ::basegfx::B2DRectangle( aBounds.getMinX() - aAABorder.getX(),
-                                                           aBounds.getMinY() - aAABorder.getY(),
-                                                           aBounds.getMaxX() + aAABorder.getX(),
-                                                           aBounds.getMaxY() + aAABorder.getY() );
+                        aBounds = ::basegfx::B2DRectangle( aBounds.getMinX() - aAABorder.getWidth(),
+                                                           aBounds.getMinY() - aAABorder.getHeight(),
+                                                           aBounds.getMaxX() + aAABorder.getWidth(),
+                                                           aBounds.getMaxY() + aAABorder.getHeight() );
                     }
                 }
             }
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index 98d9c0614645..8c1ea9523061 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -349,7 +349,8 @@ namespace slideshow::internal
 
             // create (or resize) sprite with sprite's pixel size, if
             // not done already
-            const ::basegfx::B2DSize& rSpriteSizePixel(rSpriteBoundsPixel.getRange());
+            auto aRange = rSpriteBoundsPixel.getRange();
+            basegfx::B2DSize rSpriteSizePixel(aRange.getX(), aRange.getY());
             if( !mpSprite )
             {
                 mpSprite = std::make_shared<AnimatedSprite>( mpViewLayer,
@@ -387,8 +388,8 @@ namespace slideshow::internal
             // rSpriteBoundsPixel upper, left corner is: the offset we
             // have to move sprite output to the right, top (to make
             // the desired subset content visible at all)
-            const ::basegfx::B2DSize& rSpriteCorrectionOffset(
-                rSpriteBoundsPixel.getMinimum() - rNominalShapeBoundsPixel.getMinimum() );
+            auto aDifference = rSpriteBoundsPixel.getMinimum() - rNominalShapeBoundsPixel.getMinimum();
+            const basegfx::B2DSize rSpriteCorrectionOffset(aDifference.getX(), aDifference.getY());
 
             // offset added top, left for anti-aliasing (otherwise,
             // shapes fully filling the sprite will have anti-aliased
@@ -408,14 +409,14 @@ namespace slideshow::internal
             // nearest integer here, too
             mpSprite->setPixelOffset(
                 aAAOffset - ::basegfx::B2DSize(
-                    ::basegfx::fround( rSpriteCorrectionOffset.getX() ),
-                    ::basegfx::fround( rSpriteCorrectionOffset.getY() ) ) );
+                    ::basegfx::fround( rSpriteCorrectionOffset.getWidth() ),
+                    ::basegfx::fround( rSpriteCorrectionOffset.getHeight() ) ) );
 
             // always set sprite position and transformation, since
             // they do not relate directly to the update flags
             // (e.g. sprite position changes when sprite size changes)
             mpSprite->movePixel( aSpritePosPixel );
-            mpSprite->transform( getSpriteTransformation( rSpriteSizePixel,
+            mpSprite->transform( getSpriteTransformation( basegfx::B2DVector(rSpriteSizePixel.getWidth(), rSpriteSizePixel.getHeight()),
                                                           rOrigBounds.getRange(),
                                                           pAttr ) );
 
@@ -448,10 +449,10 @@ namespace slideshow::internal
 
                     // make the clip 2*ANTIALIASING_EXTRA_SIZE larger
                     // such that it's again centered over the sprite.
-                    aViewTransform.scale(rSpriteSizePixel.getX()/
-                                         (rSpriteSizePixel.getX()-2*::cppcanvas::Canvas::ANTIALIASING_EXTRA_SIZE),
-                                         rSpriteSizePixel.getY()/
-                                         (rSpriteSizePixel.getY()-2*::cppcanvas::Canvas::ANTIALIASING_EXTRA_SIZE));
+                    aViewTransform.scale(rSpriteSizePixel.getWidth()/
+                                         (rSpriteSizePixel.getWidth()-2*::cppcanvas::Canvas::ANTIALIASING_EXTRA_SIZE),
+                                         rSpriteSizePixel.getHeight()/
+                                         (rSpriteSizePixel.getHeight()-2*::cppcanvas::Canvas::ANTIALIASING_EXTRA_SIZE));
 
                     // transform clip polygon from view to device
                     // coordinate space
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index ad5a798369cb..bf07e18acf60 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -322,7 +322,7 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >&           xDra
                         xDrawPage)),
     mpSubsettableShapeManager( mpShapeManager ),
     mpBox2DWorld( std::make_shared<box2d::utils::box2DWorld>(
-                        basegfx::B2DSize( getSlideSizeImpl() ) ) ),
+                        basegfx::B2DVector( getSlideSizeImpl() ) ) ),
     maContext( mpSubsettableShapeManager,
                rEventQueue,
                rEventMultiplexer,
@@ -336,7 +336,7 @@ SlideImpl::SlideImpl( const uno::Reference< drawing::XDrawPage >&           xDra
                mpBox2DWorld ),
     mrCursorManager( rCursorManager ),
     maAnimations( maContext,
-                  basegfx::B2DSize( getSlideSizeImpl() ) ),
+                  basegfx::B2DVector( getSlideSizeImpl() ) ),
     maPolygons(std::move(rPolyPolygonVector)),
     maUserPaintColor(aUserPaintColor),
     mdUserPaintStrokeWidth(dUserPaintStrokeWidth),
@@ -570,7 +570,7 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r
 
     SlideBitmapSharedPtr&     rBitmap( aIter->second.at( meAnimationState ));
     const ::basegfx::B2ISize& rSlideSize(
-        getSlideSizePixel( ::basegfx::B2DSize( getSlideSize() ),
+        getSlideSizePixel( ::basegfx::B2DVector( getSlideSize() ),
                            rView ));
 
     // is the bitmap valid (actually existent, and of correct
@@ -920,7 +920,7 @@ void SlideImpl::applyShapeAttributes(
                     extractValue( bVisible,
                                   rShapeProp.Value,
                                   pShape,
-                                  ::basegfx::B2DSize( getSlideSize() ) ))
+                                  basegfx::B2DVector(getSlideSize()) ))
                 {
                     pAttrShape->setVisibility( bVisible );
                 }
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index a9bc7607ddb4..1cbc167a4c4d 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -874,7 +874,7 @@ ActivitySharedPtr SlideShowImpl::createSlideTransition(
                 0.0,
                 0.0,
                 ShapeSharedPtr(),
-                basegfx::B2DSize( rEnteringSlide->getSlideSize() ) ),
+                basegfx::B2DVector( rEnteringSlide->getSlideSize() ) ),
             pTransition,
             true ));
 }
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index d2e509b6dccc..26c4e0f971bb 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -112,7 +112,7 @@ basegfx::B2DPolyPolygon createClipPolygon( const basegfx::B2DPolyPolygon&    rCl
     // =====================
 
     // AW: Simplified
-    const basegfx::B2DRange aClipRange(0, 0, rUserSize.getX(), rUserSize.getY());
+    const basegfx::B2DRange aClipRange(0, 0, rUserSize.getWidth(), rUserSize.getHeight());
 
     if(rClip.count())
     {
@@ -446,8 +446,8 @@ public:
         // limit layer bounds to visible screen
         maLayerBounds.intersect( basegfx::B2DRange(0.0,
                                                    0.0,
-                                                   maUserSize.getX(),
-                                                   maUserSize.getY()) );
+                                                   maUserSize.getWidth(),
+                                                   maUserSize.getHeight()) );
 
         basegfx::B2IRange const& rNewLayerPixel(
             getLayerBoundsPixel(maLayerBounds,
@@ -584,7 +584,7 @@ private:
 
                 const basegfx::B2I64Tuple& rSpriteSize(maLayerBoundsPixel.getRange());
                 mpSprite = mpSpriteCanvas->createCustomSprite(
-                    basegfx::B2DVector(sal::static_int_cast<sal_Int32>(rSpriteSize.getX()),
+                    basegfx::B2DSize(sal::static_int_cast<sal_Int32>(rSpriteSize.getX()),
                                        sal::static_int_cast<sal_Int32>(rSpriteSize.getY())) );
 
                 mpSprite->setPriority(
@@ -861,8 +861,8 @@ void SlideView::clear() const
     clearRect(getCanvas()->clone(),
               getLayerBoundsPixel(
                   basegfx::B2DRange(0,0,
-                                    maUserSize.getX(),
-                                    maUserSize.getY()),
+                                    maUserSize.getWidth(),
+                                    maUserSize.getHeight()),
                   getTransformation()));
 }
 
@@ -945,7 +945,7 @@ basegfx::B2DHomMatrix SlideView::getTransformation() const
     osl::MutexGuard aGuard( m_aMutex );
 
     basegfx::B2DHomMatrix aMatrix;
-    aMatrix.scale( 1.0/maUserSize.getX(), 1.0/maUserSize.getY() );
+    aMatrix.scale( 1.0 / maUserSize.getWidth(), 1.0 / maUserSize.getHeight() );
 
     return maViewTransform * aMatrix;
 }
diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx
index dadf1cfbb193..3567fa5c146b 100644
--- a/slideshow/source/engine/tools.cxx
+++ b/slideshow/source/engine/tools.cxx
@@ -77,7 +77,7 @@ namespace slideshow::internal
                                                                       const ShapeAttributeLayerSharedPtr&   pAttr )
             {
                 ::basegfx::B2DHomMatrix     aTransform;
-                const ::basegfx::B2DSize&   rSize( rShapeBounds.getRange() );
+                const basegfx::B2DSize rSize(rShapeBounds.getRange().getX(), rShapeBounds.getRange().getY());
 
                 const double nShearX( pAttr->isShearXAngleValid() ?
                                       pAttr->getShearXAngle() :
@@ -96,9 +96,9 @@ namespace slideshow::internal
                 // ensure valid size (zero size will inevitably lead
                 // to a singular transformation matrix)
                 aTransform.scale( ::basegfx::pruneScaleValue(
-                                      rSize.getX() ),
+                                      rSize.getWidth() ),
                                   ::basegfx::pruneScaleValue(
-                                      rSize.getY() ) );
+                                      rSize.getHeight() ) );
 
                 const bool bNeedShearX( !::basegfx::fTools::equalZero(nShearX) );
                 const bool bNeedShearY( !::basegfx::fTools::equalZero(nShearY) );
@@ -499,11 +499,11 @@ namespace slideshow::internal
                 // ensure valid size (zero size will inevitably lead
                 // to a singular transformation matrix).
                 aTransform.scale( ::basegfx::pruneScaleValue(
-                                      aSize.getX() /
+                                      aSize.getWidth() /
                                       ::basegfx::pruneScaleValue(
                                           rOrigSize.getX() ) ),
                                   ::basegfx::pruneScaleValue(
-                                      aSize.getY() /
+                                      aSize.getHeight() /
                                       ::basegfx::pruneScaleValue(
                                           rOrigSize.getY() ) ) );
 
@@ -606,10 +606,10 @@ namespace slideshow::internal
                 // (aka mirrored shapes) _still_ have the same bounds,
                 // only with mirrored content.
                 ::basegfx::B2DSize aSize;
-                aSize.setX( fabs( pAttr->isWidthValid() ?
+                aSize.setWidth( fabs( pAttr->isWidthValid() ?
                                   pAttr->getWidth() :
                                   rOrigBounds.getWidth() ) );
-                aSize.setY( fabs( pAttr->isHeightValid() ?
+                aSize.setHeight( fabs( pAttr->isHeightValid() ?
                                   pAttr->getHeight() :
                                   rOrigBounds.getHeight() ) );
 
@@ -624,8 +624,8 @@ namespace slideshow::internal
                 // the positional attribute retrieved from the
                 // ShapeAttributeLayer actually denotes the _middle_
                 // of the shape (do it as the PPTs do...)
-                return ::basegfx::B2DRectangle( aPos - 0.5*aSize,
-                                                aPos + 0.5*aSize );
+                return ::basegfx::B2DRectangle(aPos - 0.5 * basegfx::B2DPoint(aSize),
+                                               aPos + 0.5 * basegfx::B2DPoint(aSize));
             }
         }
 
diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx
index 19bb6cbba85f..78c7e71029b7 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.cxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.cxx
@@ -186,16 +186,16 @@ namespace slideshow::internal
             // scale polygon up to current shape size
             if( mbScaleIsotrophically )
             {
-                const double nScale( ::std::max( rTargetSize.getX(),
-                                                 rTargetSize.getY() ) );
+                const double nScale( ::std::max( rTargetSize.getWidth(),
+                                                 rTargetSize.getHeight() ) );
                 aMatrix.scale( nScale, nScale );
-                aMatrix.translate( -(nScale-rTargetSize.getX())/2.0,
-                                   -(nScale-rTargetSize.getY())/2.0 );
+                aMatrix.translate( -(nScale - rTargetSize.getWidth())/2.0,
+                                   -(nScale - rTargetSize.getHeight())/2.0 );
             }
             else
             {
-                aMatrix.scale( rTargetSize.getX(),
-                               rTargetSize.getY() );
+                aMatrix.scale( rTargetSize.getWidth(),
+                               rTargetSize.getHeight() );
             }
 
             // apply cumulative transformation to clip polygon
diff --git a/slideshow/source/engine/transitions/combtransition.cxx b/slideshow/source/engine/transitions/combtransition.cxx
index 3fcdbb2e0d2c..b79046542000 100644
--- a/slideshow/source/engine/transitions/combtransition.cxx
+++ b/slideshow/source/engine/transitions/combtransition.cxx
@@ -54,8 +54,7 @@ basegfx::B2DPolyPolygon createClipPolygon(
     basegfx::B2DHomMatrix aMatrix(basegfx::utils::createRotateAroundPoint(0.5, 0.5, aUpVec.angle( rDirection )));
 
     // blow up clip polygon to slide size
-    aMatrix.scale( rSlideSize.getX(),
-                   rSlideSize.getY() );
+    aMatrix.scale(rSlideSize.getWidth(), rSlideSize.getHeight());
 
     aClipPoly.transform( aMatrix );
 
@@ -111,18 +110,18 @@ void CombTransition::renderComb( double           t,
     // TODO(Q2): Use basegfx bitmaps here
     // TODO(F1): SlideBitmap is not fully portable between different canvases!
 
-    const basegfx::B2DSize enteringSizePixel(
+    const basegfx::B2DVector enteringSizePixel(
         getEnteringSlideSizePixel( rViewEntry.mpView) );
 
     const basegfx::B2DVector aPushDirection(
         enteringSizePixel * maPushDirectionUnit );
     const basegfx::B2DPolyPolygon aClipPolygon1 =
         createClipPolygon( maPushDirectionUnit,
-                           enteringSizePixel,
+                           basegfx::B2DSize(enteringSizePixel.getX(), enteringSizePixel.getY()),
                            mnNumStripes, 0 );
     const basegfx::B2DPolyPolygon aClipPolygon2 =
         createClipPolygon( maPushDirectionUnit,
-                           enteringSizePixel,
+                           basegfx::B2DSize(enteringSizePixel.getX(), enteringSizePixel.getY()),
                            mnNumStripes, 1 );
 
     SlideBitmapSharedPtr const & pLeavingBitmap = getLeavingBitmap(rViewEntry);
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index 934cefb98624..2df1b55a692a 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -159,8 +159,8 @@ bool ClippingAnimation::operator()( double nValue )
         "ClippingAnimation::operator(): Invalid ShapeAttributeLayer" );
 
     // set new clip
-    mpAttrLayer->setClip( maClippingFunctor( nValue,
-                                             mpShape->getDomBounds().getRange() ) );
+    auto aBounds = mpShape->getDomBounds().getRange();
+    mpAttrLayer->setClip( maClippingFunctor(nValue, basegfx::B2DSize(aBounds.getX(), aBounds.getY())) );
 
     if( mpShape->isContentChanged() )
         mpShapeManager->notifyShapeUpdate( mpShape );
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx
index ade76df4a782..6c8a0ec9eef4 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -93,7 +93,7 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr&
 
         // create empty, black-filled bitmap
         const basegfx::B2ISize slideSizePixel(
-            getSlideSizePixel( basegfx::B2DSize( mpEnteringSlide->getSlideSize() ),
+            getSlideSizePixel( basegfx::B2DVector( mpEnteringSlide->getSlideSize() ),
                                rView ));
 
         cppcanvas::CanvasSharedPtr pCanvas( rView->getCanvas() );
@@ -137,7 +137,7 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr&
 
 ::basegfx::B2ISize SlideChangeBase::getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const
 {
-    return getSlideSizePixel( basegfx::B2DSize( mpEnteringSlide->getSlideSize() ),
+    return getSlideSizePixel( basegfx::B2DVector(mpEnteringSlide->getSlideSize().getX(), mpEnteringSlide->getSlideSize().getY()),
                               pView );
 }
 
@@ -487,7 +487,7 @@ void SlideChangeBase::addSprites( ViewEntry& rEntry )
     {
         // create entering sprite:
         const basegfx::B2ISize enteringSlideSizePixel(
-            getSlideSizePixel( basegfx::B2DSize( mpEnteringSlide->getSlideSize() ),
+            getSlideSizePixel( basegfx::B2DVector( mpEnteringSlide->getSlideSize() ),
                                rEntry.mpView ));
 
         rEntry.mpInSprite = createSprite( rEntry.mpView,
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index 8e6bc0de0fed..fcee18e262c3 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -74,8 +74,8 @@ void fillPage( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
               ::basegfx::B2DRectangle(
                   aOutputPosPixel.getX(),
                   aOutputPosPixel.getY(),
-                  aOutputPosPixel.getX() + rPageSizePixel.getX(),
-                  aOutputPosPixel.getY() + rPageSizePixel.getY() ),
+                  aOutputPosPixel.getX() + rPageSizePixel.getWidth(),
+                  aOutputPosPixel.getY() + rPageSizePixel.getHeight() ),
               rFillColor.getIntegerColor() );
 }
 
@@ -619,7 +619,7 @@ void MovingSlideChange::performIn(
     rSprite->movePixel(
         aPageOrigin +
         ((t - 1.0) *
-         ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) *
+         basegfx::B2DVector( getEnteringSlideSizePixel(rViewEntry.mpView) ) *
          maEnteringDirection) );
 }
 
@@ -650,7 +650,7 @@ void MovingSlideChange::performOut(
     // move sprite
     rSprite->movePixel(
         aPageOrigin + (t *
-                       ::basegfx::B2DSize( getEnteringSlideSizePixel(rViewEntry.mpView) ) *
+                       basegfx::B2DVector( getEnteringSlideSizePixel(rViewEntry.mpView) ) *
                        maLeavingDirection) );
 }
 
diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx
index 619391fb3546..bbeda8eac558 100644
--- a/slideshow/source/engine/waitsymbol.cxx
+++ b/slideshow/source/engine/waitsymbol.cxx
@@ -111,7 +111,7 @@ void WaitSymbol::viewAdded( const UnoViewSharedPtr& rView )
     try
     {
         const geometry::IntegerSize2D spriteSize( mxBitmap->getSize() );
-        sprite = rView->createSprite( basegfx::B2DVector( spriteSize.Width,
+        sprite = rView->createSprite( basegfx::B2DSize( spriteSize.Width,
                                                           spriteSize.Height ),
                                       1000.0 ); // sprite should be in front of all
                                                 // other sprites
diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx
index 8f02bd186230..f298aaa52fb3 100644
--- a/slideshow/source/inc/animatedsprite.hxx
+++ b/slideshow/source/inc/animatedsprite.hxx
@@ -22,6 +22,7 @@
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include "viewlayer.hxx"
diff --git a/slideshow/source/inc/viewlayer.hxx b/slideshow/source/inc/viewlayer.hxx
index 4fe8aa4e03d3..bffe685f9d65 100644
--- a/slideshow/source/inc/viewlayer.hxx
+++ b/slideshow/source/inc/viewlayer.hxx
@@ -31,7 +31,7 @@ namespace basegfx
     class B2DVector;
     class B2DHomMatrix;
     class B2DPolyPolygon;
-    typedef B2DVector B2DSize;
+    class B2DSize;
 }
 namespace cppcanvas
 {
diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx
index 237fb3d386b4..cb2ad820129c 100644
--- a/slideshow/test/testview.cxx
+++ b/slideshow/test/testview.cxx
@@ -159,7 +159,8 @@ public:
     virtual ::cppcanvas::CustomSpriteSharedPtr createSprite( const ::basegfx::B2DSize& rSpriteSizePixel,
                                                              double                    nPriority ) const override
     {
-        maCreatedSprites.push_back( std::make_pair(rSpriteSizePixel,nPriority) );
+        basegfx::B2DVector aSpriteSizeVector(rSpriteSizePixel.getWidth(), rSpriteSizePixel.getHeight());
+        maCreatedSprites.emplace_back(aSpriteSizeVector, nPriority);
 
         return ::cppcanvas::CustomSpriteSharedPtr();
     }