cui/source/inc/cuitabarea.hxx | 2 +- cui/source/tabpages/tpbitmap.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 5c81c9aba2b82032d721c9b39744fd39e5392dcd Author: Mike Kaganski <[email protected]> AuthorDate: Sat Feb 21 17:40:50 2026 +0500 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 12:12:11 2026 +0100 fix VirtualDevice GDI handle leaks in SvxBitmapTabPage Similar to commit e9392c0c86fcf373e00ede92f8ceeee2c7efd233 (fix VirtualDevice GDI handle leaks across IconView callers, 2026-02-21). Change-Id: I1115807506043ccdb766bba3e0c64dc765ae8033 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199932 Reviewed-by: Andras Timar <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200594 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index c79aa4fc1404..9682c9adc908 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -556,7 +556,7 @@ private: sal_Int32 SearchBitmapList(const GraphicObject& rGraphicObject); tools::Long AddBitmap(const GraphicObject& rGraphicObject, const OUString& rName, bool bOnlyForThisDocument = false); - static VclPtr<VirtualDevice> GetVirtualDevice(Bitmap aBitmap); + static ScopedVclPtr<VirtualDevice> GetVirtualDevice(Bitmap aBitmap); void FillPresetListBox(); void ShowContextMenu(const Point& pPos); void ClickRenameHdl(); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index f5961e35f6bb..250ed05f9eff 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -173,7 +173,7 @@ void SvxBitmapTabPage::FillPresetListBox() OUString sId = OUString::number(nId); Bitmap aBitmap = m_pBitmapList->GetBitmapForPreview(nId, aIconSize); - VclPtr<VirtualDevice> aVDev = GetVirtualDevice(aBitmap); + auto aVDev = GetVirtualDevice(aBitmap); Bitmap aBmp = aVDev->GetBitmap(Point(), aVDev->GetOutputSizePixel()); OUString sImageName = pEntry->GetName(); @@ -895,7 +895,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, weld::Button&, void) OUString sId = nCount > 0 ? m_xBitmapLB->get_id( nCount - 1 ) : OUString(); sal_Int32 nId = !sId.isEmpty() ? sId.toInt32() : -1; Bitmap aBitmap = m_pBitmapList->GetBitmapForPreview( nCount, aIconSize ); - VclPtr<VirtualDevice> pVDev = GetVirtualDevice(aBitmap); + auto pVDev = GetVirtualDevice(aBitmap); Bitmap aBmp = pVDev->GetBitmap(Point(), pVDev->GetOutputSizePixel()); m_xBitmapLB->insert( nId + 1, &aName, &sId, &aBmp, nullptr); @@ -916,7 +916,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, weld::Button&, void) } } -VclPtr<VirtualDevice> SvxBitmapTabPage::GetVirtualDevice(Bitmap aBitmap) +ScopedVclPtr<VirtualDevice> SvxBitmapTabPage::GetVirtualDevice(Bitmap aBitmap) { VclPtr<VirtualDevice> pVDev = VclPtr<VirtualDevice>::Create(); const Point aNull(0, 0);
