diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-01 10:20:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-02 20:28:28 +0200 |
| commit | bab77fcf8b80594fb49561254dfbaea381da8934 (patch) | |
| tree | be5deb3285355ea8df73f4eb10f0a83a889754e0 /include | |
| parent | 21c00be1677638fc18e30425658ac7c1a6fe541c (diff) | |
weld PrintDialog
Change-Id: Id4adbe484f88be74f45dab8e7ef426c66e5cbc8b
Reviewed-on: https://gerrit.libreoffice.org/80002
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/ivctrl.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/oldprintadaptor.hxx | 7 | ||||
| -rw-r--r-- | include/vcl/print.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/include/vcl/ivctrl.hxx b/include/vcl/ivctrl.hxx index e7b89f1bc2f1..16bead7c913f 100644 --- a/include/vcl/ivctrl.hxx +++ b/include/vcl/ivctrl.hxx @@ -320,6 +320,7 @@ public: void SetDeactivatePageHdl( const Link<VerticalTabControl*, bool>& rLink ) { m_aDeactivateHdl = rLink; } OUString GetPageText(const OString& rPageId) const; + void SetPageText(const OString& rPageId, const OUString& rText); vcl::Window* GetPageParent() { return m_xBox.get(); } }; diff --git a/include/vcl/oldprintadaptor.hxx b/include/vcl/oldprintadaptor.hxx index 53e0d3d7bbfb..3e8e60bf82fb 100644 --- a/include/vcl/oldprintadaptor.hxx +++ b/include/vcl/oldprintadaptor.hxx @@ -23,6 +23,11 @@ #include <memory> #include <vcl/print.hxx> +namespace weld +{ + class Window; +} + namespace vcl { struct ImplOldStyleAdaptorData; @@ -30,7 +35,7 @@ namespace vcl { std::unique_ptr<ImplOldStyleAdaptorData> mpData; public: - OldStylePrintAdaptor(const VclPtr<Printer>&, const VclPtr<vcl::Window>&); + OldStylePrintAdaptor(const VclPtr<Printer>&, weld::Window*); virtual ~OldStylePrintAdaptor() override; void StartPage(); diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 86d65513829c..154ee694bd83 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -394,7 +394,7 @@ class VCL_DLLPUBLIC PrinterController std::unique_ptr<ImplPrinterControllerData> mpImplData; protected: - PrinterController( const VclPtr<Printer>&, const VclPtr<vcl::Window>& ); + PrinterController(const VclPtr<Printer>&, weld::Window*); public: struct MultiPageSetup { @@ -436,7 +436,7 @@ public: virtual ~PrinterController(); const VclPtr<Printer>& getPrinter() const; - const VclPtr<vcl::Window>& getWindow() const; + weld::Window* getWindow() const; /** For implementations: get current job properties as changed by e.g. print dialog diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index afd6266c377e..67050d3f30ce 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -334,11 +334,13 @@ protected: public: virtual int get_current_page() const = 0; + virtual OString get_page_ident(int nPage) const = 0; virtual OString get_current_page_ident() const = 0; virtual void set_current_page(int nPage) = 0; virtual void set_current_page(const OString& rIdent) = 0; virtual void remove_page(const OString& rIdent) = 0; virtual void append_page(const OString& rIdent, const OUString& rLabel) = 0; + virtual void set_tab_label_text(const OString& rIdent, const OUString& rLabel) = 0; virtual OUString get_tab_label_text(const OString& rIdent) const = 0; virtual int get_n_pages() const = 0; virtual weld::Container* get_page(const OString& rIdent) const = 0; |