bin/find-can-be-private-symbols.functions.results | 10 ++--- bin/find-mergedlib-can-be-private-symbols.functions.results | 10 ++--- compilerplugins/clang/unusedfields.readonly.results | 4 +- include/svx/sdr/overlay/overlayanimatedbitmap.hxx | 6 +-- include/svx/sdr/overlay/overlaybitmap.hxx | 6 +-- sd/source/ui/annotations/AnnotationPopup.cxx | 4 +- sd/source/ui/view/viewoverlaymanager.cxx | 4 +- solenv/clang-format/excludelist | 8 ++-- svx/Library_svxcore.mk | 4 +- svx/inc/sdr/overlay/overlaytools.hxx | 4 +- svx/source/sdr/overlay/overlayanimatedbitmap.cxx | 14 +++---- svx/source/sdr/overlay/overlaybitmap.cxx | 10 ++--- svx/source/sdr/overlay/overlaytools.cxx | 10 ++--- svx/source/svdraw/svdhdl.cxx | 22 ++++++------ 14 files changed, 58 insertions(+), 58 deletions(-)
New commits: commit 5765c5f197ec826b82788dc42416bd40a337efb0 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Jan 19 14:09:34 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Jan 20 08:52:03 2026 +0100 svx: Overlay*BitmapEx -> Overlay*Bitmap and OverlayBitmapExPrimitive -> OverlayBitmapPrimitive Change-Id: I0f65f3a6e5270ca0039ba920da8e178cde6f3e74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197588 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/bin/find-can-be-private-symbols.functions.results b/bin/find-can-be-private-symbols.functions.results index 732761e70a60..1ef3798194f8 100644 --- a/bin/find-can-be-private-symbols.functions.results +++ b/bin/find-can-be-private-symbols.functions.results @@ -14660,11 +14660,11 @@ sdr::contact::ViewObjectContact::triggerLazyInvalidate() sdr::contact::ViewObjectContactOfSdrObj::getPageViewOutputDevice() const sdr::contact::ViewObjectContactOfSdrObj::getSdrObject() const sdr::contact::ViewObjectContactOfSdrObj::isObjectVisibleOnAnyLayer(SdrObject const&, SdrLayerIDSet const&) -sdr::overlay::OverlayAnimatedBitmapEx::Trigger(unsigned int) -sdr::overlay::OverlayAnimatedBitmapEx::createOverlayObjectPrimitive2DSequence() -sdr::overlay::OverlayAnimatedBitmapEx::~OverlayAnimatedBitmapEx() -sdr::overlay::OverlayBitmapEx::createOverlayObjectPrimitive2DSequence() -sdr::overlay::OverlayBitmapEx::~OverlayBitmapEx() +sdr::overlay::OverlayAnimatedBitmap::Trigger(unsigned int) +sdr::overlay::OverlayAnimatedBitmap::createOverlayObjectPrimitive2DSequence() +sdr::overlay::OverlayAnimatedBitmap::~OverlayAnimatedBitmap() +sdr::overlay::OverlayBitmap::createOverlayObjectPrimitive2DSequence() +sdr::overlay::OverlayBitmap::~OverlayBitmap() sdr::overlay::OverlayManager::ImpDrawMembers(basegfx::B2DRange const&, OutputDevice&) const sdr::overlay::OverlayManager::ImpStripeDefinitionChanged() sdr::overlay::OverlayManager::create(OutputDevice&) diff --git a/bin/find-mergedlib-can-be-private-symbols.functions.results b/bin/find-mergedlib-can-be-private-symbols.functions.results index 9577516e6cf7..9461b7cae78d 100644 --- a/bin/find-mergedlib-can-be-private-symbols.functions.results +++ b/bin/find-mergedlib-can-be-private-symbols.functions.results @@ -14891,11 +14891,11 @@ sdr::contact::ViewObjectContact::triggerLazyInvalidate() sdr::contact::ViewObjectContactOfSdrObj::getPageViewOutputDevice() const sdr::contact::ViewObjectContactOfSdrObj::getSdrObject() const sdr::contact::ViewObjectContactOfSdrObj::isObjectVisibleOnAnyLayer(SdrObject const&, SdrLayerIDSet const&) -sdr::overlay::OverlayAnimatedBitmapEx::Trigger(unsigned int) -sdr::overlay::OverlayAnimatedBitmapEx::createOverlayObjectPrimitive2DSequence() -sdr::overlay::OverlayAnimatedBitmapEx::~OverlayAnimatedBitmapEx() -sdr::overlay::OverlayBitmapEx::createOverlayObjectPrimitive2DSequence() -sdr::overlay::OverlayBitmapEx::~OverlayBitmapEx() +sdr::overlay::OverlayAnimatedBitmap::Trigger(unsigned int) +sdr::overlay::OverlayAnimatedBitmap::createOverlayObjectPrimitive2DSequence() +sdr::overlay::OverlayAnimatedBitmap::~OverlayAnimatedBitmap() +sdr::overlay::OverlayBitmap::createOverlayObjectPrimitive2DSequence() +sdr::overlay::OverlayBitmap::~OverlayBitmap() sdr::overlay::OverlayManager::ImpDrawMembers(basegfx::B2DRange const&, OutputDevice&) const sdr::overlay::OverlayManager::ImpStripeDefinitionChanged() sdr::overlay::OverlayManager::OverlayManager(OutputDevice&) diff --git a/compilerplugins/clang/unusedfields.readonly.results b/compilerplugins/clang/unusedfields.readonly.results index 9e0dc27e0f78..04f665f59493 100644 --- a/compilerplugins/clang/unusedfields.readonly.results +++ b/compilerplugins/clang/unusedfields.readonly.results @@ -390,8 +390,8 @@ include/svx/EnhancedCustomShape2d.hxx:108 EnhancedCustomShape2d::EquationResult bReady _Bool include/svx/graphctl.hxx:52 GraphCtrl xVD ScopedVclPtrInstance<VirtualDevice> -include/svx/sdr/overlay/overlayanimatedbitmapex.hxx:49 - sdr::overlay::OverlayAnimatedBitmapEx mbOverlayState _Bool +include/svx/sdr/overlay/overlayanimatedbitmap.hxx:49 + sdr::overlay::OverlayAnimatedBitmap mbOverlayState _Bool include/svx/svdetc.hxx:175 SdrGlobalData maSysLocale SvtSysLocale include/svx/svdmark.hxx:139 diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmap.hxx similarity index 94% rename from include/svx/sdr/overlay/overlayanimatedbitmapex.hxx rename to include/svx/sdr/overlay/overlayanimatedbitmap.hxx index 0efe23992a5b..989a8dbf166d 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmap.hxx @@ -26,7 +26,7 @@ namespace sdr::overlay { - class SVXCORE_DLLPUBLIC OverlayAnimatedBitmapEx final : public OverlayObjectWithBasePosition + class SVXCORE_DLLPUBLIC OverlayAnimatedBitmap final : public OverlayObjectWithBasePosition { // the Bitmaps Bitmap maBitmap1; @@ -52,7 +52,7 @@ namespace sdr::overlay virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; public: - OverlayAnimatedBitmapEx( + OverlayAnimatedBitmap( const basegfx::B2DPoint& rBasePos, const Bitmap& rBitmap1, const Bitmap& rBitmap2, @@ -63,7 +63,7 @@ namespace sdr::overlay sal_uInt16 nCenY2 = 0, double fShearX = 0.0, double fRotation = 0.0); - virtual ~OverlayAnimatedBitmapEx() override; + virtual ~OverlayAnimatedBitmap() override; // execute event from base class sdr::animation::Event. Default // implementation does nothing and does not create a new event. diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmap.hxx similarity index 92% rename from include/svx/sdr/overlay/overlaybitmapex.hxx rename to include/svx/sdr/overlay/overlaybitmap.hxx index 4bf43ab0ba4e..a0ede27ce597 100644 --- a/include/svx/sdr/overlay/overlaybitmapex.hxx +++ b/include/svx/sdr/overlay/overlaybitmap.hxx @@ -26,7 +26,7 @@ namespace sdr::overlay { - class SVXCORE_DLLPUBLIC OverlayBitmapEx final : public OverlayObjectWithBasePosition + class SVXCORE_DLLPUBLIC OverlayBitmap final : public OverlayObjectWithBasePosition { // the Bitmap itself Bitmap maBitmap; @@ -43,7 +43,7 @@ namespace sdr::overlay virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; public: - OverlayBitmapEx( + OverlayBitmap( const basegfx::B2DPoint& rBasePos, const Bitmap& rBitmap, sal_uInt16 nCenX = 0, @@ -51,7 +51,7 @@ namespace sdr::overlay double fAlpha = 0.0, double fShearX = 0.0, double fRotation = 0.0); - virtual ~OverlayBitmapEx() override; + virtual ~OverlayBitmap() override; }; } // end of namespace sdr::overlay diff --git a/sd/source/ui/annotations/AnnotationPopup.cxx b/sd/source/ui/annotations/AnnotationPopup.cxx index 39b5ce3612bd..f1589001befd 100644 --- a/sd/source/ui/annotations/AnnotationPopup.cxx +++ b/sd/source/ui/annotations/AnnotationPopup.cxx @@ -19,8 +19,8 @@ #include <vcl/settings.hxx> #include <vcl/weld/weldutils.hxx> -#include <svx/sdr/overlay/overlayanimatedbitmapex.hxx> -#include <svx/sdr/overlay/overlaybitmapex.hxx> +#include <svx/sdr/overlay/overlayanimatedbitmap.hxx> +#include <svx/sdr/overlay/overlaybitmap.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/svdpagv.hxx> #include <svx/sdrpagewindow.hxx> diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index aa0fb0bc40b3..dcdf3cf65390 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -30,7 +30,7 @@ #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> -#include <svx/sdr/overlay/overlaybitmapex.hxx> +#include <svx/sdr/overlay/overlaybitmap.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/svxids.hrc> #include <svx/svdpagv.hxx> @@ -289,7 +289,7 @@ void ImageButtonHdl::CreateB2dIAObject() if(rPaintWindow.OutputToWindow() && xManager.is() ) { std::unique_ptr<sdr::overlay::OverlayObject> pOverlayObject( - new sdr::overlay::OverlayBitmapEx( aPosition, aBitmap, 0, 0 )); + new sdr::overlay::OverlayBitmap( aPosition, aBitmap, 0, 0 )); // OVERLAYMANAGER insertNewlyCreatedOverlayObjectForSdrHdl( diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 141db21ee32e..c4c926484be4 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -5686,8 +5686,8 @@ include/svx/sdr/contact/viewcontactofe3dscene.hxx include/svx/sdr/contact/viewcontactofsdrobj.hxx include/svx/sdr/contact/viewobjectcontact.hxx include/svx/sdr/contact/viewobjectcontactredirector.hxx -include/svx/sdr/overlay/overlayanimatedbitmapex.hxx -include/svx/sdr/overlay/overlaybitmapex.hxx +include/svx/sdr/overlay/overlayanimatedbitmap.hxx +include/svx/sdr/overlay/overlaybitmap.hxx include/svx/sdr/overlay/overlaymanager.hxx include/svx/sdr/overlay/overlayobject.hxx include/svx/sdr/overlay/overlayobjectlist.hxx @@ -11387,8 +11387,8 @@ svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx -svx/source/sdr/overlay/overlayanimatedbitmapex.cxx -svx/source/sdr/overlay/overlaybitmapex.cxx +svx/source/sdr/overlay/overlayanimatedbitmap.cxx +svx/source/sdr/overlay/overlaybitmap.cxx svx/source/sdr/overlay/overlaycrosshair.cxx svx/source/sdr/overlay/overlayhandle.cxx svx/source/sdr/overlay/overlayhelpline.cxx diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index e2d178b688f5..4487586a7b35 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -279,10 +279,10 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/sdr/overlay/overlaytriangle \ svx/source/sdr/overlay/overlayselection \ svx/source/sdr/overlay/overlayrectangle \ - svx/source/sdr/overlay/overlaybitmapex \ + svx/source/sdr/overlay/overlaybitmap \ svx/source/sdr/overlay/overlaymanagerbuffered \ svx/source/sdr/overlay/overlayhelpline \ - svx/source/sdr/overlay/overlayanimatedbitmapex \ + svx/source/sdr/overlay/overlayanimatedbitmap \ svx/source/sdr/overlay/overlaypolypolygon \ svx/source/sdr/overlay/overlayobjectcell \ svx/source/sdr/overlay/overlaytools \ diff --git a/svx/inc/sdr/overlay/overlaytools.hxx b/svx/inc/sdr/overlay/overlaytools.hxx index bdb6ac704674..8924d37730cb 100644 --- a/svx/inc/sdr/overlay/overlaytools.hxx +++ b/svx/inc/sdr/overlay/overlaytools.hxx @@ -65,7 +65,7 @@ public: // with the target position is given in discrete X,Y coordinates namespace drawinglayer::primitive2d { - class OverlayBitmapExPrimitive final : public DiscreteMetricDependentPrimitive2D + class OverlayBitmapPrimitive final : public DiscreteMetricDependentPrimitive2D { private: // The Bitmap to use, PixelSize is used @@ -86,7 +86,7 @@ namespace drawinglayer::primitive2d virtual Primitive2DReference create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const override; public: - OverlayBitmapExPrimitive( + OverlayBitmapPrimitive( const Bitmap& rBitmap, const basegfx::B2DPoint& rBasePosition, sal_uInt16 nCenterX, diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmap.cxx similarity index 91% rename from svx/source/sdr/overlay/overlayanimatedbitmapex.cxx rename to svx/source/sdr/overlay/overlayanimatedbitmap.cxx index eca000c828b2..1940cc95b83d 100644 --- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx +++ b/svx/source/sdr/overlay/overlayanimatedbitmap.cxx @@ -17,19 +17,19 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svx/sdr/overlay/overlayanimatedbitmapex.hxx> +#include <svx/sdr/overlay/overlayanimatedbitmap.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <sdr/overlay/overlaytools.hxx> namespace sdr::overlay { - drawinglayer::primitive2d::Primitive2DContainer OverlayAnimatedBitmapEx::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayAnimatedBitmap::createOverlayObjectPrimitive2DSequence() { if(mbOverlayState) { const drawinglayer::primitive2d::Primitive2DReference aPrimitive( - new drawinglayer::primitive2d::OverlayBitmapExPrimitive( + new drawinglayer::primitive2d::OverlayBitmapPrimitive( maBitmap1, getBasePosition(), mnCenterX1, @@ -42,7 +42,7 @@ namespace sdr::overlay else { const drawinglayer::primitive2d::Primitive2DReference aPrimitive( - new drawinglayer::primitive2d::OverlayBitmapExPrimitive( + new drawinglayer::primitive2d::OverlayBitmapPrimitive( maBitmap2, getBasePosition(), mnCenterX2, @@ -54,7 +54,7 @@ namespace sdr::overlay } } - OverlayAnimatedBitmapEx::OverlayAnimatedBitmapEx( + OverlayAnimatedBitmap::OverlayAnimatedBitmap( const basegfx::B2DPoint& rBasePos, const Bitmap& rBitmap1, const Bitmap& rBitmap2, @@ -79,11 +79,11 @@ namespace sdr::overlay mbAllowsAnimation = true; } - OverlayAnimatedBitmapEx::~OverlayAnimatedBitmapEx() + OverlayAnimatedBitmap::~OverlayAnimatedBitmap() { } - void OverlayAnimatedBitmapEx::Trigger(sal_uInt32 nTime) + void OverlayAnimatedBitmap::Trigger(sal_uInt32 nTime) { if(!getOverlayManager()) return; diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmap.cxx similarity index 90% rename from svx/source/sdr/overlay/overlaybitmapex.cxx rename to svx/source/sdr/overlay/overlaybitmap.cxx index 0beaedaf1c78..ac96eb46d62f 100644 --- a/svx/source/sdr/overlay/overlaybitmapex.cxx +++ b/svx/source/sdr/overlay/overlaybitmap.cxx @@ -18,16 +18,16 @@ */ #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> -#include <svx/sdr/overlay/overlaybitmapex.hxx> +#include <svx/sdr/overlay/overlaybitmap.hxx> #include <sdr/overlay/overlaytools.hxx> namespace sdr::overlay { - drawinglayer::primitive2d::Primitive2DContainer OverlayBitmapEx::createOverlayObjectPrimitive2DSequence() + drawinglayer::primitive2d::Primitive2DContainer OverlayBitmap::createOverlayObjectPrimitive2DSequence() { drawinglayer::primitive2d::Primitive2DReference aReference( - new drawinglayer::primitive2d::OverlayBitmapExPrimitive( + new drawinglayer::primitive2d::OverlayBitmapPrimitive( maBitmap, getBasePosition(), mnCenterX, @@ -44,7 +44,7 @@ namespace sdr::overlay return drawinglayer::primitive2d::Primitive2DContainer { aReference }; } - OverlayBitmapEx::OverlayBitmapEx( + OverlayBitmap::OverlayBitmap( const basegfx::B2DPoint& rBasePos, const Bitmap& rBitmap, sal_uInt16 nCenX, @@ -62,7 +62,7 @@ namespace sdr::overlay { } - OverlayBitmapEx::~OverlayBitmapEx() + OverlayBitmap::~OverlayBitmap() { } diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index 442fa25b7aa6..a1a2a771c642 100644 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx @@ -120,7 +120,7 @@ sal_uInt32 OverlayStaticRectanglePrimitive::getPrimitive2DID() const - OverlayBitmapExPrimitive::OverlayBitmapExPrimitive( + OverlayBitmapPrimitive::OverlayBitmapPrimitive( const Bitmap& rBitmap, const basegfx::B2DPoint& rBasePosition, sal_uInt16 nCenterX, @@ -135,7 +135,7 @@ sal_uInt32 OverlayStaticRectanglePrimitive::getPrimitive2DID() const mfRotation(fRotation) {} - Primitive2DReference OverlayBitmapExPrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const + Primitive2DReference OverlayBitmapPrimitive::create2DDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const { const Size aBitmapSize(getBitmap().GetSizePixel()); @@ -178,11 +178,11 @@ sal_uInt32 OverlayStaticRectanglePrimitive::getPrimitive2DID() const return new BitmapPrimitive2D(getBitmap(), aTransform); } - bool OverlayBitmapExPrimitive::operator==( const BasePrimitive2D& rPrimitive ) const + bool OverlayBitmapPrimitive::operator==( const BasePrimitive2D& rPrimitive ) const { if(DiscreteMetricDependentPrimitive2D::operator==(rPrimitive)) { - const OverlayBitmapExPrimitive& rCompare = static_cast< const OverlayBitmapExPrimitive& >(rPrimitive); + const OverlayBitmapPrimitive& rCompare = static_cast< const OverlayBitmapPrimitive& >(rPrimitive); return (getBitmap() == rCompare.getBitmap() && getBasePosition() == rCompare.getBasePosition() @@ -195,7 +195,7 @@ sal_uInt32 OverlayStaticRectanglePrimitive::getPrimitive2DID() const return false; } - sal_uInt32 OverlayBitmapExPrimitive::getPrimitive2DID() const + sal_uInt32 OverlayBitmapPrimitive::getPrimitive2DID() const { return PRIMITIVE2D_ID_OVERLAYBITMAPEXPRIMITIVE; } diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 432a12fa0b93..21475b5e3651 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -42,8 +42,8 @@ #include <basegfx/vector/b2dvector.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <svx/sdr/overlay/overlayanimatedbitmapex.hxx> -#include <svx/sdr/overlay/overlaybitmapex.hxx> +#include <svx/sdr/overlay/overlayanimatedbitmap.hxx> +#include <svx/sdr/overlay/overlaybitmap.hxx> #include <sdr/overlay/overlayline.hxx> #include <sdr/overlay/overlaytriangle.hxx> #include <sdr/overlay/overlayhandle.hxx> @@ -861,19 +861,19 @@ std::unique_ptr<sdr::overlay::OverlayObject> SdrHdl::CreateOverlayObject( if(eKindOfMarker == BitmapMarkerKind::Anchor || eKindOfMarker == BitmapMarkerKind::AnchorPressed) { // when anchor is used take upper left as reference point inside the handle - pRetval.reset(new sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmp1, aBmp2, nBlinkTime)); + pRetval.reset(new sdr::overlay::OverlayAnimatedBitmap(rPos, aBmp1, aBmp2, nBlinkTime)); } else if(eKindOfMarker == BitmapMarkerKind::AnchorTR || eKindOfMarker == BitmapMarkerKind::AnchorPressedTR) { // AnchorTR for SW, take top right as (0,0) - pRetval.reset(new sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmp1, aBmp2, nBlinkTime, + pRetval.reset(new sdr::overlay::OverlayAnimatedBitmap(rPos, aBmp1, aBmp2, nBlinkTime, static_cast<sal_uInt16>(aBmp1.GetSizePixel().Width() - 1), 0, static_cast<sal_uInt16>(aBmp2.GetSizePixel().Width() - 1), 0)); } else { // create centered handle as default - pRetval.reset(new sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmp1, aBmp2, nBlinkTime, + pRetval.reset(new sdr::overlay::OverlayAnimatedBitmap(rPos, aBmp1, aBmp2, nBlinkTime, static_cast<sal_uInt16>(aBmp1.GetSizePixel().Width() - 1) >> 1, static_cast<sal_uInt16>(aBmp1.GetSizePixel().Height() - 1) >> 1, static_cast<sal_uInt16>(aBmp2.GetSizePixel().Width() - 1) >> 1, @@ -901,12 +901,12 @@ std::unique_ptr<sdr::overlay::OverlayObject> SdrHdl::CreateOverlayObject( if(eKindOfMarker == BitmapMarkerKind::Anchor || eKindOfMarker == BitmapMarkerKind::AnchorPressed) { // upper left as reference point inside the handle for AnchorPressed, too - pRetval.reset(new sdr::overlay::OverlayBitmapEx(rPos, aBmp)); + pRetval.reset(new sdr::overlay::OverlayBitmap(rPos, aBmp)); } else if(eKindOfMarker == BitmapMarkerKind::AnchorTR || eKindOfMarker == BitmapMarkerKind::AnchorPressedTR) { // AnchorTR for SW, take top right as (0,0) - pRetval.reset(new sdr::overlay::OverlayBitmapEx(rPos, aBmp, + pRetval.reset(new sdr::overlay::OverlayBitmap(rPos, aBmp, static_cast<sal_uInt16>(aBmp.GetSizePixel().Width() - 1), 0)); } else @@ -933,7 +933,7 @@ std::unique_ptr<sdr::overlay::OverlayObject> SdrHdl::CreateOverlayObject( } // create centered handle as default - pRetval.reset(new sdr::overlay::OverlayBitmapEx(rPos, aBmp, nCenX, nCenY)); + pRetval.reset(new sdr::overlay::OverlayBitmap(rPos, aBmp, nCenX, nCenY)); } } @@ -1152,7 +1152,7 @@ void SdrHdlColor::CreateB2dIAObject() Bitmap aBmpCol(CreateColorDropper(m_aMarkerColor)); basegfx::B2DPoint aPosition(m_aPos.X(), m_aPos.Y()); std::unique_ptr<sdr::overlay::OverlayObject> pNewOverlayObject(new - sdr::overlay::OverlayBitmapEx( + sdr::overlay::OverlayBitmap( aPosition, aBmpCol, static_cast<sal_uInt16>(aBmpCol.GetSizePixel().Width() - 1) >> 1, @@ -2423,7 +2423,7 @@ void SdrCropHdl::CreateB2dIAObject() const sal_uInt64 nBlinkTime = rStyleSettings.GetCursorBlinkTime(); - pOverlayObject.reset(new sdr::overlay::OverlayAnimatedBitmapEx( + pOverlayObject.reset(new sdr::overlay::OverlayAnimatedBitmap( aPosition, aBmp1, aBmp2, @@ -2438,7 +2438,7 @@ void SdrCropHdl::CreateB2dIAObject() else { // create centered handle as default - pOverlayObject.reset(new sdr::overlay::OverlayBitmapEx( + pOverlayObject.reset(new sdr::overlay::OverlayBitmap( aPosition, aBmp1, static_cast<sal_uInt16>(aBmp1.GetSizePixel().Width() - 1) >> 1,
