[Libreoffice-commits] core.git: 2 commits - sc/source sd/source
Caolán McNamara
caolanm at redhat.com
Fri Feb 5 20:42:01 UTC 2016
sc/source/ui/dbgui/PivotLayoutDialog.cxx | 2 +-
sd/source/ui/view/drviewsd.cxx | 13 ++-----------
2 files changed, 3 insertions(+), 12 deletions(-)
New commits:
commit e0cba2a0a837b0d53e813abef3a379b737122c67
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 5 20:38:54 2016 +0000
coverity#1351877 'Constant' variable guards dead code
and
coverity#1351882 Useless call
sigh, silly me
regression from
commit 2ce227a7642647267c982909a8b3175d22c58b74
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 4 09:17:42 2016 +0000
coverity#1351755 Dereference null return value
Change-Id: I6d6841d04f9bba68ec2077d874dcd24edbf4ab6c
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index d7982a9..fb00e3f 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -523,7 +523,7 @@ void ScPivotLayoutDialog::ApplyChanges()
if ( ( ( rOldRange != aDestinationRange ) && !rOldRange.In( aDestinationRange ) )
|| bToNewSheet )
{
- mpDocument->GetDPAtCursor( maPivotParameters.nCol, maPivotParameters.nRow, maPivotParameters.nTab);
+ pDPObj = mpDocument->GetDPAtCursor( maPivotParameters.nCol, maPivotParameters.nRow, maPivotParameters.nTab);
}
if (pDPObj)
{
commit 57598da9fa348f09d681b334c8196feb7f23cdb9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 5 20:36:46 2016 +0000
coverity#1351878 'Constant' variable guards dead code
since
commit 2503a1e99df463aef1bf87c94b7b4a8ee3554efe
Author: Bryan Quigley <gquigs at gmail.com>
Date: Wed Jan 27 12:19:28 2016 -0500
tdf#96414 Remove showing navigator during slideshow
Change-Id: If3949c2527334107d1ca8af2bee50ec4b7b2947a
diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx
index 572378f..4ba0ab3 100644
--- a/sd/source/ui/view/drviewsd.cxx
+++ b/sd/source/ui/view/drviewsd.cxx
@@ -156,7 +156,6 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet )
sal_uInt16 nCurrentPage = 0;
sal_uInt16 nFirstPage = 0;
sal_uInt16 nLastPage;
- bool bEndless = false;
OUString aPageName;
nState |= NAVTLB_UPDATE;
@@ -172,11 +171,7 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet )
// first page / previous page
if( nCurrentPage == nFirstPage )
{
- nState |= NAVBTN_FIRST_DISABLED;
- if( !bEndless )
- nState |= NAVBTN_PREV_DISABLED;
- else
- nState |= NAVBTN_PREV_ENABLED;
+ nState |= NAVBTN_FIRST_DISABLED | NAVBTN_PREV_DISABLED;
}
else
{
@@ -186,11 +181,7 @@ void DrawViewShell::GetNavigatorWinState( SfxItemSet& rSet )
// last page / next page
if( nCurrentPage == nLastPage )
{
- nState |= NAVBTN_LAST_DISABLED;
- if( !bEndless )
- nState |= NAVBTN_NEXT_DISABLED;
- else
- nState |= NAVBTN_NEXT_ENABLED;
+ nState |= NAVBTN_LAST_DISABLED | NAVBTN_NEXT_DISABLED;
}
else
{
More information about the Libreoffice-commits
mailing list