[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source sw/source

[Srijan Bhatia (via logerrit)]

 sfx2/source/view/viewprn.cxx |   10 +---------
 sw/source/core/doc/doc.cxx   |    4 +---
 2 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit fdfd3638a3a2ca099cc47f8eb0d449f4c64fd200
Author:     Srijan Bhatia <srijanbhatiasun at gmail.com>
AuthorDate: Thu Jul 30 16:43:01 2020 +0530
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Oct 27 18:37:19 2020 +0100

    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.kaganski at collabora.com>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104879

diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 4db985c961d9..dabb57c27b4f 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -190,20 +190,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 3609e634e598..b850b2c8ac4e 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" );