cui/source/dialogs/AdditionsDialog.cxx | 2
cui/source/dialogs/cuigrfflt.cxx | 48 ++++++------
cui/source/dialogs/tipofthedaydlg.cxx | 6 -
cui/source/dialogs/uitabpage.cxx | 2
cui/source/tabpages/numpages.cxx | 4 -
cui/source/tabpages/tpbitmap.cxx | 8 +-
cui/source/tabpages/tpline.cxx | 2
filter/source/graphic/GraphicExportFilter.cxx | 2
filter/source/msfilter/msdffimp.cxx | 4 -
filter/source/msfilter/svdfppt.cxx | 2
filter/source/pdf/pdfexport.cxx | 2
forms/source/component/clickableimage.cxx | 2
framework/source/fwe/classes/addonsoptions.cxx | 10 +-
framework/source/uiconfiguration/imagemanagerimpl.cxx | 2
framework/source/uielement/imagebuttontoolbarcontroller.cxx | 8 +-
oox/source/drawingml/fillproperties.cxx | 46 ++++++-----
oox/source/export/drawingml.cxx | 4 -
reportdesign/qa/unit/data/roundTrip.odb |binary
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
sfx2/source/control/thumbnailview.cxx | 6 -
sfx2/source/dialog/filedlghelper.cxx | 2
svgio/source/svgreader/svgfeimagenode.cxx | 14 +--
svgio/source/svgreader/svgimagenode.cxx | 18 ++--
svtools/source/filter/exportdialog.cxx | 6 -
svx/source/core/graphichelper.cxx | 6 -
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 2
svx/source/svdraw/svdfmtf.cxx | 14 +--
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 -
toolkit/source/awt/vclxwindows.cxx | 6 -
toolkit/source/controls/tree/treecontrolpeer.cxx | 2
39 files changed, 150 insertions(+), 142 deletions(-)
New commits:
commit 078aa3e98baaead463d267bb84fe49e633401956
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Aug 25 11:06:48 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Aug 25 12:59:28 2025 +0200
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 <noel.gran...@collabora.co.uk>
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<graphic::XGraphic> 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<XGraphic>
lclCropGraphic(uno::Reference<graphic::XGraphic> 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<graphic::XGraphic> 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<graphic::XGraphic> 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<graphic::XGraphic> 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<XGraphic> 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 5e9eb78ebb28..f36e443b4422 100644
Binary files a/reportdesign/qa/unit/data/roundTrip.odb and
b/reportdesign/qa/unit/data/roundTrip.odb differ
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<sal_Int32>(static_cast<double>(rGraphicSize.Width()) / fXScale +
0.5 ),
static_cast<sal_Int32>(static_cast<double>(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<SdrObject>& 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<AbstractSdVectorizeDlg> 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<weld::Button> m_xBtnCreateGroup;
std::unique_ptr<weld::Button> m_xBtnHelp;
- ::std::vector< ::std::pair<BitmapEx, ::tools::Time> > m_FrameList;
+ ::std::vector< ::std::pair<Bitmap, ::tools::Time> > m_FrameList;
static constexpr size_t EMPTY_FRAMELIST =
std::numeric_limits<size_t>::max();
size_t m_nCurrentFrame;
std::unique_ptr<SdDrawDocument> 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<SwGrfNode*>(this)->mpReplacementGraphic.reset( new
GraphicObject(GetGrfObj().GetGraphic().GetBitmapEx()) );
+ const_cast<SwGrfNode*>(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: */
commit e6211a4b3bd74f2bf392fd5cda7dea51552cd250
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Aug 25 08:37:12 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Aug 25 12:59:18 2025 +0200
BitmapEx->Bitmap in various
now that Bitmap supports transparency
Change-Id: If946687832cf30db70db9749e5aeed38ab1490c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190149
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
index f2a81c1abaef..d535c6acf910 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -238,7 +238,7 @@ void LoadImage(std::u16string_view rPreviewFile,
std::shared_ptr<AdditionsItem>
// for VCL to be able to create bitmaps / do visual changes in the thread
aFilter.ImportGraphic(aGraphic, aURLObj);
- BitmapEx aBmp = aGraphic.GetBitmapEx();
+ Bitmap aBmp = aGraphic.GetBitmap();
Size aBmpSize = aBmp.GetSizePixel();
Size aThumbSize(pCurrentItem->m_xImageScreenshot->get_size_request());
if (!aBmp.IsEmpty())
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index fbd1360c5fe3..fb2f80ac342d 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -106,10 +106,10 @@ void CuiGraphicPreviewWindow::ScaleImageToFit()
if( !mpOrigGraphic->IsAnimated() )
{
- BitmapEx aBmpEx( mpOrigGraphic->GetBitmapEx() );
+ Bitmap aBmp( mpOrigGraphic->GetBitmap() );
- if( aBmpEx.Scale( aGrfSize ) )
- maScaledOrig = aBmpEx;
+ if( aBmp.Scale( aGrfSize ) )
+ maScaledOrig = aBmp;
}
}
@@ -208,14 +208,14 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const
Graphic& rGraphic,
}
else
{
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
+ Bitmap aBmp( rGraphic.GetBitmap() );
- if (BitmapFilter::Filter(aBmpEx, BitmapMosaicFilter(aSize.getWidth(),
aSize.getHeight())))
+ if (BitmapFilter::Filter(aBmp, BitmapMosaicFilter(aSize.getWidth(),
aSize.getHeight())))
{
if( IsEnhanceEdges() )
- BitmapFilter::Filter(aBmpEx, BitmapSharpenFilter());
+ BitmapFilter::Filter(aBmp, BitmapSharpenFilter());
- aRet = aBmpEx;
+ aRet = aBmp;
}
}
@@ -252,11 +252,11 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const
Graphic& rGraphic, double
}
else
{
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
+ Bitmap aBmp( rGraphic.GetBitmap() );
- if (BitmapFilter::Filter(aBmpEx, BitmapSmoothenFilter(nRadius)))
+ if (BitmapFilter::Filter(aBmp, BitmapSmoothenFilter(nRadius)))
{
- aRet = aBmpEx;
+ aRet = aBmp;
}
}
@@ -305,14 +305,14 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const
Graphic& rGraphic, doub
}
else
{
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
+ Bitmap aBmp( rGraphic.GetBitmap() );
- if (BitmapFilter::Filter(aBmpEx, BitmapSolarizeFilter(nGreyThreshold)))
+ if (BitmapFilter::Filter(aBmp, BitmapSolarizeFilter(nGreyThreshold)))
{
if( IsInvert() )
- aBmpEx.Invert();
+ aBmp.Invert();
- aRet = aBmpEx;
+ aRet = aBmp;
}
}
@@ -347,10 +347,10 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const
Graphic& rGraphic, double,
}
else
{
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
+ Bitmap aBmp( rGraphic.GetBitmap() );
- if (BitmapFilter::Filter(aBmpEx, BitmapSepiaFilter(nSepiaPct)))
- aRet = aBmpEx;
+ if (BitmapFilter::Filter(aBmp, BitmapSepiaFilter(nSepiaPct)))
+ aRet = aBmp;
}
return aRet;
@@ -361,7 +361,7 @@ GraphicFilterPoster::GraphicFilterPoster(weld::Window*
pParent, const Graphic& r
: GraphicFilterDialog(pParent, u"cui/ui/posterdialog.ui"_ustr,
u"PosterDialog"_ustr, rGraphic)
, mxNumPoster(m_xBuilder->weld_spin_button(u"value"_ustr))
{
- mxNumPoster->set_range(2,
vcl::pixelFormatBitCount(rGraphic.GetBitmapEx().getPixelFormat()));
+ mxNumPoster->set_range(2,
vcl::pixelFormatBitCount(rGraphic.GetBitmap().getPixelFormat()));
mxNumPoster->set_value(nPosterCount);
mxNumPoster->connect_value_changed(LINK(this, GraphicFilterPoster,
EditModifyHdl));
}
@@ -385,10 +385,10 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const
Graphic& rGraphic, double
}
else
{
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
+ Bitmap aBmp( rGraphic.GetBitmap() );
- if (BitmapFilter::Filter(aBmpEx,
BitmapColorQuantizationFilter(nPosterCount)))
- aRet = aBmpEx;
+ if (BitmapFilter::Filter(aBmp,
BitmapColorQuantizationFilter(nPosterCount)))
+ aRet = aBmp;
}
return aRet;
@@ -456,10 +456,10 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const
Graphic& rGraphic, double
}
else
{
- BitmapEx aBmpEx( rGraphic.GetBitmapEx() );
+ Bitmap aBmp( rGraphic.GetBitmap() );
- if (BitmapFilter::Filter(aBmpEx, BitmapEmbossGreyFilter(nAzim, nElev)))
- aRet = aBmpEx;
+ if (BitmapFilter::Filter(aBmp, BitmapEmbossGreyFilter(nAzim, nElev)))
+ aRet = aBmp;
}
return aRet;
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx
b/cui/source/dialogs/tipofthedaydlg.cxx
index 8424b58f55dc..44e7390808fc 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -241,9 +241,9 @@ void TipOfTheDayDialog::UpdateTip()
if (!aGraphic.IsAnimated())
{
- BitmapEx aBmpEx(aGraphic.GetBitmapEx());
- if (aBmpEx.Scale(ThumbSize))
- aGraphic = aBmpEx;
+ Bitmap aBmp(aGraphic.GetBitmap());
+ if (aBmp.Scale(ThumbSize))
+ aGraphic = aBmp;
}
m_aPreview.SetPreview(aGraphic);
}
diff --git a/cui/source/dialogs/uitabpage.cxx b/cui/source/dialogs/uitabpage.cxx
index b6bf2fb1191c..5d30f1ea427c 100644
--- a/cui/source/dialogs/uitabpage.cxx
+++ b/cui/source/dialogs/uitabpage.cxx
@@ -154,7 +154,7 @@ void UITabPage::UpdateImage(std::u16string_view sFileName)
{
ScopedVclPtr<VirtualDevice> m_pVirDev =
m_pImage->create_virtual_device();
m_pVirDev->SetOutputSizePixel(aGraphic.GetSizePixel());
- m_pVirDev->DrawBitmapEx(Point(0, 0), aGraphic.GetBitmapEx());
+ m_pVirDev->DrawBitmapEx(Point(0, 0), aGraphic.GetBitmap());
m_pImage->set_image(m_pVirDev.get());
m_pVirDev.disposeAndClear();
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 7494bb858bdd..8249773eb115 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1031,7 +1031,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage,
ClickAddBrowseHdl_Impl, weld::Button&, voi
Graphic aGraphic;
GraphicConverter::Import( *pIn, aGraphic );
- BitmapEx aBitmap = aGraphic.GetBitmapEx();
+ Bitmap aBitmap = aGraphic.GetBitmap();
tools::Long nPixelX = aBitmap.GetSizePixel().Width();
tools::Long nPixelY = aBitmap.GetSizePixel().Height();
double ratio = nPixelY/static_cast<double>(nPixelX);
@@ -2036,7 +2036,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage,
PopupActivateHdl_Impl, weld::Toggleable&,
}
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/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 8dc676f5a23d..c9867a9dfac4 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -315,8 +315,8 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
std::unique_ptr<GraphicObject> pGraphicObject;
pGraphicObject.reset( new GraphicObject(aItem.GetGraphicObject()) );
- BitmapEx aBmpEx(pGraphicObject->GetGraphic().GetBitmapEx());
- Size aTempBitmapSize = aBmpEx.GetSizePixel();
+ Bitmap aBmp(pGraphicObject->GetGraphic().GetBitmap());
+ Size aTempBitmapSize = aBmp.GetSizePixel();
rBitmapSize =
Application::GetDefaultDevice()->PixelToLogic(aTempBitmapSize,
MapMode(MapUnit::Map100thMM));
CalculateBitmapPresetSize();
@@ -541,8 +541,8 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapHdl,
ValueSet*, void)
if(pGraphicObject)
{
- BitmapEx aBmpEx(pGraphicObject->GetGraphic().GetBitmapEx());
- Size aTempBitmapSize = aBmpEx.GetSizePixel();
+ Bitmap aBmp(pGraphicObject->GetGraphic().GetBitmap());
+ Size aTempBitmapSize = aBmp.GetSizePixel();
const double fUIScale = mpView ?
double(mpView->GetModel().GetUIScale()) : 1.0;
Size aBitmapSize100mm = o3tl::convert(aTempBitmapSize,
o3tl::Length::pt, o3tl::Length::mm100);
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index f16428c2b85f..7210c9e78647 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1410,7 +1410,7 @@ void SvxLineTabPage::PopulateMenus()
if(pGraphic)
{
- BitmapEx aBitmap(pGraphic->GetBitmapEx());
+ Bitmap aBitmap(pGraphic->GetBitmap());
Size aSize(aBitmap.GetSizePixel());
if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() >
MAX_BMP_HEIGHT)
{
diff --git a/filter/source/graphic/GraphicExportFilter.cxx
b/filter/source/graphic/GraphicExportFilter.cxx
index f07d7fbf80e6..b6b670de01d9 100644
--- a/filter/source/graphic/GraphicExportFilter.cxx
+++ b/filter/source/graphic/GraphicExportFilter.cxx
@@ -188,7 +188,7 @@ bool GraphicExportFilter::filterRenderDocument() const
SvMemoryStream aMemStream;
const GraphicConversionParameters aParameters(aTargetSizePixel, true,
true);
- const ErrCode nResult = rFilter.ExportGraphic(
aGraphic.GetBitmapEx(aParameters), u"", aMemStream,
+ const ErrCode nResult = rFilter.ExportGraphic(
aGraphic.GetBitmap(aParameters), u"", aMemStream,
nFilterFormat, &maFilterDataSequence );
if ( nResult == ERRCODE_NONE )
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 76395bb73b1f..b6b8365f50cc 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5620,7 +5620,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet,
SdrPowerPointImport& rManager, T
Graphic aGraf;
if ( rManager.GetBLIP( rManager.GetPropertyValue(
DFF_Prop_fillBlip, 0 ), aGraf ) )
{
- Bitmap aBmp( aGraf.GetBitmapEx().GetBitmap() );
+ Bitmap aBmp( aGraf.GetBitmap().CreateColorBitmap() );
Size aSize( aBmp.GetSizePixel() );
if ( aSize.Width() && aSize.Height() )
{
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 4f7d9f740563..53b21902ba4d 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -199,7 +199,7 @@ bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter,
{
Graphic aGraph(aMtf);
// use antialiasing to improve how graphic
objects look
- BitmapEx bmp =
aGraph.GetBitmapEx(GraphicConversionParameters(Size(0, 0), false, true, false));
+ Bitmap bmp =
aGraph.GetBitmap(GraphicConversionParameters(Size(0, 0), false, true, false));
Graphic bgraph(bmp);
aMtf = bgraph.GetGDIMetaFile();
}
diff --git a/framework/source/fwe/classes/addonsoptions.cxx
b/framework/source/fwe/classes/addonsoptions.cxx
index 2dd3f6d33b1a..5286a5af9047 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -1569,16 +1569,16 @@ Bitmap AddonsOptions_Impl::ReadImageFromURL(const
OUString& aImageURL)
GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
rGF.ImportGraphic( aGraphic, u"", *pStream );
- BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
+ Bitmap aBitmap = aGraphic.GetBitmap();
- Size aBmpSize = aBitmapEx.GetSizePixel();
+ Size aBmpSize = aBitmap.GetSizePixel();
if ( !aBmpSize.IsEmpty() )
{
// Support non-transparent bitmaps to be downward compatible with
OOo 1.1.x addons
- if( !aBitmapEx.IsAlpha() )
- aBitmapEx = BitmapEx( aBitmapEx.GetBitmap(), COL_LIGHTMAGENTA
);
+ if( !aBitmap.HasAlpha() )
+ aBitmap = Bitmap(BitmapEx( aBitmap.CreateColorBitmap(),
COL_LIGHTMAGENTA ));
- aImage = Bitmap(aBitmapEx);
+ aImage = aBitmap;
}
}
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx
b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index 86b450afd86c..ec01e66b81f1 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -231,7 +231,7 @@ static bool implts_checkAndScaleGraphic( uno::Reference<
XGraphic >& rOutGraphic
Graphic aImage(rInGraphic);
if (BITMAP_SIZE[nImageType] != aImage.GetSizePixel())
{
- BitmapEx aBitmap = aImage.GetBitmapEx();
+ Bitmap aBitmap = aImage.GetBitmap();
aBitmap.Scale(BITMAP_SIZE[nImageType]);
aImage = Graphic(aBitmap);
rOutGraphic = aImage.GetXGraphic();
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index 206942d8d8de..40e3d230604e 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -124,17 +124,17 @@ bool ImageButtonToolbarController::ReadImageFromURL( bool
bBigImage, const OUStr
GraphicFilter& rGF = GraphicFilter::GetGraphicFilter();
rGF.ImportGraphic( aGraphic, u"", *pStream );
- BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
+ Bitmap aBitmap = aGraphic.GetBitmap();
const ::Size aSize = bBigImage ? aImageSizeBig : aImageSizeSmall; // Sizes
used for toolbar images
- ::Size aBmpSize = aBitmapEx.GetSizePixel();
+ ::Size aBmpSize = aBitmap.GetSizePixel();
if ( !aBmpSize.IsEmpty() )
{
::Size aNoScaleSize( aBmpSize.Width(), aSize.Height() );
if ( aBmpSize != aNoScaleSize )
- aBitmapEx.Scale( aNoScaleSize, BmpScaleFlag::BestQuality );
- aImage = Image( aBitmapEx );
+ aBitmap.Scale( aNoScaleSize, BmpScaleFlag::BestQuality );
+ aImage = Image( aBitmap );
return true;
}
diff --git a/reportdesign/qa/unit/data/roundTrip.odb
b/reportdesign/qa/unit/data/roundTrip.odb
index c3e818ec9e32..5e9eb78ebb28 100644
Binary files a/reportdesign/qa/unit/data/roundTrip.odb and
b/reportdesign/qa/unit/data/roundTrip.odb differ
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 94cf4cd8b731..d39b80a57623 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -175,17 +175,17 @@ Bitmap ThumbnailView::readThumbnail(const OUString &msURL)
}
// Extract the image from the stream.
- BitmapEx aThumbnail;
+ Bitmap aThumbnail;
if (auto pStream = utl::UcbStreamHelper::CreateStream(xIStream,
/*CloseStream=*/true))
{
Graphic aGraphic =
GraphicFilter::GetGraphicFilter().ImportUnloadedGraphic(*pStream);
- aThumbnail = aGraphic.GetBitmapEx();
+ aThumbnail = aGraphic.GetBitmap();
}
// Note that the preview is returned without scaling it to the desired
// width. This gives the caller the chance to take advantage of a
// possibly larger resolution then was asked for.
- return Bitmap(aThumbnail);
+ return aThumbnail;
}
ThumbnailView::ThumbnailView(std::unique_ptr<weld::ScrolledWindow> xWindow,
std::unique_ptr<weld::Menu> xMenu)
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 3daaab04054a..c65d8d1fefa5 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -735,7 +735,7 @@ IMPL_LINK_NOARG(FileDialogHelper_Impl, TimeOutHdl_Impl,
Timer *, void)
// is responsible for placing it at its
// proper position and painting a frame
- BitmapEx aBmp = maGraphic.GetBitmapEx();
+ Bitmap aBmp = maGraphic.GetBitmap();
if ( !aBmp.IsEmpty() )
{
// scale the bitmap to the correct size
diff --git a/svgio/source/svgreader/svgfeimagenode.cxx
b/svgio/source/svgreader/svgfeimagenode.cxx
index 89eb5fbda669..2ae59a3511d2 100644
--- a/svgio/source/svgreader/svgfeimagenode.cxx
+++ b/svgio/source/svgreader/svgfeimagenode.cxx
@@ -74,7 +74,7 @@ void SvgFeImageNode::parseAttribute(SVGToken aSVGToken, const
OUString& aContent
void SvgFeImageNode::apply(drawinglayer::primitive2d::Primitive2DContainer&
rTarget,
const SvgFilterNode* pParent) const
{
- BitmapEx aBitmapEx;
+ Bitmap aBitmap;
if (!maData.isEmpty())
{
@@ -90,7 +90,7 @@ void
SvgFeImageNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTar
if (ERRCODE_NONE
== GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic,
u"", aStream))
{
- aBitmapEx = aGraphic.GetBitmapEx();
+ aBitmap = aGraphic.GetBitmap();
}
}
}
@@ -115,20 +115,20 @@ void
SvgFeImageNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTar
if (ERRCODE_NONE
== GraphicFilter::GetGraphicFilter().ImportGraphic(aGraphic,
aAbsUrl, aStream))
{
- aBitmapEx = aGraphic.GetBitmapEx();
+ aBitmap = aGraphic.GetBitmap();
}
}
}
- if (!aBitmapEx.IsEmpty() && 0 != aBitmapEx.GetSizePixel().Width()
- && 0 != aBitmapEx.GetSizePixel().Height())
+ if (!aBitmap.IsEmpty() && 0 != aBitmap.GetSizePixel().Width()
+ && 0 != aBitmap.GetSizePixel().Height())
{
basegfx::B2DRange aViewBox
= rTarget.getB2DRange(drawinglayer::geometry::ViewInformation2D());
const drawinglayer::primitive2d::Primitive2DReference xRef(
new drawinglayer::primitive2d::BitmapPrimitive2D(
- Bitmap(aBitmapEx),
basegfx::utils::createScaleTranslateB2DHomMatrix(
- aViewBox.getRange(),
aViewBox.getMinimum())));
+ aBitmap,
basegfx::utils::createScaleTranslateB2DHomMatrix(aViewBox.getRange(),
+
aViewBox.getMinimum())));
rTarget = drawinglayer::primitive2d::Primitive2DContainer{ xRef };
}
diff --git a/svgio/source/svgreader/svgimagenode.cxx
b/svgio/source/svgreader/svgimagenode.cxx
index 88b469553251..de5a27149ce9 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -156,7 +156,7 @@ namespace svgio::svgreader
const Graphic& rGraphic,
drawinglayer::primitive2d::Primitive2DContainer& rEmbedded,
basegfx::B2DRange& rViewBox,
- BitmapEx& rBitmapEx)
+ Bitmap& rBitmap)
{
if(GraphicType::Bitmap == rGraphic.GetType())
{
@@ -171,13 +171,13 @@ namespace svgio::svgreader
else
{
// get bitmap
- rBitmapEx = rGraphic.GetBitmapEx();
+ rBitmap = rGraphic.GetBitmap();
}
}
else
{
// evtl. convert to bitmap
- rBitmapEx = rGraphic.GetBitmapEx();
+ rBitmap = rGraphic.GetBitmap();
}
}
@@ -195,7 +195,7 @@ namespace svgio::svgreader
if(fWidth <= 0.0 || fHeight <= 0.0)
return;
- BitmapEx aBitmapEx;
+ Bitmap aBitmap;
drawinglayer::primitive2d::Primitive2DContainer aNewTarget;
// prepare Target and ViewBox for evtl. AspectRatio mappings
@@ -220,7 +220,7 @@ namespace svgio::svgreader
u"",
aStream))
{
- extractFromGraphic(aGraphic, aNewTarget, aViewBox,
aBitmapEx);
+ extractFromGraphic(aGraphic, aNewTarget, aViewBox,
aBitmap);
}
}
}
@@ -247,7 +247,7 @@ namespace svgio::svgreader
aAbsUrl,
aStream))
{
- extractFromGraphic(aGraphic, aNewTarget, aViewBox,
aBitmapEx);
+ extractFromGraphic(aGraphic, aNewTarget, aViewBox,
aBitmap);
}
}
}
@@ -266,10 +266,10 @@ namespace svgio::svgreader
}
}
- if(!aBitmapEx.IsEmpty() && 0 != aBitmapEx.GetSizePixel().Width()
&& 0 != aBitmapEx.GetSizePixel().Height())
+ if(!aBitmap.IsEmpty() && 0 != aBitmap.GetSizePixel().Width() && 0
!= aBitmap.GetSizePixel().Height())
{
// calculate centered unit size
- const double fAspectRatio =
static_cast<double>(aBitmapEx.GetSizePixel().Width()) /
static_cast<double>(aBitmapEx.GetSizePixel().Height());
+ const double fAspectRatio =
static_cast<double>(aBitmap.GetSizePixel().Width()) /
static_cast<double>(aBitmap.GetSizePixel().Height());
if (basegfx::fTools::equalZero(fAspectRatio))
{
@@ -301,7 +301,7 @@ namespace svgio::svgreader
// as transformation to map the picture data correctly
aNewTarget.resize(1);
aNewTarget[0] = new
drawinglayer::primitive2d::BitmapPrimitive2D(
- Bitmap(aBitmapEx),
+ aBitmap,
basegfx::utils::createScaleTranslateB2DHomMatrix(
aViewBox.getRange(),
aViewBox.getMinimum()));
diff --git a/svtools/source/filter/exportdialog.cxx
b/svtools/source/filter/exportdialog.cxx
index c876c6fa8e3c..9216c8a4004a 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -461,10 +461,10 @@ void ExportDialog::GetGraphicStream()
( ( maSize.Width != aSizePixel.Width() ) ||
( maSize.Height != aSizePixel.Height() ) ) )
{
- BitmapEx aBmpEx( aGraphic.GetBitmapEx() );
+ Bitmap aBmp( aGraphic.GetBitmap() );
// export: use highest quality
- aBmpEx.Scale( Size( maSize.Width, maSize.Height ),
BmpScaleFlag::Lanczos );
- aGraphic = aBmpEx;
+ aBmp.Scale( Size( maSize.Width, maSize.Height ),
BmpScaleFlag::Lanczos );
+ aGraphic = aBmp;
}
}
diff --git a/svx/source/core/graphichelper.cxx
b/svx/source/core/graphichelper.cxx
index 87e1cb9f1223..cf03d23ca3b2 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -310,10 +310,10 @@ OUString GraphicHelper::ExportGraphic(weld::Window*
pParent, const Graphic& rGra
( ( nWidth != aSizePixel.Width() ) ||
( nHeight != aSizePixel.Height() ) ) )
{
- BitmapEx aBmpEx( aGraphic.GetBitmapEx() );
+ Bitmap aBmp( aGraphic.GetBitmap() );
// export: use highest quality
- aBmpEx.Scale( Size( nWidth, nHeight ),
BmpScaleFlag::Lanczos );
- aGraphic = aBmpEx;
+ aBmp.Scale( Size( nWidth, nHeight ),
BmpScaleFlag::Lanczos );
+ aGraphic = aBmp;
}
XOutBitmap::WriteGraphic( aGraphic, sPath, aFilter,
diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
index 454e5e08e095..7ef72bd4abf2 100644
--- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx
+++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx
@@ -726,7 +726,7 @@ namespace drawinglayer::primitive2d
// if there is no logical size, create a size from pixel size
and set MapMode accordingly
if(GraphicType::Bitmap == aGraphic.GetType())
{
-
aGraphic.SetPrefSize(aGraphic.GetBitmapEx().GetSizePixel());
+ aGraphic.SetPrefSize(aGraphic.GetBitmap().GetSizePixel());
aGraphic.SetPrefMapMode(MapMode(MapUnit::MapPixel));
aPrefSize = aGraphic.GetPrefSize();
}
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 737f9d7dbf0c..f44abd480016 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -528,11 +528,11 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj1,
bool bScale)
}
else
{
- BitmapEx aBitmapEx;
+ Bitmap aBitmap;
if(pSdrGrafObj)
{
- aBitmapEx = pSdrGrafObj->GetGraphic().GetBitmapEx();
+ aBitmap = pSdrGrafObj->GetGraphic().GetBitmap();
}
pObj.clear();
@@ -558,11 +558,11 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj1,
bool bScale)
pObj->SetLayer(aOldLayer);
pObj->SetMergedItemSet(aOldItemSet);
- if(!aBitmapEx.IsEmpty())
+ if(!aBitmap.IsEmpty())
{
// aNewRange is inside of aOldRange and defines which
part of aBitmapEx is used
- const double fScaleX(aBitmapEx.GetSizePixel().Width()
/ (aOldRange.getWidth() ? aOldRange.getWidth() : 1.0));
- const double fScaleY(aBitmapEx.GetSizePixel().Height()
/ (aOldRange.getHeight() ? aOldRange.getHeight() : 1.0));
+ const double fScaleX(aBitmap.GetSizePixel().Width() /
(aOldRange.getWidth() ? aOldRange.getWidth() : 1.0));
+ const double fScaleY(aBitmap.GetSizePixel().Height() /
(aOldRange.getHeight() ? aOldRange.getHeight() : 1.0));
basegfx::B2DRange aPixel(aNewRange);
basegfx::B2DHomMatrix aTrans;
@@ -570,7 +570,7 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj1,
bool bScale)
aTrans.scale(fScaleX, fScaleY);
aPixel.transform(aTrans);
- const Size aOrigSizePixel(aBitmapEx.GetSizePixel());
+ const Size aOrigSizePixel(aBitmap.GetSizePixel());
const Point aClipTopLeft(
basegfx::fround<tools::Long>(floor(std::max(0.0,
aPixel.getMinX()))),
basegfx::fround<tools::Long>(floor(std::max(0.0,
aPixel.getMinY()))));
@@ -578,7 +578,7 @@ void ImpSdrGDIMetaFileImport::InsertObj(SdrObject* pObj1,
bool bScale)
basegfx::fround<tools::Long>(ceil(std::min(static_cast<double>(aOrigSizePixel.Width()),
aPixel.getWidth()))),
basegfx::fround<tools::Long>(ceil(std::min(static_cast<double>(aOrigSizePixel.Height()),
aPixel.getHeight()))));
const BitmapEx aClippedBitmap(
- aBitmapEx,
+ BitmapEx(aBitmap),
aClipTopLeft,
aClipSize);
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 740790d5279c..c67f0c40b17b 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2325,7 +2325,7 @@ void SAL_CALL VCLXDialog::setProperty(
{
Graphic aImage(xGraphic);
- Wallpaper aWallpaper(aImage.GetBitmapEx());
+ Wallpaper aWallpaper(aImage.GetBitmap());
aWallpaper.SetStyle( WallpaperStyle::Scale );
pDialog->SetBackground( aWallpaper );
}
@@ -2460,7 +2460,7 @@ void SAL_CALL VCLXMultiPage::setProperty(
{
Graphic aImage(xGraphic);
- Wallpaper aWallpaper(aImage.GetBitmapEx());
+ Wallpaper aWallpaper(aImage.GetBitmap());
aWallpaper.SetStyle( WallpaperStyle::Scale );
pTabControl->SetBackground( aWallpaper );
}
@@ -2670,7 +2670,7 @@ void SAL_CALL VCLXTabPage::setProperty(
{
Graphic aImage(xGraphic);
- Wallpaper aWallpaper(aImage.GetBitmapEx());
+ Wallpaper aWallpaper(aImage.GetBitmap());
aWallpaper.SetStyle( WallpaperStyle::Scale );
pTabPage->SetBackground( aWallpaper );
}
diff --git a/toolkit/source/controls/tree/treecontrolpeer.cxx
b/toolkit/source/controls/tree/treecontrolpeer.cxx
index ef2779f118a4..9bc4604763f1 100644
--- a/toolkit/source/controls/tree/treecontrolpeer.cxx
+++ b/toolkit/source/controls/tree/treecontrolpeer.cxx
@@ -1392,7 +1392,7 @@ bool TreeControlPeer::loadImage( const OUString& rURL,
Image& rImage )
Reference< XGraphic > xGraphic( mxGraphicProvider->queryGraphic(
aProps ) );
Graphic aGraphic( xGraphic );
- rImage = Image(aGraphic.GetBitmapEx());
+ rImage = Image(aGraphic.GetBitmap());
return true;
}
catch( Exception& )
