[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basctl/source dbaccess/source filter/source sc/source sd/source svtools/source svx/source sw/source vcl/aqua
Herbert Dürr
hdu at apache.org
Tue Jan 21 06:08:02 PST 2014
basctl/source/dlged/dlged.cxx | 2 +-
dbaccess/source/ui/querydesign/JoinTableView.cxx | 2 +-
filter/source/msfilter/svdfppt.cxx | 2 +-
sc/source/filter/excel/tokstack.cxx | 2 +-
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 2 +-
sc/source/filter/xml/XMLStylesExportHelper.cxx | 2 +-
sd/source/filter/xml/sdxmlwrp.cxx | 2 +-
svtools/source/edit/syntaxhighlight.cxx | 2 +-
svx/source/table/cell.cxx | 2 +-
svx/source/unodraw/unoshape.cxx | 2 +-
sw/source/ui/app/appopt.cxx | 2 +-
vcl/aqua/source/app/salinst.cxx | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 275a1d7a011e79a7f9c44c51e947d2cb50197051
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Jan 21 13:56:09 2014 +0000
get rid of an extraneous parentheses in "if((A==B))"
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 0623039..296a3f3 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -514,7 +514,7 @@ void DlgEditor::MouseButtonUp( const MouseEvent& rMEvt )
{
sal_Bool bRet = pFunc->MouseButtonUp( rMEvt );
- if( (eMode == DLGED_INSERT) )
+ if( eMode == DLGED_INSERT )
bCreateOK = bRet;
}
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 6f57917..27c560e 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1462,7 +1462,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt)
// no conn for any reason -> select the next or previous tab win
if(bForward)
{
- if ((aIter->second == m_aTableMap.rbegin()->second))
+ if( aIter->second == m_aTableMap.rbegin()->second)
pNextWin = m_aTableMap.begin()->second;
else
{
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 51af756..692e3d0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1089,7 +1089,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, DffObjData& rObjData, voi
}
sal_uInt32 nDestinationInstance = aTextObj.GetInstance();
- if ( ( rPersistEntry.ePageKind == PPT_MASTERPAGE ) )
+ if ( rPersistEntry.ePageKind == PPT_MASTERPAGE )
{
if ( !rPersistEntry.pPresentationObjects )
{
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 5701f71..5be7dbe 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -939,7 +939,7 @@ const String* TokenPool::GetExternal( const TokenId& rId ) const
if( n && n <= nElementAkt )
{
n--;
- if( (pType[ n ] == T_Ext) )
+ if( pType[ n ] == T_Ext )
{
sal_uInt16 nExt = pElement[ n ];
if ( nExt < nP_Ext && ppP_Ext[ nExt ] )
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index c4929fd..2173c9d 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -558,7 +558,7 @@ void ScXMLChangeTrackingImportHelper::CreateGeneratedActions(ScMyGeneratedList&
ScMyGeneratedList::iterator aEndItr(rList.end());
while (aItr != aEndItr)
{
- if (((*aItr)->nID == 0))
+ if( (*aItr)->nID == 0)
{
ScBaseCell* pCell = NULL;
if ((*aItr)->pCellInfo)
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 5faea3e..ad58ffd 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -331,7 +331,7 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport,
sal_Bool bPrevCharWasSpace(sal_True);
while(i < sText.getLength())
{
- if ((sText[i] == '\n'))
+ if( sText[i] == '\n')
{
SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False);
rExport.GetTextParagraphExport()->exportText(sTemp.makeStringAndClear(), bPrevCharWasSpace);
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 99250db..c0e404b 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -791,7 +791,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
bool bTransform = false;
- if( (nRet == 0) )
+ if( nRet == 0 )
{
if( sBuildId.getLength() )
{
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index c24a199..b3f276e 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -483,7 +483,7 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
}
reType = TT_PARAMETER;
}
- else if ((c=='-'))
+ else if( c=='-' )
{
sal_Unicode cPeekNext = peekChar();
if (cPeekNext=='-')
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index f14a23e..cc8f75d 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -1439,7 +1439,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
case XATTR_FILLFLOATTRANSPARENCE:
{
NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
- if( ( pItem == NULL ) )
+ if( pItem == NULL )
eState = PropertyState_DEFAULT_VALUE;
}
break;
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 582929c..6ffa6e4 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2222,7 +2222,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
case XATTR_FILLFLOATTRANSPARENCE:
{
NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
- if( ( pItem == NULL ) )
+ if( pItem == NULL )
eState = beans::PropertyState_DEFAULT_VALUE;
}
break;
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index c757efd..a2ca512 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -298,7 +298,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
{
// the text dialog mustn't apply data to the web view and vice versa
sal_Bool bWebView = 0 != PTR_CAST(SwWebView, pAppView);
- if( (bWebView == bTextDialog))
+ if( bWebView == bTextDialog)
pAppView = 0; //
}
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index c47479a..63252c5 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -622,7 +622,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
std::list<AquaSalFrame*>::iterator it = pSalData->maFrames.begin();
while( (*it) && ( (it != pSalData->maFrames.end() ) || ( (*it)->mbFullScreen == false ) ) )
{
- if ( ((*it)->mbFullScreen == true) )
+ if( (*it)->mbFullScreen )
bIsFullScreenMode = true;
it++;
}
More information about the Libreoffice-commits
mailing list