Author: truckman
Date: Tue May 1 18:46:30 2018
New Revision: 1830707
URL: http://svn.apache.org/viewvc?rev=1830707&view=rev
Log:
The register storage class is deprecated and is incompatible with C++17.
Modern compilers have mostly been ignoring it, probably other than to
forbid the use of the address-of operator. Get ahead of the game and
delete it now.
Reported by clang 6.
Modified:
openoffice/trunk/main/i18npool/source/search/levdis.cxx
openoffice/trunk/main/i18npool/source/search/textsearch.cxx
openoffice/trunk/main/store/source/storcach.cxx
openoffice/trunk/main/store/source/stortree.cxx
openoffice/trunk/main/svl/inc/svl/cntnrsrt.hxx
openoffice/trunk/main/svl/inc/svl/svarray.hxx
openoffice/trunk/main/svl/source/items/itemset.cxx
openoffice/trunk/main/svl/source/memtools/svarray.cxx
openoffice/trunk/main/svl/source/misc/inethist.cxx
openoffice/trunk/main/svl/source/numbers/zforfind.cxx
openoffice/trunk/main/svl/source/numbers/zformat.cxx
openoffice/trunk/main/unotools/source/i18n/charclass.cxx
openoffice/trunk/main/vcl/source/gdi/bitmap4.cxx
openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl.cxx
openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl.hxx
openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl2.cxx
openoffice/trunk/main/vcl/unx/generic/fontmanager/afm_hash.cpp
openoffice/trunk/main/vcl/unx/generic/fontmanager/parseAFM.cxx
openoffice/trunk/main/vos/source/object.cxx
Modified: openoffice/trunk/main/i18npool/source/search/levdis.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/source/search/levdis.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/i18npool/source/search/levdis.cxx (original)
+++ openoffice/trunk/main/i18npool/source/search/levdis.cxx Tue May 1 18:46:30
2018
@@ -93,7 +93,7 @@
{ \
if ( jj != ii ) \
{ \
- register sal_Int32 k; \
+ sal_Int32 k; \
if ( jj > 0 ) \
for ( k=0; k < jj; k++ ) \
if ( cpPattern[k] == c ) \
@@ -272,7 +272,7 @@ int WLevDistance::WLD( const sal_Unicode
nSPMin = npDistance[0];
int nReplacePos = -1; // tristate Flag
// fuer jede Patternspalte den String durchgehen
- for ( register sal_Int32 i=1; i <= nStringLen; i++ )
+ for ( sal_Int32 i=1; i <= nStringLen; i++ )
{
d1 = d2; // WLD( X(i-1), Y(j-1) )
d2 = npDistance[i]; // WLD( X(i) , Y(j-1) )
Modified: openoffice/trunk/main/i18npool/source/search/textsearch.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/source/search/textsearch.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/i18npool/source/search/textsearch.cxx (original)
+++ openoffice/trunk/main/i18npool/source/search/textsearch.cxx Tue May 1
18:46:30 2018
@@ -879,7 +879,7 @@ SearchResult TextSearch::ApproxSrchFrwrd
OUString aWTemp( searchStr );
- register sal_Int32 nStt, nEnd;
+ sal_Int32 nStt, nEnd;
Boundary aWBnd = xBreak->getWordBoundary( aWTemp, startPos,
aSrchPara.Locale,
@@ -926,7 +926,7 @@ SearchResult TextSearch::ApproxSrchBkwrd
OUString aWTemp( searchStr );
- register sal_Int32 nStt, nEnd;
+ sal_Int32 nStt, nEnd;
Boundary aWBnd = xBreak->getWordBoundary( aWTemp, startPos,
aSrchPara.Locale,
Modified: openoffice/trunk/main/store/source/storcach.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/source/storcach.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/store/source/storcach.cxx (original)
+++ openoffice/trunk/main/store/source/storcach.cxx Tue May 1 18:46:30 2018
@@ -227,7 +227,7 @@ void EntryCache::destroy (Entry * entry)
*======================================================================*/
static int highbit(sal_Size n)
{
- register int k = 1;
+ int k = 1;
if (n == 0)
return (0);
@@ -426,7 +426,7 @@ void PageCache_Impl::rescale_Impl (sal_S
Entry * PageCache_Impl::lookup_Impl (Entry * entry, sal_uInt32 nOffset)
{
- register int lookups = 0;
+ int lookups = 0;
while (entry != 0)
{
if (entry->m_nOffset == nOffset)
Modified: openoffice/trunk/main/store/source/stortree.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/store/source/stortree.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/store/source/stortree.cxx (original)
+++ openoffice/trunk/main/store/source/stortree.cxx Tue May 1 18:46:30 2018
@@ -63,12 +63,12 @@ OStoreBTreeNodeData::OStoreBTreeNodeData
*/
sal_uInt16 OStoreBTreeNodeData::find (const T& t) const
{
- register sal_Int32 l = 0;
- register sal_Int32 r = usageCount() - 1;
+ sal_Int32 l = 0;
+ sal_Int32 r = usageCount() - 1;
while (l < r)
{
- register sal_Int32 const m = ((l + r) >> 1);
+ sal_Int32 const m = ((l + r) >> 1);
if (t.m_aKey == m_pData[m].m_aKey)
return ((sal_uInt16)(m));
Modified: openoffice/trunk/main/svl/inc/svl/cntnrsrt.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/inc/svl/cntnrsrt.hxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/svl/inc/svl/cntnrsrt.hxx (original)
+++ openoffice/trunk/main/svl/inc/svl/cntnrsrt.hxx Tue May 1 18:46:30 2018
@@ -136,7 +136,7 @@ sal_uLong ClassName::GetPos( const Type*
\
sal_Bool ClassName::Seek_Entry( const Type* pObj, sal_uLong* pPos ) const
\
{ \
- register sal_uLong nO = Count(),
\
+ sal_uLong nO = Count(), \
nM,
\
nU = 0;
\
if( nO > 0 )
\
Modified: openoffice/trunk/main/svl/inc/svl/svarray.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/inc/svl/svarray.hxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/svl/inc/svl/svarray.hxx (original)
+++ openoffice/trunk/main/svl/inc/svl/svarray.hxx Tue May 1 18:46:30 2018
@@ -486,13 +486,13 @@ public:\
#define _SV_SEEK_PTR(nm,AE)\
sal_Bool nm::Seek_Entry( const AE aE, sal_uInt16* pP ) const\
{\
- register sal_uInt16 nO = nm##_SAR::Count(),\
+ sal_uInt16 nO = nm##_SAR::Count(),\
nM, \
nU = 0;\
if( nO > 0 )\
{\
nO--;\
- register long rCmp = (long)aE;\
+ long rCmp = (long)aE;\
while( nU <= nO )\
{\
nM = nU + ( nO - nU ) / 2;\
@@ -519,7 +519,7 @@ sal_Bool nm::Seek_Entry( const AE aE, sa
#define _SV_SEEK_PTR_TO_OBJECT( nm,AE )\
sal_Bool nm::Seek_Entry( const AE aE, sal_uInt16* pP ) const\
{\
- register sal_uInt16 nO = nm##_SAR::Count(),\
+ sal_uInt16 nO = nm##_SAR::Count(),\
nM, \
nU = 0;\
if( nO > 0 )\
@@ -551,7 +551,7 @@ sal_Bool nm::Seek_Entry( const AE aE, sa
#define _SV_SEEK_OBJECT( nm,AE )\
sal_Bool nm::Seek_Entry( const AE & aE, sal_uInt16* pP ) const\
{\
- register sal_uInt16 nO = nm##_SAR::Count(),\
+ sal_uInt16 nO = nm##_SAR::Count(),\
nM, \
nU = 0;\
if( nO > 0 )\
Modified: openoffice/trunk/main/svl/source/items/itemset.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/items/itemset.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/items/itemset.cxx (original)
+++ openoffice/trunk/main/svl/source/items/itemset.cxx Tue May 1 18:46:30 2018
@@ -1407,7 +1407,7 @@ void SfxItemSet::MergeValues( const SfxI
else
{
SfxWhichIter aIter( rSet );
- register sal_uInt16 nWhich;
+ sal_uInt16 nWhich;
while( 0 != ( nWhich = aIter.NextWhich() ) )
{
const SfxPoolItem* pItem = 0;
Modified: openoffice/trunk/main/svl/source/memtools/svarray.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/memtools/svarray.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/memtools/svarray.cxx (original)
+++ openoffice/trunk/main/svl/source/memtools/svarray.cxx Tue May 1 18:46:30
2018
@@ -99,7 +99,7 @@ void SvStringsISort::DeleteAndDestroy( s
}
sal_Bool SvStringsISort::Seek_Entry( const StringPtr aE, sal_uInt16* pP ) const
{
- register sal_uInt16 nO = SvStringsISort_SAR::Count(),
+ sal_uInt16 nO = SvStringsISort_SAR::Count(),
nM,
nU = 0;
if( nO > 0 )
@@ -146,7 +146,7 @@ void SvStringsISortDtor::DeleteAndDestro
}
sal_Bool SvStringsISortDtor::Seek_Entry( const StringPtr aE, sal_uInt16* pP )
const
{
- register sal_uInt16 nO = SvStringsISortDtor_SAR::Count(),
+ sal_uInt16 nO = SvStringsISortDtor_SAR::Count(),
nM,
nU = 0;
if( nO > 0 )
@@ -182,7 +182,7 @@ sal_Bool SvStringsISortDtor::Seek_Entry(
/* SortArray fuer UShorts */
sal_Bool SvUShortsSort::Seek_Entry( const sal_uInt16 aE, sal_uInt16* pP ) const
{
- register sal_uInt16 nO = SvUShorts::Count(),
+ sal_uInt16 nO = SvUShorts::Count(),
nM,
nU = 0;
if( nO > 0 )
@@ -285,7 +285,7 @@ void SvByteStringsISort::DeleteAndDestro
}
sal_Bool SvByteStringsISort::Seek_Entry( const ByteStringPtr aE, sal_uInt16*
pP ) const
{
- register sal_uInt16 nO = SvByteStringsISort_SAR::Count(),
+ sal_uInt16 nO = SvByteStringsISort_SAR::Count(),
nM,
nU = 0;
if( nO > 0 )
@@ -331,7 +331,7 @@ void SvByteStringsISortDtor::DeleteAndDe
}
sal_Bool SvByteStringsISortDtor::Seek_Entry( const ByteStringPtr aE,
sal_uInt16* pP ) const
{
- register sal_uInt16 nO = SvByteStringsISortDtor_SAR::Count(),
+ sal_uInt16 nO = SvByteStringsISortDtor_SAR::Count(),
nM,
nU = 0;
if( nO > 0 )
Modified: openoffice/trunk/main/svl/source/misc/inethist.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/misc/inethist.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/misc/inethist.cxx (original)
+++ openoffice/trunk/main/svl/source/misc/inethist.cxx Tue May 1 18:46:30 2018
@@ -180,8 +180,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;
@@ -193,7 +193,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;
Modified: openoffice/trunk/main/svl/source/numbers/zforfind.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/numbers/zforfind.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/numbers/zforfind.cxx (original)
+++ openoffice/trunk/main/svl/source/numbers/zforfind.cxx Tue May 1 18:46:30
2018
@@ -249,8 +249,8 @@ sal_Bool ImpSvNumberInputScan::NextNumbe
sal_Bool isNumber = sal_False;
sal_Unicode cToken;
ScanState eState = SsStart;
- register const sal_Unicode* pHere = pStr;
- register xub_StrLen nChars = 0;
+ const sal_Unicode* pHere = pStr;
+ xub_StrLen nChars = 0;
while ( ((cToken = *pHere) != 0) && eState != SsStop)
{
@@ -314,7 +314,7 @@ sal_Bool ImpSvNumberInputScan::SkipThous
sal_Bool res = sal_False;
sal_Unicode cToken;
const String& rThSep = pFormatter->GetNumThousandSep();
- register const sal_Unicode* pHere = pStr;
+ const sal_Unicode* pHere = pStr;
ScanState eState = SsStart;
xub_StrLen nCounter = 0; // counts 3 digits
@@ -418,9 +418,9 @@ sal_Bool ImpSvNumberInputScan::StringPtr
{
if ( rWhat.Len() == 0 )
return sal_False;
- register const sal_Unicode* pWhat = rWhat.GetBuffer();
- register const sal_Unicode* const pEnd = pWhat + rWhat.Len();
- register const sal_Unicode* pStr = pString + nPos;
+ const sal_Unicode* pWhat = rWhat.GetBuffer();
+ const sal_Unicode* const pEnd = pWhat + rWhat.Len();
+ const sal_Unicode* pStr = pString + nPos;
while ( pWhat < pEnd )
{
if ( *pWhat != *pStr )
@@ -459,7 +459,7 @@ inline void ImpSvNumberInputScan::SkipBl
{
if ( nPos < rString.Len() )
{
- register const sal_Unicode* p = rString.GetBuffer() + nPos;
+ const sal_Unicode* p = rString.GetBuffer() + nPos;
while ( *p == ' ' )
{
nPos++;
Modified: openoffice/trunk/main/svl/source/numbers/zformat.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svl/source/numbers/zformat.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/svl/source/numbers/zformat.cxx (original)
+++ openoffice/trunk/main/svl/source/numbers/zformat.cxx Tue May 1 18:46:30
2018
@@ -1624,9 +1624,9 @@ void SvNumberformat::LoadString( SvStrea
else
{
sal_Unicode cTarget = NfCurrencyEntry::GetEuroSymbol();
- register const sal_Char* p = aStr.GetBuffer();
- register const sal_Char* const pEnd = p + aStr.Len();
- register sal_Unicode* pUni = rStr.AllocBuffer( aStr.Len() );
+ const sal_Char* p = aStr.GetBuffer();
+ const sal_Char* const pEnd = p + aStr.Len();
+ sal_Unicode* pUni = rStr.AllocBuffer( aStr.Len() );
while ( p < pEnd )
{
if ( *p == cStream )
@@ -3515,7 +3515,7 @@ sal_Bool SvNumberformat::ImpGetNumberOut
xub_StrLen nPoint = sStr.Search( '.' );
if ( nPoint != STRING_NOTFOUND )
{
- register const sal_Unicode* p = sStr.GetBuffer() + nPoint;
+ const sal_Unicode* p = sStr.GetBuffer() + nPoint;
while ( *++p == '0' )
;
if ( !*p )
@@ -3566,7 +3566,7 @@ sal_Bool SvNumberformat::ImpGetNumberOut
{
const String& rStr = rInfo.sStrArray[j];
const sal_Unicode* p1 = rStr.GetBuffer();
- register const sal_Unicode* p = p1 + rStr.Len();
+ const sal_Unicode* p = p1 + rStr.Len();
while ( p1 < p-- )
{
const sal_Unicode c = *p;
@@ -3735,7 +3735,7 @@ sal_Bool SvNumberformat::ImpNumberFillWi
{
const String& rStr = rInfo.sStrArray[j];
const sal_Unicode* p1 = rStr.GetBuffer();
- register const sal_Unicode* p = p1 + rStr.Len();
+ const sal_Unicode* p = p1 + rStr.Len();
while ( p1 < p-- )
{
nDigitCount++;
@@ -3858,7 +3858,7 @@ sal_Bool SvNumberformat::ImpNumberFill(
{
const String& rStr = rInfo.sStrArray[j];
const sal_Unicode* p1 = rStr.GetBuffer();
- register const sal_Unicode* p = p1 + rStr.Len();
+ const sal_Unicode* p = p1 + rStr.Len();
while ( p1 < p-- )
{
if (k > 0)
@@ -3945,7 +3945,7 @@ void SvNumberformat::GetNumForInfo( sal_
short nType = rInfo.nTypeArray[i];
if ( nType == NF_SYMBOLTYPE_DIGIT)
{
- register const sal_Unicode* p = rInfo.sStrArray[i].GetBuffer();
+ const sal_Unicode* p = rInfo.sStrArray[i].GetBuffer();
while ( *p == '#' )
p++;
while ( *p++ == '0' )
@@ -4429,7 +4429,7 @@ sal_Bool SvNumberformat::HasStringNegati
return sal_False;
const sal_Unicode* const pBeg = rStr.GetBuffer();
const sal_Unicode* const pEnd = pBeg + nLen;
- register const sal_Unicode* p = pBeg;
+ const sal_Unicode* p = pBeg;
do
{ // Anfang
if ( *p == '-' )
@@ -4501,7 +4501,7 @@ void SvNumberformat::EraseCommentBraces(
// static
void SvNumberformat::EraseComment( String& rStr )
{
- register const sal_Unicode* p = rStr.GetBuffer();
+ const sal_Unicode* p = rStr.GetBuffer();
sal_Bool bInString = sal_False;
sal_Bool bEscaped = sal_False;
sal_Bool bFound = sal_False;
@@ -4542,9 +4542,9 @@ sal_Bool SvNumberformat::IsInQuote( cons
xub_StrLen nLen = rStr.Len();
if ( nPos >= nLen )
return sal_False;
- register const sal_Unicode* p0 = rStr.GetBuffer();
- register const sal_Unicode* p = p0;
- register const sal_Unicode* p1 = p0 + nPos;
+ const sal_Unicode* p0 = rStr.GetBuffer();
+ const sal_Unicode* p = p0;
+ const sal_Unicode* p1 = p0 + nPos;
sal_Bool bQuoted = sal_False;
while ( p <= p1 )
{
@@ -4582,9 +4582,9 @@ xub_StrLen SvNumberformat::GetQuoteEnd(
return nPos; // schliessendes cQuote
return STRING_NOTFOUND;
}
- register const sal_Unicode* p0 = rStr.GetBuffer();
- register const sal_Unicode* p = p0 + nPos;
- register const sal_Unicode* p1 = p0 + nLen;
+ const sal_Unicode* p0 = rStr.GetBuffer();
+ const sal_Unicode* p = p0 + nPos;
+ const sal_Unicode* p1 = p0 + nLen;
while ( p < p1 )
{
if ( *p == cQuote && p > p0 && *(p-1) != cEscIn )
Modified: openoffice/trunk/main/unotools/source/i18n/charclass.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/unotools/source/i18n/charclass.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/unotools/source/i18n/charclass.cxx (original)
+++ openoffice/trunk/main/unotools/source/i18n/charclass.cxx Tue May 1
18:46:30 2018
@@ -126,8 +126,8 @@ sal_Bool CharClass::isAsciiNumeric( cons
{
if ( !rStr.Len() )
return sal_False;
- register const sal_Unicode* p = rStr.GetBuffer();
- register const sal_Unicode* const pStop = p + rStr.Len();
+ const sal_Unicode* p = rStr.GetBuffer();
+ const sal_Unicode* const pStop = p + rStr.Len();
do
{
if ( !isAsciiDigit( *p ) )
@@ -142,8 +142,8 @@ sal_Bool CharClass::isAsciiAlpha( const
{
if ( !rStr.Len() )
return sal_False;
- register const sal_Unicode* p = rStr.GetBuffer();
- register const sal_Unicode* const pStop = p + rStr.Len();
+ const sal_Unicode* p = rStr.GetBuffer();
+ const sal_Unicode* const pStop = p + rStr.Len();
do
{
if ( !isAsciiAlpha( *p ) )
@@ -158,8 +158,8 @@ sal_Bool CharClass::isAsciiAlphaNumeric(
{
if ( !rStr.Len() )
return sal_False;
- register const sal_Unicode* p = rStr.GetBuffer();
- register const sal_Unicode* const pStop = p + rStr.Len();
+ const sal_Unicode* p = rStr.GetBuffer();
+ const sal_Unicode* const pStop = p + rStr.Len();
do
{
if ( !isAsciiAlphaNumeric( *p ) )
Modified: openoffice/trunk/main/vcl/source/gdi/bitmap4.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/bitmap4.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/gdi/bitmap4.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/bitmap4.cxx Tue May 1 18:46:30 2018
@@ -33,7 +33,7 @@
// - Defines -
// -----------
-#define S2(a,b) { register long t; if( ( t = b
- a ) < 0 ) { a += t; b -= t; } }
+#define S2(a,b) { long t; if( ( t = b - a ) < 0
) { a += t; b -= t; } }
#define MN3(a,b,c) S2(a,b); S2(a,c);
#define MX3(a,b,c) S2(b,c); S2(a,c);
#define MNMX3(a,b,c) MX3(a,b,c); S2(a,b);
Modified: openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl.cxx Tue May 1 18:46:30
2018
@@ -2027,14 +2027,14 @@ inline void PDFWriterImpl::appendUnicode
if( checkEncryptionBufferSize( nLen*2 ) )
{
enableStringEncryption( nInObjectNumber );
- register sal_uInt8 *pCopy = m_pEncryptionBuffer;
+ sal_uInt8 *pCopy = m_pEncryptionBuffer;
sal_Int32 nChars = 2;
*pCopy++ = 0xFE;
*pCopy++ = 0xFF;
// we need to prepare a byte stream from the unicode string buffer
- for( register int i = 0; i < nLen; i++ )
+ for( int i = 0; i < nLen; i++ )
{
- register sal_Unicode aUnChar = pStr[i];
+ sal_Unicode aUnChar = pStr[i];
*pCopy++ = (sal_uInt8)( aUnChar >> 8 );
*pCopy++ = (sal_uInt8)( aUnChar & 255 );
nChars += 2;
@@ -2042,7 +2042,7 @@ inline void PDFWriterImpl::appendUnicode
//encrypt in place
rtl_cipher_encodeARCFOUR( m_aCipher,
m_pEncryptionBuffer, nChars, m_pEncryptionBuffer, nChars );
//now append, hexadecimal (appendHex), the encrypted result
- for(register int i = 0; i < nChars; i++)
+ for(int i = 0; i < nChars; i++)
appendHex( m_pEncryptionBuffer[i], rOutBuffer );
}
}
Modified: openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl.hxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl.hxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl.hxx Tue May 1 18:46:30
2018
@@ -819,14 +819,14 @@ i12626
sal_Int32
m_nEncryptionBufferSize;
/* check and reallocate the buffer for encryption */
- sal_Bool checkEncryptionBufferSize( register sal_Int32 newSize );
+ sal_Bool checkEncryptionBufferSize( sal_Int32 newSize );
/* this function implements part of the PDF spec algorithm 3.1 in
encryption, the rest (the actual encryption) is in PDFWriterImpl::writeBuffer */
- void checkAndEnableStreamEncryption( register sal_Int32 nObject );
+ void checkAndEnableStreamEncryption( sal_Int32 nObject );
void disableStreamEncryption() { m_bEncryptThisStream = false; };
/* */
- void enableStringEncryption( register sal_Int32 nObject );
+ void enableStringEncryption( sal_Int32 nObject );
// test if the encryption is active, if yes than encrypt the unicode string
and add to the OStringBuffer parameter
void appendUnicodeTextStringEncrypt( const rtl::OUString& rInString,
const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer );
Modified: openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl2.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl2.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/pdfwriter_impl2.cxx Tue May 1
18:46:30 2018
@@ -1146,7 +1146,7 @@ EncHashTransporter* EncHashTransporter::
return pResult;
}
-sal_Bool PDFWriterImpl::checkEncryptionBufferSize( register sal_Int32 newSize )
+sal_Bool PDFWriterImpl::checkEncryptionBufferSize( sal_Int32 newSize )
{
if( m_nEncryptionBufferSize < newSize )
{
@@ -1161,7 +1161,7 @@ sal_Bool PDFWriterImpl::checkEncryptionB
return ( m_nEncryptionBufferSize != 0 );
}
-void PDFWriterImpl::checkAndEnableStreamEncryption( register sal_Int32 nObject
)
+void PDFWriterImpl::checkAndEnableStreamEncryption( sal_Int32 nObject )
{
if( m_aContext.Encryption.Encrypt() )
{
@@ -1181,7 +1181,7 @@ void PDFWriterImpl::checkAndEnableStream
}
}
-void PDFWriterImpl::enableStringEncryption( register sal_Int32 nObject )
+void PDFWriterImpl::enableStringEncryption( sal_Int32 nObject )
{
if( m_aContext.Encryption.Encrypt() )
{
Modified: openoffice/trunk/main/vcl/unx/generic/fontmanager/afm_hash.cpp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/generic/fontmanager/afm_hash.cpp?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/unx/generic/fontmanager/afm_hash.cpp (original)
+++ openoffice/trunk/main/vcl/unx/generic/fontmanager/afm_hash.cpp Tue May 1
18:46:30 2018
@@ -69,7 +69,7 @@ public:
};
inline unsigned int
-AfmKeywordHash::hash (register const char *str, register unsigned int len)
+AfmKeywordHash::hash (const char *str, unsigned int len)
{
static const unsigned char asso_values[] =
{
@@ -100,7 +100,7 @@ AfmKeywordHash::hash (register const cha
58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
58, 58, 58, 58, 58, 58
};
- register int hval = len;
+ int hval = len;
switch (hval)
{
@@ -121,7 +121,7 @@ AfmKeywordHash::hash (register const cha
}
const struct hash_entry *
-AfmKeywordHash::in_word_set (register const char *str, register unsigned int
len)
+AfmKeywordHash::in_word_set (const char *str, unsigned int len)
{
static const unsigned char lengthtable[] =
{
@@ -251,12 +251,12 @@ AfmKeywordHash::in_word_set (register co
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
- register int key = hash (str, len);
+ int key = hash (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
if (len == lengthtable[key])
{
- register const char *s = wordlist[key].name;
+ const char *s = wordlist[key].name;
if (*str == *s && !memcmp (str + 1, s + 1, len - 1))
return &wordlist[key];
Modified: openoffice/trunk/main/vcl/unx/generic/fontmanager/parseAFM.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/generic/fontmanager/parseAFM.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/unx/generic/fontmanager/parseAFM.cxx (original)
+++ openoffice/trunk/main/vcl/unx/generic/fontmanager/parseAFM.cxx Tue May 1
18:46:30 2018
@@ -334,7 +334,7 @@ static char *linetoken( FileInputStream*
*/
#include "afm_hash.cpp"
-static inline enum parseKey recognize( register char* ident, int len)
+static inline enum parseKey recognize( char* ident, int len)
{
const hash_entry* pEntry = AfmKeywordHash::in_word_set( ident, len );
return pEntry ? pEntry->eKey : NOPE;
@@ -363,11 +363,11 @@ static inline enum parseKey recognize( r
* parseFile to determine if there is more file to parse.
*/
-static int parseGlobals( FileInputStream* fp, register GlobalFontInfo* gfi )
+static int parseGlobals( FileInputStream* fp, GlobalFontInfo* gfi )
{
bool cont = true, save = (gfi != NULL);
int error = ok;
- register char *keyword;
+ char *keyword;
int direction = -1;
int tokenlen;
@@ -567,12 +567,12 @@ static int parseGlobals( FileInputStream
* FileInputStream is reset to be where it was upon entering this function.
*/
-static int initializeArray( FileInputStream* fp, register int* cwi)
+static int initializeArray( FileInputStream* fp, int* cwi)
{
bool cont = true, found = false;
unsigned int opos = fp->tell();
int code = 0, width = 0, i = 0, error = 0, tokenlen;
- register char *keyword;
+ char *keyword;
while (cont)
{
@@ -657,11 +657,11 @@ static int initializeArray( FileInputStr
* parseFile to determine if there is more file to parse.
*/
-static int parseCharWidths( FileInputStream* fp, register int* cwi)
+static int parseCharWidths( FileInputStream* fp, int* cwi)
{
bool cont = true, save = (cwi != NULL);
int pos = 0, error = ok, tokenlen;
- register char *keyword;
+ char *keyword;
while (cont)
{
@@ -810,12 +810,12 @@ enlargeCount( unsigned int n_oldcount )
* parseFile to determine if there is more file to parse.
*/
-static int parseCharMetrics( FileInputStream* fp, register FontInfo* fi)
+static int parseCharMetrics( FileInputStream* fp, FontInfo* fi)
{
bool cont = true, firstTime = true;
int error = ok, count = 0, tokenlen;
- register CharMetricInfo *temp = fi->cmi;
- register char *keyword;
+ CharMetricInfo *temp = fi->cmi;
+ char *keyword;
while (cont)
{
@@ -969,11 +969,11 @@ static int parseCharMetrics( FileInputSt
* parseFile to determine if there is more file to parse.
*/
-static int parseTrackKernData( FileInputStream* fp, register FontInfo* fi)
+static int parseTrackKernData( FileInputStream* fp, FontInfo* fi)
{
bool cont = true, save = (fi->tkd != NULL);
int pos = 0, error = ok, tcount = 0, tokenlen;
- register char *keyword;
+ char *keyword;
while (cont)
{
@@ -1077,11 +1077,11 @@ static int parseTrackKernData( FileInput
* parseFile to determine if there is more file to parse.
*/
-static int parsePairKernData( FileInputStream* fp, register FontInfo* fi)
+static int parsePairKernData( FileInputStream* fp, FontInfo* fi)
{
bool cont = true, save = (fi->pkd != NULL);
int pos = 0, error = ok, pcount = 0, tokenlen;
- register char *keyword;
+ char *keyword;
while (cont)
{
@@ -1207,11 +1207,11 @@ static int parsePairKernData( FileInputS
* parseFile to determine if there is more file to parse.
*/
-static int parseCompCharData( FileInputStream* fp, register FontInfo* fi)
+static int parseCompCharData( FileInputStream* fp, FontInfo* fi)
{
bool cont = true, firstTime = true, save = (fi->ccd != NULL);
int pos = 0, j = 0, error = ok, ccount = 0, pcount = 0, tokenlen;
- register char *keyword;
+ char *keyword;
while (cont)
{
@@ -1362,7 +1362,7 @@ int parseFile( const char* pFilename, Fo
int error = ok; /* used as the return code from this function */
int tokenlen;
- register char *keyword; /* used to store a token */
+ char *keyword; /* used to store a token */
(*fi) = (FontInfo *) calloc(1, sizeof(FontInfo));
Modified: openoffice/trunk/main/vos/source/object.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vos/source/object.cxx?rev=1830707&r1=1830706&r2=1830707&view=diff
==============================================================================
--- openoffice/trunk/main/vos/source/object.cxx (original)
+++ openoffice/trunk/main/vos/source/object.cxx Tue May 1 18:46:30 2018
@@ -149,7 +149,7 @@ const OClassInfo* OClassInfo::getClassIn
return (pClass);
}
-VOS_CLASSINIT::VOS_CLASSINIT(register OClassInfo* pNewClass)
+VOS_CLASSINIT::VOS_CLASSINIT(OClassInfo* pNewClass)
{
VOS_ASSERT(pNewClass != NULL);
