diff options
Diffstat (limited to 'connectivity/source')
| -rw-r--r-- | connectivity/source/commontools/dbtools.cxx | 10 | ||||
| -rw-r--r-- | connectivity/source/drivers/dbase/DTable.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/drivers/hsqldb/HStorageMap.cxx | 14 | ||||
| -rw-r--r-- | connectivity/source/drivers/mork/MQueryHelper.cxx | 2 |
4 files changed, 10 insertions, 20 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 1b17eb112d49..35b5bf818b6c 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -976,14 +976,10 @@ try { xNewProps->setPropertyValue(pResult->Name, xOldProps->getPropertyValue(pResult->Name)); } - catch(IllegalArgumentException&) + catch(IllegalArgumentException const & exc) { -#ifdef DBG_UTIL - OUString sMessage = "TransferFormComponentProperties : could not transfer the value for property \"" + - pResult->Name + - "\""; - OSL_FAIL(OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US).getStr()); -#endif + SAL_WARN( "connectivity.commontools", "TransferFormComponentProperties : could not transfer the value for property \"" + << pResult->Name << "\" " << exc.Message); } } } diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index d1b8960f79da..709ab9345fd6 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1253,7 +1253,7 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo) throwInvalidColumnType( STR_INVALID_COLUMN_NAME_LENGTH, aName ); } - (*m_pFileStream).WriteCharPtr( aCol.getStr() ); + m_pFileStream->WriteCharPtr( aCol.getStr() ); m_pFileStream->WriteBytes(aBuffer, 11 - aCol.getLength()); sal_Int32 nPrecision = 0; @@ -2091,7 +2091,7 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, std::size_t& rBlockNr const char cEOF = (char) DBF_EOL; nSize++; m_pMemoStream->WriteBytes(aStr.getStr(), aStr.getLength()); - (*m_pMemoStream).WriteChar( cEOF ).WriteChar( cEOF ); + m_pMemoStream->WriteChar( cEOF ).WriteChar( cEOF ); } break; case MemoFoxPro: case MemodBaseIV: // dBase IV-Memofeld with length diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index fe1c184d7e99..3181b940bf84 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -311,16 +311,10 @@ namespace connectivity } catch(const Exception& e) { -#if OSL_DEBUG_LEVEL > 0 - OString sMessage( "[HSQLDB-SDBC] caught an exception while opening a stream\n" ); - sMessage += "Name: "; - sMessage += OString( sName.getStr(), sName.getLength(), osl_getThreadTextEncoding() ); - sMessage += "\nMode: 0x"; - if ( _nMode < 16 ) - sMessage += "0"; - sMessage += OString::number( _nMode, 16 ).toAsciiUpperCase(); - OSL_FAIL( sMessage.getStr() ); -#endif + SAL_WARN( "connectivity.hsqldb", "[HSQLDB-SDBC] caught an exception while opening a stream\n" + "Name: " << sName + << "\nMode: 0x" << ( _nMode < 16 ? "0" : "") + << std::hex << _nMode ); StorageContainer::throwJavaException(e,env); } } diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index cfea0be76e83..51a20c5e65e2 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -271,7 +271,7 @@ std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpressi MQueryExpressionString* evStr = static_cast<MQueryExpressionString*> (*evIter); // Set the 'name' property of the boolString. OString attrName = _aQuery->getColumnAlias().getProgrammaticNameOrFallbackToUTF8Alias( evStr->getName() ); - SAL_INFO("connectivity.mork", "Name = " << attrName.getStr()); + SAL_INFO("connectivity.mork", "Name = " << attrName); bool bRequiresValue = true; OUString currentValue = entry->getValue(attrName); if (evStr->getCond() == MQueryOp::Exists || evStr->getCond() == MQueryOp::DoesNotExist) |