diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:03 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:29:03 +0000 |
commit | 5a7157d319477830426797532e02ac39d3b859f4 (patch) | |
tree | 3773f5ce209bee14a5643e98672e0f3828c71434 /include/vcl | |
parent | Releasing progress-linux version 4:24.2.0-3~progress7.99u1. (diff) | |
download | libreoffice-5a7157d319477830426797532e02ac39d3b859f4.tar.xz libreoffice-5a7157d319477830426797532e02ac39d3b859f4.zip |
Merging upstream version 4:24.2.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/abstdlg.hxx | 8 | ||||
-rw-r--r-- | include/vcl/print.hxx | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx index 793d8cdd36..137117866d 100644 --- a/include/vcl/abstdlg.hxx +++ b/include/vcl/abstdlg.hxx @@ -103,6 +103,14 @@ public: virtual void AllowEmpty() = 0; }; +class VCL_DLLPUBLIC AbstractSecurityOptionsDialog : public VclAbstractDialog +{ +protected: + virtual ~AbstractSecurityOptionsDialog() override = default; +public: + virtual bool SetSecurityOptions() = 0; +}; + class VCL_DLLPUBLIC AbstractScreenshotAnnotationDlg : public VclAbstractDialog { protected: diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index d6ce7728f9..e23cf8d0af 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -227,6 +227,7 @@ public: bool SetPaperBin( sal_uInt16 nPaperBin ); sal_uInt16 GetPaperBin() const; + sal_uInt16 GetPaperBinBySourceIndex(sal_uInt16 nPaperSource) const; void SetPaper( Paper ePaper ); bool SetPaperSizeUser( const Size& rSize ); /** @return The paper format of the printer's current "jobsetup". Note that if PAPER_USER the actual size can be anything. */ |