screenshots: added more virtualization/abstraction

TabPabe Identification to UI-File names. Isolated some data
initialization constructs. Added more dialogs to dump. Should dump on
all systems now

Change-Id: I7ee07309e0bf88064f789c13bcbff93c17370f77

3 files changed, 13 insertions, 12 deletions

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 2b913abdc537..7476251ca319 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -1586,20 +1586,20 @@ bool SdPublishingDlg::Save()
     return( aMedium.GetError() == 0 );
 }
 
-std::vector<OUString> SdPublishingDlg::getAllPageUIXMLDescriptions() const
+std::vector<OString> SdPublishingDlg::getAllPageUIXMLDescriptions() const
 {
     // this dialog has a hard number of pages
-    std::vector<OUString> aRetval;
+    std::vector<OString> aRetval;
 
     for (sal_uInt32 a(0); a < 6; a++)
     {
-        aRetval.push_back(OUString::number(a));
+        aRetval.push_back(OString::number(a));
     }
 
     return aRetval;
 }
 
-void SdPublishingDlg::selectPageByUIXMLDescription(const OUString& rUIXMLDescription)
+bool SdPublishingDlg::selectPageByUIXMLDescription(const OString& rUIXMLDescription)
 {
     // rUIXMLDescription contains one of the values above, make use of it
     const sal_uInt32 nPage(rUIXMLDescription.toUInt32());
@@ -1607,9 +1607,10 @@ void SdPublishingDlg::selectPageByUIXMLDescription(const OUString& rUIXMLDescrip
     if (nPage < 6)
     {
         aAssistentFunc.GotoPage(nPage + 1);
-
-        // does this already call 'ChangePage()'..? Check!
+        return true;
     }
+
+    return false;
 }
 
 // SdDesignNameDlg Methods
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index c9a9352212bf..72b0505b6a2e 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -29,15 +29,15 @@ public:                                                 \
         : pDlg(p)                                       \
     {                                                   \
     }                                                   \
-    virtual std::vector<OUString> getAllPageUIXMLDescriptions() const override; \
-    virtual void selectPageByUIXMLDescription(const OUString& rUIXMLDescription) override; \
+    virtual std::vector<OString> getAllPageUIXMLDescriptions() const override; \
+    virtual bool selectPageByUIXMLDescription(const OString& 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); } \
+std::vector<OString> Class::getAllPageUIXMLDescriptions() const { return pDlg->getAllPageUIXMLDescriptions(); } \
+bool Class::selectPageByUIXMLDescription(const OString& rUIXMLDescription) { return 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 f5156e0ea79b..5b4f3763b9a5 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -202,8 +202,8 @@ public:
     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;
+    virtual std::vector<OString> getAllPageUIXMLDescriptions() const override;
+    virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription) override;
 };
 
 #endif // INCLUDED_SD_SOURCE_UI_INC_PUBDLG_HXX