summaryrefslogtreecommitdiff
path: root/i18npool
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-02-11 13:20:49 +0200
committerNoel Grandin <noel@peralex.com>2015-02-23 09:26:58 +0200
commitba233e87efddf0a6751b35784dca1c805364ff3b (patch)
tree9d7c8a4256e688c2d47cb6ecf580ac196c4da2c0 /i18npool
parenta2fa9e2468aa5c4fd4b610c5d0ebc8959e87a072 (diff)
remove unnecessary parenthesis in return statements
found with $ git grep -lP 'return\s*\(\s*\w+\s*\)\s*;' Change-Id: Ic51606877a9edcadeb647c5bf17bc928b69ab60e
Diffstat (limited to 'i18npool')
-rw-r--r--i18npool/source/calendar/calendar_hijri.cxx2
-rw-r--r--i18npool/source/collator/collator_unicode.cxx2
-rw-r--r--i18npool/source/search/levdis.cxx12
-rw-r--r--i18npool/source/search/levdis.hxx22
-rw-r--r--i18npool/source/transliteration/transliterationImpl.cxx2
5 files changed, 20 insertions, 20 deletions
diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx
index a0200417fa39..ff1bf5126440 100644
--- a/i18npool/source/calendar/calendar_hijri.cxx
+++ b/i18npool/source/calendar/calendar_hijri.cxx
@@ -163,7 +163,7 @@ Calendar_hijri::NewMoon(sal_Int32 n)
// convert from Ephemeris Time (ET) to (approximate) Universal Time (UT)
jd += xtra - (0.41 + 1.2053 * t + 0.4992 * t2)/1440;
- return (jd);
+ return jd;
}
// Get Hijri Date
diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index ef425738832a..a2b110c157fe 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -375,7 +375,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::
else
collator->setStrength(Collator::TERTIARY);
- return(0);
+ return 0;
}
diff --git a/i18npool/source/search/levdis.cxx b/i18npool/source/search/levdis.cxx
index bc32b159bae7..c0dc37a0ee80 100644
--- a/i18npool/source/search/levdis.cxx
+++ b/i18npool/source/search/levdis.cxx
@@ -89,7 +89,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen )
// more insertions or deletions necessary as the limit? Then leave
if ( (nLenDiff * nInsQ0 > nLimit)
|| ((nStars == 0) && (nLenDiff * nDelR0 < -nLimit)) )
- return(LEVDISBIG);
+ return LEVDISBIG;
// comparative String greater than instantaneous array
// -> adapt array size
@@ -247,7 +247,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen )
}
}
if ( (nSPMin <= nLimit) && (npDistance[nStringLen] <= nLimit) )
- return(npDistance[nStringLen]);
+ return npDistance[nStringLen];
else
{
if ( bSplitCount )
@@ -257,10 +257,10 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen )
if ( (nSPMin <= 2 * nLimit)
&& (npDistance[nStringLen] <= 2 * nLimit)
&& (nRepS * nRepP0 <= nLimit) )
- return( -npDistance[nStringLen] );
- return(LEVDISBIG);
+ return -npDistance[nStringLen];
+ return LEVDISBIG;
}
- return(LEVDISBIG);
+ return LEVDISBIG;
}
}
@@ -286,7 +286,7 @@ int WLevDistance::CalcLPQR( int nX, int nY, int nZ, bool bRelaxed )
nInsQ0 = ( nY ? nLimit / nY : nLimit + 1 );
nDelR0 = ( nZ ? nLimit / nZ : nLimit + 1 );
bSplitCount = bRelaxed;
- return( nLimit );
+ return nLimit;
}
// greatest common divisior according to Euklid (chaindivision)
diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx
index e25883ba91c8..426e7228de5b 100644
--- a/i18npool/source/search/levdis.hxx
+++ b/i18npool/source/search/levdis.hxx
@@ -171,11 +171,11 @@ public:
int CalcLPQR( int nOtherX, int nShorterY, int nLongerZ,
bool bRelaxed = true );
- inline int GetLimit() const { return( nLimit ); }
- inline int GetReplaceP0() const { return( nRepP0 ); }
- inline int GetInsertQ0() const { return( nInsQ0 ); }
- inline int GetDeleteR0() const { return( nDelR0 ); }
- inline bool GetSplit() const { return( bSplitCount ); }
+ inline int GetLimit() const { return nLimit; }
+ inline int GetReplaceP0() const { return nRepP0; }
+ inline int GetInsertQ0() const { return nInsQ0; }
+ inline int GetDeleteR0() const { return nDelR0; }
+ inline bool GetSplit() const { return bSplitCount; }
inline int SetLimit( int nNewLimit );
inline int SetReplaceP0( int nNewP0 );
inline int SetInsertQ0( int nNewQ0 );
@@ -184,7 +184,7 @@ public:
internal weighs! */
inline bool SetSplit( bool bNewSplit );
- inline bool IsNormal( sal_Int32 nPos ) const { return( !bpPatIsWild[nPos] ); }
+ inline bool IsNormal( sal_Int32 nPos ) const { return !bpPatIsWild[nPos]; }
// Calculate current balance, keep this inline for performance reasons!
// c == cpPattern[jj] == cString[ii]
@@ -224,35 +224,35 @@ inline int WLevDistance::SetLimit( int nNewLimit )
{
int nTmp = nLimit;
nLimit = nNewLimit;
- return( nTmp );
+ return nTmp;
}
inline int WLevDistance::SetReplaceP0( int nNewP0 )
{
int nTmp = nRepP0;
nRepP0 = nNewP0;
- return( nTmp );
+ return nTmp;
}
inline int WLevDistance::SetInsertQ0( int nNewQ0 )
{
int nTmp = nInsQ0;
nInsQ0 = nNewQ0;
- return( nTmp );
+ return nTmp;
}
inline int WLevDistance::SetDeleteR0( int nNewR0 )
{
int nTmp = nDelR0;
nDelR0 = nNewR0;
- return( nTmp );
+ return nTmp;
}
inline bool WLevDistance::SetSplit( bool bNewSplit )
{
bool bTmp = bSplitCount;
bSplitCount = bNewSplit;
- return( bTmp );
+ return bTmp;
}
#endif
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 1fb47350bbdb..a90ef47d84cd 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -170,7 +170,7 @@ TransliterationImpl::getType() throw(RuntimeException, std::exception)
if (numCascade > 1)
return (TransliterationType::CASCADE|TransliterationType::IGNORE);
if (numCascade > 0 && bodyCascade[0].is())
- return(bodyCascade[0]->getType());
+ return bodyCascade[0]->getType();
throw ERROR;
}