diff options
Diffstat (limited to 'dbaccess/source/ui/inc')
| -rw-r--r-- | dbaccess/source/ui/inc/AdabasStatDlg.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/IItemSetHelper.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/RelationTableView.hxx | 21 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/TableController.hxx | 12 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/TableWindow.hxx | 31 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/TableWindowListBox.hxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/UITools.hxx | 23 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/UserAdminDlg.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/curledit.hxx | 5 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbadmin.hxx | 9 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbwiz.hxx | 12 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbwizsetup.hxx | 18 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dsmeta.hxx | 12 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/unoadmin.hxx | 5 |
16 files changed, 84 insertions, 93 deletions
diff --git a/dbaccess/source/ui/inc/AdabasStatDlg.hxx b/dbaccess/source/ui/inc/AdabasStatDlg.hxx index c87aeaef4093..68c95b3500f0 100644 --- a/dbaccess/source/ui/inc/AdabasStatDlg.hxx +++ b/dbaccess/source/ui/inc/AdabasStatDlg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AdabasStatDlg.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.68.1 $ * * This file is part of OpenOffice.org. * @@ -86,7 +86,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; + virtual ::dbaccess::DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); virtual void setTitle(const ::rtl::OUString& _sTitle); diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index ad234fa305d5..c4c2904487fe 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: IItemSetHelper.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.68.1 $ * * This file is part of OpenOffice.org. * @@ -62,7 +62,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const = 0; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection() = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver() = 0; - virtual DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const = 0; + virtual ::dbaccess::DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const = 0; virtual void clearPassword() = 0; virtual sal_Bool saveDatasource() = 0; virtual void setTitle(const ::rtl::OUString& _sTitle) = 0; diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index 15b6a03192a4..7ddd30df0aaa 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RelationTableView.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.26.1 $ * * This file is part of OpenOffice.org. * @@ -30,18 +30,24 @@ #ifndef DBAUI_RELATION_TABLEVIEW_HXX #define DBAUI_RELATION_TABLEVIEW_HXX -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif +#include <comphelper/containermultiplexer.hxx> +#include <cppuhelper/basemutex.hxx> +#include <rtl/ref.hxx> namespace dbaui { class ORelationDesignView; - class ORelationTableView : public OJoinTableView + class ORelationTableView : public ::cppu::BaseMutex + , public OJoinTableView + , public ::comphelper::OContainerListener { OTableConnection* m_pExistingConnection; // is set when a connection was draged on an existing connection TTableConnectionData::value_type m_pCurrentlyTabConnData; // set when we creating a connection with more than one keycolumn - protected: + ::rtl::Reference< comphelper::OContainerListenerAdapter> + m_pContainerListener; + bool m_bInRemove; + virtual void ConnDoubleClicked( OTableConnection* pConnection ); virtual void AddTabWin(const ::rtl::OUString& _rComposedName, const ::rtl::OUString& rWinName, BOOL bNewTable = FALSE); @@ -51,6 +57,11 @@ namespace dbaui */ virtual bool allowQueries() const; + // OContainerListener + virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); + public: ORelationTableView( Window* pParent, ORelationDesignView* pView ); virtual ~ORelationTableView(); diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 121cd4ce5891..7f9d3bc5eb7e 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableController.hxx,v $ - * $Revision: 1.40 $ + * $Revision: 1.40.68.1 $ * * This file is part of OpenOffice.org. * @@ -60,6 +60,7 @@ #ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> #endif +#include "dsntypes.hxx" class FixedText; namespace dbaui @@ -70,10 +71,11 @@ namespace dbaui class OTableController : public OTableController_BASE { private: - OModuleClient m_aModuleClient; + OModuleClient m_aModuleClient; ::std::vector< ::boost::shared_ptr<OTableRow> > m_vRowList; - OTypeInfoMap m_aTypeInfo; - ::std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; + OTypeInfoMap m_aTypeInfo; + ::std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; + ::dbaccess::ODsnTypeCollection m_aTypeCollection; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; @@ -125,7 +127,7 @@ namespace dbaui sal_Bool isAddAllowed() const; sal_Bool isDropAllowed() const; sal_Bool isAlterAllowed() const; - + bool isAutoIncrementPrimaryKey() const; inline sal_Bool isAutoIncrementValueEnabled() const { return m_bAllowAutoIncrementValue; } inline const ::rtl::OUString& getAutoIncrementValue() const { return m_sAutoIncrementValue; } diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 47f4b5f96c4d..075c8e9424fc 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableWindow.hxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.19.68.2 $ * * This file is part of OpenOffice.org. * @@ -30,28 +30,17 @@ #ifndef DBAUI_TABLEWINDOW_HXX #define DBAUI_TABLEWINDOW_HXX -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef DBAUI_TABLEWINDOWTITLE_HXX #include "TableWindowTitle.hxx" -#endif -#ifndef _RTTI_HXX #include <tools/rtti.hxx> -#endif -#ifndef DBAUI_TABLEWINDOWDATA_HXX +#include <rtl/ref.hxx> #include "TableWindowData.hxx" -#endif #include <vector> -#ifndef _SV_WINDOW_HXX #include <vcl/window.hxx> -#endif -#ifndef _UNOTOOLS_EVENTLISTENERADAPTER_HXX_ -#include <unotools/eventlisteneradapter.hxx> -#endif + +#include <comphelper/containermultiplexer.hxx> +#include "cppuhelper/basemutex.hxx" class SvLBoxEntry; namespace dbaui @@ -69,7 +58,9 @@ namespace dbaui class OJoinTableView; class OTableWindowAccess; - class OTableWindow : public Window + class OTableWindow : public ::cppu::BaseMutex + ,public ::comphelper::OContainerListener + ,public Window { friend class OTableWindowTitle; friend class OTableWindowListBox; @@ -83,12 +74,18 @@ namespace dbaui private: TTableWindowData::value_type m_pData; + ::rtl::Reference< comphelper::OContainerListenerAdapter> + m_pContainerListener; sal_Int32 m_nMoveCount; // how often the arrow keys was pressed sal_Int32 m_nMoveIncrement; // how many pixel we should move UINT16 m_nSizingFlags; BOOL m_bActive; void Draw3DBorder( const Rectangle& rRect ); + // OContainerListener + virtual void _elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void _elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void _elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); protected: virtual void Resize(); diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index de1896e7a4ef..9c78b163358f 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TableWindowListBox.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.11.68.2 $ * * This file is part of OpenOffice.org. * @@ -30,13 +30,8 @@ #ifndef DBAUI_TABLEWINDOWLISTBOX_HXX #define DBAUI_TABLEWINDOWLISTBOX_HXX -#ifndef _SVTREEBOX_HXX #include <svtools/svtreebx.hxx> -#endif - -#ifndef _DBACCESS_UI_CALLBACKS_HXX_ #include "callbacks.hxx" -#endif struct AcceptDropEvent; struct ExecuteDropEvent; diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 4e900ac49482..297cdceb9b36 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: UITools.hxx,v $ - * $Revision: 1.37 $ + * $Revision: 1.37.26.1 $ * * This file is part of OpenOffice.org. * @@ -105,7 +105,7 @@ class SvLBoxEntry; namespace dbaui { // ......................................................................... - class ODsnTypeCollection; + //class ODsnTypeCollection; class DBTreeListBox; /** creates a new connection and appends the eventlistener @@ -369,25 +369,6 @@ namespace dbaui @return the configuration node name of user defined drivers. */ - ::rtl::OUString getUserDefinedDriverNodeName(); - - /** returns the configuration node name of user defined driver type display name. - @return - the configuration node name of user defined driver type display name. - */ - ::rtl::OUString getDriverTypeDisplayNodeName(); - - /** returns the configuration node name of user defined driver DSN prefix. - @return - the configuration node name of user defined driver DSN prefix. - */ - ::rtl::OUString getDriverDsnPrefixNodeName(); - - /** returns the configuration node name of user defined driver extension. - @return - the configuration node name of user defined driver extension. - */ - ::rtl::OUString getDriverExtensionNodeName(); /** returns the result of the user action when view the query dialog. @param _pParent diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 736fc65e9d66..0f482be4baf8 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: UserAdminDlg.hxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.68.1 $ * * This file is part of OpenOffice.org. * @@ -90,7 +90,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; + virtual ::dbaccess::DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); virtual void setTitle(const ::rtl::OUString& _sTitle); diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 94a78ba1d5ea..5f690f96893b 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: advancedsettingsdlg.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.68.1 $ * * This file is part of OpenOffice.org. * @@ -72,7 +72,7 @@ namespace dbaui virtual ~AdvancedSettingsDialog(); /// determines whether or not the given data source type has any advanced setting - static bool doesHaveAnyAdvancedSettings( DATASOURCE_TYPE _eType ); + static bool doesHaveAnyAdvancedSettings( ::dbaccess::DATASOURCE_TYPE _eType ); virtual const SfxItemSet* getOutputSet() const; virtual SfxItemSet* getWriteOutputSet(); @@ -83,7 +83,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; + virtual ::dbaccess::DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); virtual void setTitle(const ::rtl::OUString& _sTitle); diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index db3a95b9ae47..1a4570512ec0 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: curledit.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.68.1 $ * * This file is part of OpenOffice.org. * @@ -55,7 +55,8 @@ namespace dbaui */ class OConnectionURLEdit : public Edit { - ODsnTypeCollection m_aTypeCollection; + ::dbaccess::ODsnTypeCollection + m_aTypeCollection; FixedText* m_pForcedPrefix; String m_sSaveValueNoPrefix; BOOL m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index aa00cec1a92f..94bfb2633c9e 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbadmin.hxx,v $ - * $Revision: 1.36 $ + * $Revision: 1.36.68.1 $ * * This file is part of OpenOffice.org. * @@ -43,7 +43,6 @@ #ifndef _COMPHELPER_UNO3_HXX_ #include <comphelper/uno3.hxx> #endif - #include <memory> FORWARD_DECLARE_INTERFACE(beans,XPropertySet) @@ -55,8 +54,6 @@ namespace dbaui { //......................................................................... -class ODsnTypeCollection; - //========================================================================= //= ODbAdminDialog //========================================================================= @@ -90,7 +87,7 @@ public: @param _pTypeCollection pointer to an <type>ODatasourceMap</type>. May be NULL, in this case the pool will not contain a typecollection default. */ - static SfxItemSet* createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults, ODsnTypeCollection* _pTypeCollection); + static SfxItemSet* createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults, ::dbaccess::ODsnTypeCollection* _pTypeCollection); /** destroy and item set / item pool / pool defaults previously created by <method>createItemSet</method> */ static void destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults); @@ -108,7 +105,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; + virtual ::dbaccess::DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); virtual void setTitle(const ::rtl::OUString& _sTitle); diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 0d4a39731633..4c60de3e9c8e 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbu_resource.hrc,v $ - * $Revision: 1.104 $ + * $Revision: 1.104.68.1 $ * * This file is part of OpenOffice.org. * @@ -390,7 +390,7 @@ //======================================================================== // untyped resources -#define RSC_DATASOURCE_TYPES RID_UNTYPED_START + 1 +// free #define RSC_CHARSETS RID_UNTYPED_START + 2 #define RSC_DATASOURCE_TYPE_UINAMES RID_UNTYPED_START + 3 #define RSC_QUERY_OBJECT_TYPE RID_UNTYPED_START + 4 diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 5a923b17ccbb..c0526a0d7533 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbwiz.hxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.68.1 $ * * This file is part of OpenOffice.org. * @@ -55,13 +55,15 @@ FORWARD_DECLARE_INTERFACE(beans,XPropertySet) FORWARD_DECLARE_INTERFACE(sdbc,XConnection) FORWARD_DECLARE_INTERFACE(lang,XMultiServiceFactory) +namespace dbaccess +{ + class ODsnTypeCollection; +} //......................................................................... namespace dbaui { //......................................................................... -class ODsnTypeCollection; - //========================================================================= //= ODbTypeWizDialog //========================================================================= @@ -75,7 +77,7 @@ private: OModuleClient m_aModuleClient; ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; - DATASOURCE_TYPE m_eType; + ::dbaccess::DATASOURCE_TYPE m_eType; sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing @@ -99,7 +101,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; + virtual ::dbaccess::DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual sal_Bool saveDatasource(); virtual void setTitle(const ::rtl::OUString& _sTitle); diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 326356621e22..b25bbad01a8e 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbwizsetup.hxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.68.1 $ * * This file is part of OpenOffice.org. * @@ -66,7 +66,6 @@ namespace dbaui { //......................................................................... -class ODsnTypeCollection; class OGenericAdministrationPage; //========================================================================= @@ -85,8 +84,8 @@ private: OModuleClient m_aModuleClient; ::std::auto_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; - DATASOURCE_TYPE m_eType; - DATASOURCE_TYPE m_eOldType; + ::dbaccess::DATASOURCE_TYPE m_eType; + ::dbaccess::DATASOURCE_TYPE m_eOldType; sal_Bool m_bResetting : 1; /// sal_True while we're resetting the pages sal_Bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing sal_Bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> @@ -109,7 +108,8 @@ private: String m_sWorkPath; OGeneralPage* m_pGeneralPage; OMySQLIntroPageSetup* m_pMySQLIntroPage; - ODsnTypeCollection* m_pCollection; /// the DSN type collection instance + ::dbaccess::ODsnTypeCollection* + m_pCollection; /// the DSN type collection instance @@ -131,7 +131,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const; virtual ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(); - virtual DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; + virtual ::dbaccess::DATASOURCE_TYPE getDatasourceType(const SfxItemSet& _rSet) const; virtual void clearPassword(); virtual void setTitle(const ::rtl::OUString& _sTitle); virtual void enableConfirmSettings( bool _bEnable ); @@ -182,7 +182,7 @@ private: the first state in this path, following by an arbitrary number of others, as in RoadmapWizard::declarePath. */ - void declareAuthDepPath( DATASOURCE_TYPE _eType, PathId _nPathId, WizardState _nFirstState, ... ); + void declareAuthDepPath( ::dbaccess::DATASOURCE_TYPE _eType, PathId _nPathId, WizardState _nFirstState, ... ); void RegisterDataSourceByLocation(const ::rtl::OUString& sPath); sal_Bool SaveDatabaseDocument(); @@ -190,9 +190,9 @@ private: String createUniqueFileName(const INetURLObject& rURL); void CreateDatabase(); void createUniqueFolderName(INetURLObject* pURL); - DATASOURCE_TYPE VerifyDataSourceType(const DATASOURCE_TYPE _DatabaseType) const; + ::dbaccess::DATASOURCE_TYPE VerifyDataSourceType(const ::dbaccess::DATASOURCE_TYPE _DatabaseType) const; - DATASOURCE_TYPE getDefaultDatabaseType() const; + ::dbaccess::DATASOURCE_TYPE getDefaultDatabaseType() const; void updateTypeDependentStates(); sal_Bool callSaveAsDialog(); diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index 866d2cc8c65f..174d42803086 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dsmeta.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.68.2 $ * * This file is part of OpenOffice.org. * @@ -70,7 +70,7 @@ namespace dbaui class DataSourceMetaData { public: - DataSourceMetaData( DATASOURCE_TYPE _eType ); + DataSourceMetaData( ::dbaccess::DATASOURCE_TYPE _eType ); ~DataSourceMetaData(); /// returns a struct describing this data source type's support for our known advanced settings @@ -79,7 +79,7 @@ namespace dbaui /// determines whether or not the data source requires authentication AuthenticationMode getAuthentication() const; - static AuthenticationMode getAuthentication( DATASOURCE_TYPE _eType ); + static AuthenticationMode getAuthentication( ::dbaccess::DATASOURCE_TYPE _eType ); private: ::boost::shared_ptr< DataSourceMetaData_Impl > m_pImpl; @@ -108,6 +108,7 @@ namespace dbaui bool bBooleanComparisonMode; bool bFormsCheckRequiredFields; bool bIgnoreCurrency; + bool bAutoIncrementIsPrimaryKey; // Note: If you extend this list, you need to adjust the ctor (of course) // and (maybe) the implementation of supportsAnySpecialSetting @@ -127,6 +128,7 @@ namespace dbaui ,bBooleanComparisonMode ( true ) ,bFormsCheckRequiredFields ( true ) ,bIgnoreCurrency ( false ) + ,bAutoIncrementIsPrimaryKey ( false ) { } @@ -152,7 +154,9 @@ namespace dbaui || ( bUseDOSLineEnds == true ) || ( bBooleanComparisonMode == true ) || ( bFormsCheckRequiredFields == true ) - || ( bIgnoreCurrency == true ); + || ( bIgnoreCurrency == true ) + || ( bAutoIncrementIsPrimaryKey == true ) + ; } //........................................................................ diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index 6bf62063b3c2..17f44436ec22 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoadmin.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.68.1 $ * * This file is part of OpenOffice.org. * @@ -67,7 +67,8 @@ protected: SfxItemSet* m_pDatasourceItems; // item set for the dialog SfxItemPool* m_pItemPool; // item pool for the item set for the dialog SfxPoolItem** m_pItemPoolDefaults; // pool defaults - ODsnTypeCollection* m_pCollection; // datasource type collection + ::dbaccess::ODsnTypeCollection* + m_pCollection; // datasource type collection ::com::sun::star::uno::Any m_aInitialSelection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; |