diff options
Diffstat (limited to 'dbaccess/source/ui/inc')
| -rw-r--r-- | dbaccess/source/ui/inc/dbadmin.hxx | 17 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_dlg.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_pageids.hxx | 38 |
3 files changed, 6 insertions, 51 deletions
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 65ff82a197fb..04b88151df8c 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -44,26 +44,21 @@ namespace dbaui class ODbDataSourceAdministrationHelper; /** tab dialog for administrating the office wide registered data sources */ -class ODbAdminDialog final : public SfxTabDialog , public IItemSetHelper, public IDatabaseSettingsDialog +class ODbAdminDialog final : public SfxTabDialogController, public IItemSetHelper, public IDatabaseSettingsDialog { private: - std::stack< sal_Int32 > m_aCurrentDetailPages; // ids of all currently enabled (type-dependent) detail pages - std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> - sal_uInt16 m_nMainPageID; + OString m_sMainPageID; public: /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed after the dialog has been destroyed */ - ODbAdminDialog(vcl::Window* pParent, - SfxItemSet const * _pItems, - const css::uno::Reference< css::uno::XComponentContext >& _rxORB - ); + ODbAdminDialog(weld::Window* pParent, SfxItemSet const * _pItems, + const css::uno::Reference< css::uno::XComponentContext >& _rxORB); virtual ~ODbAdminDialog() override; - virtual void dispose() override; /** create and return an item set for use with the dialog. @param _pTypeCollection pointer to an <type>ODatasourceMap</type>. May be NULL, in this case @@ -95,9 +90,9 @@ public: private: // adds a new detail page and remove all the old ones - void addDetailPage(sal_uInt16 _nPageId, const char* pTextId, CreateTabPage pCreateFunc); + void addDetailPage(const OString& rPageId, const char* pTextId, CreateTabPage pCreateFunc); - virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) override; + virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override; virtual short Ok() override; /// select a datasource with a given name, adjust the item set accordingly, and everything like that .. diff --git a/dbaccess/source/ui/inc/dbu_dlg.hxx b/dbaccess/source/ui/inc/dbu_dlg.hxx index 2990728ff047..f6d36879efdf 100644 --- a/dbaccess/source/ui/inc/dbu_dlg.hxx +++ b/dbaccess/source/ui/inc/dbu_dlg.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC #define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_DLG_HRC -#include "dbu_pageids.hxx" - #define PAGE_X 281 #define PAGE_Y 215 #define WIZARD_PAGE_X 225 diff --git a/dbaccess/source/ui/inc/dbu_pageids.hxx b/dbaccess/source/ui/inc/dbu_pageids.hxx deleted file mode 100644 index 710a582d933a..000000000000 --- a/dbaccess/source/ui/inc/dbu_pageids.hxx +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC -#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBU_RESOURCE_HRC - -// tab pages - -#define PAGE_DBASE 1001 -#define PAGE_ODBC 1003 -#define PAGE_TEXT 1004 -#define PAGE_ADO 1007 -#define PAGE_LDAP 1015 -#define PAGE_MYSQL_ODBC 1017 -#define PAGE_USERDRIVER 1019 -#define PAGE_MYSQL_JDBC 1020 -#define PAGE_MYSQL_NATIVE 1024 -#define PAGE_ORACLE_JDBC 1027 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |