[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 
AuthorDate: Sun Jul 12 21:27:08 2020 +0530
Commit: Xisco Fauli 
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 
Signed-off-by: Xisco Fauli 
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(mrProperties.getIntValue( "EvenOdd", 0 ));
-return nInclude != 1;
+return nInclude != 2;
 }
 
 bool IsPrintBackPage() const
 {
 sal_Int32 nInclude = 
static_cast(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 @@
 True
 0
 
-  Even and Odd Pages
-  Even Pages
+  Odd and Even Pages
   Odd Pages
+  Even Pages
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara (via logerrit)]

 sc/source/filter/excel/excel.cxx |6 +++---
 sd/source/filter/sdpptwrp.cxx|6 +++---
 sw/source/filter/ww8/wrtww8.cxx  |2 +-
 sw/source/filter/ww8/ww8par.cxx  |4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 81c7702865551e2f8a5bbcde2c8e37e4446c387c
Author: Caolán McNamara 
AuthorDate: Sat Jun 27 16:18:35 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jun 27 21:33:24 2020 +0200

cid#1464973 & cid#1464975 Resource leak

Change-Id: I4df8fefa7f875e0a25585c4fef22f077dcd0b83d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97300
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index 34dd49a81c8b..1e2c61233a2c 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -59,8 +59,8 @@ static void lcl_getListOfStreams(SotStorage * pStorage, 
comphelper::SequenceAsHa
 OUString sStreamFullName = sPrefix.getLength() ? sPrefix + "/" + 
aElement.GetName() : aElement.GetName();
 if (aElement.IsStorage())
 {
-SotStorage * pSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
-lcl_getListOfStreams(pSubStorage, aStreamsData, sStreamFullName);
+tools::SvRef xSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
+lcl_getListOfStreams(xSubStorage.get(), aStreamsData, 
sStreamFullName);
 }
 else
 {
@@ -371,7 +371,7 @@ static ErrCode lcl_ExportExcelBiff( SfxMedium& rMedium, 
ScDocument *pDocument,
 break;
 }
 
-SotStorageStream* pStream = pStorage->OpenSotStream(sFileName);
+tools::SvRef pStream = 
pStorage->OpenSotStream(sFileName);
 if (!pStream)
 {
 eRet = ERRCODE_IO_GENERAL;
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index 68b0b1886fd2..8fac3b162263 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -83,8 +83,8 @@ static void lcl_getListOfStreams(SotStorage * pStorage, 
comphelper::SequenceAsHa
 OUString sStreamFullName = sPrefix.getLength() ? sPrefix + "/" + 
aElement.GetName() : aElement.GetName();
 if (aElement.IsStorage())
 {
-SotStorage * pSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
-lcl_getListOfStreams(pSubStorage, aStreamsData, sStreamFullName);
+tools::SvRef xSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
+lcl_getListOfStreams(xSubStorage.get(), aStreamsData, 
sStreamFullName);
 }
 else
 {
@@ -307,7 +307,7 @@ bool SdPPTFilter::Export()
 {
 // To avoid long paths split and open substorages 
recursively
 // Splitting paths manually, since 
comphelper::string::split is trimming special characters like \0x01, \0x09
-SotStorage * pStorage = xEncryptedRootStrg.get();
+tools::SvRef pStorage = 
xEncryptedRootStrg.get();
 OUString sFileName;
 sal_Int32 idx = 0;
 do
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 5fedd5bb39b7..9b5980f3e5e1 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -3724,7 +3724,7 @@ ErrCode SwWW8Writer::WriteStorage()
 {
 // To avoid long paths split and open substorages recursively
 // Splitting paths manually, since comphelper::string::split is 
trimming special characters like \0x01, \0x09
-SotStorage * pStorage = m_pStg.get();
+tools::SvRef pStorage = m_pStg.get();
 OUString sFileName;
 sal_Int32 idx = 0;
 do
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index f58506ec5268..054b0a98e9ee 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6343,8 +6343,8 @@ static void lcl_getListOfStreams(SotStorage * pStorage, 
comphelper::SequenceAsHa
 OUString sStreamFullName = sPrefix.getLength() ? sPrefix + "/" + 
aElement.GetName() : aElement.GetName();
 if (aElement.IsStorage())
 {
-SotStorage * pSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
-lcl_getListOfStreams(pSubStorage, aStreamsData, sStreamFullName);
+tools::SvRef xSubStorage = 
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ | 
StreamMode::SHARE_DENYALL);
+lcl_getListOfStreams(xSubStorage.get(),