diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-07-02 15:34:11 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-07-06 23:26:56 +0000 |
| commit | 0251e61640b94094918406b33ee7b05564409feb (patch) | |
| tree | 06149a67ca4d2afbb87c80316fc78eca2e4ee198 /include | |
| parent | cd4bbac0a866432adf7a7104add3a55f43636576 (diff) | |
tdf#91362: Make "printer was modified" status persistent
To test:
Scenario 1:
* go to Writer -> Format -> Page
* select page format and orientation, if possible a different one than the default
in your env.
* File -> Print -> Properties should now show those values (and not the default
values from the printer)
Scenario 2 (aka Scenario 2 from tdf#61186)
* now go to File -> Printer settings
* change page format and orientation, if possible to yet a different one than the
printer default and a page one
* File -> Print -> Properties should now show what was selected in Printer settings
and not the format of the page
Change-Id: Ibc84540f428b79dbec2587c50eefe526a62751b3
Reviewed-on: https://gerrit.libreoffice.org/16716
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/viewsh.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/print.hxx | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 39effbb31caf..c6e7f4a2ca12 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -148,6 +148,7 @@ friend class SfxPrinterController; SfxShell* pSubShell; VclPtr<vcl::Window> pWindow; bool bNoNewWindow; + bool mbPrinterSettingsModified; protected: virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index e3eba8e7f5ae..cc2e80d741bd 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -563,6 +563,8 @@ public: SAL_DLLPRIVATE bool getReversePrint() const; SAL_DLLPRIVATE void setPapersizeFromSetup( bool i_bPapersizeFromSetup ); SAL_DLLPRIVATE bool getPapersizeFromSetup() const; + VCL_PLUGIN_PUBLIC void setPrinterModified( bool i_bPapersizeFromSetup ); + VCL_PLUGIN_PUBLIC bool getPrinterModified() const; SAL_DLLPRIVATE void pushPropertiesToPrinter(); SAL_DLLPRIVATE void resetPaperToLastConfigured(); VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState ); |