include/svx/numvset.hxx | 2 +- svx/source/dialog/svxbmpnumvalueset.cxx | 2 +- sw/source/ui/frmdlg/column.cxx | 4 ++-- sw/source/uibase/inc/column.hxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit abe33472b46a7f08299b7135b5cecdbf64d3be0d Author: Mike Kaganski <[email protected]> AuthorDate: Sat Feb 21 19:14:09 2026 +0500 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 13:46:18 2026 +0100 fix VirtualDevice GDI handle leaks in SwColumnPage Similar to commit e9392c0c86fcf373e00ede92f8ceeee2c7efd233 (fix VirtualDevice GDI handle leaks across IconView callers, 2026-02-21). Change-Id: Ib75f76de3a58a24da9187db204d108015dfd4ab3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199941 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200603 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 9eef4088a4a4..9de3bb9f4fa7 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -496,7 +496,7 @@ void SwColumnPage::InitColumnLayouts() OUString aItemText = GetColumnLayoutText(i); OUString aItemId = OUString::number(i); - VclPtr<VirtualDevice> aColumnVDev = CreateColumnLayoutVDev(i + 1); + auto aColumnVDev = CreateColumnLayoutVDev(i + 1); Bitmap aBmp = aColumnVDev->GetBitmap(Point(), aColumnVDev->GetOutputSizePixel()); m_xDefaultIV->insert(i, &aItemText, &aItemId, &aBmp, nullptr); } @@ -1337,7 +1337,7 @@ void SwColumnPage::SetInSection(bool bSet) m_xTextDirectionLB->set_visible(bSet); } -VclPtr<VirtualDevice> SwColumnPage::CreateColumnLayoutVDev(sal_uInt16 nItemId) +ScopedVclPtr<VirtualDevice> SwColumnPage::CreateColumnLayoutVDev(sal_uInt16 nItemId) { VclPtr<VirtualDevice> pVDev = VclPtr<VirtualDevice>::Create(); const Size aSize(30, 30); diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index ed2c6971f90f..cccb57e741da 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -148,7 +148,7 @@ class SwColumnPage final : public SfxTabPage void InitColumnLayouts(); static OUString GetColumnLayoutText(sal_Int32 nId); - static VclPtr<VirtualDevice> CreateColumnLayoutVDev(sal_uInt16 nItemId); + static ScopedVclPtr<VirtualDevice> CreateColumnLayoutVDev(sal_uInt16 nItemId); bool isLineNotNone() const; commit 9110e1f177d65256b887f7c2de7526bb3f480964 Author: Mike Kaganski <[email protected]> AuthorDate: Sat Feb 21 18:56:36 2026 +0500 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Feb 27 13:46:10 2026 +0100 fix VirtualDevice GDI handle leaks in SvxNumValueSet Similar to commit e9392c0c86fcf373e00ede92f8ceeee2c7efd233 (fix VirtualDevice GDI handle leaks across IconView callers, 2026-02-21). Change-Id: I521f8cd5679172c5e98172939dd7065cfc8afd86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199940 Reviewed-by: Andras Timar <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200602 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index 6c8bc4dd4073..86d9bee62895 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -51,7 +51,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet { NumberingPageType mePageType; tools::Rectangle maOrgRect; - VclPtr<VirtualDevice> mpVDev; + ScopedVclPtr<VirtualDevice> mpVDev; css::uno::Reference<css::text::XNumberingFormatter> mxFormatter; css::lang::Locale maLocale; diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 82349b5d9123..a3d6b2a2d54b 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -404,7 +404,7 @@ FactoryFunction SvxNumValueSet::GetUITestFactory() const void SvxNumValueSet::init(NumberingPageType eType) { mePageType = eType; - mpVDev = nullptr; + mpVDev.disposeAndClear(); SetColCount( 4 ); SetLineCount( 2 );
