screenshots: extend default paths where stuff gets written

Change-Id: I1886d832bb9474371ea27d4d36f0446b221246d0

5 files changed, 46 insertions, 9 deletions

diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index a6b4f9defb0d..01f23aaabdd9 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Module_add_check_targets,sd,\
     CppunitTest_sd_export_ooxml2 \
     CppunitTest_sd_export_tests \
     CppunitTest_sd_filters_test \
+    CppunitTest_sd_dialogs_test \
     CppunitTest_sd_misc_tests \
     CppunitTest_sd_html_export_tests \
 ))
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 2c4f5b6bfe78..5b7e3b921264 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -150,7 +150,7 @@ class AbstractHeaderFooterDialog : public VclAbstractDialog
 class SdAbstractDialogFactory
 {
 public:
-    static SdAbstractDialogFactory*     Create();
+    SD_DLLPUBLIC static SdAbstractDialogFactory*     Create();
 
     virtual VclAbstractDialog*          CreateBreakDlg(vcl::Window* pWindow, ::sd::DrawView* pDrView, ::sd::DrawDocShell* pShell, sal_uLong nSumActionCount, sal_uLong nObjCount ) = 0;
     virtual AbstractCopyDlg*            CreateCopyDlg(vcl::Window* pWindow, const SfxItemSet& rInAttrs, const rtl::Reference<XColorList> &pColTab, ::sd::View* pView ) = 0;
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index a926105d31c6..2b913abdc537 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1586,6 +1586,32 @@ bool SdPublishingDlg::Save()
     return( aMedium.GetError() == 0 );
 }
 
+std::vector<OUString> SdPublishingDlg::getAllPageUIXMLDescriptions() const
+{
+    // this dialog has a hard number of pages
+    std::vector<OUString> aRetval;
+
+    for (sal_uInt32 a(0); a < 6; a++)
+    {
+        aRetval.push_back(OUString::number(a));
+    }
+
+    return aRetval;
+}
+
+void SdPublishingDlg::selectPageByUIXMLDescription(const OUString& rUIXMLDescription)
+{
+    // rUIXMLDescription contains one of the values above, make use of it
+    const sal_uInt32 nPage(rUIXMLDescription.toUInt32());
+
+    if (nPage < 6)
+    {
+        aAssistentFunc.GotoPage(nPage + 1);
+
+        // does this already call 'ChangePage()'..? Check!
+    }
+}
+
 // SdDesignNameDlg Methods
 SdDesignNameDlg::SdDesignNameDlg(vcl::Window* pWindow, const OUString& aName)
     : ModalDialog(pWindow, "NameDesignDialog", "modules/sdraw/ui/namedesign.ui")
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index c5ec43014349..c9a9352212bf 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -22,17 +22,23 @@
 #include "sdabstdlg.hxx"
 #include <sfx2/basedlgs.hxx>
 
-#define DECL_ABSTDLG_BASE(Class,DialogClass)        \
-    ScopedVclPtr<DialogClass> pDlg;                 \
-public:                                             \
-    explicit Class(DialogClass* p)                  \
-        : pDlg(p)                                   \
-    {                                               \
-    }                                               \
-    virtual         ~Class();                       \
+#define DECL_ABSTDLG_BASE(Class,DialogClass)            \
+    ScopedVclPtr<DialogClass> pDlg;                     \
+public:                                                 \
+    explicit Class(DialogClass* p)                      \
+        : pDlg(p)                                       \
+    {                                                   \
+    }                                                   \
+    virtual std::vector<OUString> getAllPageUIXMLDescriptions() const override; \
+    virtual void selectPageByUIXMLDescription(const OUString& rUIXMLDescription) override; \
+    virtual Bitmap createScreenshot() const override;   \
+    virtual         ~Class();                           \
     virtual short   Execute() override ;
 
 #define IMPL_ABSTDLG_BASE(Class)                    \
+std::vector<OUString> Class::getAllPageUIXMLDescriptions() const { return pDlg->getAllPageUIXMLDescriptions(); } \
+void Class::selectPageByUIXMLDescription(const OUString& rUIXMLDescription) { pDlg->selectPageByUIXMLDescription(rUIXMLDescription); } \
+Bitmap Class::createScreenshot() const { return pDlg->createScreenshot();} \
 Class::~Class()                                     \
 {                                                   \
 }                                                   \
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 894f33d9c9ff..f5156e0ea79b 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -200,6 +200,10 @@ public:
     virtual void dispose() override;
 
     void GetParameterSequence( css::uno::Sequence< css::beans::PropertyValue >& rParams );
+
+    // Screenshot interface
+    virtual std::vector<OUString> getAllPageUIXMLDescriptions() const override;
+    virtual void selectPageByUIXMLDescription(const OUString& rUIXMLDescription) override;
 };
 
 #endif // INCLUDED_SD_SOURCE_UI_INC_PUBDLG_HXX