Tag: cws_src680_dba30a User: fs Date: 2008-02-25 08:01:41+0000 Modified: dba/dbaccess/source/core/api/KeySet.cxx dba/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
Log: RESYNC: (1.69-1.70); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: KeySet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/KeySet.cxx?r1=1.69.12.1&r2=1.69.12.2 Delta lines: +4 -3 ------------------- --- KeySet.cxx 2008-02-20 21:31:54+0000 1.69.12.1 +++ KeySet.cxx 2008-02-25 08:01:28+0000 1.69.12.2 @@ -117,6 +117,7 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif +#include <string.h> using namespace dbaccess; using namespace ::connectivity; Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlFileBasedDatabase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx?r1=1.2.36.1&r2=1.2.36.2 Delta lines: +4 -4 ------------------- --- xmlFileBasedDatabase.cxx 2008-02-20 21:31:55+0000 1.2.36.1 +++ xmlFileBasedDatabase.cxx 2008-02-25 08:01:31+0000 1.2.36.2 @@ -135,7 +135,7 @@ else if ( sMediaType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "application/msaccess" ) ) ) { if ( sFileTypeExtension.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "mdb" ) ) ) - sURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ado:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=")); + sURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=")); else sURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ado:access:Provider=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=")); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
