diff options
| author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2016-06-15 17:57:39 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-08-18 02:39:07 +0200 |
| commit | 13a9727a6399df8df0b2719adb094c81e147a3e8 (patch) | |
| tree | a6da2221808f08b901c0e1f2a042bcb09e3e97df /include | |
| parent | 3fb0839da320bb2256b7a2dcf46363fc25bbfbc9 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/tabdlg.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/abstdlg.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/builder.hxx | 15 | ||||
| -rw-r--r-- | include/vcl/dialog.hxx | 4 |
4 files changed, 21 insertions, 6 deletions
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 85429068d0a8..d80d269c2293 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -204,8 +204,8 @@ public: virtual FactoryFunction GetUITestFactory() const override; // 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; }; namespace sfx { class ItemConnectionBase; } diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index da45dbe2f13a..daa897d83647 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -35,8 +35,8 @@ public: virtual short Execute() = 0; // Screenshot interface - virtual std::vector<OUString> getAllPageUIXMLDescriptions() const; - virtual void selectPageByUIXMLDescription(const OUString& rUIXMLDescription); + virtual std::vector<OString> getAllPageUIXMLDescriptions() const; + virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription); virtual Bitmap createScreenshot() const; }; diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 787f6ea30b81..33f42da12023 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -110,6 +110,12 @@ public: const css::uno::Reference<css::frame::XFrame>& getFrame() { return m_xFrame; } + /// return UI-File name (without '.ui') + const OString& getUIFile() const + { + return m_sHelpRoot; + } + private: VclBuilder(const VclBuilder&) = delete; VclBuilder& operator=(const VclBuilder&) = delete; @@ -462,6 +468,15 @@ public: return; m_pUIBuilder->setDeferredProperties(); } + OString getUIFile() const + { + if (m_pUIBuilder) + { + return m_pUIBuilder->getUIFile(); + } + + return OString(); + } protected: VclBuilder *m_pUIBuilder; diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index a1ec41f9825d..6946d6487b75 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -101,8 +101,8 @@ public: virtual void PostPaint(vcl::RenderContext& rRenderContext) override; // Screenshot interface - virtual std::vector<OUString> getAllPageUIXMLDescriptions() const; - virtual void selectPageByUIXMLDescription(const OUString& rUIXMLDescription); + virtual std::vector<OString> getAllPageUIXMLDescriptions() const; + virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription); Bitmap createScreenshot(); virtual short Execute(); |