[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sc/source sd/source sw/source vcl/uiconfig

[Srijan Bhatia (via logerrit)]

 sc/source/ui/unoobj/docuno.cxx         |    4 ++--
 sd/source/ui/view/DocumentRenderer.cxx |    4 ++--
 sw/source/core/view/printdata.cxx      |    4 ++--
 vcl/uiconfig/ui/printdialog.ui         |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit cd1c6c06cdba864238e1a590759b053ef12b80cb
Author:     Srijan Bhatia <srijanbhatiasun at gmail.com>
AuthorDate: Sun Jul 12 21:27:08 2020 +0530
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Oct 27 18:36:47 2020 +0100

    tdf#127680 change even/odd dialog order
    
    Change-Id: I6dea25b3d212072df9a6638dc774f35e203e1f80
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98602
    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/+/104878

diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index dec6a92b3362..4ade34d59481 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1625,8 +1625,8 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount(const uno::Any& aSelection,
         return pDocShell->GetDocument().GetTableCount();
     }
 
-    bool bIsPrintEvenPages = (nEOContent != 2 && nContent == 0) || nContent != 0;
-    bool bIsPrintOddPages = (nEOContent != 1 && nContent == 0) || nContent != 0;
+    bool bIsPrintEvenPages = (nEOContent != 1 && nContent == 0) || nContent != 0;
+    bool bIsPrintOddPages = (nEOContent != 2 && nContent == 0) || nContent != 0;
 
     for ( sal_Int32 nPage = 1; nPage <= nPages; nPage++ )
     {
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 8a9be771b149..3c3f44de011d 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -187,13 +187,13 @@ namespace {
         bool IsPrintFrontPage() const
         {
             sal_Int32 nInclude = static_cast<sal_Int32>(mrProperties.getIntValue( "EvenOdd", 0 ));
-            return nInclude != 1;
+            return nInclude != 2;
         }
 
         bool IsPrintBackPage() const
         {
             sal_Int32 nInclude = static_cast<sal_Int32>(mrProperties.getIntValue( "EvenOdd", 0 ));
-            return nInclude != 2;
+            return nInclude != 1;
         }
 
         bool IsPaperBin() const
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 5c24e1dd691d..4001314a953f 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -388,7 +388,7 @@ bool SwPrintUIOptions::IsPrintLeftPages() const
     // 1: left pages only
     // 2: right pages only
     sal_Int64 nEOPages = getIntValue( "EvenOdd", 0 /* default: all */ );
-    bool bRes = nEOPages != 2;
+    bool bRes = nEOPages != 1;
     bRes = getBoolValue( "EvenOdd", bRes /* <- default value if property is not found */ );
     return bRes;
 }
@@ -399,7 +399,7 @@ bool SwPrintUIOptions::IsPrintRightPages() const
     // for compatibility the old name should win (may still be used for PDF export or via Uno API)
 
     sal_Int64 nEOPages = getIntValue( "EvenOdd", 0 /* default: all */ );
-    bool bRes = nEOPages != 1;
+    bool bRes = nEOPages != 2;
     bRes = getBoolValue( "EvenOdd", bRes /* <- default value if property is not found */ );
     return bRes;
 }
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 5cd2dfd4553b..584454e2ab4f 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -577,9 +577,9 @@
                                                 <property name="hexpand">True</property>
                                                 <property name="active">0</property>
                                                 <items>
-                                                  <item translatable="yes" context="printdialog|liststore3">Even and Odd Pages</item>
-                                                  <item translatable="yes" context="printdialog|liststore3">Even Pages</item>
+                                                  <item translatable="yes" context="printdialog|liststore3">Odd and Even Pages</item>
                                                   <item translatable="yes" context="printdialog|liststore3">Odd Pages</item>
+                                                  <item translatable="yes" context="printdialog|liststore3">Even Pages</item>
                                                 </items>
                                               </object>
                                               <packing>