Skip to content

C
core
Kaydet (Commit) 9072e259 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

auto_ptr -> scoped_ptr 

Change-Id: I878aae330a3b1658c8bca83bd8a1126d2a8d26b6
üst 9a5f4019
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 13 deletions
mysqlc/source/mysqlc_databasemetadata.cxx
Dosyayı görüntüle @ 9072e259
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include "mysqlc_databasemetadata.hxx" #include "mysqlc_databasemetadata.hxx"
#include <boost/scoped_ptr.hpp>
#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
...@@ -1566,7 +1567,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() ...@@ -1566,7 +1567,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs()
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
std::auto_ptr< sql::ResultSet> rset( meta->getCatalogs()); boost::scoped_ptr< sql::ResultSet> rset( meta->getCatalogs());
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -1601,7 +1602,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() ...@@ -1601,7 +1602,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas()
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
std::auto_ptr< sql::ResultSet> rset( meta->getSchemas()); boost::scoped_ptr< sql::ResultSet> rset( meta->getSchemas());
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -1650,7 +1651,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( ...@@ -1650,7 +1651,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
std::auto_ptr< sql::ResultSet> rset( meta->getColumnPrivileges(cat, sch, tab, cNamePattern.compare("")? cNamePattern:wild)); boost::scoped_ptr< sql::ResultSet> rset( meta->getColumnPrivileges(cat, sch, tab, cNamePattern.compare("")? cNamePattern:wild));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
...@@ -1692,7 +1693,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( ...@@ -1692,7 +1693,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr()); cNamePattern(OUStringToOString(columnNamePattern, m_rConnection.getConnectionEncoding()).getStr());
try { try {
std::auto_ptr< sql::ResultSet> rset( meta->getColumns(cat, boost::scoped_ptr< sql::ResultSet> rset( meta->getColumns(cat,
sPattern.compare("")? sPattern:wild, sPattern.compare("")? sPattern:wild,
tNamePattern.compare("")? tNamePattern:wild, tNamePattern.compare("")? tNamePattern:wild,
cNamePattern.compare("")? cNamePattern:wild)); cNamePattern.compare("")? cNamePattern:wild));
...@@ -1750,7 +1751,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( ...@@ -1750,7 +1751,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
} }
try { try {
std::auto_ptr< sql::ResultSet> rset( meta->getTables(cat, boost::scoped_ptr< sql::ResultSet> rset( meta->getTables(cat,
sPattern.compare("")? sPattern:wild, sPattern.compare("")? sPattern:wild,
tNamePattern.compare("")? tNamePattern:wild, tNamePattern.compare("")? tNamePattern:wild,
tabTypes)); tabTypes));
...@@ -1818,7 +1819,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( ...@@ -1818,7 +1819,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
try { try {
std::auto_ptr< sql::ResultSet> rset( meta->getProcedures(cat, boost::scoped_ptr< sql::ResultSet> rset( meta->getProcedures(cat,
sPattern.compare("")? sPattern:wild, sPattern.compare("")? sPattern:wild,
pNamePattern.compare("")? pNamePattern:wild)); pNamePattern.compare("")? pNamePattern:wild));
...@@ -1878,7 +1879,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( ...@@ -1878,7 +1879,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
std::auto_ptr< sql::ResultSet> rset( meta->getExportedKeys(cat, sch, tab)); boost::scoped_ptr< sql::ResultSet> rset( meta->getExportedKeys(cat, sch, tab));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -1920,7 +1921,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( ...@@ -1920,7 +1921,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
std::auto_ptr< sql::ResultSet> rset( meta->getImportedKeys(cat, sch, tab)); boost::scoped_ptr< sql::ResultSet> rset( meta->getImportedKeys(cat, sch, tab));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -1961,7 +1962,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( ...@@ -1961,7 +1962,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
std::auto_ptr< sql::ResultSet> rset( meta->getPrimaryKeys(cat, sch, tab)); boost::scoped_ptr< sql::ResultSet> rset( meta->getPrimaryKeys(cat, sch, tab));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -2004,7 +2005,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( ...@@ -2004,7 +2005,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
std::auto_ptr< sql::ResultSet> rset( meta->getIndexInfo(cat, sch, tab, unique, approximate)); boost::scoped_ptr< sql::ResultSet> rset( meta->getIndexInfo(cat, sch, tab, unique, approximate));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -2047,7 +2048,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( ...@@ -2047,7 +2048,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
std::auto_ptr< sql::ResultSet> rset( meta->getBestRowIdentifier(cat, sch, tab, scope, nullable)); boost::scoped_ptr< sql::ResultSet> rset( meta->getBestRowIdentifier(cat, sch, tab, scope, nullable));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -2108,7 +2109,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( ...@@ -2108,7 +2109,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
} }
} else { } else {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
std::auto_ptr< sql::ResultSet> rset( meta->getTablePrivileges(cat, sPattern.compare("")? sPattern:wild, tPattern.compare("")? tPattern:wild)); boost::scoped_ptr< sql::ResultSet> rset( meta->getTablePrivileges(cat, sPattern.compare("")? sPattern:wild, tPattern.compare("")? tPattern:wild));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
...@@ -2156,7 +2157,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( ...@@ -2156,7 +2157,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
try { try {
rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding(); rtl_TextEncoding encoding = m_rConnection.getConnectionEncoding();
std::auto_ptr< sql::ResultSet> rset( meta->getCrossReference(primaryCat, pSchema, pTable, foreignCat, fSchema, fTable)); boost::scoped_ptr< sql::ResultSet> rset( meta->getCrossReference(primaryCat, pSchema, pTable, foreignCat, fSchema, fTable));
sql::ResultSetMetaData * rs_meta = rset->getMetaData(); sql::ResultSetMetaData * rs_meta = rset->getMetaData();
sal_uInt32 columns = rs_meta->getColumnCount(); sal_uInt32 columns = rs_meta->getColumnCount();
while (rset->next()) { while (rset->next()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment