Tag: cws_src680_mdbdriver02 User: fridrich_strba Date: 06/02/07 07:44:49 Modified: /dba/connectivity/source/drivers/mdb/ mdb_wrapper.cxx
Log: Issue number: N/A Submitted by: geki Reviewed by: fridrich_strba A fix of mdbwrapper not to use temporary strings File Changes: Directory: /dba/connectivity/source/drivers/mdb/ ================================================ File [changed]: mdb_wrapper.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mdb/mdb_wrapper.cxx?r1=1.1.4.2&r2=1.1.4.3 Delta lines: +5 -13 -------------------- --- mdb_wrapper.cxx 31 Oct 2005 12:54:38 -0000 1.1.4.2 +++ mdb_wrapper.cxx 7 Feb 2006 15:44:47 -0000 1.1.4.3 @@ -82,7 +82,6 @@ ::std::vector< ::rtl::OUString > m_aTableNames; ::rtl::OUString aTableName; -::rtl::OString sTemp; if (!mdb) { @@ -103,8 +102,7 @@ /* skip the MSys tables */ if (!skip_sys || strncmp (entry->object_name, "MSys", 4)) { - sTemp = rtl::OString (entry->object_name); - aTableName = rtl::OStringToOUString(sTemp, RTL_TEXTENCODING_UTF8); + aTableName = rtl::OUString::createFromAscii(entry->object_name); m_aTableNames.push_back( aTableName ); // Table name /*if (line_break) @@ -136,7 +134,6 @@ int line_break=1; int skip_sys=0; int opt; - ::rtl::OString sTemp; ::rtl::OUString aColumnName; ::rtl::OString sTableNameTemp= @@ -178,11 +175,9 @@ // Schema aRow[1] <<= ::rtl::OUString::createFromAscii(""); // TABLE_NAME - sTemp = rtl::OString (entry->object_name); - aRow[2] <<= rtl::OStringToOUString(sTemp, RTL_TEXTENCODING_UTF8); + aRow[2] <<= rtl::OUString::createFromAscii(entry->object_name); // COLUMN_NAME - sTemp = rtl::OString (col->name); - aRow[3] <<= rtl::OStringToOUString(sTemp, RTL_TEXTENCODING_UTF8); + aRow[3] <<= rtl::OUString::createFromAscii(col->name); // DATA_TYPE aRow[4] <<= ::rtl::OUString::valueOf( mdb_access_types[col->col_type].value ,10); // TYPE_NAME, not used @@ -299,12 +294,10 @@ unsigned long row_count = 0; Sequence< OUString > seq( sql->num_columns ); - ::rtl::OString sTemp; for (j=0;j<sql->num_columns;j++) { sqlcol = (MdbSQLColumn*) g_ptr_array_index(sql->columns,j); - sTemp = rtl::OString (sqlcol->name); - seq[j] = rtl::OStringToOUString(sTemp, RTL_TEXTENCODING_UTF8); + seq[j] = rtl::OUString::createFromAscii(sqlcol->name); //fprintf(stdout, "%s%s", sqlcol->name, "|"); } //fprintf(stdout,"\n"); @@ -318,8 +311,7 @@ Sequence< Any > row( sql->num_columns ); for (j=0;j<sql->num_columns;j++) { sqlcol = (MdbSQLColumn*) g_ptr_array_index(sql->columns,j); - sTemp = rtl::OString (static_cast<char *>(sql->bound_values[j])); - row[j] <<= rtl::OStringToOUString(sTemp, RTL_TEXTENCODING_UTF8); + row[j] <<= rtl::OUString::createFromAscii(static_cast<char *>(sql->bound_values[j])); //fprintf(stdout, "%s%s", sql->bound_values[j], "|"); } //fprintf(stdout,"\n"); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
