diff options
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/Library_dbu.mk | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/DriverSettings.cxx | 91 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/DriverSettings.hxx | 10 |
3 files changed, 0 insertions, 102 deletions
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index d1b5a53599bb..b8ff06ecbf7f 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -132,7 +132,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/ui/dlg/dlgattr \ dbaccess/source/ui/dlg/dlgsave \ dbaccess/source/ui/dlg/dlgsize \ - dbaccess/source/ui/dlg/DriverSettings \ dbaccess/source/ui/dlg/dsselect \ dbaccess/source/ui/dlg/finteraction \ dbaccess/source/ui/dlg/generalpage \ diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx deleted file mode 100644 index ba388a60c734..000000000000 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ /dev/null @@ -1,91 +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 . - */ - - -#include "DriverSettings.hxx" -#include <dsmeta.hxx> - -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/beans/NamedValue.hpp> - -#include <connectivity/DriversConfig.hxx> - -using ::com::sun::star::uno::Sequence; -using ::com::sun::star::beans::NamedValue; - -using namespace dbaui; -void ODriversSettings::getSupportedIndirectSettings( const OUString& _sURLPrefix,const css::uno::Reference< css::uno::XComponentContext >& _xContext, std::vector< sal_Int32>& _out_rDetailsIds ) -{ - // for a number of settings, we do not need to use hard-coded here, but can ask a - // central DataSourceUI instance. - DataSourceMetaData aMeta( _sURLPrefix ); - const FeatureSet& rFeatures( aMeta.getFeatureSet() ); - for (auto const& feature : rFeatures) - { - _out_rDetailsIds.push_back(feature); - } - - // the rest is configuration-based - // TODO: that's not really true: *everything* is configuration-based nowadays, even the FeatureSet obtained - // from the DataSourceMetaData has been initialized from the configuration. So in fact, we could consolidate - // the two blocks. - // The best approach would be to extend the FeatureSet to contain *all* known data source features, not only - // the ones from the "Advanced settings" UI. - - ::connectivity::DriversConfig aDriverConfig(_xContext); - const ::comphelper::NamedValueCollection& aProperties = aDriverConfig.getProperties(_sURLPrefix); - typedef std::pair<sal_uInt16, OUString> TProperties; - TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,OUString("ShowDeleted")) - ,TProperties(DSID_CHARSET,OUString("CharSet")) - ,TProperties(DSID_FIELDDELIMITER,OUString("FieldDelimiter")) - ,TProperties(DSID_TEXTDELIMITER,OUString("StringDelimiter")) - ,TProperties(DSID_DECIMALDELIMITER,OUString("DecimalDelimiter")) - ,TProperties(DSID_THOUSANDSDELIMITER,OUString("ThousandDelimiter")) - ,TProperties(DSID_TEXTFILEEXTENSION,OUString("Extension")) - ,TProperties(DSID_TEXTFILEHEADER,OUString("HeaderLine")) - ,TProperties(DSID_ADDITIONALOPTIONS,OUString("SystemDriverSettings")) - ,TProperties(DSID_CONN_SHUTSERVICE,OUString("ShutdownDatabase")) - ,TProperties(DSID_CONN_DATAINC,OUString("DataCacheSizeIncrement")) - ,TProperties(DSID_CONN_CACHESIZE,OUString("DataCacheSize")) - ,TProperties(DSID_CONN_CTRLUSER,OUString("ControlUser")) - ,TProperties(DSID_CONN_CTRLPWD,OUString("ControlPassword")) - ,TProperties(DSID_USECATALOG,OUString("UseCatalog")) - ,TProperties(DSID_CONN_SOCKET,OUString("LocalSocket")) - ,TProperties(DSID_NAMED_PIPE,OUString("NamedPipe")) - ,TProperties(DSID_JDBCDRIVERCLASS,OUString("JavaDriverClass")) - ,TProperties(DSID_CONN_LDAP_BASEDN,OUString("BaseDN")) - ,TProperties(DSID_CONN_LDAP_ROWCOUNT,OUString("MaxRowCount")) - ,TProperties(DSID_CONN_LDAP_USESSL,OUString("UseSSL")) - ,TProperties(DSID_IGNORECURRENCY,OUString("IgnoreCurrency")) - ,TProperties(0,OUString()) - }; - // TODO: This mapping between IDs and property names already exists - in ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper. - // Another mapping (which is also duplicated in ODbDataSourceAdministrationHelper) exists in dsmeta.cxx. We should - // consolidate those three places into one. - // However, care has to be taken: We need to distinguish between "features" and "properties" of a data source (resp. driver). - // That is, a driver can support a certain property, but not allow to change it in the UI, which means it would - // not have the respective "feature". - for ( TProperties* pProps = aProps; pProps->first; ++pProps ) - { - if ( aProperties.has(pProps->second) ) - _out_rDetailsIds.push_back(pProps->first); - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 1259f3a987f9..8194bfec03a6 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -33,16 +33,6 @@ namespace dbaui { public: - /** fills the IDs of the settings which are reflected in indirect data source properties - (aka properties in the css.sdb.DataSource.Info sequence) - - @param _eType - The Type of the data source. - @param _out_rDetailsIds - Will be filled. - */ - static void getSupportedIndirectSettings( const OUString& _sURLPrefix,const css::uno::Reference< css::uno::XComponentContext >& _xContext,std::vector< sal_Int32>& _out_rDetailsIds ); - /** Creates the detail page for ado */ static VclPtr<SfxTabPage> CreateDbase( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); |