Tag: cws_dev300_dba31b User: oj Date: 2008-08-12 10:28:24+0000 Modified: dba/dbaccess/source/filter/xml/makefile.mk dba/dbaccess/source/filter/xml/xmlExport.cxx dba/dbaccess/source/filter/xml/xmlExport.hxx dba/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx dba/dbaccess/source/inc/dsntypes.hxx
Log: #i92092# moved dsntypes to dba File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/makefile.mk?r1=1.10&r2=1.10.68.1 Delta lines: +4 -4 ------------------- --- makefile.mk 2008-04-10 13:21:28+0000 1.10 +++ makefile.mk 2008-08-12 10:28:21+0000 1.10.68.1 @@ -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 @@ .IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" SHL1STDLIBS+= \ - -ldbu$(DLLPOSTFIX) + -ldba$(DLLPOSTFIX) .ELSE SHL1STDLIBS+= \ - idbu.lib + idba.lib .ENDIF File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.cxx?r1=1.22&r2=1.22.18.1 Delta lines: +4 -4 ------------------- --- xmlExport.cxx 2008-06-30 15:10:21+0000 1.22 +++ xmlExport.cxx 2008-08-12 10:28:21+0000 1.22.18.1 @@ -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 @@ ::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 @@ try { ::rtl::OUString sExtension; - if ( eType == dbaui::DST_MSACCESS ) + if ( eType == dbaccess::DST_MSACCESS ) sExtension = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("mdb")); else { File [changed]: xmlExport.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.hxx?r1=1.11&r2=1.11.34.1 Delta lines: +3 -3 ------------------- --- xmlExport.hxx 2008-06-16 12:32:10+0000 1.11 +++ xmlExport.hxx 2008-08-12 10:28:21+0000 1.11.34.1 @@ -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 @@ mutable UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; Reference<XPropertySet> m_xDataSource; - ::dbaui::ODsnTypeCollection m_aTypeCollection; + ::dbaccess::ODsnTypeCollection m_aTypeCollection; sal_Bool m_bAllreadyFilled; void exportDataSource(); File [changed]: xmlFileBasedDatabase.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx?r1=1.6&r2=1.6.68.1 Delta lines: +3 -3 ------------------- --- xmlFileBasedDatabase.cxx 2008-04-10 13:30:04+0000 1.6 +++ xmlFileBasedDatabase.cxx 2008-08-12 10:28:21+0000 1.6.68.1 @@ -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 @@ } if ( sLocation.getLength() && sMediaType.getLength() ) { - ::rtl::OUString sURL(dbaui::ODsnTypeCollection::getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); + ::rtl::OUString sURL(dbaccess::ODsnTypeCollection::getDatasourcePrefixFromMediaType(sMediaType,sFileTypeExtension)); sURL += sLocation; try { Directory: /dba/dbaccess/source/inc/ ==================================== File [changed]: dsntypes.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/inc/dsntypes.hxx?r1=1.3.68.1&r2=1.3.68.2 Delta lines: +7 -29 -------------------- --- dsntypes.hxx 2008-08-11 19:55:32+0000 1.3.68.1 +++ dsntypes.hxx 2008-08-12 10:28:21+0000 1.3.68.2 @@ -8,7 +8,7 @@ * * $RCSfile: dsntypes.hxx,v $ * - * $Revision: 1.3.68.1 $ + * $Revision: 1.3.68.2 $ * * This file is part of OpenOffice.org. * @@ -29,18 +29,17 @@ * ************************************************************************/ -#ifndef _DBAUI_DSNTYPES_HXX_ -#define _DBAUI_DSNTYPES_HXX_ +#ifndef _DBACCESS_DSNTYPES_HXX_ +#define _DBACCESS_DSNTYPES_HXX_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <svtools/poolitem.hxx> - #include <comphelper/stl_types.hxx> #include "dbaccessdllapi.h" +#include <tools/string.hxx> //......................................................................... -namespace dbaui +namespace dbaccess { //......................................................................... @@ -212,30 +211,9 @@ TypeIterator(const ODsnTypeCollection* _pContainer, sal_Int32 _nInitialPos = 0); }; -//========================================================================= -//= DbuTypeCollectionItem -//========================================================================= -/** allows an ODsnTypeCollection to be transported in an SfxItemSet -*/ -class DbuTypeCollectionItem : public SfxPoolItem -{ - ODsnTypeCollection* m_pCollection; - -public: - TYPEINFO(); - DbuTypeCollectionItem(sal_Int16 nWhich = 0, ODsnTypeCollection* _pCollection = NULL); - DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); - - virtual int operator==(const SfxPoolItem& _rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const; - - ODsnTypeCollection* getCollection() const { return m_pCollection; } -}; - - //......................................................................... -} // namespace dbaui +} // namespace dbaccess //......................................................................... -#endif // _DBAUI_DSNTYPES_HXX_ +#endif // _DBACCESS_DSNTYPES_HXX_ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
