2 files changed, 24 insertions, 4 deletions
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 730b2a87aea7..963fc1bb8249 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -3711,6 +3711,15 @@ Size SvtValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesire
     return aSize;
 }
 
+void SvtValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage )
+{
+    std::unique_ptr<SvtValueSetItem> pItem(new SvtValueSetItem( *this ));
+    pItem->mnId     = nItemId;
+    pItem->meType   = VALUESETITEM_IMAGE;
+    pItem->maImage  = rImage;
+    ImplInsertItem( std::move(pItem), VALUESET_APPEND );
+}
+
 void SvtValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage,
                            const OUString& rText, size_t nPos )
 {
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index b1bbb41155a5..e76aa4266214 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -23,25 +23,36 @@
 #include <tools/diagnose_ex.h>
 #include <svtools/svtresid.hxx>
 #include <svtools/strings.hrc>
-
+#include <vcl/svapp.hxx>
 
 namespace svt
 {
-
-
     //= WizardPageImplData
-
     OWizardPage::OWizardPage(vcl::Window *pParent, const OString& rID,
         const OUString& rUIXMLDescription)
         : TabPage(pParent, rID, rUIXMLDescription)
     {
     }
 
+    OWizardPage::OWizardPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID)
+        : TabPage(pParent.pPage ? Application::GetDefDialogParent() : pParent.pParent.get()) //just drag this along hidden in this scenario
+        , m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, rUIXMLDescription)
+                                   : Application::CreateInterimBuilder(this, rUIXMLDescription))
+        , m_xContainer(m_xBuilder->weld_container(rID))
+    {
+    }
+
     OWizardPage::~OWizardPage()
     {
         disposeOnce();
     }
 
+    void OWizardPage::dispose()
+    {
+        m_xBuilder.reset();
+        TabPage::dispose();
+    }
+
     void OWizardPage::initializePage()
     {
     }