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

connectivity: dbase: global variable cleanup

Browse Source
This commit is contained in:
Michael Stahl
2012-01-14 20:59:35 +01:00
parent ff2df7b7b6
commit 88cceffc27
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
connectivity/source/drivers/dbase/dindexnode.cxx
View File

@@ -34,6 +34,7 @@
#include "diagnose_ex.h" #include "diagnose_ex.h"
#include <algorithm> #include <algorithm>
#include <boost/scoped_array.hpp>
using namespace connectivity; using namespace connectivity;
@@ -683,8 +684,6 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
rStream >> aChild; rStream >> aChild;
} }
char aData[128];
//------------------------------------------------------------------ //------------------------------------------------------------------
void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
{ {
@@ -696,24 +695,32 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
if (rIndex.getHeader().db_keytype) // double if (rIndex.getHeader().db_keytype) // double
{ {
if (sizeof(double) != rIndex.getHeader().db_keylen)
{
OSL_TRACE("this key length cannot possibly be right?");
}
if (aKey.getValue().isNull()) if (aKey.getValue().isNull())
{ {
memset(aData,0,rIndex.getHeader().db_keylen); sal_uInt8 buf[sizeof(double)];
rStream.Write((sal_uInt8*)aData,rIndex.getHeader().db_keylen); memset(&buf[0], 0, sizeof(double));
rStream.Write(&buf[0], sizeof(double));
} }
else else
rStream << (double) aKey.getValue(); rStream << (double) aKey.getValue();
} }
else else
{ {
memset(aData,0x20,rIndex.getHeader().db_keylen); sal_uInt16 const nLen(rIndex.getHeader().db_keylen);
::boost::scoped_array<sal_uInt8> pBuf(new sal_uInt8[nLen]);
memset(&pBuf[0], 0x20, nLen);
if (!aKey.getValue().isNull()) if (!aKey.getValue().isNull())
{ {
::rtl::OUString sValue = aKey.getValue(); ::rtl::OUString sValue = aKey.getValue();
rtl::OString aText(rtl::OUStringToOString(sValue, rIndex.m_pTable->getConnection()->getTextEncoding())); rtl::OString aText(rtl::OUStringToOString(sValue, rIndex.m_pTable->getConnection()->getTextEncoding()));
strncpy(aData, aText.getStr(), std::min<size_t>(rIndex.getHeader().db_keylen, aText.getLength())); strncpy(reinterpret_cast<char *>(&pBuf[0]), aText.getStr(),
std::min<size_t>(nLen, aText.getLength()));
} }
rStream.Write((sal_uInt8*)aData,rIndex.getHeader().db_keylen); rStream.Write(&pBuf[0], nLen);
} }
rStream << aChild; rStream << aChild;
} }