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 025fc769ab44..15460f452c63 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -407,7 +407,7 @@ FactoryFunction SvxNumValueSet::GetUITestFactory() const
 void SvxNumValueSet::init(NumberingPageType eType)
 {
     mePageType = eType;
-    mpVDev = nullptr;
+    mpVDev.disposeAndClear();
 
     SetColCount( 4 );
     SetLineCount( 2 );