diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-06-20 17:32:31 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-06-20 17:32:51 +0200 |
commit | e7b87d69be29dfe9d7c879935a26171beba29cb5 (patch) | |
tree | c9123e117f3b6d621f34f59979b0597144012c2c /svl | |
parent | error: logical not is only applied to the left hand side of this comparison (diff) | |
download | core-e7b87d69be29dfe9d7c879935a26171beba29cb5.tar.gz core-e7b87d69be29dfe9d7c879935a26171beba29cb5.zip |
-Werror,-Wdeprecated-register
Change-Id: I8edac5a93f9471c6f245bd484e845985c11027dd
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/items/itemset.cxx | 2 | ||||
-rw-r--r-- | svl/source/misc/inethist.cxx | 6 | ||||
-rw-r--r-- | svl/source/numbers/zforfind.cxx | 4 | ||||
-rw-r--r-- | svl/source/numbers/zformat.cxx | 22 |
4 files changed, 17 insertions, 17 deletions
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index de2e1ae514e5..3f6da5df58e6 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -1376,7 +1376,7 @@ void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults ) else { SfxWhichIter aIter( rSet ); - register sal_uInt16 nWhich; + sal_uInt16 nWhich; while( 0 != ( nWhich = aIter.NextWhich() ) ) { const SfxPoolItem* pItem = 0; diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 7eb8c6e3a3d8..7dda81a7c621 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -169,8 +169,8 @@ class INetURLHistory_Impl */ void backlink (sal_uInt16 nThis, sal_uInt16 nTail) { - register lru_entry &rThis = m_pList[nThis]; - register lru_entry &rTail = m_pList[nTail]; + lru_entry &rThis = m_pList[nThis]; + lru_entry &rTail = m_pList[nTail]; rTail.m_nNext = nThis; rTail.m_nPrev = rThis.m_nPrev; @@ -182,7 +182,7 @@ class INetURLHistory_Impl */ void unlink (sal_uInt16 nThis) { - register lru_entry &rThis = m_pList[nThis]; + lru_entry &rThis = m_pList[nThis]; m_pList[rThis.m_nPrev].m_nNext = rThis.m_nNext; m_pList[rThis.m_nNext].m_nPrev = rThis.m_nPrev; diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 5fbb9c628b33..381a2604bf62 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -307,7 +307,7 @@ bool ImpSvNumberInputScan::SkipThousands( const sal_Unicode*& pStr, OUStringBuffer sBuff(rSymbol); sal_Unicode cToken; const OUString& rThSep = pFormatter->GetNumThousandSep(); - register const sal_Unicode* pHere = pStr; + const sal_Unicode* pHere = pStr; ScanState eState = SsStart; sal_Int32 nCounter = 0; // counts 3 digits @@ -458,7 +458,7 @@ inline void ImpSvNumberInputScan::SkipBlanks( const OUString& rString, { if ( nPos < rString.getLength() ) { - register const sal_Unicode* p = rString.getStr() + nPos; + const sal_Unicode* p = rString.getStr() + nPos; while ( *p == ' ' ) { nPos++; diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 7b6e0c7fbc19..4ffa3ce3d7f8 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -4297,7 +4297,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber, sal_Int32 nPoint = sStr.indexOf((sal_Unicode)'.' ); if ( nPoint >= 0) { - register const sal_Unicode* p = sStr.getStr() + nPoint; + const sal_Unicode* p = sStr.getStr() + nPoint; while ( *++p == '0' ) ; if ( !*p ) @@ -4353,7 +4353,7 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber, { const OUString& rStr = rInfo.sStrArray[j]; const sal_Unicode* p1 = rStr.getStr(); - register const sal_Unicode* p = p1 + rStr.getLength(); + const sal_Unicode* p = p1 + rStr.getLength(); while ( p1 < p-- ) { const sal_Unicode c = *p; @@ -4539,7 +4539,7 @@ bool SvNumberformat::ImpNumberFillWithThousands( OUStringBuffer& sBuff, // numb { const OUString& rStr = rInfo.sStrArray[j]; const sal_Unicode* p1 = rStr.getStr(); - register const sal_Unicode* p = p1 + rStr.getLength(); + const sal_Unicode* p = p1 + rStr.getLength(); while ( p1 < p-- ) { nDigitCount++; @@ -4670,7 +4670,7 @@ bool SvNumberformat::ImpNumberFill( OUStringBuffer& sBuff, // number string { const OUString& rStr = rInfo.sStrArray[j]; const sal_Unicode* p1 = rStr.getStr(); - register const sal_Unicode* p = p1 + rStr.getLength(); + const sal_Unicode* p = p1 + rStr.getLength(); while ( p1 < p-- ) { if (k > 0) @@ -5360,7 +5360,7 @@ bool SvNumberformat::HasStringNegativeSign( const OUString& rStr ) } const sal_Unicode* const pBeg = rStr.getStr(); const sal_Unicode* const pEnd = pBeg + nLen; - register const sal_Unicode* p = pBeg; + const sal_Unicode* p = pBeg; do { // Start if ( *p == (sal_Unicode)'-' ) @@ -5392,9 +5392,9 @@ bool SvNumberformat::IsInQuote( const OUString& rStr, sal_Int32 nPos, { return false; } - register const sal_Unicode* p0 = rStr.getStr(); - register const sal_Unicode* p = p0; - register const sal_Unicode* p1 = p0 + nPos; + const sal_Unicode* p0 = rStr.getStr(); + const sal_Unicode* p = p0; + const sal_Unicode* p1 = p0 + nPos; bool bQuoted = false; while ( p <= p1 ) { @@ -5442,9 +5442,9 @@ sal_Int32 SvNumberformat::GetQuoteEnd( const OUString& rStr, sal_Int32 nPos, } return -1; } - register const sal_Unicode* p0 = rStr.getStr(); - register const sal_Unicode* p = p0 + nPos; - register const sal_Unicode* p1 = p0 + nLen; + const sal_Unicode* p0 = rStr.getStr(); + const sal_Unicode* p = p0 + nPos; + const sal_Unicode* p1 = p0 + nLen; while ( p < p1 ) { if ( *p == cQuote && p > p0 && *(p-1) != cEscIn ) |