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@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@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 dec6a92..4ade34d 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 8a9be77..3c3f44d 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 5c24e1d..4001314 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 5cd2dfd..584454e 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>
