avmedia/source/framework/mediacontrol.cxx | 2 +-
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2 +-
svtools/source/uno/treecontrolpeer.cxx | 6 ------
svx/source/svdraw/svdundo.cxx | 2 +-
sw/source/core/layout/pagechg.cxx | 3 +--
sw/source/ui/dbui/mmaddressblockpage.cxx | 2 +-
6 files changed, 5 insertions(+), 12 deletions(-)
New commits:
commit 35b3ae2ceb6e647c44f1a8adc9d7b0548a3ca383
Author: Noel Grandin <n...@peralex.com>
Date: Wed May 18 12:33:22 2016 +0200
clang-tidy clang-analyzer-alpha.core.IdenticalExpr
Change-Id: I110d8d63d5a6657c18aba97227c046027eb8f7f4
Reviewed-on: https://gerrit.libreoffice.org/25086
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/avmedia/source/framework/mediacontrol.cxx
b/avmedia/source/framework/mediacontrol.cxx
index cf04846..a175bee 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -68,7 +68,7 @@ MediaControl::MediaControl( vcl::Window* pParent,
MediaControlStyle eControlStyl
maVolumeSlider( VclPtr<Slider>::Create(this, WB_HORZ | WB_DRAG |
WB_SLIDERSET) ),
maZoomToolBox( VclPtr<ToolBox>::Create(this, WB_3DLOOK) ),
mpZoomListBox( VclPtr<ListBox>::Create( maZoomToolBox.get(), WB_BORDER |
WB_DROPDOWN | WB_AUTOHSCROLL | WB_3DLOOK ) ),
- maTimeEdit( VclPtr<Edit>::Create(this, WB_CENTER | WB_READONLY | WB_BORDER
| WB_3DLOOK | WB_READONLY) ),
+ maTimeEdit( VclPtr<Edit>::Create(this, WB_CENTER | WB_READONLY | WB_BORDER
| WB_3DLOOK ) ),
meControlStyle( eControlStyle ),
mbLocked( false )
{
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 9a6484a..160dca9 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -1296,7 +1296,7 @@ namespace
{
bool bRet = true;
::connectivity::OSQLParseNode* pFirstColumnRef = _pFirstColumnRef;
- for (size_t i = 0; bRet && i < _pCondition->count() && bRet; ++i)
+ for (size_t i = 0; bRet && i < _pCondition->count(); ++i)
{
const ::connectivity::OSQLParseNode* pChild =
_pCondition->getChild(i);
if ( pChild->isToken() )
diff --git a/svtools/source/uno/treecontrolpeer.cxx
b/svtools/source/uno/treecontrolpeer.cxx
index 5aee8a1..8bd3af1 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1377,12 +1377,6 @@ void TreeControlPeer::onChangeRootDisplayed( bool
bIsRootDisplayed )
// todo
fillTree( rTree, mxDataModel );
- if( mbIsRootDisplayed )
- {
- }
- else
- {
- }
}
bool TreeControlPeer::loadImage( const OUString& rURL, Image& rImage )
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index 675edb8..abc459f 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -648,7 +648,7 @@ void SdrUndoGeoObj::Undo()
if (pTableObj && mbSkipChangeLayout)
pTableObj->SetSkipChangeLayout(true);
pObj->SetGeoData(*pUndoGeo);
- if (pTableObj && mbSkipChangeLayout && pTableObj)
+ if (pTableObj && mbSkipChangeLayout)
pTableObj->SetSkipChangeLayout(false);
}
}
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index beb6039..c722da9 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1082,8 +1082,7 @@ void SwFrame::CheckPageDescs( SwPageFrame *pStart, bool
bNotifyFields, SwPageFra
else if ( !pFormatWish ) //6.
{
// get format with inverted logic
- if (!pFormatWish)
- pFormatWish = bOdd ? pDesc->GetLeftFormat() :
pDesc->GetRightFormat();
+ pFormatWish = bOdd ? pDesc->GetLeftFormat() :
pDesc->GetRightFormat();
if ( pPage->GetFormat() != pFormatWish )
pPage->SetFrameFormat( pFormatWish );
}
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx
b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 02014b3..f402105 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -836,7 +836,7 @@ public:
VCL_BUILDER_FACTORY_ARGS(SwAssignFieldsControl, WB_BORDER)
SwAssignFieldsControl::SwAssignFieldsControl(vcl::Window* pParent, WinBits
nBits) :
- Control(pParent, nBits | WB_DIALOGCONTROL | WB_TABSTOP | WB_DIALOGCONTROL),
+ Control(pParent, nBits | WB_DIALOGCONTROL | WB_TABSTOP),
m_aVScroll(VclPtr<ScrollBar>::Create(this)),
m_aHeaderHB(VclPtr<HeaderBar>::Create(this, WB_BUTTONSTYLE |
WB_BOTTOMBORDER)),
m_aWindow(VclPtr<vcl::Window>::Create(this, WB_BORDER | WB_DIALOGCONTROL)),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
