[Libreoffice-commits] core.git: cui/source sd/source sfx2/source svx/source sw/source vcl/source xmloff/source
Stephan Bergmann
sbergman at redhat.com
Thu May 18 16:07:17 UTC 2017
cui/source/tabpages/numpages.cxx | 2 +-
sd/source/core/stlsheet.cxx | 2 +-
sfx2/source/doc/SfxDocumentMetaData.cxx | 2 +-
sfx2/source/doc/docinsert.cxx | 2 +-
svx/source/table/cell.cxx | 2 +-
svx/source/unodraw/unoshape.cxx | 2 +-
sw/source/filter/docx/swdocxreader.cxx | 2 +-
vcl/source/gdi/sallayout.cxx | 2 +-
xmloff/source/text/XMLTextFrameContext.cxx | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit c345299186841ccb1fe846f6f277039c188941d6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu May 18 18:04:20 2017 +0200
Remove parentheses around some comparisons
...where Clang would otherwise start to emit -Wparentheses-equality as soon as
the order of arguments were switched by loplugin:comparisonwithconstant
Change-Id: If064c2c6e2f81478154395137138b71f2d1c6534
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index f785bbec456e..e6d35cf4e517 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1410,7 +1410,7 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet* rSet )
{
sal_uInt16 nEntryData = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFmtLB->GetEntryData(i - 1));
if(/*SVX_NUM_NUMBER_NONE == nEntryData ||*/
- ((SVX_NUM_BITMAP|LINK_TOKEN) == nEntryData))
+ (SVX_NUM_BITMAP|LINK_TOKEN) == nEntryData)
m_pFmtLB->RemoveEntry(i - 1);
}
}
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 2c34c5e068c9..9d984d001d02 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -1217,7 +1217,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN
}
// if a item is set, this doesn't mean we want it :)
- if( ( PropertyState_DIRECT_VALUE == eState ) )
+ if( PropertyState_DIRECT_VALUE == eState )
{
switch( pEntry->nWID )
{
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 606b4001c2bb..fa34dc6e498a 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -746,7 +746,7 @@ SfxDocumentMetaData::setMetaList(const char* i_name,
// if nothing changed, do nothing
// alas, this does not check for permutations, or attributes...
- if ((nullptr == i_pAttrs)) {
+ if (nullptr == i_pAttrs) {
if (static_cast<size_t>(i_rValue.getLength()) == vec.size()) {
bool isEqual(true);
for (sal_Int32 i = 0; i < i_rValue.getLength(); ++i) {
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 30cdb908ba11..5957b0fa4d92 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -255,7 +255,7 @@ IMPL_LINK_NOARG(DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*, void
m_pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, true ) );
else
{
- if ( ( TemplateDescription::FILEOPEN_READONLY_VERSION == nDlgType ) )
+ if ( TemplateDescription::FILEOPEN_READONLY_VERSION == nDlgType )
{
try
{
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 3483a7d3bdcb..5266e5e2165f 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -1425,7 +1425,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName )
}
// if a item is set, this doesn't mean we want it :)
- if( ( PropertyState_DIRECT_VALUE == eState ) )
+ if( PropertyState_DIRECT_VALUE == eState )
{
switch( pMap->nWID )
{
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 7cc707c7f510..ba50ddedc577 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2017,7 +2017,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
}
// if a item is set, this doesn't mean we want it :)
- if( ( beans::PropertyState_DIRECT_VALUE == eState ) )
+ if( beans::PropertyState_DIRECT_VALUE == eState )
{
switch( pMap->nWID )
{
diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx
index 501b0e567a18..bba7dd1ff723 100644
--- a/sw/source/filter/docx/swdocxreader.cxx
+++ b/sw/source/filter/docx/swdocxreader.cxx
@@ -151,7 +151,7 @@ bool SwDOCXReader::MakeEntries( SwDoc *pD, SwTextBlocks &rBlocks )
if( rIdx.GetNode().GetTextNode() &&
rIdx.GetNode().GetTextNode()->GetText().isEmpty() )
rIdx = aStart.GetNode().EndOfSectionIndex() - 2;
- if( ( nullptr == ( pCNd = rIdx.GetNode().GetContentNode() ) ) )
+ if( nullptr == ( pCNd = rIdx.GetNode().GetContentNode() ) )
{
++rIdx;
pCNd = pD->GetNodes().MakeTextNode( rIdx, pColl );
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 30f2e60292f0..11e1d307eb73 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -223,7 +223,7 @@ inline bool IsControlChar( sal_UCS4 cChar )
// deprecated formatting characters
if( (0x206A <= cChar) && (cChar <= 0x206F) )
return true;
- if( (0x2060 == cChar) )
+ if( 0x2060 == cChar )
return true;
// byte order markers and invalid unicode
if( (cChar == 0xFEFF) || (cChar == 0xFFFE) || (cChar == 0xFFFF) )
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index ece946e001b6..c11222ff1c9b 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1069,7 +1069,7 @@ SvXMLImportContext *XMLTextFrameContext_Impl::CreateChildContext(
xAttrList, aParamMap );
}
}
- else if( (XML_NAMESPACE_OFFICE == nPrefix) )
+ else if( XML_NAMESPACE_OFFICE == nPrefix )
{
if( IsXMLToken( rLocalName, XML_BINARY_DATA ) )
{
More information about the Libreoffice-commits
mailing list