summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/dbase/DNoException.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2004-08-02 16:00:49 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2004-08-02 16:00:49 +0000
commitd9b27fcdd9f69caf5b3f4b0290d81a4b65fd1845 (patch)
tree7af3862b69c0e80ff3710c6889b9b7cd73c260f0 /connectivity/source/drivers/dbase/DNoException.cxx
parent11b35de26e11b4abd277d7a5736d6a94c4a18adb (diff)
INTEGRATION: CWS insight01 (1.12.8); FILE MERGED
2004/02/12 16:06:32 oj 1.12.8.1: #111075# fix refcount problem
Diffstat (limited to 'connectivity/source/drivers/dbase/DNoException.cxx')
-rw-r--r--connectivity/source/drivers/dbase/DNoException.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/connectivity/source/drivers/dbase/DNoException.cxx b/connectivity/source/drivers/dbase/DNoException.cxx
index 272c0a63e3e6..b9da3266ba1f 100644
--- a/connectivity/source/drivers/dbase/DNoException.cxx
+++ b/connectivity/source/drivers/dbase/DNoException.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: DNoException.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: rt $ $Date: 2003-12-01 10:47:39 $
+ * last change: $Author: hr $ $Date: 2004-08-02 17:00:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -248,11 +248,11 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
aStr += ::rtl::OUString(aBStr.GetBuffer(),aBStr.Len(), getConnection()->getTextEncoding());
nLength -= STRING_MAXLEN;
}
- if ( nLength )
+ if ( nLength > 0 )
{
ByteString aBStr;
- aBStr.Expand(nLength);
- m_pMemoStream->Read(aBStr.AllocBuffer(nLength),nLength);
+ aBStr.Expand(static_cast<xub_StrLen>(nLength));
+ m_pMemoStream->Read(aBStr.AllocBuffer(static_cast<xub_StrLen>(nLength)),nLength);
// aBStr.ReleaseBufferAccess();
aStr += ::rtl::OUString(aBStr.GetBuffer(),aBStr.Len(), getConnection()->getTextEncoding());
@@ -711,12 +711,14 @@ void ONDXPage::PrintPage()
DBG_TRACE("SDB: -----------------------------------------------\n");
if (!IsLeaf())
{
+#if OSL_DEBUG_LEVEL > 1
GetChild(&rIndex)->PrintPage();
for (USHORT i = 0; i < nCount; i++)
{
ONDXNode rNode = (*this)[i];
rNode.GetChild(&rIndex,this)->PrintPage();
}
+#endif
}
DBG_TRACE("SDB: ===============================================\n");
}