sfx2/source/view/viewprn.cxx | 10 +---------
sw/source/core/doc/doc.cxx | 4 +---
2 files changed, 2 insertions(+), 12 deletions(-)
New commits:
commit aedbbfd934c65b4d73afd13020116fb65567f0d1
Author: Srijan Bhatia <srijanbhatia...@gmail.com>
AuthorDate: Thu Jul 30 16:43:01 2020 +0530
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Aug 7 15:57:36 2020 +0200
tdf#135082 fix print selection
Change-Id: Id4d48f25161aac20e8594b5e32c5dbe09e78ccc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99790
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 19b954d26fe6..45341cd1892a 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -189,20 +189,12 @@ const Any& SfxPrinterController::getSelectionObject()
const
return bSel ? maSelection : maCompleteSelection;
}
- bool bIsCalc = false;
- pVal = getValue( OUString( "PrintRange" ) );
- if ( pVal )
- bIsCalc = true;
-
sal_Int32 nChoice = 0;
pVal = getValue( OUString( "PrintContent" ) );
if( pVal )
pVal->Value >>= nChoice;
- if ( bIsCalc )
- return (nChoice > 1) ? maSelection : maCompleteSelection;
- else
- return (nChoice > 3) ? maSelection : maCompleteSelection;
+ return (nChoice > 1) ? maSelection : maCompleteSelection;
}
Sequence< beans::PropertyValue > SfxPrinterController::getMergedOptions() const
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index f560de2e7238..69dcd0f98039 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -721,9 +721,7 @@ void SwDoc::CalculatePagesForPrinting(
// PageContent :
// 0 -> print all pages (default if aPageRange is empty)
// 1 -> print range according to PageRange
- // 2 -> print even pages
- // 3 -> print odd pages
- // 4 -> print selection
+ // 2 -> print selection
if (1 == nContent)
aPageRange = rOptions.getStringValue( "PageRange" );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
