From 078aa3e98baaead463d267bb84fe49e633401956 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 25 Aug 2025 11:06:48 +0200 Subject: [PATCH] BitmapEx->Bitmap in various now that Bitmap supports transparency Change-Id: Ie494104a84cdf64e3c44b5fda98cc893e49e91b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190160 Tested-by: Jenkins Reviewed-by: Noel Grandin --- filter/source/msfilter/msdffimp.cxx | 4 +- forms/source/component/clickableimage.cxx | 2 +- oox/source/drawingml/fillproperties.cxx | 46 +++++++++++++--------- oox/source/export/drawingml.cxx | 4 +- reportdesign/qa/unit/data/roundTrip.odb | Bin 22234 -> 22045 bytes sc/source/filter/excel/xeescher.cxx | 2 +- sd/source/filter/eppt/epptso.cxx | 8 ++-- sd/source/ui/dlg/BulletAndPositionDlg.cxx | 2 +- sd/source/ui/dlg/PhotoAlbumDialog.cxx | 2 +- sd/source/ui/dlg/animobjs.cxx | 30 +++++++------- sd/source/ui/func/fuvect.cxx | 2 +- sd/source/ui/inc/animobjs.hxx | 2 +- sw/source/core/graphic/ndgrf.cxx | 2 +- sw/source/ui/frmdlg/frmpage.cxx | 6 +-- sw/source/uibase/dochdl/swdtflvr.cxx | 2 +- sw/source/uibase/inc/bmpwin.hxx | 4 +- 16 files changed, 63 insertions(+), 55 deletions(-) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 95240d7e9ee2..106cb53dd876 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3805,7 +3805,7 @@ static void lcl_ApplyCropping( const DffPropSet& rPropSet, SfxItemSet* pSet, Gra double fFactor; Size aCropSize; - BitmapEx aCropBitmap; + Bitmap aCropBitmap; sal_uInt32 nTop( 0 ), nBottom( 0 ), nLeft( 0 ), nRight( 0 ); // Cropping has to be applied on a loaded graphic. @@ -3815,7 +3815,7 @@ static void lcl_ApplyCropping( const DffPropSet& rPropSet, SfxItemSet* pSet, Gra aCropSize = lcl_GetPrefSize(rGraf, MapMode(MapUnit::Map100thMM)); else { - aCropBitmap = rGraf.GetBitmapEx(); + aCropBitmap = rGraf.GetBitmap(); aCropSize = aCropBitmap.GetSizePixel(); } if ( nCropTop ) diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 7f4ccc69e490..0c264f453c14 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -812,7 +812,7 @@ namespace frm IMPL_LINK( OClickableImageBaseModel, OnImageImportDone, Graphic*, i_pGraphic, void ) { - const Reference< XGraphic > xGraphic( i_pGraphic != nullptr ? Graphic(i_pGraphic->GetBitmapEx()).GetXGraphic() : nullptr ); + const Reference< XGraphic > xGraphic( i_pGraphic != nullptr ? Graphic(i_pGraphic->GetBitmap()).GetXGraphic() : nullptr ); if ( !xGraphic.is() ) { m_xGraphicObject.clear(); diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 8168a0791d81..20c2f9cd29fc 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -88,10 +88,10 @@ Reference< XGraphic > lclRotateGraphic(uno::Reference const & assert (aGraphic.GetType() == GraphicType::Bitmap); - BitmapEx aBitmapEx(aGraphic.GetBitmapEx()); + Bitmap aBitmap(aGraphic.GetBitmap()); const ::Color aColor(0x00); - aBitmapEx.Rotate(nRotation, aColor); - aReturnGraphic = ::Graphic(aBitmapEx); + aBitmap.Rotate(nRotation, aColor); + aReturnGraphic = ::Graphic(aBitmap); aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); return aReturnGraphic.GetXGraphic(); @@ -134,22 +134,22 @@ Reference lclCropGraphic(uno::Reference const& xGra ::Graphic aGraphic(xGraphic); assert (aGraphic.GetType() == GraphicType::Bitmap); - BitmapEx aBitmapEx; + Bitmap aBitmap; if (quotients) { - aBitmapEx = aGraphic.GetBitmapEx(); + aBitmap = aGraphic.GetBitmap(); - const Size bmpSize = aBitmapEx.GetSizePixel(); + const Size bmpSize = aBitmap.GetSizePixel(); const auto& [qx1, qy1, qx2, qy2] = *quotients; const tools::Long l = std::round(bmpSize.Width() * qx1); const tools::Long t = std::round(bmpSize.Height() * qy1); const tools::Long r = std::round(bmpSize.Width() * qx2); const tools::Long b = std::round(bmpSize.Height() * qy2); - aBitmapEx.Crop({ l, t, bmpSize.Width() - r - 1, bmpSize.Height() - b - 1 }); + aBitmap.Crop({ l, t, bmpSize.Width() - r - 1, bmpSize.Height() - b - 1 }); } - ::Graphic aReturnGraphic(aBitmapEx); + ::Graphic aReturnGraphic(aBitmap); aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); return aReturnGraphic.GetXGraphic(); @@ -162,7 +162,7 @@ Reference< XGraphic > lclMirrorGraphic(uno::Reference const & assert (aGraphic.GetType() == GraphicType::Bitmap); - BitmapEx aBitmapEx(aGraphic.GetBitmapEx()); + Bitmap aBitmap(aGraphic.GetBitmap()); BmpMirrorFlags nMirrorFlags = BmpMirrorFlags::NONE; if(bFlipH) @@ -170,9 +170,9 @@ Reference< XGraphic > lclMirrorGraphic(uno::Reference const & if(bFlipV) nMirrorFlags |= BmpMirrorFlags::Vertical; - aBitmapEx.Mirror(nMirrorFlags); + aBitmap.Mirror(nMirrorFlags); - aReturnGraphic = ::Graphic(aBitmapEx); + aReturnGraphic = ::Graphic(aBitmap); aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); return aReturnGraphic.GetXGraphic(); @@ -185,10 +185,10 @@ Reference< XGraphic > lclGreysScaleGraphic(uno::Reference con assert (aGraphic.GetType() == GraphicType::Bitmap); - BitmapEx aBitmapEx(aGraphic.GetBitmapEx()); - aBitmapEx.Convert(BmpConversion::N8BitGreys); + Bitmap aBitmap(aGraphic.GetBitmap()); + aBitmap.Convert(BmpConversion::N8BitGreys); - aReturnGraphic = ::Graphic(aBitmapEx); + aReturnGraphic = ::Graphic(aBitmap); aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); return aReturnGraphic.GetXGraphic(); @@ -207,13 +207,21 @@ Reference lclApplyBlackWhiteEffect(const BlipFillProperties& aBlipProp ::Graphic aGraphic(xGraphic); ::Graphic aReturnGraphic; - BitmapEx aBitmapEx(aGraphic.GetBitmapEx()); - const AlphaMask& aMask(aBitmapEx.GetAlphaMask()); + Bitmap aBitmap(aGraphic.GetBitmap()); + if (aBitmap.HasAlpha()) + { + const AlphaMask aMask(aBitmap.CreateAlphaMask()); - Bitmap aTmpBmp(aBitmapEx.GetBitmap()); - BitmapFilter::Filter(aTmpBmp, BitmapMonochromeFilter{ nThreshold }); + Bitmap aTmpBmp(aBitmap.CreateColorBitmap()); + BitmapFilter::Filter(aTmpBmp, BitmapMonochromeFilter{ nThreshold }); - aReturnGraphic = ::Graphic(BitmapEx(aTmpBmp, aMask)); + aReturnGraphic = ::Graphic(BitmapEx(aTmpBmp, aMask)); + } + else + { + BitmapFilter::Filter(aBitmap, BitmapMonochromeFilter{ nThreshold }); + aReturnGraphic = ::Graphic(aBitmap); + } aReturnGraphic.setOriginURL(aGraphic.getOriginURL()); return aReturnGraphic.GetXGraphic(); } diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 484e2bcafea3..256eeb958aa2 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -3324,10 +3324,10 @@ void DrawingML::WriteParagraphNumbering(const Reference< XPropertySet >& rXPropS AlphaMask aMask(aDestSize); aMask.Erase(255); - BitmapEx aSourceBitmap(aGraphic.GetBitmapEx()); + Bitmap aSourceBitmap(aGraphic.GetBitmap()); aSourceBitmap.Scale(aDestRect.GetSize()); tools::Rectangle aSourceRect(Point(0, 0), aDestRect.GetSize()); - BitmapEx aDestBitmap(Bitmap(aDestSize, vcl::PixelFormat::N24_BPP), aMask); + Bitmap aDestBitmap(BitmapEx(Bitmap(aDestSize, vcl::PixelFormat::N24_BPP), aMask)); aDestBitmap.CopyPixel(aDestRect, aSourceRect, aSourceBitmap); Graphic aDestGraphic(aDestBitmap); sRelationId = writeGraphicToStorage(aDestGraphic); diff --git a/reportdesign/qa/unit/data/roundTrip.odb b/reportdesign/qa/unit/data/roundTrip.odb index 5e9eb78ebb28aaa2782b70358940b2777b7c2ea5..f36e443b44221163b41f5301d8e82a90a95e37a9 100644 GIT binary patch delta 1165 zcmYk6do*hn_16vrs%w@TYAuLYgdn1>8a_uWX{U{=lebP@xAAKKKFa)TJhQzT#Fw- zP|?RQ5{7X(_FrxsDGp^lZ&z$T5cVuyR%{RLwVuJ z`hnGDGTB>5KJ6Z)pEJHdWA*UU@eZn_=O(%)x)3gSD%zjd(Y9#eK9umdhoa%#ZBVnW zI^WHJ0_{r^(?IS%w^~NYE9&~>ov@1hu1&Pb;ilxB9ZYXud=wG?Rn}r+mh?!ybwt`| z?i@`{F;uC|)?AL#*&ENfE`giV`TWj>vq?Fp@94kysi3Fw4IBSqy{v2YS`znzi;RMZ zufMSAksLg^RrxouI^)Zux{ON9`f{d z)YKbE-W2B)_oIxl&s5`X*9u1rR?h!<6pnOls5Q2{AZY8>xca&NWq)VLEB3&r{|KPu zcT4SY-wT$u@Ata?`Uo;EO1Fr%Zn)BqR5MN7qHyD(t@MKS!=XDfuXOtogi;d2Vj)~5QJCt$iOhQ`bPI0CE-NrFY zardrK0q1x|#O>~ZS)M7L3hO*a6;Q!2a0oU9KR(5*N)^LSrAjj6B$;+^r6lhZSGF8T z`KIV|b#T|vhYr3qnotLc1_jpnbR^dT^I#ub9mK(2s9hIYgV|`z01^#NKqrKbbAT1% zh1SeK8sdYS!C(j*w+1Z%8#&Tolx7O40y-WA9}Bz?kq&iq8z63mY5W+$>9(_;k;crsqnx_gJ3p zOFq7>T1}4MweZHd@vME4J;C#fJthBkly99q`$UcB zrYBi*#dgk!Hb^YA_Rmx>_#e)3>axJ=Yd_@{iA26P+1e82Ct=jTV6N$9(+mA(LH&Dz zO>cJm<5An|VJVZ#6_7dWh38T4ojX7NIxipK&CXH!NP6ja1_p**j0_B*fZ-5f;Nai@ zg-oRMn7oGhXgxbeMu^ql4M3q4P@OQ1$VwR)cz`NW5=#=35{pyy zbMn(KUoSGda*4l;H;{w>6Hj4pdEwW>o)CivOq~{OZ9lAk|Nd3grm@5F7t8KN+-)qa zyNVcr&SK{{-OS`_3^d9Sh@sAeMBwIX786!r+-=^->ForH!++i(theg+7oVCO?xQ6$ zcT4+mrmb#5uDaV@F0ttp_Gs{K3R#ouU{z!{fAU-(@%r=k8WR>D{E*kdwP;nBv4T36 zZDygcZ1jp94LAJFZznT`YP+miS*i=w#C{c8FUHO+HB`^n7L zC%d8?Dm-}iIo?`(Nc)ssR4rre(q(4*tR7q3C@j@Aj@eykx_fq^XzMC>!7UHw@OS#| zxvs}ym2ZECmtUwp&1=^=)8yB78j&A&neGkE?fU;B{r0JKQFiFdOPB7cAhuI&m9>@_}r0YNP*WU^kj^(8@P6khI z?MM?-n|1Tc#V;K7tk32-a-UjY{YLj5>*I2@{EWB$36cNVr4%eGCpcC-OWZWM{e++0 z-{oq&7u}_n^b5F0NfcL}xvKtL=KqiNQ8i4U@Ly+;w|N6Fq9^f!!k>{zgaMX=CcpPJ z0foD&pEa+Ujbt=DK~2u}Gm!_0tme)?e+C$D20;D%KpFvhCm-;WVuPfx$q)Qw7^hAC z>nGs=OLEAO4oXJ|(8z+Cs?eMy?JvXlZnA~HF_RGMMo~n9YpYNh#b=t$H|6{5|dYl2uyYjm11&mo}3u! q%4Fm<`Mf8{QVtbZ;3CJUC`uR<`b_>1D$l3Dpums-EF@F>K(YYiHPW~M diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index d9bc7f3ea56d..ede251e562b8 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -393,7 +393,7 @@ XclExpImgData::XclExpImgData( Graphic aGraphic, sal_uInt16 nRecId ) : void XclExpImgData::Save( XclExpStream& rStrm ) { - Bitmap aBmp = maGraphic.GetBitmapEx().GetBitmap(); + Bitmap aBmp = maGraphic.GetBitmap().CreateColorBitmap(); if (aBmp.getPixelFormat() != vcl::PixelFormat::N24_BPP) aBmp.Convert( BmpConversion::N24Bit ); diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index b3e1711e8f52..2ed414db9bdb 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -91,13 +91,13 @@ sal_uInt16 PPTExBulletProvider::GetId(Graphic const & rGraphic, Size& rGraphicSi Graphic aMappedGraphic; GraphicObject aGraphicObject(rGraphic); Size aPrefSize( rGraphic.GetPrefSize() ); - BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); + Bitmap aBmp( rGraphic.GetBitmap() ); if ( rGraphicSize.Width() && rGraphicSize.Height() ) { if (aPrefSize.IsEmpty()) { - aBmpEx.Scale(aPrefSize); + aBmp.Scale(aPrefSize); } else { @@ -113,11 +113,11 @@ sal_uInt16 PPTExBulletProvider::GetId(Graphic const & rGraphic, Size& rGraphicSi if ( ( fXScale != 1.0 ) || ( fYScale != 1.0 ) ) { - aBmpEx.Scale( fXScale, fYScale ); + aBmp.Scale( fXScale, fYScale ); rGraphicSize = Size( static_cast(static_cast(rGraphicSize.Width()) / fXScale + 0.5 ), static_cast(static_cast(rGraphicSize.Height()) / fYScale + 0.5 ) ); - aMappedGraphic = Graphic( aBmpEx ); + aMappedGraphic = Graphic( aBmp ); aGraphicObject.SetGraphic(aMappedGraphic); } } diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index 44eb256f0775..921d33d1f869 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -912,7 +912,7 @@ void SvxBulletAndPositionDlg::PopulateGalleryMenu() sGrfName = aObj.PathToFileName(); if (GalleryExplorer::GetGraphicObj(GALLERY_THEME_BULLETS, i, &aGraphic)) { - BitmapEx aBitmap(aGraphic.GetBitmapEx()); + Bitmap aBitmap(aGraphic.GetBitmap()); Size aSize(aBitmap.GetSizePixel()); if (aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT) { diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index e15b8fc954b6..79334a5a947f 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -602,7 +602,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl, weld::TreeView&, void) m_pGraphicFilter->ImportGraphic( aGraphic, aURLObj, nFilter, nullptr, nFilterImportFlags ); } - BitmapEx aBmp = aGraphic.GetBitmapEx(); + Bitmap aBmp = aGraphic.GetBitmap(); sal_Int32 nBmpWidth = aBmp.GetSizePixel().Width(); sal_Int32 nBmpHeight = aBmp.GetSizePixel().Height(); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 6d906aa71d4f..ac6516b202e5 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -641,8 +641,8 @@ Fraction AnimationWindow::GetScale() Size aBmpSize(0, 0); for (size_t i = 0; i < nCount; i++) { - BitmapEx const & rBitmap = m_FrameList[i].first; - Size aTempSize( rBitmap.GetBitmap().GetSizePixel() ); + Bitmap const & rBitmap = m_FrameList[i].first; + Size aTempSize( rBitmap.GetSizePixel() ); aBmpSize.setWidth( std::max( aBmpSize.Width(), aTempSize.Width() ) ); aBmpSize.setHeight( std::max( aBmpSize.Height(), aTempSize.Height() ) ); } @@ -745,7 +745,7 @@ void AnimationWindow::AddObj (::sd::View& rView ) size_t nIndex = m_nCurrentFrame + 1; m_FrameList.insert( m_FrameList.begin() + nIndex, - ::std::make_pair(rAnimationFrame.maBitmapEx, aTime)); + ::std::make_pair(Bitmap(rAnimationFrame.maBitmapEx), aTime)); // increment => next one inserted after this one ++m_nCurrentFrame; @@ -763,11 +763,11 @@ void AnimationWindow::AddObj (::sd::View& rView ) for (const rtl::Reference& pSnapShot : *pObjList) { - BitmapEx aBitmapEx(SdrExchangeView::GetObjGraphic(*pSnapShot).GetBitmapEx()); + Bitmap aBitmap(SdrExchangeView::GetObjGraphic(*pSnapShot).GetBitmap()); size_t nIndex = m_nCurrentFrame + 1; m_FrameList.insert( m_FrameList.begin() + nIndex, - ::std::make_pair(aBitmapEx, m_xFormatter->GetTime())); + ::std::make_pair(aBitmap, m_xFormatter->GetTime())); // increment => next one inserted after this one ++m_nCurrentFrame; @@ -783,14 +783,14 @@ void AnimationWindow::AddObj (::sd::View& rView ) // also one single animated object if( !bAnimObj && !( bAllObjects && nMarkCount > 1 ) ) { - BitmapEx aBitmapEx(rView.GetAllMarkedGraphic().GetBitmapEx()); + Bitmap aBitmap(rView.GetAllMarkedGraphic().GetBitmap()); ::tools::Time aTime( m_xFormatter->GetTime() ); size_t nIndex = m_nCurrentFrame + 1; m_FrameList.insert( m_FrameList.begin() + nIndex, - ::std::make_pair(aBitmapEx, aTime)); + ::std::make_pair(aBitmap, aTime)); } // one single object @@ -812,11 +812,11 @@ void AnimationWindow::AddObj (::sd::View& rView ) { // Clone SdrObject* pObject(rMarkList.GetMark(nObject)->GetMarkedSdrObj()); - BitmapEx aBitmapEx(SdrExchangeView::GetObjGraphic(*pObject).GetBitmapEx()); + Bitmap aBitmap(SdrExchangeView::GetObjGraphic(*pObject).GetBitmap()); size_t nIndex = m_nCurrentFrame + 1; m_FrameList.insert( m_FrameList.begin() + nIndex, - ::std::make_pair(aBitmapEx, m_xFormatter->GetTime())); + ::std::make_pair(aBitmap, m_xFormatter->GetTime())); // increment => next one inserted after this one ++m_nCurrentFrame; @@ -881,10 +881,10 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) // find biggest bitmap for (size_t i = 0; i < nCount; ++i) { - const BitmapEx& rBmpEx = m_FrameList[i].first; - const Graphic aGraphic( rBmpEx ); + const Bitmap& rBmp = m_FrameList[i].first; + const Graphic aGraphic( rBmp ); Size aTmpSizeLog; - const Size aTmpSizePix( rBmpEx.GetSizePixel() ); + const Size aTmpSizePix( rBmp.GetSizePixel() ); if ( aGraphic.GetPrefMapMode().GetMapUnit() == MapUnit::MapPixel ) aTmpSizeLog = pDefDev->PixelToLogic( aGraphic.GetPrefSize(), aMap100 ); @@ -912,10 +912,10 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) ::tools::Long nTime = rTime.GetNanoSec(); nTime += rTime.GetSec() * 100; - BitmapEx const & rBitmapEx = m_FrameList[i].first; + Bitmap const & rBitmap = m_FrameList[i].first; // calculate offset for the specified direction - const Size aBitmapSize( rBitmapEx.GetSizePixel() ); + const Size aBitmapSize( rBitmap.GetSizePixel() ); switch( eBA ) { @@ -968,7 +968,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) if( nPos != -1 && nPos != m_xLbLoopCount->get_count() - 1 ) // endless nLoopCount = m_xLbLoopCount->get_active_text().toUInt32(); - aAnimationFrame.maBitmapEx = rBitmapEx; + aAnimationFrame.maBitmapEx = rBitmap; aAnimationFrame.maPositionPixel = aPt; aAnimationFrame.maSizePixel = aBitmapSize; aAnimationFrame.mnWait = nTime; diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx index aadf01793a75..24d8017b3e0b 100644 --- a/sd/source/ui/func/fuvect.cxx +++ b/sd/source/ui/func/fuvect.cxx @@ -63,7 +63,7 @@ void FuVectorize::DoExecute( SfxRequest& ) SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create(); ScopedVclPtr pDlg( pFact->CreateSdVectorizeDlg(mpWindow ? mpWindow->GetFrameWeld() : nullptr, - pSdrGrafObj->GetGraphic().GetBitmapEx().GetBitmap(), mpDocSh ) ); + pSdrGrafObj->GetGraphic().GetBitmap().CreateColorBitmap(), mpDocSh ) ); if( pDlg->Execute() != RET_OK ) return; diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index bddf9e597fc5..200d61c741b9 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -111,7 +111,7 @@ private: std::unique_ptr m_xBtnCreateGroup; std::unique_ptr m_xBtnHelp; - ::std::vector< ::std::pair > m_FrameList; + ::std::vector< ::std::pair > m_FrameList; static constexpr size_t EMPTY_FRAMELIST = std::numeric_limits::max(); size_t m_nCurrentFrame; std::unique_ptr pMyDoc; diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index a4d45fd19d1e..077edc081e06 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -380,7 +380,7 @@ const GraphicObject* SwGrfNode::GetReplacementGrfObj() const else if (GetGrfObj().GetGraphic().GetType() == GraphicType::GdiMetafile) { // Replacement graphic for PDF and metafiles is just the bitmap. - const_cast(this)->mpReplacementGraphic.reset( new GraphicObject(GetGrfObj().GetGraphic().GetBitmapEx()) ); + const_cast(this)->mpReplacementGraphic.reset( new GraphicObject(GetGrfObj().GetGraphic().GetBitmap()) ); } } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 8ac5d98e99d2..bd83353dc170 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -2506,7 +2506,7 @@ SwGrfExtPage::SwGrfExtPage(weld::Container* pPage, weld::DialogController* pCont // tdf#138843 place holder for the graphic type , m_xLabelGraphicType(m_xBuilder->weld_label(u"label-graphic-type"_ustr)) { - m_aBmpWin.SetBitmapEx(BitmapEx(Bitmap(RID_BMP_PREVIEW_FALLBACK))); + m_aBmpWin.SetBitmap(Bitmap(RID_BMP_PREVIEW_FALLBACK)); m_xCtlAngle->SetLinkedField(m_xNfAngle.get(), 2); @@ -2823,7 +2823,7 @@ void BmpWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle if (m_bHorz || m_bVert) { - BitmapEx aTmpBmp(m_bGraphic ? m_aGraphic.GetBitmapEx() : m_aBmp); + Bitmap aTmpBmp(m_bGraphic ? m_aGraphic.GetBitmap() : m_aBmp); BmpMirrorFlags nMirrorFlags(BmpMirrorFlags::NONE); if (m_bHorz) nMirrorFlags |= BmpMirrorFlags::Vertical; @@ -2854,7 +2854,7 @@ void BmpWindow::SetGraphic(const Graphic& rGraphic) Invalidate(); } -void BmpWindow::SetBitmapEx(const BitmapEx& rBmp) +void BmpWindow::SetBitmap(const Bitmap& rBmp) { m_aBmp = rBmp; Invalidate(); diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 31704834183e..8a65bfec9331 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -1011,7 +1011,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut, bool bDeleteRedlines ) m_pWrtShell->Copy(rDoc); #if HAVE_FEATURE_DESKTOP - if (m_pOrigGraphic && !m_pOrigGraphic->GetBitmapEx().IsEmpty()) + if (m_pOrigGraphic && !m_pOrigGraphic->GetBitmap().IsEmpty()) AddFormat( SotClipboardFormatId::SVXB ); #endif diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx index fe2535d6b450..3732518c78a7 100644 --- a/sw/source/uibase/inc/bmpwin.hxx +++ b/sw/source/uibase/inc/bmpwin.hxx @@ -28,7 +28,7 @@ class BmpWindow final : public weld::CustomWidgetController { private: Graphic m_aGraphic; - BitmapEx m_aBmp; + Bitmap m_aBmp; bool m_bHorz : 1; bool m_bVert : 1; @@ -44,7 +44,7 @@ public: void MirrorVert(bool bMirror) { m_bVert = bMirror; Invalidate(); } void MirrorHorz(bool bMirror) { m_bHorz = bMirror; Invalidate(); } void SetGraphic(const Graphic& rGrf); - void SetBitmapEx(const BitmapEx& rGrf); + void SetBitmap(const Bitmap& rGrf); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */