[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - connectivity/source i18npool/source sdext/source store/source svl/inc svl/source unotools/source vcl/source vcl/unx vos/source
Don Lewis
truckman at apache.org
Tue May 1 20:09:40 UTC 2018
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 8 +-
connectivity/source/commontools/dbexception.cxx | 8 +-
connectivity/source/drivers/adabas/BUser.cxx | 2
connectivity/source/drivers/file/FResultSet.cxx | 8 +-
connectivity/source/drivers/file/FStatement.cxx | 16 ++--
connectivity/source/drivers/hsqldb/HUser.cxx | 2
connectivity/source/drivers/mysql/YUser.cxx | 2
connectivity/source/inc/propertyids.hxx | 2
connectivity/source/parse/PColumn.cxx | 18 ++---
connectivity/source/sdbcx/VCatalog.cxx | 2
connectivity/source/sdbcx/VColumn.cxx | 14 ++--
connectivity/source/sdbcx/VIndex.cxx | 2
connectivity/source/sdbcx/VKey.cxx | 8 +-
connectivity/source/sdbcx/VKeyColumn.cxx | 2
connectivity/source/sdbcx/VTable.cxx | 8 +-
connectivity/source/sdbcx/VView.cxx | 8 +-
i18npool/source/search/levdis.cxx | 4 -
i18npool/source/search/textsearch.cxx | 4 -
sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 2
store/source/storcach.cxx | 4 -
store/source/stortree.cxx | 6 -
svl/inc/svl/cntnrsrt.hxx | 2
svl/inc/svl/svarray.hxx | 8 +-
svl/source/items/itemset.cxx | 2
svl/source/memtools/svarray.cxx | 10 +-
svl/source/misc/inethist.cxx | 6 -
svl/source/numbers/zforfind.cxx | 14 ++--
svl/source/numbers/zformat.cxx | 32 ++++-----
unotools/source/i18n/charclass.cxx | 12 +--
vcl/source/gdi/bitmap4.cxx | 2
vcl/source/gdi/pdfwriter_impl.cxx | 8 +-
vcl/source/gdi/pdfwriter_impl.hxx | 6 -
vcl/source/gdi/pdfwriter_impl2.cxx | 6 -
vcl/unx/generic/app/wmadaptor.cxx | 2
vcl/unx/generic/fontmanager/afm_hash.cpp | 10 +-
vcl/unx/generic/fontmanager/parseAFM.cxx | 34 +++++-----
vos/source/object.cxx | 2
37 files changed, 143 insertions(+), 143 deletions(-)
New commits:
commit 0ee87bc7c34f6caea6604d42354df2ea97d26b64
Author: Don Lewis <truckman at apache.org>
Date: Tue May 1 18:46:30 2018 +0000
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.
diff --git a/i18npool/source/search/levdis.cxx b/i18npool/source/search/levdis.cxx
index 60581a170bcf..c4ffeca7ead6 100644
--- a/i18npool/source/search/levdis.cxx
+++ b/i18npool/source/search/levdis.cxx
@@ -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* cString, sal_Int32 nStringLen )
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) )
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 7c716e8a2828..7d625ece3976 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -879,7 +879,7 @@ SearchResult TextSearch::ApproxSrchFrwrd( const OUString& searchStr,
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( const OUString& searchStr,
OUString aWTemp( searchStr );
- register sal_Int32 nStt, nEnd;
+ sal_Int32 nStt, nEnd;
Boundary aWBnd = xBreak->getWordBoundary( aWTemp, startPos,
aSrchPara.Locale,
diff --git a/store/source/storcach.cxx b/store/source/storcach.cxx
index 63aaaae9e15f..0520f144e1eb 100644
--- a/store/source/storcach.cxx
+++ b/store/source/storcach.cxx
@@ -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_Size new_size)
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)
diff --git a/store/source/stortree.cxx b/store/source/stortree.cxx
index 74591c45ef4c..0d74225dc5d0 100644
--- a/store/source/stortree.cxx
+++ b/store/source/stortree.cxx
@@ -63,12 +63,12 @@ OStoreBTreeNodeData::OStoreBTreeNodeData (sal_uInt16 nPageSize)
*/
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));
diff --git a/svl/inc/svl/cntnrsrt.hxx b/svl/inc/svl/cntnrsrt.hxx
index 70166aeae9d5..e3f45d1af16d 100644
--- a/svl/inc/svl/cntnrsrt.hxx
+++ b/svl/inc/svl/cntnrsrt.hxx
@@ -136,7 +136,7 @@ sal_uLong ClassName::GetPos( const Type* pObj ) const
\
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 ) \
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index d7cd33c35124..8895ca5d0076 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -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, sal_uInt16* pP ) const\
#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, sal_uInt16* pP ) const\
#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 )\
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index b59610087fff..f5402a71a392 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -1407,7 +1407,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/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index bb8746499ab1..b0b5ca37009a 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.cxx
@@ -99,7 +99,7 @@ void SvStringsISort::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
}
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::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
}
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( const StringPtr aE, sal_uInt16* pP ) co
/* 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::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
}
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::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL )
}
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 )
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index f910069720ce..850c789b9f37 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -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;
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 1a507fb5ba8c..6ab1b7a6bb7f 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -249,8 +249,8 @@ sal_Bool ImpSvNumberInputScan::NextNumberStringSymbol(
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::SkipThousands(
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::StringPtrContainsImpl( const String& rWhat,
{
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::SkipBlanks( const String& rString,
{
if ( nPos < rString.Len() )
{
- register const sal_Unicode* p = rString.GetBuffer() + nPos;
+ const sal_Unicode* p = rString.GetBuffer() + nPos;
while ( *p == ' ' )
{
nPos++;
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index a45af36ae89e..23aa00490199 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1624,9 +1624,9 @@ void SvNumberformat::LoadString( SvStream& rStream, String& rStr )
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::ImpGetNumberOutput(double fNumber,
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::ImpGetNumberOutput(double fNumber,
{
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::ImpNumberFillWithThousands(
{
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( String& sStr, // number string
{
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_uInt16 nNumFor, short& rScannedType,
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::HasStringNegativeSign( const String& rStr )
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( String& rStr )
// 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( const String& rStr, xub_StrLen nPos,
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( const String& rStr, xub_StrLen nPos,
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 )
diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx
index 22a9b89b559a..e91fd72be407 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.cxx
@@ -126,8 +126,8 @@ sal_Bool CharClass::isAsciiNumeric( const String& rStr )
{
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 String& rStr )
{
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( const String& rStr )
{
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 ) )
diff --git a/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index a765d4ea45be..10ea294d5231 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.cxx
@@ -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);
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index bee62eb97bf9..9fe550836574 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2027,14 +2027,14 @@ inline void PDFWriterImpl::appendUnicodeTextStringEncrypt( const rtl::OUString&
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::appendUnicodeTextStringEncrypt( const rtl::OUString&
//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 );
}
}
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index 20a216cf987d..6e8d07ee8244 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -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 );
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 4359d4186bce..f682f9c24328 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -1146,7 +1146,7 @@ EncHashTransporter* EncHashTransporter::getEncHashTransporter( const uno::Refere
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::checkEncryptionBufferSize( register sal_Int32 newSize )
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::checkAndEnableStreamEncryption( register sal_Int32 nObject )
}
}
-void PDFWriterImpl::enableStringEncryption( register sal_Int32 nObject )
+void PDFWriterImpl::enableStringEncryption( sal_Int32 nObject )
{
if( m_aContext.Encryption.Encrypt() )
{
diff --git a/vcl/unx/generic/fontmanager/afm_hash.cpp b/vcl/unx/generic/fontmanager/afm_hash.cpp
index 95ed27e1659f..1638a93f7543 100644
--- a/vcl/unx/generic/fontmanager/afm_hash.cpp
+++ b/vcl/unx/generic/fontmanager/afm_hash.cpp
@@ -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 char *str, register unsigned int len)
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 char *str, register unsigned int len)
}
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 const char *str, register unsigned int len
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];
diff --git a/vcl/unx/generic/fontmanager/parseAFM.cxx b/vcl/unx/generic/fontmanager/parseAFM.cxx
index d1c59ce1f597..063895c33d2c 100644
--- a/vcl/unx/generic/fontmanager/parseAFM.cxx
+++ b/vcl/unx/generic/fontmanager/parseAFM.cxx
@@ -334,7 +334,7 @@ static char *linetoken( FileInputStream* stream )
*/
#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( register char* ident, int len)
* 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* fp, register GlobalFontInfo* gfi )
* 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( FileInputStream* fp, register int* cwi)
* 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( FileInputStream* fp, register FontInfo* fi)
* 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( FileInputStream* fp, register FontInfo* fi)
* 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( FileInputStream* fp, register FontInfo* fi)
* 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, FontInfo** fi, FLAGS flags)
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));
diff --git a/vos/source/object.cxx b/vos/source/object.cxx
index 3a369e95fbf9..05baea59535c 100644
--- a/vos/source/object.cxx
+++ b/vos/source/object.cxx
@@ -149,7 +149,7 @@ const OClassInfo* OClassInfo::getClassInfo(const sal_Char* pClassName)
return (pClass);
}
-VOS_CLASSINIT::VOS_CLASSINIT(register OClassInfo* pNewClass)
+VOS_CLASSINIT::VOS_CLASSINIT(OClassInfo* pNewClass)
{
VOS_ASSERT(pNewClass != NULL);
commit 47adda92cb9c8778e6ab7bf4ebf7fc5d80eea951
Author: Don Lewis <truckman at apache.org>
Date: Tue May 1 18:38:50 2018 +0000
Fix the easy cast-related errors reported by clang 6 in its default
C++14 mode.
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 94e26103b7a5..88431691f4b8 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -88,10 +88,10 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet()
// -------------------------------------------------------------------------
void ODatabaseMetaDataResultSet::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0, &m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(NULL)));
}
// -----------------------------------------------------------------------------
void ODatabaseMetaDataResultSet::setType(MetaDataResultSetType _eType)
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index b54429508c71..c9923dd2321b 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -141,7 +141,7 @@ SQLExceptionInfo::SQLExceptionInfo(const ::com::sun::star::sdb::SQLErrorEvent& _
//------------------------------------------------------------------------------
SQLExceptionInfo::SQLExceptionInfo(const staruno::Any& _rError)
{
- const staruno::Type& aSQLExceptionType = ::getCppuType(reinterpret_cast< ::com::sun::star::sdbc::SQLException*>(NULL));
+ const staruno::Type& aSQLExceptionType = ::getCppuType(static_cast< ::com::sun::star::sdbc::SQLException*>(NULL));
sal_Bool bValid = isAssignableFrom(aSQLExceptionType, _rError.getValueType());
if (bValid)
m_aContent = _rError;
@@ -155,9 +155,9 @@ void SQLExceptionInfo::implDetermineType()
{
staruno::Type aContentType = m_aContent.getValueType();
- const Type& aSQLExceptionType = ::getCppuType( reinterpret_cast< SQLException* >( NULL ) );
- const Type& aSQLWarningType = ::getCppuType( reinterpret_cast< SQLWarning* >( NULL ) );
- const Type& aSQLContextType = ::getCppuType( reinterpret_cast< SQLContext* >( NULL ) );
+ const Type& aSQLExceptionType = ::getCppuType( static_cast< SQLException* >( NULL ) );
+ const Type& aSQLWarningType = ::getCppuType( static_cast< SQLWarning* >( NULL ) );
+ const Type& aSQLContextType = ::getCppuType( static_cast< SQLContext* >( NULL ) );
if ( isAssignableFrom( aSQLContextType, m_aContent.getValueType() ) )
m_eType = SQL_CONTEXT;
diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx
index 7847f0c7d920..6776d2882f9f 100644
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
@@ -93,7 +93,7 @@ typedef connectivity::sdbcx::OUser OUser_TYPEDEF;
void OUserExtend::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
}
// -----------------------------------------------------------------------------
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index c34566c30f95..75effe3b229c 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -150,10 +150,10 @@ OResultSet::~OResultSet()
void OResultSet::construct()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OResultSet::construct" );
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, 0,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, 0,&m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY,PropertyAttribute::READONLY,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(NULL)));
}
// -------------------------------------------------------------------------
void OResultSet::disposing(void)
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 9fe20a823618..d592bd4b1d00 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -90,16 +90,16 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
sal_Int32 nAttrib = 0;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, nAttrib,&m_aCursorName, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, nAttrib,&m_nMaxFieldSize, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, nAttrib,&m_nMaxRows, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, nAttrib,&m_nQueryTimeOut, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, nAttrib,&m_nFetchSize, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, nAttrib,&m_nResultSetType, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, nAttrib,&m_nFetchDirection, ::getCppuType(static_cast<sal_Int32*>(NULL)));
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),PROPERTY_ID_ESCAPEPROCESSING, nAttrib,&m_bEscapeProcessing,::getCppuBooleanType());
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, nAttrib,&m_nResultSetConcurrency, ::getCppuType(static_cast<sal_Int32*>(NULL)));
}
// -----------------------------------------------------------------------------
OStatement_Base::~OStatement_Base()
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index 0fd7a7642ca1..fb37252265ec 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -68,7 +68,7 @@ OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::
typedef connectivity::sdbcx::OUser OUser_TYPEDEF;
void OUserExtend::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
}
// -----------------------------------------------------------------------------
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index a6a5b1954b44..6f78641b8ef2 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -68,7 +68,7 @@ OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::
typedef connectivity::sdbcx::OUser OUser_TYPEDEF;
void OUserExtend::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
}
// -----------------------------------------------------------------------------
cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index 211f3031d26f..4cc4cb33ea36 100644
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
@@ -70,7 +70,7 @@ namespace connectivity
//------------------------------------------------------------------------------
#define DECL_PROP1IMPL(varname, type) \
-pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)),
+pProperties[nPos++] = ::com::sun::star::beans::Property(::connectivity::OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(NULL)),
//------------------------------------------------------------------------------
#define DECL_PROP0(varname, type) \
DECL_PROP1IMPL(varname, type) 0)
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index f1a939e6c276..2dbfa5592047 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -173,13 +173,13 @@ OParseColumn::~OParseColumn()
// -------------------------------------------------------------------------
void OParseColumn::construct()
{
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0, &m_bFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, 0, &m_aTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0, &m_aRealName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged, ::getCppuType(reinterpret_cast<sal_Bool*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, &m_bIsSearchable, ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL), PROPERTY_ID_LABEL, 0, &m_sLabel, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION), PROPERTY_ID_FUNCTION, 0, &m_bFunction, ::getCppuType(static_cast< sal_Bool*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AGGREGATEFUNCTION), PROPERTY_ID_AGGREGATEFUNCTION, 0, &m_bAggregateFunction, ::getCppuType(static_cast< sal_Bool*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME, 0, &m_aTableName, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME), PROPERTY_ID_REALNAME, 0, &m_aRealName, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DBASEPRECISIONCHANGED), PROPERTY_ID_DBASEPRECISIONCHANGED, 0, &m_bDbasePrecisionChanged, ::getCppuType(static_cast<sal_Bool*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE), PROPERTY_ID_ISSEARCHABLE, 0, &m_bIsSearchable, ::getCppuType(static_cast< sal_Bool*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL), PROPERTY_ID_LABEL, 0, &m_sLabel, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
}
// -----------------------------------------------------------------------------
::cppu::IPropertyArrayHelper* OParseColumn::createArrayHelper() const
@@ -265,9 +265,9 @@ OOrderColumn::~OOrderColumn()
void OOrderColumn::construct()
{
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING,
- PropertyAttribute::READONLY, const_cast< sal_Bool* >( &m_bAscending ), ::getCppuType( reinterpret_cast< sal_Bool* >( NULL ) ) );
+ PropertyAttribute::READONLY, const_cast< sal_Bool* >( &m_bAscending ), ::getCppuType( static_cast< sal_Bool* >( NULL ) ) );
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME), PROPERTY_ID_TABLENAME,
- PropertyAttribute::READONLY, const_cast< ::rtl::OUString* >( &m_sTableName ), ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ PropertyAttribute::READONLY, const_cast< ::rtl::OUString* >( &m_sTableName ), ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
}
// -----------------------------------------------------------------------------
::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index e8af9d9fb41f..9c2318a8fcf0 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -227,7 +227,7 @@ void OCatalog::fillNames(Reference< XResultSet >& _xResult,TStringVector& _rName
void ODescriptor::construct()
{
sal_Int32 nAttrib = isNew() ? 0 : ::com::sun::star::beans::PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
}
// -------------------------------------------------------------------------
ODescriptor::~ODescriptor()
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index ae62c4ea52a3..5e0923288b34 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -163,13 +163,13 @@ void OColumn::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME), PROPERTY_ID_TYPENAME, nAttrib,&m_TypeName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), PROPERTY_ID_DEFAULTVALUE, nAttrib,&m_DefaultValue, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION), PROPERTY_ID_PRECISION, nAttrib,&m_Precision, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE), PROPERTY_ID_SCALE, nAttrib,&m_Scale, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE), PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME), PROPERTY_ID_TYPENAME, nAttrib,&m_TypeName, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION, nAttrib,&m_Description, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), PROPERTY_ID_DEFAULTVALUE, nAttrib,&m_DefaultValue, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION), PROPERTY_ID_PRECISION, nAttrib,&m_Precision, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE), PROPERTY_ID_SCALE, nAttrib,&m_Scale, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE), PROPERTY_ID_ISNULLABLE, nAttrib,&m_IsNullable, ::getCppuType(static_cast<sal_Int32*>(NULL)));
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT), PROPERTY_ID_ISAUTOINCREMENT, nAttrib,&m_IsAutoIncrement, ::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISROWVERSION), PROPERTY_ID_ISROWVERSION, nAttrib,&m_IsRowVersion, ::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY), PROPERTY_ID_ISCURRENCY, nAttrib,&m_IsCurrency, ::getBooleanCppuType());
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index bda919318a09..7ae89811b1b7 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -139,7 +139,7 @@ void OIndex::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOG), PROPERTY_ID_CATALOG, nAttrib,&m_Catalog, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE), PROPERTY_ID_ISUNIQUE, nAttrib,&m_IsUnique, ::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISPRIMARYKEYINDEX),PROPERTY_ID_ISPRIMARYKEYINDEX, nAttrib,&m_IsPrimaryKeyIndex, ::getBooleanCppuType());
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCLUSTERED), PROPERTY_ID_ISCLUSTERED, nAttrib,&m_IsClustered, ::getBooleanCppuType());
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index 749e0c895e57..ab36150a2c89 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -136,10 +136,10 @@ void OKey::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(reinterpret_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REFERENCEDTABLE), PROPERTY_ID_REFERENCEDTABLE, nAttrib,&m_aProps->m_ReferencedTable, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_aProps->m_Type, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE), PROPERTY_ID_UPDATERULE, nAttrib,&m_aProps->m_UpdateRule, ::getCppuType(static_cast<sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE), PROPERTY_ID_DELETERULE, nAttrib,&m_aProps->m_DeleteRule, ::getCppuType(static_cast<sal_Int32*>(NULL)));
}
// -------------------------------------------------------------------------
void SAL_CALL OKey::disposing()
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 7809029e2435..761c76fd2542 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -112,7 +112,7 @@ OKeyColumn::~OKeyColumn()
void OKeyColumn::construct()
{
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index 4701620c03a8..515945dcda36 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -118,10 +118,10 @@ void OTable::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION), PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE), PROPERTY_ID_TYPE, nAttrib,&m_Type, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
}
// -----------------------------------------------------------------------------
void SAL_CALL OTable::acquire() throw()
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 7fcdcfc4d88c..8aef91c785c5 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -75,10 +75,10 @@ void OView::construct()
sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CATALOGNAME), PROPERTY_ID_CATALOGNAME,nAttrib,&m_CatalogName, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME), PROPERTY_ID_SCHEMANAME, nAttrib,&m_SchemaName, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND), PROPERTY_ID_COMMAND, nAttrib,&m_Command, ::getCppuType(static_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION), PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(static_cast< sal_Int32*>(NULL)));
}
// -------------------------------------------------------------------------
void OView::disposing(void)
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
index b0a3d7d81182..a419b9f28c1f 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
@@ -121,7 +121,7 @@ sal_uInt32 PngHelper::deflateBuffer( const Output_t* i_pBuf, size_t i_nLen, Outp
void PngHelper::appendFileHeader( OutputBuffer& o_rOutputBuf )
{
- static const Output_t aHeader[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a };
+ static const Output_t aHeader[] = { static_cast<char>(0x89), 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a };
o_rOutputBuf.insert( o_rOutputBuf.end(), aHeader, aHeader + sizeof(aHeader)/sizeof(aHeader[0]) );
}
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index ffa244ae14e3..14d493cd71c6 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -2522,7 +2522,7 @@ void WMAdaptor::setPID( X11SalFrame* i_pFrame ) const
void WMAdaptor::setClientMachine( X11SalFrame* i_pFrame ) const
{
rtl::OString aWmClient( rtl::OUStringToOString( GetX11SalData()->GetLocalHostName(), RTL_TEXTENCODING_ASCII_US ) );
- XTextProperty aClientProp = { (unsigned char*)aWmClient.getStr(), XA_STRING, 8, aWmClient.getLength() };
+ XTextProperty aClientProp = { (unsigned char*)aWmClient.getStr(), XA_STRING, 8, static_cast<unsigned long>(aWmClient.getLength()) };
XSetWMClientMachine( m_pDisplay, i_pFrame->GetShellWindow(), &aClientProp );
}
More information about the Libreoffice-commits
mailing list