mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#i90829# Remove 'std::'

Browse Source
This commit is contained in:
Rüdiger Timm
2008-06-18 07:06:47 +00:00
parent 8e3fab2a34
commit 4450b4afed
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
avmedia/source/viewer/mediawindow.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: mediawindow.cxx,v $ * $RCSfile: mediawindow.cxx,v $
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -473,7 +473,7 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr
{ {
try 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( uno::Reference< ::com::sun::star::media::XManager > xManager(
xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ), xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),

10
connectivity/source/drivers/odbc/OTools.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: OTools.cxx,v $ * $RCSfile: OTools.cxx,v $
* $Revision: 1.32 $ * $Revision: 1.33 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -96,7 +96,7 @@ void OTools::bindParameter( OConnection* _pConnection,
nColumnSize = 1; nColumnSize = 1;
if(fSqlType == SQL_LONGVARCHAR || fSqlType == SQL_LONGVARBINARY) 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 // 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); // 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)); ::rtl::OString aString(::rtl::OUStringToOString(*(::rtl::OUString*)_pValue,_nTextEncoding));
*pLen = SQL_NTS; *pLen = SQL_NTS;
_nColumnSize = aString.getLength(); _nColumnSize = aString.getLength();
std::memcpy(_pData,aString.getStr(),aString.getLength()); memcpy(_pData,aString.getStr(),aString.getLength());
((sal_Int8*)_pData)[aString.getLength()] = '\0'; ((sal_Int8*)_pData)[aString.getLength()] = '\0';
} }
break; break;
@@ -170,7 +170,7 @@ void OTools::bindData( SQLSMALLINT _nOdbcType,
::rtl::OString aString = ::rtl::OString::valueOf(*(double*)_pValue); ::rtl::OString aString = ::rtl::OString::valueOf(*(double*)_pValue);
_nColumnSize = aString.getLength(); _nColumnSize = aString.getLength();
*pLen = _nColumnSize; *pLen = _nColumnSize;
std::memcpy(_pData,aString.getStr(),aString.getLength()); memcpy(_pData,aString.getStr(),aString.getLength());
((sal_Int8*)_pData)[_nColumnSize] = '\0'; ((sal_Int8*)_pData)[_nColumnSize] = '\0';
} break; } break;
case SQL_BIT: case SQL_BIT:
@@ -523,7 +523,7 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection,
_aStatementHandle,SQL_HANDLE_STMT,_xInterface); _aStatementHandle,SQL_HANDLE_STMT,_xInterface);
sal_Int32 nLen = aData.getLength(); sal_Int32 nLen = aData.getLength();
aData.realloc(nLen + nBytes); aData.realloc(nLen + nBytes);
std::memcpy(aData.getArray() + nLen, aCharArray, nBytes); memcpy(aData.getArray() + nLen, aCharArray, nBytes);
} }
return aData; return aData;
} }