diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:59:48 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:59:48 +0000 |
| commit | e56b3b0fc9c340771c531cdef3412cc41a53e282 (patch) | |
| tree | 424e5937c27daae1a5ff1771aff2321339a4a7bc /unotools | |
| parent | 15c26089b22e66b3fdf4c360b9a76ed9f51e87cc (diff) | |
INTEGRATION: CWS hr51 (1.40.2); FILE MERGED
2008/06/06 14:15:32 hr 1.40.2.1: #i88947#: std namespace
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/i18n/localedatawrapper.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 74ccc50cafd9..f030833ad544 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: localedatawrapper.cxx,v $ - * $Revision: 1.40 $ + * $Revision: 1.41 $ * * This file is part of OpenOffice.org. * @@ -1375,7 +1375,7 @@ inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const String& rStr ) ; else { - memcpy( pBuf, rStr.GetBuffer(), rStr.Len() * sizeof(sal_Unicode) ); + std::memcpy( pBuf, rStr.GetBuffer(), rStr.Len() * sizeof(sal_Unicode) ); pBuf += rStr.Len(); } return pBuf; @@ -1392,7 +1392,7 @@ inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, sal_Unicode c ) inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const sal_Unicode* pCopyBuf, xub_StrLen nLen ) { - memcpy( pBuf, pCopyBuf, nLen * sizeof(sal_Unicode) ); + std::memcpy( pBuf, pCopyBuf, nLen * sizeof(sal_Unicode) ); return pBuf + nLen; } @@ -1971,8 +1971,8 @@ void LocaleDataWrapper::outputCheckMessage( const String& rMsg ) // static void LocaleDataWrapper::outputCheckMessage( const char* pStr ) { - fprintf( stderr, "\n%s\n", pStr); - fflush( stderr); + std::fprintf( stderr, "\n%s\n", pStr); + std::fflush( stderr); DBG_ERROR( pStr); } |