diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-18 20:24:08 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-19 13:38:45 +0000 |
| commit | af9709c3cba8c386a30553c43a620320b15c65f4 (patch) | |
| tree | 9577932ccec61d1bc10553092abba92af332f765 /dbaccess/source/ui | |
| parent | 3b2b7be3b721a328b2cd32a34d0c03dd98a89a6c (diff) | |
remove adabas/adabasui
Diffstat (limited to 'dbaccess/source/ui')
33 files changed, 29 insertions, 1639 deletions
diff --git a/dbaccess/source/ui/dlg/AdabasPage.hrc b/dbaccess/source/ui/dlg/AdabasPage.hrc deleted file mode 100644 index a36dbb25da27..000000000000 --- a/dbaccess/source/ui/dlg/AdabasPage.hrc +++ /dev/null @@ -1,50 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef DBAUI_ADABASPAGE_HRC -#define DBAUI_ADABASPAGE_HRC - -#define FT_CACHE_SIZE 1 -#define FT_DATA_INCREMENT 2 -#define FT_CTRLPASSWORD 3 -#define FT_CTRLUSERNAME 4 - - -#define NF_DATA_INCREMENT 1 -#define NF_CACHE_SIZE 2 - -#define CB_SHUTDB 1 - -#define FL_1 1 - -#define PB_STAT 1 - -#define ET_CTRLPASSWORD 1 -#define ET_CTRLUSERNAME 2 - -#endif // DBAUI_ADABASPAGE_HRC - - diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx deleted file mode 100644 index 919112b9d490..000000000000 --- a/dbaccess/source/ui/dlg/AdabasStat.cxx +++ /dev/null @@ -1,303 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include <cppuhelper/exc_hlp.hxx> -#include <tools/diagnose_ex.h> -#include <osl/diagnose.h> -#include "AdabasStat.hxx" -#include <comphelper/types.hxx> -#include <com/sun/star/sdbc/XStatement.hpp> -#include <com/sun/star/sdbc/XRow.hpp> -#include <com/sun/star/sdbc/XResultSet.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include "AdabasStat.hrc" -#include "dbu_dlg.hrc" -#include "dbustrings.hrc" -#include "UITools.hxx" -#include <connectivity/dbtools.hxx> -#include "sqlmessage.hxx" - -using namespace dbaui; -DBG_NAME(OAdabasStatistics) -namespace dbaui -{ - using namespace dbtools; - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::beans; - using namespace ::com::sun::star::sdbc; - using namespace ::com::sun::star::lang; - - - -OAdabasStatistics::OAdabasStatistics( Window* pParent, - const ::rtl::OUString& _rUser, - const Reference< ::com::sun::star::sdbc::XConnection >& _xCurrentConnection, - const Reference< XMultiServiceFactory >& _xFactory) - : ModalDialog( pParent, ModuleRes(DLG_ADABASSTAT) ) - ,m_FL_FILES( this , ModuleRes(FL_FILES)) - ,m_FT_SYSDEVSPACE( this , ModuleRes(FT_SYSDEVSPACE)) - ,m_ET_SYSDEVSPACE( this , STR_ADABAS_HELP_SYSDEVSPACE,ModuleRes(ET_SYSDEVSPACE)) - ,m_FT_TRANSACTIONLOG( this , ModuleRes(FT_TRANSACTIONLOG)) - ,m_ET_TRANSACTIONLOG( this , STR_ADABAS_HELP_TRANSACT,ModuleRes(ET_TRANSACTIONLOG)) - ,m_FT_DATADEVSPACE( this , ModuleRes(FT_DATADEVSPACE)) - ,m_LB_DATADEVS( this , STR_ADABAS_HELP_DATADEVSPACES,ModuleRes(LB_DATADEVS)) - ,m_FL_SIZES( this , ModuleRes(FL_SIZES)) - ,m_FT_SIZE( this , ModuleRes(FT_SIZE)) - ,m_ET_SIZE( this , STR_ADABAS_HELP_SIZE,ModuleRes(ET_SIZE)) - ,m_FT_FREESIZE( this , ModuleRes(FT_FREESIZE)) - ,m_ET_FREESIZE( this , STR_ADABAS_HELP_FREESIZE,ModuleRes(ET_FREESIZE)) - ,m_FT_MEMORYUSING( this , ModuleRes(FT_MEMORYUSING)) - ,m_ET_MEMORYUSING( this , STR_ADABAS_HELP_MEMORYUSING,ModuleRes(ET_MEMORYUSING)) - ,m_PB_OK( this , ModuleRes(PB_OK)) - ,m_xConnection(_xCurrentConnection) - ,m_bErrorShown(sal_False) -{ - DBG_CTOR(OAdabasStatistics,NULL); - - FreeResource(); - - OSL_ENSURE(m_xConnection.is(),"No connection"); - if(m_xConnection.is()) - { - Reference<XStatement> xStmt; - Reference<XResultSet> xRes; - - sal_Bool bCanSelect = sal_False; - ::rtl::OUString aStmt; - ::rtl::OUString sSchema = _rUser.toAsciiUpperCase(); - - Reference<XDatabaseMetaData> xMetaData; - // first read the sizes - try - { - xMetaData = m_xConnection->getMetaData(); - bCanSelect = checkSystemTable(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SERVERDBSTATISTICS")), sSchema); - - if(bCanSelect) - { - aStmt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT SERVERDBSIZE, UNUSEDPAGES FROM ")); - - aStmt += ::dbtools::quoteTableName(xMetaData,sSchema,::dbtools::eInDataManipulation); - aStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".\"SERVERDBSTATISTICS\"")); - - xStmt = m_xConnection->createStatement(); - xRes = xStmt->executeQuery(aStmt); - - - Reference<XRow> xRow(xRes,UNO_QUERY); - // first the db sizes - if(xRes.is() && xRes->next()) - { - double nUsedPages = xRow->getInt(1) / 256; - double nFreePages = xRow->getInt(2) / 256; - - m_ET_SIZE.SetText(::rtl::OUString::valueOf((sal_Int32)nUsedPages)); - m_ET_FREESIZE.SetText(::rtl::OUString::valueOf((sal_Int32)nFreePages)); - m_ET_MEMORYUSING.SetValue(static_cast<sal_Int32>(((nUsedPages-nFreePages)/nUsedPages)*100)); - } - else - showError(); - - xRow = NULL; - } - else - showError(); - } - catch(const SQLException& ) - { - ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ), pParent, _xFactory ); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - try - { - ::comphelper::disposeComponent(xStmt); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - - // now fill the datadev spaces - if(bCanSelect) - { - try - { - bCanSelect = checkSystemTable(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATADEVSPACES")), sSchema); - - if(bCanSelect) - { - // then the db files - aStmt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT DEVSPACENAME FROM ")); - aStmt += ::dbtools::quoteTableName(xMetaData,sSchema,::dbtools::eInDataManipulation); - aStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".\"DATADEVSPACES\"")); - xStmt = m_xConnection->createStatement(); - xRes = xStmt->executeQuery(aStmt); - - Reference<XRow> xRow(xRes,UNO_QUERY); - while(xRes.is() && xRes->next()) - { - m_LB_DATADEVS.InsertEntry(xRow->getString(1)); - } - if(!m_LB_DATADEVS.GetEntryCount()) - showError(); - } - else - showError(); - } - catch(const SQLException& e) - { - ::dbaui::showError(SQLExceptionInfo(e),pParent,_xFactory); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - try - { - ::comphelper::disposeComponent(xStmt); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - - // now fill the sysdatadev spaces - if(bCanSelect) - { - try - { - bCanSelect = checkSystemTable(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CONFIGURATION")), sSchema); - - if(bCanSelect) - { - aStmt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM ")); - aStmt += ::dbtools::quoteTableName(xMetaData,sSchema,::dbtools::eInDataManipulation); - aStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".CONFIGURATION WHERE DESCRIPTION LIKE 'SYS%DEVSPACE%NAME'")); - xStmt = m_xConnection->createStatement(); - xRes = xStmt->executeQuery(aStmt); - if(xRes.is() && xRes->next()) - { - Reference<XRow> xRow(xRes,UNO_QUERY); - m_ET_SYSDEVSPACE.SetText(xRow->getString(2)); - } - else - showError(); - - aStmt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM ")); - aStmt += ::dbtools::quoteTableName(xMetaData,sSchema,::dbtools::eInDataManipulation); - aStmt += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".CONFIGURATION WHERE DESCRIPTION = 'TRANSACTION LOG NAME'")); - xRes = xStmt->executeQuery(aStmt); - if(xRes.is() && xRes->next()) - { - Reference<XRow> xRow(xRes,UNO_QUERY); - m_ET_TRANSACTIONLOG.SetText(xRow->getString(2)); - } - else - showError(); - } - else - showError(); - } - catch(const SQLException& e) - { - ::dbaui::showError(SQLExceptionInfo(e),pParent,_xFactory); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - try - { - ::comphelper::disposeComponent(xStmt); - } - catch( const Exception& ) - { - DBG_UNHANDLED_EXCEPTION(); - } - } - } - } - - m_ET_SYSDEVSPACE.SetSpecialReadOnly(sal_True); - m_ET_TRANSACTIONLOG.SetSpecialReadOnly(sal_True); - m_LB_DATADEVS.SetSpecialReadOnly(sal_True); - m_ET_SIZE.SetSpecialReadOnly(sal_True); - m_ET_FREESIZE.SetSpecialReadOnly(sal_True); - m_ET_MEMORYUSING.SetSpecialReadOnly(sal_True); -} -//------------------------------------------------------------------------ -OAdabasStatistics::~OAdabasStatistics() -{ - DBG_DTOR(OAdabasStatistics,NULL); -} -// ----------------------------------------------------------------------------- -sal_Bool OAdabasStatistics::checkSystemTable(const ::rtl::OUString& _rsSystemTable, ::rtl::OUString& _rsSchemaName ) -{ - sal_Bool bCanSelect = sal_False; - Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData(); - if ( xMeta.is() ) - { - Reference<XResultSet> xRes = xMeta->getTablePrivileges(Any(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%")), _rsSystemTable); - if(xRes.is()) - { - Reference<XRow> xRow(xRes,UNO_QUERY); - static const ::rtl::OUString sSelect(RTL_CONSTASCII_USTRINGPARAM("SELECT")); - // first the db sizes - while( xRow.is() && xRes->next() ) - { - _rsSchemaName = xRow->getString(2); - if(sSelect == xRow->getString(6) && !xRow->wasNull()) - { - bCanSelect = sal_True; - break; - } - } - ::comphelper::disposeComponent(xRes); - } - } - - return bCanSelect; -} -// ----------------------------------------------------------------------------- -void OAdabasStatistics::showError() -{ - if(!m_bErrorShown) - { - OSQLMessageBox aMsg(GetParent(),GetText(),String(ModuleRes(STR_ADABAS_ERROR_SYSTEMTABLES))); - aMsg.Execute(); - m_bErrorShown = sal_True; - } -} -// ----------------------------------------------------------------------------- -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/AdabasStat.hrc b/dbaccess/source/ui/dlg/AdabasStat.hrc deleted file mode 100644 index 32734ea9075a..000000000000 --- a/dbaccess/source/ui/dlg/AdabasStat.hrc +++ /dev/null @@ -1,52 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef DBAUI_ADABASSTAT_HRC -#define DBAUI_ADABASSTAT_HRC - - -#define FT_SYSDEVSPACE 1 -#define FT_TRANSACTIONLOG 2 -#define FT_DATADEVSPACE 3 -#define FT_SIZE 4 -#define FT_FREESIZE 5 -#define FT_MEMORYUSING 6 - -#define ET_SYSDEVSPACE 1 -#define ET_TRANSACTIONLOG 2 -#define ET_MEMORYUSING 3 -#define ET_SIZE 4 -#define ET_FREESIZE 5 - -#define LB_DATADEVS 1 - -#define PB_OK 1 - -#define FL_FILES 1 -#define FL_SIZES 2 - - -#endif // DBAUI_ADABASSTAT_HRC diff --git a/dbaccess/source/ui/dlg/AdabasStat.hxx b/dbaccess/source/ui/dlg/AdabasStat.hxx deleted file mode 100644 index 7bba19f59724..000000000000 --- a/dbaccess/source/ui/dlg/AdabasStat.hxx +++ /dev/null @@ -1,86 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _DBAUI_ADASTAT_HXX_ -#define _DBAUI_ADASTAT_HXX_ - -#include <vcl/fixed.hxx> -#include <vcl/button.hxx> -#include <vcl/dialog.hxx> -#include "FieldControls.hxx" -#include <svtools/prgsbar.hxx> -#include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - - -namespace dbaui -{ - //======================================================================== - // shows some statistics - //======================================================================== - class OAdabasStatistics : public ModalDialog - { - protected: - - FixedLine m_FL_FILES; - FixedText m_FT_SYSDEVSPACE; - OPropEditCtrl m_ET_SYSDEVSPACE; - FixedText m_FT_TRANSACTIONLOG; - OPropEditCtrl m_ET_TRANSACTIONLOG; - FixedText m_FT_DATADEVSPACE; - OPropListBoxCtrl m_LB_DATADEVS; - FixedLine m_FL_SIZES; - FixedText m_FT_SIZE; - OPropEditCtrl m_ET_SIZE; - FixedText m_FT_FREESIZE; - OPropEditCtrl m_ET_FREESIZE; - FixedText m_FT_MEMORYUSING; - OPropNumericEditCtrl m_ET_MEMORYUSING; - - OKButton m_PB_OK; - - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > - m_xConnection; /// valid as long as the page is active - sal_Bool m_bErrorShown; // true when we shown already the error - - // check if the given table is accessable by the connected user - sal_Bool checkSystemTable(const ::rtl::OUString& _rsSystemTable, ::rtl::OUString& _rsSchemaName ); - void showError(); - - public: - OAdabasStatistics( Window* pParent, - const ::rtl::OUString& _rUser, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCurrentConnection, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory); - ~OAdabasStatistics(); - - }; -} -#endif //_DBAUI_ADASTAT_HXX_ - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src deleted file mode 100644 index 476750f7b531..000000000000 --- a/dbaccess/source/ui/dlg/AdabasStat.src +++ /dev/null @@ -1,208 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef DBAUI_ADABASSTAT_HRC -#include "AdabasStat.hrc" -#endif -#ifndef _DBU_DLG_HRC_ -#include "dbu_dlg.hrc" -#endif - -#define WINDOW_SIZE_X 260 -#define WINDOW_SIZE_Y 190 - -ModalDialog DLG_ADABASSTAT -{ - HelpID = "dbaccess:ModalDialog:DLG_ADABASSTAT"; - OutputSize = TRUE ; - Moveable = TRUE ; - Closeable = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ; - - FixedLine FL_FILES - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 12, 8 ) ; - Text [ en-US ] = "Database files"; - }; - - FixedText FT_SYSDEVSPACE - { - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; - Text [ en-US ] = "S~YSDEVSPACE:"; - }; - - Edit ET_SYSDEVSPACE - { - HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_SYSDEVSPACE"; - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 14 ) ; - Size = MAP_APPFONT ( 128 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; - }; - - FixedText FT_TRANSACTIONLOG - { - Pos = MAP_APPFONT ( 12 , 32 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; - Text [ en-US ] = "~TRANSACTIONLOG:"; - }; - - Edit ET_TRANSACTIONLOG - { - HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_TRANSACTIONLOG"; - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 31 ) ; - Size = MAP_APPFONT ( 128 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; - }; - - FixedText FT_DATADEVSPACE - { - Pos = MAP_APPFONT ( 12 , 49 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; - Text [ en-US ] = "DATAD~EVSPACE:"; - }; - - ListBox LB_DATADEVS - { - HelpID = "dbaccess:ListBox:DLG_ADABASSTAT:LB_DATADEVS"; - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 48 ) ; - Size = MAP_APPFONT ( 128 , 42 ) ; - TabStop = TRUE; - AutoHScroll = TRUE; - VScroll = TRUE; - HScroll = TRUE; - }; - FixedLine FL_SIZES - { - Pos = MAP_APPFONT ( 6 , 99 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ; - Text [ en-US ] = "Database sizes"; - }; - - FixedText FT_SIZE - { - Pos = MAP_APPFONT ( 12 , 110 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; - Text [ en-US ] = "S~ize (MB):"; - }; - - Edit ET_SIZE - { - HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_SIZE"; - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 109 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; - }; - - FixedText FT_FREESIZE - { - Pos = MAP_APPFONT ( 12 , 127 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; - Text [ en-US ] = "~Free memory space (MB):"; - }; - - Edit ET_FREESIZE - { - HelpID = "dbaccess:Edit:DLG_ADABASSTAT:ET_FREESIZE"; - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 126 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; - }; - - FixedText FT_MEMORYUSING - { - Pos = MAP_APPFONT ( 12 , 144 ) ; - Size = MAP_APPFONT ( 102 , 10 ) ; - Text [ en-US ] = "~Memory utilization (in %):"; - }; - - NumericField ET_MEMORYUSING - { - HelpID = "dbaccess:NumericField:DLG_ADABASSTAT:ET_MEMORYUSING"; - Border = TRUE ; - Pos = MAP_APPFONT ( 120 , 144 ) ; - Size = MAP_APPFONT ( 60 , 12 ) ; - TabStop = TRUE ; - ReadOnly = TRUE; - }; - - OKButton PB_OK - { - Pos = MAP_APPFONT ( WINDOW_SIZE_X - 56,WINDOW_SIZE_Y - 20 ) ; - Size = MAP_APPFONT ( 50, 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - - Text [ en-US ] = "Database Statistics"; -}; - -String STR_ADABAS_HELP_SYSDEVSPACE -{ - Text [ en-US ] = "Contains the system tables"; -}; - -String STR_ADABAS_HELP_TRANSACT -{ - Text [ en-US ] = "Contains information about transaction"; -}; - -String STR_ADABAS_HELP_DATADEVSPACES -{ - Text [ en-US ] = "Contains all data files"; -}; - -String STR_ADABAS_HELP_SIZE -{ - Text [ en-US ] = "Total size of the database files"; -}; - -String STR_ADABAS_HELP_FREESIZE -{ - Text [ en-US ] = "Currently available space before a new datadev file is created."; -}; - -String STR_ADABAS_HELP_MEMORYUSING -{ - Text [ en-US ] = "Currently used memory"; -}; - -String STR_ADABAS_ERROR_SYSTEMTABLES -{ - Text [ en-US ] = "No information could be displayed because no access rights exist for the required system tables."; -}; diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src index e43e2a13a7fb..1b1e31e1a741 100644 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ b/dbaccess/source/ui/dlg/AutoControls.src @@ -59,11 +59,6 @@ String STR_ORACLE_DATABASE_NAME Text[ en-US ] = "Name of the Oracle database"; }; -String STR_ADABAS_DATABASE_NAME -{ - Text[ en-US ] = "Name of the Adabas D database"; -}; - String STR_MSACCESS_MDB_FILE { Text[ en-US ] = "Microsoft Access database file"; diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 24e044cde839..cdc5f97e4349 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -263,86 +263,6 @@ DBG_NAME(OConnectionHelper) askForFileName(aFileDlg); } break; - case ::dbaccess::DST_ADABAS: - { - // collect all names from the config dir - // and all dir's of the DBWORK/wrk or DBROOT/wrk dir - // compare the names - - // collect the names of the installed databases - StringBag aInstalledDBs; - ::rtl::OUString sAdabasConfigDir,sAdabasWorkDir,sRootDir; - ::rtl::OUString sEnvVarName(RTL_CONSTASCII_USTRINGPARAM("DBWORK")); - rtl_uString* pDbVar = NULL; - if(osl_getEnvironment(sEnvVarName.pData,&pDbVar) == osl_Process_E_None && pDbVar) - { - sAdabasWorkDir = pDbVar; - rtl::OUString sURL; - utl::LocalFileHelper::ConvertPhysicalNameToURL(sAdabasWorkDir,sURL); - sAdabasWorkDir = sURL; - rtl_uString_release(pDbVar); - pDbVar = NULL; - } - - sEnvVarName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBCONFIG")); - if(osl_getEnvironment(sEnvVarName.pData,&pDbVar) == osl_Process_E_None && pDbVar) - { - sAdabasConfigDir = pDbVar; - rtl::OUString sURL; - utl::LocalFileHelper::ConvertPhysicalNameToURL(sAdabasConfigDir,sURL); - sAdabasConfigDir = sURL; - rtl_uString_release(pDbVar); - pDbVar = NULL; - } - - sEnvVarName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DBROOT")); - if(osl_getEnvironment(sEnvVarName.pData,&pDbVar) == osl_Process_E_None && pDbVar) - { - sRootDir = pDbVar; - rtl::OUString sURL; - utl::LocalFileHelper::ConvertPhysicalNameToURL(sRootDir,sURL); - sRootDir = sURL; - rtl_uString_release(pDbVar); - pDbVar = NULL; - } - - sal_Bool bOldFashion = !(sAdabasConfigDir.isEmpty() || sAdabasWorkDir.isEmpty()); - - if(!bOldFashion) // we have a normal adabas installation - { // so we check the local database names in $DBROOT/config - sAdabasConfigDir = sRootDir; - sAdabasWorkDir = sRootDir; - } - - if(!(sAdabasConfigDir.isEmpty() || sAdabasWorkDir.isEmpty() || sRootDir.isEmpty())) - { - - aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); - - if(!aInstalledDBs.size() && bOldFashion) - { - sAdabasConfigDir = sRootDir; - sAdabasWorkDir = sRootDir; - aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir); - } - - ODatasourceSelectDialog aSelector(GetParent(), aInstalledDBs, true,m_pItemSetHelper->getWriteOutputSet()); - if (RET_OK == aSelector.Execute()) - { - setURLNoPrefix(aSelector.GetSelected()); - SetRoadmapStateValue(sal_True); - callModifiedHdl(); - } - } - else - { - LocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE ); - String sError = String(ModuleRes(STR_NO_ADABASE_DATASOURCES)); - ErrorBox aBox(this, WB_OK, sError); - aBox.Execute(); - } - } - break; case ::dbaccess::DST_MYSQL_ODBC: case ::dbaccess::DST_ODBC: { @@ -408,7 +328,7 @@ DBG_NAME(OConnectionHelper) // execute the select dialog - ODatasourceSelectDialog aSelector(GetParent(), aProfiles, eType); + ODatasourceSelectDialog aSelector(GetParent(), aProfiles); ::rtl::OUString sOldProfile=getURLNoPrefix(); if (!sOldProfile.isEmpty()) @@ -605,98 +525,6 @@ DBG_NAME(OConnectionHelper) return RET_OK; } - - //------------------------------------------------------------------------- - StringBag OConnectionHelper::getInstalledAdabasDBDirs(const String& _rPath,const ::ucbhelper::ResultSetInclude& _reResultSetInclude) - { - INetURLObject aNormalizer; - aNormalizer.SetSmartProtocol(INET_PROT_FILE); - aNormalizer.SetSmartURL(_rPath); - String sAdabasConfigDir = aNormalizer.GetMainURL(INetURLObject::NO_DECODE); - - ::ucbhelper::Content aAdabasConfigDir; - try - { - aAdabasConfigDir = ::ucbhelper::Content(sAdabasConfigDir, Reference< ::com::sun::star::ucb::XCommandEnvironment >()); - } - catch(::com::sun::star::ucb::ContentCreationException&) - { - return StringBag(); - } - - StringBag aInstalledDBs; - sal_Bool bIsFolder = sal_False; - try - { - bIsFolder = aAdabasConfigDir.isFolder(); - } - catch(Exception&) // the exception is thrown when the path doesn't exists - { - } - if (bIsFolder && aAdabasConfigDir.get().is()) - { // we have a content for the directory, loop through all entries - Sequence< ::rtl::OUString > aProperties(1); - aProperties[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")); - - try - { - Reference< XResultSet > xFiles = aAdabasConfigDir.createCursor(aProperties, _reResultSetInclude); - Reference< XRow > xRow(xFiles, UNO_QUERY); - xFiles->beforeFirst(); - while (xFiles->next()) - { -#ifdef DBG_UTIL - ::rtl::OUString sName = xRow->getString(1); -#endif - aInstalledDBs.insert(xRow->getString(1)); - } - } - catch(Exception&) - { - OSL_FAIL("OConnectionHelper::getInstalledAdabasDBDirs: could not enumerate the adabas config files!"); - } - } - - - return aInstalledDBs; - } - // ----------------------------------------------------------------------------- - StringBag OConnectionHelper::getInstalledAdabasDBs(const String &_rConfigDir,const String &_rWorkDir) - { - String sAdabasConfigDir(_rConfigDir),sAdabasWorkDir(_rWorkDir); - - if (sAdabasConfigDir.Len() && ('/' == sAdabasConfigDir.GetBuffer()[sAdabasConfigDir.Len() - 1])) - sAdabasConfigDir.AppendAscii("config"); - else - sAdabasConfigDir.AppendAscii("/config"); - - if (sAdabasWorkDir.Len() && ('/' == sAdabasWorkDir.GetBuffer()[sAdabasWorkDir.Len() - 1])) - sAdabasWorkDir.AppendAscii("wrk"); - else - sAdabasWorkDir.AppendAscii("/wrk"); - // collect the names of the installed databases - StringBag aInstalledDBs; - // collect the names of the installed databases - StringBag aConfigDBs,aWrkDBs; - aConfigDBs = getInstalledAdabasDBDirs(sAdabasConfigDir,::ucbhelper::INCLUDE_DOCUMENTS_ONLY); - aWrkDBs = getInstalledAdabasDBDirs(sAdabasWorkDir,::ucbhelper::INCLUDE_FOLDERS_ONLY); - ConstStringBagIterator aOuter = aConfigDBs.begin(); - ConstStringBagIterator aOuterEnd = aConfigDBs.end(); - for(;aOuter != aOuterEnd;++aOuter) - { - ConstStringBagIterator aInner = aWrkDBs.begin(); - ConstStringBagIterator aInnerEnd = aWrkDBs.end(); - for (;aInner != aInnerEnd; ++aInner) - { - if (aInner->equalsIgnoreAsciiCase(*aOuter)) - { - aInstalledDBs.insert(*aInner); - break; - } - } - } - return aInstalledDBs; - } // ----------------------------------------------------------------------------- IS_PATH_EXIST OConnectionHelper::pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const { diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index cd1e491dfb6b..5598bd6bb85a 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -118,8 +118,6 @@ namespace dbaui private: DECL_LINK(OnBrowseConnections, PushButton*); - StringBag getInstalledAdabasDBDirs(const String &_rPath,const ::ucbhelper::ResultSetInclude& _reResultSetInclude); - StringBag getInstalledAdabasDBs(const String &_rConfigDir,const String &_rWorkDir); String impl_getURL( sal_Bool _bPrefix ) const; void impl_setURL( const String& _rURL, sal_Bool _bPrefix ); void implUpdateURLDependentStates() const; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 84fd1161b80a..2e323ff821e2 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -161,10 +161,6 @@ namespace dbaui m_aFT_Connection.SetText(String(ModuleRes(STR_CALC_PATH_OR_FILE))); m_aConnectionURL.SetHelpId(HID_DSADMIN_CALC_PATH); break; - case ::dbaccess::DST_ADABAS: - m_aFT_Connection.SetText(String(ModuleRes(STR_ADABAS_DATABASE_NAME))); - m_aConnectionURL.SetHelpId(HID_DSADMIN_ADABAS_DATABASE); - break; case ::dbaccess::DST_ADO: m_aFT_Connection.SetText(String(ModuleRes(STR_COMMONURL))); break; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hrc b/dbaccess/source/ui/dlg/ConnectionPage.hrc index 347b0f0bac28..be8b20f9ca49 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hrc +++ b/dbaccess/source/ui/dlg/ConnectionPage.hrc @@ -39,7 +39,7 @@ #define FT_MSACCESS_MDB_FILE 6 #define FT_FLAT_PATH_OR_FILE 7 #define FT_CALC_PATH_OR_FILE 8 -#define FT_ADABAS_DATABASE_NAME 9 + // FREE #define FT_NO_ADDITIONAL_SETTINGS 10 #define FT_HOSTNAME 11 #define FT_ORACLE_DATABASE_NAME 12 diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src index 63c400b0a77a..9d864a5754ad 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.src +++ b/dbaccess/source/ui/dlg/ConnectionPage.src @@ -149,11 +149,6 @@ TabPage PAGE_CONNECTION }; -String STR_NO_ADABASE_DATASOURCES -{ - Text [ en-US ] = "No Adabas D data sources were found on your system."; -}; - String STR_CONNECTION_TEST { Text [ en-US ] = "Connection Test"; diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index e392b87a2048..2a1dcd57db53 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -96,13 +96,6 @@ namespace dbaui return oDBWizardPage; } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) - { - OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ADABAS, _rAttrSet, STR_ADABAS_HELPTEXT, STR_ADABAS_HEADERTEXT, STR_ADABAS_DATABASE_NAME); - oDBWizardPage->FreeResource(); - return oDBWizardPage; - } - OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ) { OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ADO, _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL); diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 0fd31cf58101..4825eeef9d32 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -63,7 +63,6 @@ namespace dbaui public: static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); - static OGenericAdministrationPage* CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index a7cbcf4722ad..ffce144460d4 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -209,13 +209,6 @@ ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_RESPECTRESULTSETTYPE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RespectDriverResultSetType" ) ) ) ); m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_MAX_ROW_SCAN, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxRowScan" ) ) ) ); - // special settings for adabas - m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_SHUTSERVICE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShutdownDatabase")))); - m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_DATAINC, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSizeIncrement")))); - m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_CACHESIZE, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataCacheSize")))); - m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_CTRLUSER, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlUser")))); - m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_CONN_CTRLPWD, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlPassword")))); - // extra settings for odbc m_aIndirectPropTranslator.insert(MapInt2String::value_type(DSID_USECATALOG, INFO_USECATALOG)); // extra settings for a ldap address book @@ -520,17 +513,6 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const case ::dbaccess::DST_FLAT: case ::dbaccess::DST_CALC: break; - case ::dbaccess::DST_ADABAS: - { - SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); - sNewUrl = lcl_createHostWithPort(pHostName,NULL); - String sUrl = pCollection->cutPrefix(pUrlItem->GetValue()); - if ( comphelper::string::getTokenCount(sUrl, ':') == 1 ) - sNewUrl += String::CreateFromAscii(":"); - - sNewUrl += sUrl; - } - break; case ::dbaccess::DST_MSACCESS: case ::dbaccess::DST_MSACCESS_2007: { diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 13b4b50e5943..e81508790cde 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -87,10 +87,6 @@ namespace dbaui */ static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet ); - /** Creates the detail page for Adabas - */ - static SfxTabPage* CreateAdabas( Window* _pParent, const SfxItemSet& _rAttrSet ); - /** Creates the detail page for LDAP */ static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet& _rAttrSet ); diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index d8ce26f8d3ef..5a074c9fc2e2 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -46,7 +46,6 @@ #include <vcl/mnemonic.hxx> #include <svl/cjkoptions.hxx> #include <jvmaccess/virtualmachine.hxx> -#include "AdabasStat.hxx" #include <connectivity/CommonTools.hxx> #include "DriverSettings.hxx" #include "dbadmin.hxx" diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 90d347099f34..c1c4cd2b8491 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -165,7 +165,7 @@ namespace dbaui { aEnumeration.getDatasourceNames(aOdbcDatasources); // execute the select dialog - ODatasourceSelectDialog aSelector(GetParent(), aOdbcDatasources, false); + ODatasourceSelectDialog aSelector(GetParent(), aOdbcDatasources); if (!_sCurr.isEmpty()) aSelector.Select(_sCurr); if ( RET_OK == aSelector.Execute() ) diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index a323f75f109f..bef0ddcd54d9 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -173,14 +173,6 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD addDetailPage(PAGE_ORACLE_JDBC, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateOracleJDBC); break; - case ::dbaccess::DST_ADABAS: - // for adabas we have more than one page - // CAUTION: the order of inserting pages matters. - // the major detail page should be inserted last always (thus, it becomes the first page after - // the general page) - addDetailPage(PAGE_ADABAS, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateAdabas); - break; - case ::dbaccess::DST_LDAP: addDetailPage(PAGE_LDAP,STR_PAGETITLE_ADVANCED,ODriversSettings::CreateLDAP); break; diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src index 8bacdec5e006..be0b7ec72905 100644 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ b/dbaccess/source/ui/dlg/dbadmin.src @@ -40,9 +40,6 @@ #ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" #endif -#ifndef DBAUI_ADABASPAGE_HRC -#include "AdabasPage.hrc" -#endif #include "admincontrols.hrc" //------------------------------------------------------------------------- @@ -396,127 +393,6 @@ TabPage PAGE_ODBC AUTO_USECATALOG( 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) }; -TabPage PAGE_ADABAS -{ - SVLook = TRUE ; - Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ; - Hide = TRUE; - HelpId = HID_DSADMIN_PAGE_ADABAS; - - FixedLine FL_SEPARATOR1 - { - Pos = MAP_APPFONT ( 4 , UNRELATED_CONTROLS ) ; - Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ; - Text[ en-US ] = "Connection Settings"; - }; - - FixedText FT_HOSTNAME - { - Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + RELATED_CONTROLS + FIXEDTEXT_HEIGHT) ; - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; - Text[ en-US ] = "~Host name"; - }; - Edit ET_HOSTNAME - { - HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_HOSTNAME"; - TabStop = TRUE ; - Border = TRUE ; - - Pos = MAP_APPFONT ( EDIT_X , UNRELATED_CONTROLS + RELATED_CONTROLS + FIXEDTEXT_HEIGHT-1 ) ; - Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ; - }; - - FixedText FT_CACHE_SIZE - { - Pos = MAP_APPFONT ( 6 , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT ) ; - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; - Text[ en-US ] = "Data ~buffer size (MB)"; - }; - NumericField NF_CACHE_SIZE - { - HelpID = "dbaccess:NumericField:PAGE_ADABAS:NF_CACHE_SIZE"; - Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ; - Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; - SpinSize = 1; - StrictFormat = TRUE; - }; - - FixedText FT_DATA_INCREMENT - { - Pos = MAP_APPFONT ( 6 , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT ) ; - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; - Text[ en-US ] = "~Data increment (MB)"; - }; - NumericField NF_DATA_INCREMENT - { - HelpID = "dbaccess:NumericField:PAGE_ADABAS:NF_DATA_INCREMENT"; - Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ; - Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; - SpinSize = 1; - StrictFormat = TRUE; - }; - FixedLine FL_SEPARATOR2 - { - Pos = MAP_APPFONT ( 6 , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT ) ; - Size = MAP_APPFONT ( 248 , FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "Administration" ; - }; - FixedText FT_CTRLUSERNAME - { - Pos = MAP_APPFONT ( 6 , 4*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT ) ; - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "Control ~user name" ; - }; - Edit ET_CTRLUSERNAME - { - HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_CTRLUSERNAME"; - Border = TRUE ; - Pos = MAP_APPFONT ( EDIT_X , 4*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT-1 ) ; - Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ; - TabStop = TRUE ; - }; - FixedText FT_CTRLPASSWORD - { - Pos = MAP_APPFONT ( 6 , 5*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT ) ; - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; - Text [ en-US ] = "Control ~password" ; - }; - Edit ET_CTRLPASSWORD - { - HelpID = "dbaccess:Edit:PAGE_ADABAS:ET_CTRLPASSWORD"; - Border = TRUE ; - Pos = MAP_APPFONT ( EDIT_X , 5*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT-1 ) ; - Size = MAP_APPFONT ( 105 , EDIT_HEIGHT) ; - TabStop = TRUE ; - PassWord = TRUE ; - }; - - CheckBox CB_SHUTDB - { - HelpID = "dbaccess:CheckBox:PAGE_ADABAS:CB_SHUTDB"; - Pos = MAP_APPFONT ( 6 , 6*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT ) ; - Size = MAP_APPFONT ( 248 , CHECKBOX_HEIGHT ) ; - Text[ en-US ] = "~Shut down service when closing %PRODUCTNAME"; - }; - - PushButton PB_STAT - { - HelpID = "dbaccess:PushButton:PAGE_ADABAS:PB_STAT"; - Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ; - Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; - Text[ en-US ] = "E~xtended..."; - }; - - AUTO_CHARSET( 7*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 7*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT, PAGE_X ) -}; - //......................................................................... #define MYSQL_YDIST 53 #define MYSQL_FL_Y 8 diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc index 7d6757951089..4aaa4c32d31c 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.hrc +++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc @@ -51,7 +51,7 @@ #define STR_SPREADSHEET_HELPTEXT 36 // FREE #define STR_FINAL_HELPTEXT 38 -#define STR_ADABAS_HELPTEXT 39 + // FREE #define STR_ORACLE_HELPTEXT 40 #define STR_DBASE_HEADERTEXT 41 #define STR_MSACCESS_HEADERTEXT 42 @@ -64,14 +64,14 @@ // FREE #define STR_SPREADSHEET_HEADERTEXT 50 #define STR_FINAL_HEADERTEXT 52 -#define STR_ADABAS_HEADERTEXT 53 + // FREE #define STR_ORACLE_HEADERTEXT 54 #define STR_GENERAL_HEADERTEXT 55 #define STR_DBWIZARDTITLE 56 #define STR_DEFAULTLDAPPORTNUMBER 60 -#define STR_ADABASNAME 61 + // FREE #define STR_ODBCDATASOURCENAME 63 #define STR_SPREADSHEETPATH 64 #define STR_DBLOCATIONLABEL 65 @@ -83,7 +83,7 @@ #define STR_PAGETITLE_TEXT 71 #define STR_PAGETITLE_MSACCESS 72 #define STR_PAGETITLE_LDAP 73 -#define STR_PAGETITLE_ADABAS 74 + // FREE #define STR_PAGETITLE_ADO 75 #define STR_PAGETITLE_JDBC 76 #define STR_PAGETITLE_ORACLE 77 diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src index a5b8d73062a7..9ef973589f19 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ b/dbaccess/source/ui/dlg/dbadminsetup.src @@ -90,11 +90,6 @@ ModalDialog DLG_DATABASE_WIZARD Text[ en-US ] = "Set up LDAP connection" ; }; - String STR_PAGETITLE_ADABAS - { - Text[ en-US ] = "Set up Adabas D connection" ; - }; - String STR_PAGETITLE_ADO { Text[ en-US ] = "Set up ADO connection" ; @@ -497,26 +492,6 @@ TabPage PAGE_DBWIZARD_LDAP }; }; -TabPage PAGE_DBWIZARD_ADABAS -{ - HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADABAS"; - SVLook = TRUE ; - Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; - Hide = TRUE ; - - String STR_ADABAS_HEADERTEXT - { - Text[ en-US ] = "Set up a connection to an Adabas D database" ; - }; - - String STR_ADABAS_HELPTEXT{ - Text[ en-US ] = "Enter the name of the Adabas D database you want to connect to.\nClick 'Browse...' to select an Adabas D database that is already registered in %PRODUCTNAME." ; - }; - - AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME, HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME) -}; - TabPage PAGE_DBWIZARD_ADO { HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADO"; diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 85cbc2c2018b..950e3a567d42 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -65,7 +65,7 @@ using namespace com::sun::star::container; #define ADDITIONAL_PAGE_DBASE 2 #define ADDITIONAL_PAGE_FLAT 3 #define ADDITIONAL_PAGE_LDAP 4 -#define ADDITIONAL_PAGE_ADABAS 5 +//5 was ADDITIONAL_PAGE_ADABAS #define ADDITIONAL_PAGE_MYSQL_JDBC 6 #define ADDITIONAL_PAGE_MYSQL_ODBC 7 #define ADDITIONAL_PAGE_ORACLE_JDBC 8 @@ -189,9 +189,6 @@ WizardTypes::WizardState ODbTypeWizDialog::determineNextState( WizardState _nCur case ::dbaccess::DST_LDAP: nNextState = ADDITIONAL_PAGE_LDAP; break; - case ::dbaccess::DST_ADABAS: - nNextState = ADDITIONAL_PAGE_ADABAS; - break; case ::dbaccess::DST_MYSQL_JDBC: nNextState = ADDITIONAL_PAGE_MYSQL_JDBC; break; @@ -283,9 +280,6 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState) case ADDITIONAL_PAGE_LDAP: pPage = ODriversSettings::CreateLDAP(this,*m_pOutSet); break; - case ADDITIONAL_PAGE_ADABAS: - pPage = ODriversSettings::CreateAdabas(this,*m_pOutSet); - break; case ADDITIONAL_PAGE_MYSQL_JDBC: pPage = ODriversSettings::CreateMySQLJDBC(this,*m_pOutSet); break; diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 31ef7beac712..b318d3586e2f 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -147,7 +147,6 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent , m_sRM_TextText(ModuleRes(STR_PAGETITLE_TEXT)) , m_sRM_MSAccessText(ModuleRes(STR_PAGETITLE_MSACCESS)) , m_sRM_LDAPText(ModuleRes(STR_PAGETITLE_LDAP)) - , m_sRM_ADABASText(ModuleRes(STR_PAGETITLE_ADABAS)) , m_sRM_ADOText(ModuleRes(STR_PAGETITLE_ADO)) , m_sRM_JDBCText(ModuleRes(STR_PAGETITLE_JDBC)) , m_sRM_MySQLNativePageTitle(ModuleRes(STR_PAGETITLE_MYSQL_NATIVE)) @@ -257,9 +256,6 @@ String ODbTypeWizDialogSetup::getStateDisplayName( WizardState _nState ) const case PAGE_DBSETUPWIZARD_LDAP: sRoadmapItem = m_sRM_LDAPText; break; - case PAGE_DBSETUPWIZARD_ADABAS: - sRoadmapItem = m_sRM_ADABASText; - break; case PAGE_DBSETUPWIZARD_JDBC: sRoadmapItem = m_sRM_JDBCText; break; @@ -570,11 +566,7 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState) pPage = OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( this, *m_pOutSet); break; - case PAGE_DBSETUPWIZARD_ADABAS: - pPage = OConnectionTabPageSetup::CreateAdabasTabPage( this, *m_pOutSet); - break; - - case PAGE_DBSETUPWIZARD_LDAP : + case PAGE_DBSETUPWIZARD_LDAP: pPage = OLDAPConnectionPageSetup::CreateLDAPTabPage(this,*m_pOutSet); break; diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 684156a256eb..140344030785 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -49,8 +49,6 @@ #include <vcl/mnemonic.hxx> #include <svl/cjkoptions.hxx> #include <jvmaccess/virtualmachine.hxx> -#include "AdabasPage.hrc" -#include "AdabasStat.hxx" #include <connectivity/CommonTools.hxx> #include "DriverSettings.hxx" #include "dbadmin.hxx" @@ -765,176 +763,6 @@ namespace dbaui return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_ORACLE_JDBC, _rAttrSet,DSID_ORACLE_PORTNUMBER) ); } - - //======================================================================== - //= OAdabasDetailsPage - //======================================================================== - OAdabasDetailsPage::OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ) - :OCommonBehaviourTabPage(pParent, PAGE_ADABAS, _rCoreAttrs, CBTP_USE_CHARSET ,false) - ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) - ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_FT_CACHE_SIZE( this, ModuleRes( FT_CACHE_SIZE ) ) - ,m_NF_CACHE_SIZE( this, ModuleRes( NF_CACHE_SIZE ) ) - ,m_FT_DATA_INCREMENT( this, ModuleRes( FT_DATA_INCREMENT ) ) - ,m_NF_DATA_INCREMENT( this, ModuleRes( NF_DATA_INCREMENT ) ) - ,m_aFL_2( this, ModuleRes( FL_SEPARATOR2 ) ) - ,m_FT_CTRLUSERNAME( this, ModuleRes( FT_CTRLUSERNAME ) ) - ,m_ET_CTRLUSERNAME( this, ModuleRes( ET_CTRLUSERNAME ) ) - ,m_FT_CTRLPASSWORD( this, ModuleRes( FT_CTRLPASSWORD ) ) - ,m_ET_CTRLPASSWORD( this, ModuleRes( ET_CTRLPASSWORD ) ) - ,m_CB_SHUTDB( this, ModuleRes( CB_SHUTDB ) ) - ,m_PB_STAT( this, ModuleRes( PB_STAT ) ) - { - m_aEDHostname.SetModifyHdl(getControlModifiedLink()); - - FreeResource(); - - m_PB_STAT.SetClickHdl( LINK(this,OAdabasDetailsPage,PBClickHdl)); - - m_CB_SHUTDB.SetClickHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_NF_DATA_INCREMENT.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_ET_CTRLUSERNAME.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - m_ET_CTRLPASSWORD.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl)); - - m_ET_CTRLUSERNAME.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); - m_ET_CTRLPASSWORD.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl)); - - m_NF_DATA_INCREMENT.SetMin(20); - m_NF_DATA_INCREMENT.SetMax(LONG_MAX); - m_NF_DATA_INCREMENT.SetValue(20); - m_NF_DATA_INCREMENT.SetDecimalDigits(0); - - m_NF_CACHE_SIZE.SetMin(4); - m_NF_CACHE_SIZE.SetMax(LONG_MAX); - m_NF_CACHE_SIZE.SetValue(4); - m_NF_CACHE_SIZE.SetDecimalDigits(0); - - Window* pWindows[] = { &m_aFTHostname,&m_aEDHostname - ,&m_FT_CACHE_SIZE,&m_NF_CACHE_SIZE - ,&m_FT_DATA_INCREMENT,&m_NF_DATA_INCREMENT - ,&m_FT_CTRLUSERNAME,&m_ET_CTRLUSERNAME - ,&m_FT_CTRLPASSWORD,&m_ET_CTRLPASSWORD - ,&m_CB_SHUTDB - ,m_pCharsetLabel, m_pCharset,&m_PB_STAT}; - - sal_Int32 nCount = SAL_N_ELEMENTS(pWindows); - for (sal_Int32 i=1; i < nCount; ++i) - pWindows[i]->SetZOrder(pWindows[i-1], WINDOW_ZORDER_BEHIND); - } - - // ----------------------------------------------------------------------- - SfxTabPage* ODriversSettings::CreateAdabas( Window* pParent, const SfxItemSet& _rAttrSet ) - { - return ( new OAdabasDetailsPage( pParent, _rAttrSet ) ); - } - - // ----------------------------------------------------------------------- - void OAdabasDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) - { - OCommonBehaviourTabPage::fillControls(_rControlList); - _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aEDHostname)); - _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_NF_CACHE_SIZE)); - _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_NF_DATA_INCREMENT)); - _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_ET_CTRLUSERNAME)); - _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_ET_CTRLPASSWORD)); - _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_CB_SHUTDB)); - } - // ----------------------------------------------------------------------- - void OAdabasDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) - { - OCommonBehaviourTabPage::fillWindows(_rControlList); - _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHostname)); - _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_1)); - _rControlList.push_back(new ODisableWrapper<FixedText>(&m_FT_CACHE_SIZE)); - _rControlList.push_back(new ODisableWrapper<FixedText>(&m_FT_DATA_INCREMENT)); - _rControlList.push_back(new ODisableWrapper<FixedLine>(&m_aFL_2)); - _rControlList.push_back(new ODisableWrapper<FixedText>(&m_FT_CTRLUSERNAME)); - _rControlList.push_back(new ODisableWrapper<FixedText>(&m_FT_CTRLPASSWORD)); - _rControlList.push_back(new ODisableWrapper<PushButton>(&m_PB_STAT)); - } - // ----------------------------------------------------------------------- - void OAdabasDetailsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) - { - // first check whether or not the selection is invalid or readonly (invalid implies readonly, but not vice versa) - sal_Bool bValid, bReadonly; - getFlags(_rSet, bValid, bReadonly); - - SFX_ITEMSET_GET(_rSet, pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True); - SFX_ITEMSET_GET(_rSet, pCtrlUserItem, SfxStringItem, DSID_CONN_CTRLUSER, sal_True); - SFX_ITEMSET_GET(_rSet, pCtrlPwdItem, SfxStringItem, DSID_CONN_CTRLPWD, sal_True); - SFX_ITEMSET_GET(_rSet, pShutItem, SfxBoolItem, DSID_CONN_SHUTSERVICE, sal_True); - SFX_ITEMSET_GET(_rSet, pIncItem, SfxInt32Item, DSID_CONN_DATAINC, sal_True); - SFX_ITEMSET_GET(_rSet, pCacheItem, SfxInt32Item, DSID_CONN_CACHESIZE, sal_True); - if ( bValid ) - { - m_aEDHostname.SetText(pHostName->GetValue()); - m_aEDHostname.ClearModifyFlag(); - m_CB_SHUTDB.Check( pShutItem->GetValue() ); - m_NF_DATA_INCREMENT.SetValue( pIncItem->GetValue() ); - m_NF_CACHE_SIZE.SetValue( pCacheItem->GetValue() ); - m_ET_CTRLUSERNAME.SetText(pCtrlUserItem->GetValue()); - m_ET_CTRLPASSWORD.SetText(pCtrlPwdItem->GetValue()); - m_CB_SHUTDB.Enable(m_ET_CTRLUSERNAME.GetText().Len() && m_ET_CTRLPASSWORD.GetText().Len()); - } - - OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); - } - // ----------------------------------------------------------------------- - sal_Bool OAdabasDetailsPage::FillItemSet( SfxItemSet& _rSet ) - { - sal_Bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); - - fillString(_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething); - fillBool(_rSet,&m_CB_SHUTDB,DSID_CONN_SHUTSERVICE,bChangedSomething); - fillInt32(_rSet,&m_NF_DATA_INCREMENT,DSID_CONN_DATAINC,bChangedSomething ); - fillInt32(_rSet,&m_NF_CACHE_SIZE,DSID_CONN_CACHESIZE,bChangedSomething ); - fillString(_rSet,&m_ET_CTRLUSERNAME,DSID_CONN_CTRLUSER,bChangedSomething ); - fillString(_rSet,&m_ET_CTRLPASSWORD,DSID_CONN_CTRLPWD,bChangedSomething ); - - return bChangedSomething; - } - //------------------------------------------------------------------------ - IMPL_LINK( OAdabasDetailsPage, AttributesChangedHdl, void *, EMPTYARG ) - { - m_CB_SHUTDB.Enable(m_ET_CTRLUSERNAME.GetText().Len() && m_ET_CTRLPASSWORD.GetText().Len()); - bAttrsChanged = sal_True; - callModifiedHdl(); - return 0; - } - //------------------------------------------------------------------------ - IMPL_LINK( OAdabasDetailsPage, LoseFocusHdl, Edit *, /*pEdit*/ ) - { - m_CB_SHUTDB.Enable(m_ET_CTRLUSERNAME.GetText().Len() && m_ET_CTRLPASSWORD.GetText().Len()); - return 0; - } - //------------------------------------------------------------------------ - IMPL_LINK( OAdabasDetailsPage, PBClickHdl, Button *, /*pButton*/ ) - { - OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF"); - if ( m_pAdminDialog ) - { - m_pAdminDialog->saveDatasource(); - try - { - Reference< XConnection > xConnection = m_pAdminDialog->createConnection().first; - if ( xConnection.is() ) - { - OAdabasStatistics aDlg(this,m_sUser,xConnection,m_pAdminDialog->getORB()); - aDlg.Execute(); - ::comphelper::disposeComponent(xConnection); - } - } - catch(Exception&) - { - } - } - - return 0; - } - - //======================================================================== //= OLDAPDetailsPage //======================================================================== diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 6d48d2fd2711..bb0a6f388d93 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -257,47 +257,6 @@ namespace dbaui }; //======================================================================== - //= OAdabasDetailsPage - //======================================================================== - class OAdabasDetailsPage : public OCommonBehaviourTabPage - { - public: - virtual sal_Bool FillItemSet (SfxItemSet& _rCoreAttrs); - - OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ); - protected: - virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue); - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); - - private: - FixedText m_aFTHostname; - Edit m_aEDHostname; - FixedLine m_aFL_1; - FixedText m_FT_CACHE_SIZE; - NumericField m_NF_CACHE_SIZE; - - FixedText m_FT_DATA_INCREMENT; - NumericField m_NF_DATA_INCREMENT; - - FixedLine m_aFL_2; - FixedText m_FT_CTRLUSERNAME; - Edit m_ET_CTRLUSERNAME; - FixedText m_FT_CTRLPASSWORD; - Edit m_ET_CTRLPASSWORD; - - CheckBox m_CB_SHUTDB; - PushButton m_PB_STAT; - String m_sUser; - sal_Bool bAttrsChanged; - - DECL_LINK( AttributesChangedHdl, void * ); - DECL_LINK( UserSettingsHdl, void * ); - DECL_LINK( LoseFocusHdl, Edit * ); - DECL_LINK( PBClickHdl, Button *); - }; - - //======================================================================== //= OOdbcDetailsPage //======================================================================== class OLDAPDetailsPage : public OCommonBehaviourTabPage diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index a314601a5e63..3e450c1f0f17 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -62,7 +62,7 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::ui::dialogs; using namespace ::comphelper; //================================================================== -ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, bool _bAdabas,SfxItemSet* _pOutputSet) +ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet) :ModalDialog(_pParent, ModuleRes(DLG_DATASOURCE_SELECTION)) ,m_aDescription (this, ModuleRes(FT_DESCRIPTION)) ,m_aDatasource (this, ModuleRes(LB_DATASOURCE)) @@ -72,53 +72,14 @@ ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringB #ifdef HAVE_ODBC_ADMINISTRATION ,m_aManageDatasources (this, ModuleRes(PB_MANAGE)) #endif - ,m_aCreateAdabasDB (this, ModuleRes(PB_CREATE)) ,m_pOutputSet(_pOutputSet) { - if ( _bAdabas ) - { // set a new title (indicating that we're browsing local data sources only) - SetText(ModuleRes(STR_LOCAL_DATASOURCES)); - m_aDescription.SetText(ModuleRes(STR_DESCRIPTION2)); - - m_aCreateAdabasDB.Show(); - m_aCreateAdabasDB.SetClickHdl(LINK(this,ODatasourceSelectDialog,CreateDBClickHdl)); - - // resize the dialog a little bit, 'cause Adabas data source names are usually somewhat shorter - // than ODBC ones are - - // shrink the listbox - Size aOldSize = m_aDatasource.GetSizePixel(); - Size aNewSize(3 * aOldSize.Width() / 4, aOldSize.Height()); - m_aDatasource.SetSizePixel(aNewSize); - - sal_Int32 nLostPixels = aOldSize.Width() - aNewSize.Width(); - - // shrink the fixed text - aOldSize = m_aDescription.GetSizePixel(); - m_aDescription.SetSizePixel(Size(aOldSize.Width() - nLostPixels, aOldSize.Height())); - - // move the buttons - PushButton* pButtons[] = { &m_aOk, &m_aCancel, &m_aHelp ,&m_aCreateAdabasDB}; - for (size_t i=0; i < SAL_N_ELEMENTS(pButtons); ++i) - { - Point aOldPos = pButtons[i]->GetPosPixel(); - pButtons[i]->SetPosPixel(Point(aOldPos.X() - nLostPixels, aOldPos.Y())); - } - - // resize the dialog itself - aOldSize = GetSizePixel(); - SetSizePixel(Size(aOldSize.Width() - nLostPixels, aOldSize.Height())); - } - fillListBox(_rDatasources); #ifdef HAVE_ODBC_ADMINISTRATION // allow ODBC datasource managenment - if ( !_bAdabas ) - { - m_aManageDatasources.Show(); - m_aManageDatasources.Enable(); - m_aManageDatasources.SetClickHdl(LINK(this,ODatasourceSelectDialog,ManageClickHdl)); - } + m_aManageDatasources.Show(); + m_aManageDatasources.Enable(); + m_aManageDatasources.SetClickHdl(LINK(this,ODatasourceSelectDialog,ManageClickHdl)); #endif m_aDatasource.SetDoubleClickHdl(LINK(this,ODatasourceSelectDialog,ListDblClickHdl)); FreeResource(); @@ -136,63 +97,6 @@ IMPL_LINK( ODatasourceSelectDialog, ListDblClickHdl, ListBox *, pListBox ) EndDialog(RET_OK); return 0; } -// ----------------------------------------------------------------------- -IMPL_LINK( ODatasourceSelectDialog, CreateDBClickHdl, PushButton*, /*pButton*/ ) -{ - try - { - OSL_ENSURE(m_pOutputSet,"No itemset given!"); - Reference< ::com::sun::star::lang::XMultiServiceFactory > xORB = ::comphelper::getProcessServiceFactory(); - Reference<XCreateCatalog> xCatalog(xORB->createInstance(SERVICE_EXTENDED_ADABAS_DRIVER),UNO_QUERY); - if ( xCatalog.is() && m_pOutputSet ) - { - Sequence< Any > aArgs(2); - aArgs[0] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateCatalog")), 0, makeAny(xCatalog), PropertyState_DIRECT_VALUE); - aArgs[1] <<= PropertyValue(PROPERTY_PARENTWINDOW, 0, makeAny(VCLUnoHelper::GetInterface(this)), PropertyState_DIRECT_VALUE); - - Reference< XExecutableDialog > xDialog( - xORB->createInstanceWithArguments(SERVICE_SDB_ADABASCREATIONDIALOG, aArgs), UNO_QUERY); - if (!xDialog.is()) - { - // ShowServiceNotAvailableError(this, String(SERVICE_SDB_ADABASCREATIONDIALOG), sal_True); - return 0L; - } - - if ( xDialog->execute() == RET_OK ) - { - Reference<XPropertySet> xProp(xDialog,UNO_QUERY); - if(xProp.is()) - { - Reference<XPropertySetInfo> xPropInfo(xProp->getPropertySetInfo()); - if(xPropInfo->hasPropertyByName(PROPERTY_DATABASENAME)) - { - String sDatabaseName; - sDatabaseName = String(::comphelper::getString(xProp->getPropertyValue(PROPERTY_DATABASENAME))); - m_aDatasource.SelectEntryPos(m_aDatasource.InsertEntry( sDatabaseName )); - - } - if ( xPropInfo->hasPropertyByName(PROPERTY_CONTROLUSER) ) - m_pOutputSet->Put(SfxStringItem(DSID_CONN_CTRLUSER, ::comphelper::getString(xProp->getPropertyValue(PROPERTY_CONTROLUSER)))); - if ( xPropInfo->hasPropertyByName(PROPERTY_CONTROLPASSWORD) ) - m_pOutputSet->Put(SfxStringItem(DSID_CONN_CTRLPWD, ::comphelper::getString(xProp->getPropertyValue(PROPERTY_CONTROLPASSWORD)))); - if ( xPropInfo->hasPropertyByName(PROPERTY_USER) ) - m_pOutputSet->Put(SfxStringItem(DSID_USER, ::comphelper::getString(xProp->getPropertyValue(PROPERTY_USER)))); - if ( xPropInfo->hasPropertyByName(PROPERTY_PASSWORD) ) - { - m_pOutputSet->Put(SfxStringItem(DSID_PASSWORD, ::comphelper::getString(xProp->getPropertyValue(PROPERTY_PASSWORD)))); - m_pOutputSet->Put(SfxBoolItem(DSID_PASSWORDREQUIRED, sal_True)); - } - if ( xPropInfo->hasPropertyByName(PROPERTY_CACHESIZE) ) - m_pOutputSet->Put(SfxInt32Item(DSID_CONN_CACHESIZE, ::comphelper::getINT32(xProp->getPropertyValue(PROPERTY_CACHESIZE)))); - } - } - } - } - catch(Exception&) - { - } - return 0L; -} // ----------------------------------------------------------------------- sal_Bool ODatasourceSelectDialog::Close() diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 34050aff9cb9..56566c023de4 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -62,7 +62,6 @@ protected: #ifdef HAVE_ODBC_ADMINISTRATION PushButton m_aManageDatasources; #endif - PushButton m_aCreateAdabasDB; SfxItemSet* m_pOutputSet; #ifdef HAVE_ODBC_ADMINISTRATION ::std::auto_ptr< OOdbcManagement > @@ -70,7 +69,7 @@ protected: #endif public: - ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, bool _bAdabas,SfxItemSet* _pOutputSet = NULL ); + ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, SfxItemSet* _pOutputSet = NULL ); ~ODatasourceSelectDialog(); inline String GetSelected() const { return m_aDatasource.GetSelectEntry();} @@ -84,7 +83,6 @@ protected: DECL_LINK( ManageClickHdl, PushButton * ); DECL_LINK( ManageProcessFinished, void* ); #endif - DECL_LINK( CreateDBClickHdl, PushButton * ); void fillListBox(const StringBag& _rDatasources); }; diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc index b107a0014dbb..95d6f4aada75 100644 --- a/dbaccess/source/ui/inc/dbu_dlg.hrc +++ b/dbaccess/source/ui/inc/dbu_dlg.hrc @@ -55,13 +55,13 @@ #define INDENT_BELOW_CHECK 10 -#define STR_ADABAS_HELP_SYSDEVSPACE RID_STR_DLG_START -#define STR_ADABAS_HELP_TRANSACT RID_STR_DLG_START + 1 -#define STR_ADABAS_HELP_DATADEVSPACES RID_STR_DLG_START + 2 -#define STR_ADABAS_HELP_SIZE RID_STR_DLG_START + 3 -#define STR_ADABAS_HELP_FREESIZE RID_STR_DLG_START + 4 -#define STR_ADABAS_HELP_MEMORYUSING RID_STR_DLG_START + 5 -#define STR_ADABAS_ERROR_SYSTEMTABLES RID_STR_DLG_START + 6 + // FREE + // FREE + // FREE + // FREE + // FREE + // FREE + // FREE #define STR_ERROR_PASSWORDS_NOT_IDENTICAL RID_STR_DLG_START + 7 #define STR_INDEXDESIGN_DOUBLE_COLUMN_NAME RID_STR_DLG_START + 8 // FREE @@ -103,11 +103,11 @@ #define STR_NAME_OF_ODBC_DATASOURCE RID_STR_DLG_START + 48 #define STR_MYSQL_DATABASE_NAME RID_STR_DLG_START + 49 #define STR_ORACLE_DATABASE_NAME RID_STR_DLG_START + 50 -#define STR_ADABAS_DATABASE_NAME RID_STR_DLG_START + 51 + // FREE #define STR_MSACCESS_MDB_FILE RID_STR_DLG_START + 52 #define STR_COMMONURL RID_STR_DLG_START + 53 #define STR_DATABASEDEFAULTNAME RID_STR_DLG_START + 54 -#define STR_NO_ADABASE_DATASOURCES RID_STR_DLG_START + 55 + // FREE #define STR_NO_ADDITIONAL_SETTINGS RID_STR_DLG_START + 56 #define STR_HOSTNAME RID_STR_DLG_START + 57 // FREE diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index e2cb7fcf14d1..4e2673f7ab9d 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -104,9 +104,9 @@ #define DLG_QRY_JOIN RID_DIALOG_START + 15 #define WIZ_RTFCOPYTABLE RID_DIALOG_START + 16 #define DLG_REL_PROPERTIES RID_DIALOG_START + 17 -#define DLG_ADABASSTAT RID_DIALOG_START + 18 + // FREE #define DLG_INDEXDESIGN RID_DIALOG_START + 19 -#define DLG_DATABASE_ADABASADMIN RID_DIALOG_START + 20 + // FREE #define DLG_DATABASE_USERADMIN RID_DIALOG_START + 21 #define DLG_DIRECTSQL RID_DIALOG_START + 22 #define DLG_PASSWORD RID_DIALOG_START + 23 @@ -126,7 +126,7 @@ #define PAGE_DBASE RID_PAGE_START + 1 #define PAGE_ODBC RID_PAGE_START + 3 #define PAGE_TEXT RID_PAGE_START + 4 -#define PAGE_ADABAS RID_PAGE_START + 5 + // FREE #define PAGE_CONNECTION RID_PAGE_START + 6 #define PAGE_ADO RID_PAGE_START + 7 #define PAGE_QUERYADMINISTRATION RID_PAGE_START + 8 @@ -134,7 +134,7 @@ #define TAB_WIZ_TYPE_SELECT RID_PAGE_START + 10 #define TAB_WIZ_NAME_MATCHING RID_PAGE_START + 11 #define TAB_WIZ_COPYTABLE RID_PAGE_START + 12 -#define TAB_PAG_ADABAS_SETTINGS RID_PAGE_START + 13 + // FREE // free #define PAGE_LDAP RID_PAGE_START + 15 #define TAB_PAGE_USERADMIN RID_PAGE_START + 16 @@ -161,7 +161,7 @@ #define PAGE_DBWIZARD_TEXT RID_PAGE_START + 42 #define PAGE_DBWIZARD_MSACCESS RID_PAGE_START + 43 #define PAGE_DBWIZARD_LDAP RID_PAGE_START + 44 -#define PAGE_DBWIZARD_ADABAS RID_PAGE_START + 45 + // FREE #define PAGE_DBWIZARD_MYSQL_INTRO RID_PAGE_START + 46 #define PAGE_DBWIZARD_MYSQL_ODBC RID_PAGE_START + 47 #define PAGE_DBWIZARD_ORACLE RID_PAGE_START + 48 diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 921152162b1c..e1c339360c3c 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -85,7 +85,6 @@ private: String m_sRM_TextText; String m_sRM_MSAccessText; String m_sRM_LDAPText; - String m_sRM_ADABASText; String m_sRM_ADOText; String m_sRM_JDBCText; String m_sRM_MySQLNativePageTitle; diff --git a/dbaccess/source/ui/misc/dbumiscres.hrc b/dbaccess/source/ui/misc/dbumiscres.hrc index 81b72e5dda87..3f09360c94ee 100644 --- a/dbaccess/source/ui/misc/dbumiscres.hrc +++ b/dbaccess/source/ui/misc/dbumiscres.hrc @@ -33,7 +33,7 @@ #define STR_MYSQL_ODBC 1 #define STR_MYSQL_JDBC 2 -#define STR_ADABAS 3 +//3 was STR_ADABAS #define STR_ORACLE_JDBC 4 #define STR_JDBC 5 #define STR_ODBC 6 diff --git a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx b/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx deleted file mode 100644 index d5087eb33259..000000000000 --- a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx +++ /dev/null @@ -1,127 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - - -#include "dbu_reghelper.hxx" -#include "AdabasSettingsDlg.hxx" -#include "AdabasStatDlg.hxx" - - -using namespace dbaui; - -extern "C" void SAL_CALL createRegistryInfo_OAdabasSettingsDialog() -{ - static OMultiInstanceAutoRegistration< OAdabasSettingsDialog > aAutoRegistration; -} - -//......................................................................... -namespace dbaui -{ -//......................................................................... - - using namespace ::com::sun::star::uno; - using namespace ::com::sun::star::lang; - using namespace ::com::sun::star::beans; - -//========================================================================= -//------------------------------------------------------------------------- -OAdabasSettingsDialog::OAdabasSettingsDialog(const Reference< XMultiServiceFactory >& _rxORB) - :ODatabaseAdministrationDialog(_rxORB) -{ -} -//------------------------------------------------------------------------- -Sequence<sal_Int8> SAL_CALL OAdabasSettingsDialog::getImplementationId( ) throw(RuntimeException) -{ - static ::cppu::OImplementationId aId; - return aId.getImplementationId(); -} - -//------------------------------------------------------------------------- -Reference< XInterface > SAL_CALL OAdabasSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory) -{ - return *(new OAdabasSettingsDialog(_rxFactory)); -} - -//------------------------------------------------------------------------- -::rtl::OUString SAL_CALL OAdabasSettingsDialog::getImplementationName() throw(RuntimeException) -{ - return getImplementationName_Static(); -} - -//------------------------------------------------------------------------- -::rtl::OUString OAdabasSettingsDialog::getImplementationName_Static() throw(RuntimeException) -{ - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OAdabasSettingsDialog")); -} - -//------------------------------------------------------------------------- -::comphelper::StringSequence SAL_CALL OAdabasSettingsDialog::getSupportedServiceNames() throw(RuntimeException) -{ - return getSupportedServiceNames_Static(); -} - -//------------------------------------------------------------------------- -::comphelper::StringSequence OAdabasSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException) -{ - ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.AdabasAdministrationDialog")); - return aSupported; -} - -//------------------------------------------------------------------------- -Reference<XPropertySetInfo> SAL_CALL OAdabasSettingsDialog::getPropertySetInfo() throw(RuntimeException) -{ - Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); - return xInfo; -} - -//------------------------------------------------------------------------- -::cppu::IPropertyArrayHelper& OAdabasSettingsDialog::getInfoHelper() -{ - return *const_cast<OAdabasSettingsDialog*>(this)->getArrayHelper(); -} - -//------------------------------------------------------------------------------ -::cppu::IPropertyArrayHelper* OAdabasSettingsDialog::createArrayHelper( ) const -{ - Sequence< Property > aProps; - describeProperties(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); -} -//------------------------------------------------------------------------------ -Dialog* OAdabasSettingsDialog::createDialog(Window* _pParent) -{ - OAdabasStatPageDlg* pDlg = new OAdabasStatPageDlg(_pParent, m_pDatasourceItems, m_aContext.getLegacyServiceFactory(),m_aInitialSelection); - return pDlg; -} - -//......................................................................... -} // namespace dbaui -//......................................................................... - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx b/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx deleted file mode 100644 index f102ba02c39d..000000000000 --- a/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _DBAUI_ADABASSETTINGSDLG_HXX -#define _DBAUI_ADABASSETTINGSDLG_HXX - -#ifndef _DBAUI_UNOADMIN_ -#include "unoadmin.hxx" -#endif - -//......................................................................... -namespace dbaui -{ -//......................................................................... -//========================================================================= -//= OAdabasSettingsDialog -//========================================================================= -class OAdabasSettingsDialog - :public ODatabaseAdministrationDialog - ,public ::comphelper::OPropertyArrayUsageHelper< OAdabasSettingsDialog > -{ - -protected: - OAdabasSettingsDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); - -public: - // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); - - // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - - // XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&); - - // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; -protected: -// OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); -}; - -//......................................................................... -} // namespace dbaui -//......................................................................... - -#endif // _DBAUI_ADABASSETTINGSDLG_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |