sfx2/source/view/viewprn.cxx | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit eb40f8ba7d55489bd8bc2f8940dc5829402cded8
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Apr 3 11:54:42 2020 +0200
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Apr 7 10:18:42 2020 +0200
tdf#131849 Handle changed doc print options when printer changed
Previously, the SfxPrinterChangeFlags::OPTIONS flag was
only set for the case that the printer itself was considered
unchanged ('else' case below).
However, this also needs to be done when the printer is
considered to have changed, so the flag is properly
passed in the call to 'SetPrinter' below, to make
sure that changes in document-specific options are
properly propagated.
Change-Id: Id91ebbbf40888e52149b40ac25f188af4be425f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91626
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit 21fc54777d5dedc33d6bfa23b9f1072a6667eebe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91519
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 2347f69584c4..8ee3fe18de04 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -542,6 +542,11 @@ void SfxViewShell::SetPrinter_Impl( VclPtr<SfxPrinter>&
pNewPrinter )
if ( (aTempPrtName != aDocPrtName) || (pDocPrinter->IsDefPrinter() !=
pNewPrinter->IsDefPrinter()) )
{
nChangedFlags |=
SfxPrinterChangeFlags::PRINTER|SfxPrinterChangeFlags::JOBSETUP;
+ if ( ! (pNewPrinter->GetOptions() == pDocPrinter->GetOptions()) )
+ {
+ nChangedFlags |= SfxPrinterChangeFlags::OPTIONS;
+ }
+
pDocPrinter = pNewPrinter;
}
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
