diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 12:28:29 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 12:28:29 +0000 |
| commit | d2b287cdd4f5bbe93b136d9f2bf2bf2cebfcbdb6 (patch) | |
| tree | 4f639206bc55b316e2be549cdb3d4db323fb3e0f /dbaccess/source/filter | |
| parent | c8ebff286bc889d44236ab17de63fc3712c97acd (diff) | |
CWS-TOOLING: integrate CWS dba31b
Diffstat (limited to 'dbaccess/source/filter')
| -rw-r--r-- | dbaccess/source/filter/xml/makefile.mk | 6 | ||||
| -rw-r--r-- | dbaccess/source/filter/xml/xmlExport.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/filter/xml/xmlExport.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/dbaccess/source/filter/xml/makefile.mk b/dbaccess/source/filter/xml/makefile.mk index e6c3814028a0..6eb3f1f47094 100644 --- a/dbaccess/source/filter/xml/makefile.mk +++ b/dbaccess/source/filter/xml/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.10.68.1 $ # # This file is part of OpenOffice.org. # @@ -97,10 +97,10 @@ SHL1STDLIBS=\ .IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" SHL1STDLIBS+= \ - -ldbu$(DLLPOSTFIX) + -ldba$(DLLPOSTFIX) .ELSE SHL1STDLIBS+= \ - idbu.lib + idba.lib .ENDIF diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 614334c7b5a4..4441d77a2acd 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlExport.cxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.18.1 $ * * This file is part of OpenOffice.org. * @@ -611,7 +611,7 @@ void ODBExport::exportConnectionData() ::rtl::OUString sValue; Reference<XPropertySet> xProp(getDataSource()); xProp->getPropertyValue(PROPERTY_URL) >>= sValue; - const dbaui::DATASOURCE_TYPE eType = m_aTypeCollection.getType(sValue); + const ::dbaccess::DATASOURCE_TYPE eType = m_aTypeCollection.getType(sValue); if ( m_aTypeCollection.isFileSystemBased(eType) ) { SvXMLElementExport aDatabaseDescription(*this,XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, sal_True, sal_True); @@ -621,7 +621,7 @@ void ODBExport::exportConnectionData() try { ::rtl::OUString sExtension; - if ( eType == dbaui::DST_MSACCESS ) + if ( eType == dbaccess::DST_MSACCESS ) sExtension = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("mdb")); else { diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 5e2e2445e6d9..26419b6f4e59 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlExport.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.34.1 $ * * This file is part of OpenOffice.org. * @@ -151,7 +151,7 @@ class ODBExport : public SvXMLExport mutable UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; Reference<XPropertySet> m_xDataSource; - ::dbaui::ODsnTypeCollection m_aTypeCollection; + ::dbaccess::ODsnTypeCollection m_aTypeCollection; sal_Bool m_bAllreadyFilled; void exportDataSource(); diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index ccbdf3a94537..2a8e075ce93c 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlFileBasedDatabase.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.68.1 $ * * This file is part of OpenOffice.org. * @@ -114,7 +114,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, } if ( sLocation.getLength() && sMediaType.getLength() ) { - ::rtl::OUString sURL(dbaui::ODsnTypeCollection::getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); + ::rtl::OUString sURL(dbaccess::ODsnTypeCollection::getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); sURL += sLocation; try { |