summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--avmedia/source/viewer/mediawindow.cxx4
-rw-r--r--connectivity/source/drivers/odbc/OTools.cxx10
2 files changed, 7 insertions, 7 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 056121a84433..5e0adc2c1909 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: mediawindow.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
* This file is part of OpenOffice.org.
*
@@ -473,7 +473,7 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
{
try
{
- std::fprintf(stderr, "-->%s uno reference \n\n",AVMEDIA_MANAGER_SERVICE_NAME);
+ fprintf(stderr, "-->%s uno reference \n\n",AVMEDIA_MANAGER_SERVICE_NAME);
uno::Reference< ::com::sun::star::media::XManager > xManager(
xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index ceb08958f7bb..62b1f294a966 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: OTools.cxx,v $
- * $Revision: 1.32 $
+ * $Revision: 1.33 $
*
* This file is part of OpenOffice.org.
*
@@ -96,7 +96,7 @@ void OTools::bindParameter( OConnection* _pConnection,
nColumnSize = 1;
if(fSqlType == SQL_LONGVARCHAR || fSqlType == SQL_LONGVARBINARY)
- std::memcpy(pDataBuffer,&nPos,sizeof(nPos));
+ memcpy(pDataBuffer,&nPos,sizeof(nPos));
// 20.09.2001 OJ: Problems with mysql. mysql returns only CHAR as parameter type
// nRetcode = (*(T3SQLDescribeParam)_pConnection->getOdbcFunction(ODBC3SQLDescribeParam))(_hStmt,(SQLUSMALLINT)nPos,&fSqlType,&nColumnSize,&nDecimalDigits,&nNullable);
@@ -144,7 +144,7 @@ void OTools::bindData( SQLSMALLINT _nOdbcType,
::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding));
*pLen = SQL_NTS;
_nColumnSize = aString.getLength();
- std::memcpy(_pData,aString.getStr(),aString.getLength());
+ memcpy(_pData,aString.getStr(),aString.getLength());
((sal_Int8*)_pData)[aString.getLength()] = '\0';
}
break;
@@ -170,7 +170,7 @@ void OTools::bindData( SQLSMALLINT _nOdbcType,
::rtl::OString aString = ::rtl::OString::valueOf(*(double*)_pValue);
_nColumnSize = aString.getLength();
*pLen = _nColumnSize;
- std::memcpy(_pData,aString.getStr(),aString.getLength());
+ memcpy(_pData,aString.getStr(),aString.getLength());
((sal_Int8*)_pData)[_nColumnSize] = '\0';
} break;
case SQL_BIT:
@@ -523,7 +523,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
sal_Int32 nLen = aData.getLength();
aData.realloc(nLen + nBytes);
- std::memcpy(aData.getArray() + nLen, aCharArray, nBytes);
+ memcpy(aData.getArray() + nLen, aCharArray, nBytes);
}
return aData;
}