User: kz Date: 2008-04-03 16:48:34+0000 Modified: dba/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
Log: INTEGRATION: CWS dbodf11 (1.2.22); FILE MERGED 2008/04/01 11:11:33 oj 1.2.22.4: RESYNC: (1.2-1.4); FILE MERGED 2008/01/31 07:47:45 oj 1.2.22.3: #i85757# as odf 1.2 form 2008/01/28 13:16:16 oj 1.2.22.2: use constant 2008/01/28 13:14:04 oj 1.2.22.1: remove duplicate ado entry File Changes: 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.4&r2=1.5 Delta lines: +2 -21 -------------------- --- xmlFileBasedDatabase.cxx 2008-03-05 16:50:46+0000 1.4 +++ xmlFileBasedDatabase.cxx 2008-04-03 16:48:31+0000 1.5 @@ -63,7 +63,7 @@ #include <tools/diagnose_ex.h> #endif #include <comphelper/sequence.hxx> - +#include "dsntypes.hxx" namespace dbaxml { using namespace ::com::sun::star::uno; @@ -119,26 +119,7 @@ } if ( sLocation.getLength() && sMediaType.getLength() ) { - ::rtl::OUString sURL(RTL_CONSTASCII_USTRINGPARAM("sdbc:")); - if ( sMediaType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "text/csv" ) ) ) - { - sURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("flat:")); - } - else if ( sMediaType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "application/dbase" ) ) ) - { - sURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dbase:")); - } - else if ( sMediaType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "application/vnd.oasis.opendocument.spreadsheet" ) ) ) - { - sURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("calc:")); - } - else if ( sMediaType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "application/msaccess" ) ) ) - { - if ( sFileTypeExtension.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "mdb" ) ) ) - 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=")); - } + ::rtl::OUString sURL(dbaui::ODsnTypeCollection::getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); sURL += sLocation; try { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
