Tag: cws_dev300_c22v001 User: pl Date: 2008-03-07 11:50:03+0000 Modified: dba/connectivity/source/drivers/macab/MacabHeader.cxx dba/connectivity/source/drivers/macab/MacabRecord.cxx
Log: join aquavcl05 File Changes: Directory: /dba/connectivity/source/drivers/macab/ ================================================== File [changed]: MacabHeader.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/macab/MacabHeader.cxx?r1=1.2&r2=1.2.78.1 Delta lines: +18 -12 --------------------- --- MacabHeader.cxx 2007-09-13 17:52:42+0000 1.2 +++ MacabHeader.cxx 2008-03-07 11:50:00+0000 1.2.78.1 @@ -52,8 +52,14 @@ #include <com/sun/star/sdbc/DataType.hpp> #endif +#ifndef _DBHELPER_DBCONVERSION_HXX_ +#include <connectivity/dbconversion.hxx> +#endif + using namespace connectivity::macab; using namespace com::sun::star::sdbc; +using namespace com::sun::star::util; +using namespace ::dbtools; // ------------------------------------------------------------------------- MacabHeader::MacabHeader(const sal_Int32 _size, macabfield **_fields) @@ -75,6 +81,7 @@ fields[i] = new macabfield; fields[i]->type = _fields[i]->type; fields[i]->value = _fields[i]->value; + if (fields[i]->value) CFRetain(fields[i]->value); } } @@ -169,14 +176,13 @@ if(i < size) { - if(fields[i] == NULL) + if(fields[i] == NULL || fields[i]->value == NULL || CFGetTypeID(fields[i]->value) != CFStringGetTypeID()) return ::rtl::OUString(); try { nRet = CFStringToOUString( (CFStringRef) fields[i]->value); } catch(...){ } - } return nRet; File [changed]: MacabRecord.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/macab/MacabRecord.cxx?r1=1.2&r2=1.2.78.1 Delta lines: +7 -5 ------------------- --- MacabRecord.cxx 2007-09-13 17:53:20+0000 1.2 +++ MacabRecord.cxx 2008-03-07 11:50:00+0000 1.2.78.1 @@ -101,6 +101,7 @@ fields[_column] = new macabfield; fields[_column]->value = _value; + if (fields[_column]->value) CFRetain(fields[_column]->value); fields[_column]->type = _type; } @@ -151,6 +152,7 @@ macabfield *_copy = new macabfield; _copy->type = fields[i]->type; _copy->value = fields[i]->value; + if (_copy->value) CFRetain(_copy->value); return _copy; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
