diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-20 13:05:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-23 12:33:44 +0200 |
| commit | c0af8057188c0e95831f9e6d1ef96a424da6f9b2 (patch) | |
| tree | 6509c67d0cfcc42e3b107004167f2efcccda43cd /include/vcl | |
| parent | 27e26fc4286f66ab1bf4c807d86b8f3254c5c68b (diff) | |
weld SfxPrintOptionsDialog
and SwMMResultPrintDialog
Change-Id: Icded6a26a3a151293bea0c9173334cf634283e89
Reviewed-on: https://gerrit.libreoffice.org/53299
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/print.hxx | 7 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index ae40d76ce96f..0c14fb3f2955 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -51,6 +51,7 @@ namespace vcl { class PrintDialog; } +namespace weld { class Window; } enum class PrinterSupport { @@ -291,8 +292,8 @@ public: bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } - bool Setup( vcl::Window* pWindow, - PrinterSetupMode eMode = PrinterSetupMode::DocumentGlobal ); + bool Setup(weld::Window* pWindow, + PrinterSetupMode eMode = PrinterSetupMode::DocumentGlobal); bool SetPrinterProps( const Printer* pPrinter ); /** SetPrinterOptions is used internally only now @@ -559,7 +560,7 @@ public: SAL_DLLPRIVATE void pushPropertiesToPrinter(); SAL_DLLPRIVATE void resetPaperToLastConfigured(); VCL_PLUGIN_PUBLIC void setJobState( css::view::PrintableState ); - SAL_DLLPRIVATE void setupPrinter( vcl::Window* i_pDlgParent ); + SAL_DLLPRIVATE void setupPrinter( weld::Window* i_pDlgParent ); SAL_DLLPRIVATE int getPageCountProtected() const; SAL_DLLPRIVATE css::uno::Sequence< css::beans::PropertyValue > diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index ae9931eb2b0c..93c5b55ed644 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -37,7 +37,8 @@ public: virtual void set_sensitive(bool sensitive) = 0; virtual bool get_sensitive() const = 0; virtual void set_visible(bool visible) = 0; - virtual bool get_visible() const = 0; + virtual bool get_visible() const = 0; //if this widget visibility is true + virtual bool is_visible() const = 0; //if this widget visibility and all parents is true virtual void grab_focus() = 0; virtual bool has_focus() const = 0; virtual void show() = 0; @@ -155,6 +156,8 @@ public: void connect_help(const Link<Widget&, bool>& rLink) { m_aHelpRequestHdl = rLink; } + virtual SystemEnvData get_system_data() const = 0; + virtual void resize_to_request() = 0; }; @@ -189,6 +192,7 @@ public: = 0; virtual void set_default_response(int response) = 0; virtual Button* get_widget_for_response(int response) = 0; + virtual Container* weld_content_area() = 0; }; class VCL_DLLPUBLIC MessageDialog : virtual public Dialog |