diff options
49 files changed, 256 insertions, 133 deletions
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 11a9692e2a6f..bd10672d6952 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -21,7 +21,9 @@ #include "apitools.hxx" #include "dbastrings.hrc" #include "module_dba.hxx" +#include "services.hxx" +#include <boost/noncopyable.hpp> #include <tools/debug.hxx> #include <osl/diagnose.h> #include <comphelper/sequence.hxx> @@ -51,12 +53,10 @@ namespace dbaccess /// helper class for column property change events which holds the OComponentDefinition weak typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener > TColumnPropertyListener_BASE; -class OColumnPropertyListener : public TColumnPropertyListener_BASE +class OColumnPropertyListener: + public TColumnPropertyListener_BASE, private boost::noncopyable { OComponentDefinition* m_pComponent; - - OColumnPropertyListener(const OColumnPropertyListener&); - void operator =(const OColumnPropertyListener&); protected: virtual ~OColumnPropertyListener(){} public: diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index ac6b1b84ae7a..8efc22290fb0 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -21,6 +21,7 @@ #include "apitools.hxx" #include "dbastrings.hrc" #include "module_dba.hxx" +#include "services.hxx" #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index af1c8da1c364..33e675ff8f7c 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -19,6 +19,7 @@ #include "dbastrings.hrc" #include "module_dba.hxx" +#include "services.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 5ed028badec2..9270176061c6 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -23,6 +23,7 @@ #include "databasedocument.hxx" #include "dbastrings.hrc" #include "module_dba.hxx" +#include "services.hxx" #include "documenteventexecutor.hxx" #include "databasecontext.hxx" #include "documentcontainer.hxx" diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index 626de4241c2e..56142a313af6 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -27,6 +27,8 @@ #include <tools/urlobj.hxx> #include <unotools/confignode.hxx> +#include <databaseregistrations.hxx> + namespace dbaccess { using ::com::sun::star::uno::Reference; diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 5f18204be4ac..3d653631ddb4 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -19,6 +19,7 @@ #include "datasource.hxx" #include "module_dba.hxx" +#include "services.hxx" #include "userinformation.hxx" #include "commandcontainer.hxx" #include "dbastrings.hrc" diff --git a/dbaccess/source/core/inc/services.hxx b/dbaccess/source/core/inc/services.hxx new file mode 100644 index 000000000000..41fcee709022 --- /dev/null +++ b/dbaccess/source/core/inc/services.hxx @@ -0,0 +1,40 @@ +/* -*- 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_CORE_INC_SERVICES_HXX +#define INCLUDED_DBACCESS_SOURCE_CORE_INC_SERVICES_HXX + +#include <sal/config.h> + +#include <sal/types.h> + +extern "C" { + +void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory(); +void SAL_CALL createRegistryInfo_OCommandDefinition(); +void SAL_CALL createRegistryInfo_OComponentDefinition(); +void SAL_CALL createRegistryInfo_ODatabaseDocument(); +void SAL_CALL createRegistryInfo_ODatabaseSource(); +void SAL_CALL createRegistryInfo_ORowSet(); + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 750ddcd5dcd0..5e2e11bc89e2 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -25,19 +25,12 @@ #include "dbadllapi.hxx" #include <../dataaccess/databasecontext.hxx> +#include <services.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; -// registry functions -extern "C" void SAL_CALL createRegistryInfo_OCommandDefinition(); -extern "C" void SAL_CALL createRegistryInfo_OComponentDefinition(); -extern "C" void SAL_CALL createRegistryInfo_ORowSet(); -extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument(); -extern "C" void SAL_CALL createRegistryInfo_ODatabaseSource(); -extern "C" void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory(); - namespace dba{ ::cppu::ImplementationEntry entries[] = { { diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index e73b33451ca3..332d82987d20 100644 --- a/dbaccess/source/ext/macromigration/dbmm_services.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx @@ -18,12 +18,11 @@ */ #include "dbmm_module.hxx" +#include "macromigrationwizard.hxx" namespace dbmm { - extern void createRegistryInfo_MacroMigrationDialogService(); - static void initializeModule() { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index c5a9766999af..3faefe25d752 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.cxx +++ b/dbaccess/source/ext/macromigration/docinteraction.cxx @@ -53,11 +53,6 @@ namespace dbmm { Reference< XInteractionHandler > xHandler; - InteractionHandler_Data( const Reference< XInteractionHandler >& _rxHandler ) - :xHandler( _rxHandler ) - { - } - InteractionHandler_Data( const Reference<XComponentContext>& _rContext ) :xHandler( ::com::sun::star::task::InteractionHandler::createWithParent(_rContext, 0), UNO_QUERY ) { diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 57397e8e566c..4913bcd737ae 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -20,6 +20,7 @@ #include "dbmm_module.hxx" #include "dbmm_global.hrc" #include "macromigrationdialog.hxx" +#include "macromigrationwizard.hxx" #include <com/sun/star/ucb/AlreadyInitializedException.hpp> #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx new file mode 100644 index 000000000000..3c0bb6c37bbc --- /dev/null +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx @@ -0,0 +1,33 @@ +/* -*- 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_EXT_MACROMIGRATION_MACROMIGRATIONWIZARD_HXX +#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONWIZARD_HXX + +#include <sal/config.h> + +namespace dbmm { + +void createRegistryInfo_MacroMigrationDialogService(); + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index f8c0e3a0d792..fb401c0a2a82 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -785,12 +785,6 @@ namespace dbmm { } - PhaseGuard( ProgressMixer& _rMixer, const PhaseID _nID, const sal_uInt32 _nPhaseRange ) - :m_rMixer( _rMixer ) - { - start( _nID, _nPhaseRange ); - } - ~PhaseGuard() { m_rMixer.endPhase(); diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index e17ec8db756b..82be373b67f6 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -38,13 +38,6 @@ namespace dbmm OUString sOldName; OUString sNewName; - LibraryEntry() - :eType( eBasic ) - ,sOldName() - ,sNewName() - { - } - LibraryEntry( const ScriptType& _eType, const OUString& _rOldName, const OUString& _rNewName ) :eType( _eType ) ,sOldName( _rOldName ) diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index c07d0fd24490..d91b392ce0a6 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -18,6 +18,7 @@ */ #include "flt_reghelper.hxx" +#include "xmlservices.hxx" #include "xmlstrings.hrc" #include <com/sun/star/beans/NamedValue.hpp> diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 36acf9fc2ad7..4471e5897263 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -19,6 +19,7 @@ #include "xmlExport.hxx" #include "xmlAutoStyle.hxx" +#include "xmlservices.hxx" #include "flt_reghelper.hxx" #include <sax/tools/converter.hxx> #include <xmloff/ProgressBarHelper.hxx> diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index f253d60b6c98..ec538fae4d29 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <boost/noncopyable.hpp> #include <config_features.h> #include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> @@ -26,6 +29,7 @@ #include <jvmaccess/virtualmachine.hxx> #endif #include "xmlfilter.hxx" +#include "xmlservices.hxx" #include "flt_reghelper.hxx" #include <vcl/svapp.hxx> #include <vcl/window.hxx> @@ -171,12 +175,12 @@ namespace dbaxml delete this; } - class DatasourceURLListener : public ::cppu::WeakImplHelper1< beans::XPropertyChangeListener > + class DatasourceURLListener: + public cppu::WeakImplHelper1<beans::XPropertyChangeListener>, + private boost::noncopyable { uno::Reference< uno::XComponentContext > m_xContext; ::dbaccess::ODsnTypeCollection m_aTypeCollection; - DatasourceURLListener(const DatasourceURLListener&); - void operator =(const DatasourceURLListener&); protected: virtual ~DatasourceURLListener(){} public: diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index 35b6294190e6..b90a801f22de 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -20,24 +20,13 @@ #include <cppuhelper/factory.hxx> #include <osl/diagnose.h> #include "flt_reghelper.hxx" +#include "xmlservices.hxx" using namespace ::dbaxml; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; - - -// registry functions -extern "C" void SAL_CALL createRegistryInfo_ODBFilter(); -extern "C" void SAL_CALL createRegistryInfo_ODBFilterExport(); -extern "C" void SAL_CALL createRegistryInfo_OSettingsExport(); -extern "C" void SAL_CALL createRegistryInfo_OFullExport(); -extern "C" void SAL_CALL createRegistryInfo_DBContentLoader2(); -extern "C" void SAL_CALL createRegistryInfo_DBTypeDetection(); -extern "C" void SAL_CALL writeDBLoaderInfo2(void* pRegistryKey); - - extern "C" void SAL_CALL createRegistryInfo_dbaxml() { static sal_Bool bInit = sal_False; diff --git a/dbaccess/source/filter/xml/xmlservices.hxx b/dbaccess/source/filter/xml/xmlservices.hxx new file mode 100644 index 000000000000..8176d8c0fb9b --- /dev/null +++ b/dbaccess/source/filter/xml/xmlservices.hxx @@ -0,0 +1,40 @@ +/* -*- 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_FILTER_XML_XMLSERVICES_HXX +#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSERVICES_HXX + +#include <sal/config.h> + +#include <sal/types.h> + +extern "C" { + +void SAL_CALL createRegistryInfo_DBContentLoader2(); +void SAL_CALL createRegistryInfo_DBTypeDetection(); +void SAL_CALL createRegistryInfo_ODBFilter(); +void SAL_CALL createRegistryInfo_ODBFilterExport(); +void SAL_CALL createRegistryInfo_OFullExport(); +void SAL_CALL createRegistryInfo_OSettingsExport(); + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx index 58252ebb98ef..1f700203087e 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.cxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx @@ -18,6 +18,7 @@ */ #include "connectiontools.hxx" +#include "sdbt_services.hxx" #include "tablename.hxx" #include "objectnames.hxx" #include "datasourcemetadata.hxx" diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index ff7f0ce505b9..1e5dc0bac430 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -34,6 +34,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> +#include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> namespace sdbtools @@ -232,7 +233,7 @@ namespace sdbtools }; // NameCheckFactory - class NameCheckFactory + class NameCheckFactory: private boost::noncopyable { public: /** creates an INameValidation instance which can be used to check the existence of query or table names @@ -282,9 +283,6 @@ namespace sdbtools ); private: - NameCheckFactory(); // never implemented - - private: static void verifyCommandType( sal_Int32 _nCommandType ); }; diff --git a/dbaccess/source/sdbtools/inc/sdbt_services.hxx b/dbaccess/source/sdbtools/inc/sdbt_services.hxx new file mode 100644 index 000000000000..a6491e2f5cfc --- /dev/null +++ b/dbaccess/source/sdbtools/inc/sdbt_services.hxx @@ -0,0 +1,31 @@ +/* -*- 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_SDBTOOLS_INC_SDBT_SERVICES_HXX +#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_SDBT_SERVICES_HXX + +#include <sal/config.h> + +#include <sal/types.h> + +extern "C" void SAL_CALL createRegistryInfo_ConnectionTools(); + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index 03eba5f12ac6..55b25fd869c9 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -18,6 +18,7 @@ */ #include "module_sdbt.hxx" +#include "sdbt_services.hxx" using ::com::sun::star::lang::XMultiServiceFactory; using ::com::sun::star::registry::XRegistryKey; @@ -25,8 +26,6 @@ using ::com::sun::star::registry::InvalidRegistryException; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; -extern "C" void SAL_CALL createRegistryInfo_ConnectionTools(); - extern "C" void SAL_CALL sdbt_initializeModule() { static sal_Bool s_bInit = sal_False; diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index e04443262ba9..9493a2cd75a3 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -21,6 +21,7 @@ #include "dbustrings.hrc" #include "advancedsettingsdlg.hxx" #include "subcomponentmanager.hxx" +#include "uiservices.hxx" #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/container/XChild.hpp> diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 0370affdb564..c15c149451dd 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -91,33 +91,6 @@ using ::com::sun::star::ui::XContextMenuInterceptor; namespace DatabaseObject = ::com::sun::star::sdb::application::DatabaseObject; namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition; -class CloseChecker : public ::cppu::WeakImplHelper1< com::sun::star::lang::XEventListener > -{ - bool m_bClosed; - -public: - CloseChecker() - :m_bClosed( false ) - { - } - - virtual ~CloseChecker() - { - } - - bool isClosed() - { - return true; - } - - // interface XEventListener - virtual void SAL_CALL disposing( const EventObject& /*Source*/ ) throw( RuntimeException, std::exception ) SAL_OVERRIDE - { - m_bClosed = true; - } - -}; - void OApplicationController::convertToView(const OUString& _sName) { try diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 272c42f1d035..dcfd8af5bc16 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -19,6 +19,7 @@ #include "dbu_reghelper.hxx" #include "dbustrings.hrc" +#include "uiservices.hxx" #include "UITools.hxx" #include <com/sun/star/container/XChild.hpp> diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index f97c16a8f917..9a450b637fb5 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -18,6 +18,7 @@ */ #include "exsrcbrw.hxx" +#include "uiservices.hxx" #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/form/XGridColumnFactory.hpp> diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 4186ab4bd081..29987bbadad2 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -18,6 +18,7 @@ */ #include "sbagrid.hrc" +#include "uiservices.hxx" #include <svx/svxids.hrc> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 24cfc475a000..a6887b7ca4c6 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -27,6 +27,7 @@ #include "dbu_reghelper.hxx" #include "dbustrings.hrc" #include "dlgsave.hxx" +#include "uiservices.hxx" #include "HtmlReader.hxx" #include "imageprovider.hxx" #include "listviewitems.hxx" diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 9332118a0a36..079bb8f97830 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -18,6 +18,7 @@ */ #include "toolboxcontroller.hxx" +#include "uiservices.hxx" #include <com/sun/star/ui/ImageType.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <toolkit/helper/vclunohelper.hxx> diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index c5e5ca648043..d6f948ab8377 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -87,8 +87,6 @@ namespace dbaui { } - extern sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const OUString& _sAllowedChars); - bool DbaIndexList::EditedEntry( SvTreeListEntry* _pEntry, const OUString& _rNewText ) { // first check if this is valid SQL92 name diff --git a/dbaccess/source/ui/inc/uiservices.hxx b/dbaccess/source/ui/inc/uiservices.hxx new file mode 100644 index 000000000000..d013e7a63f8b --- /dev/null +++ b/dbaccess/source/ui/inc/uiservices.hxx @@ -0,0 +1,59 @@ +/* -*- 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_UISERVICES_HXX +#define INCLUDED_DBACCESS_SOURCE_UI_INC_UISERVICES_HXX + +#include <sal/config.h> + +#include <sal/types.h> + +extern "C" { + +void SAL_CALL createRegistryInfo_ComposerDialogs(); +void SAL_CALL createRegistryInfo_CopyTableWizard(); +void SAL_CALL createRegistryInfo_DBContentLoader(); +void SAL_CALL createRegistryInfo_LimitBoxController(); +void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog(); +void SAL_CALL createRegistryInfo_OBrowser(); +void SAL_CALL createRegistryInfo_OColumnControl(); +void SAL_CALL createRegistryInfo_OColumnControlModel(); +void SAL_CALL createRegistryInfo_ODBApplication(); +void SAL_CALL createRegistryInfo_ODBTypeWizDialog(); +void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup(); +void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog(); +void SAL_CALL createRegistryInfo_ODirectSQLDialog(); +void SAL_CALL createRegistryInfo_OFormGridView(); +void SAL_CALL createRegistryInfo_OInteractionHandler(); +void SAL_CALL createRegistryInfo_OQueryControl(); +void SAL_CALL createRegistryInfo_ORelationControl(); +void SAL_CALL createRegistryInfo_OSQLMessageDialog(); +void SAL_CALL createRegistryInfo_OTableControl(); +void SAL_CALL createRegistryInfo_OTableFilterDialog(); +void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog(); +void SAL_CALL createRegistryInfo_OToolboxController(); +void SAL_CALL createRegistryInfo_OUserSettingsDialog(); +void SAL_CALL createRegistryInfo_OViewControl(); +void SAL_CALL createRegistryInfo_SbaXGridControl(); + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 2a95483dcecb..bff738c6d4f7 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -20,42 +20,13 @@ #include <cppuhelper/factory.hxx> #include <osl/diagnose.h> #include "dbu_reghelper.hxx" +#include "uiservices.hxx" using namespace ::dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::registry; - - -// registry functions -extern "C" void SAL_CALL createRegistryInfo_OTableFilterDialog(); -extern "C" void SAL_CALL createRegistryInfo_ODataSourcePropertyDialog(); -extern "C" void SAL_CALL createRegistryInfo_OSQLMessageDialog(); -extern "C" void SAL_CALL createRegistryInfo_OBrowser(); -extern "C" void SAL_CALL createRegistryInfo_OFormGridView(); -extern "C" void SAL_CALL createRegistryInfo_DBContentLoader(); -extern "C" void SAL_CALL createRegistryInfo_OInteractionHandler(); -extern "C" void SAL_CALL createRegistryInfo_SbaXGridControl(); -extern "C" void SAL_CALL createRegistryInfo_OQueryControl(); -extern "C" void SAL_CALL createRegistryInfo_OViewControl(); -extern "C" void SAL_CALL createRegistryInfo_OTableControl(); -extern "C" void SAL_CALL createRegistryInfo_ORelationControl(); -extern "C" void SAL_CALL createRegistryInfo_ComposerDialogs(); -extern "C" void SAL_CALL createRegistryInfo_ODBApplication(); -extern "C" void SAL_CALL createRegistryInfo_ODirectSQLDialog(); -extern "C" void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog(); -extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialog(); -extern "C" void SAL_CALL createRegistryInfo_OUserSettingsDialog(); -extern "C" void SAL_CALL createRegistryInfo_ODBTypeWizDialogSetup(); -extern "C" void SAL_CALL createRegistryInfo_OColumnControlModel(); -extern "C" void SAL_CALL createRegistryInfo_OColumnControl(); -extern "C" void SAL_CALL createRegistryInfo_OToolboxController(); -extern "C" void SAL_CALL createRegistryInfo_CopyTableWizard(); -extern "C" void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog(); -extern "C" void SAL_CALL createRegistryInfo_LimitBoxController(); - - extern "C" void SAL_CALL createRegistryInfo_DBU() { static sal_Bool bInit = sal_False; diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 3675b3494a66..cb616d4b4f99 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -8,6 +8,7 @@ */ #include "limitboxcontroller.hxx" +#include "uiservices.hxx" #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 22a6b75dccf5..261f687e68f8 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -22,6 +22,7 @@ #include <map> #include "dbu_reghelper.hxx" +#include "uiservices.hxx" #include <sfx2/sfxsids.hrc> #include "dbu_rel.hrc" #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 531e0b7006a7..af8a96dcbd18 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -61,11 +61,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdb; -namespace dbaui -{ - extern OUString GetTypeString( sal_uInt16 nType ); -} - // TYPEINIT1(OTableEditorCtrl, DBView); #define HANDLE_ID 0 diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 0bc7256c0921..a8335de80f01 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -33,6 +33,7 @@ #include "dsmeta.hxx" #include "indexdialog.hxx" #include "sqlmessage.hxx" +#include "uiservices.hxx" #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index f6614bd0fee1..c6d98828b4eb 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include "uiservices.hxx" #include "unoadmin.hxx" #include "dbu_reghelper.hxx" #include "advancedsettingsdlg.hxx" diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index e5dbc9a40bab..a91c0949c3d3 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -20,6 +20,7 @@ #include "ColumnControl.hxx" #include "ColumnPeer.hxx" #include "dbustrings.hrc" +#include "uiservices.hxx" #include "apitools.hxx" #include <com/sun/star/awt/PosSize.hpp> #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index 9247eafacb6a..040717436328 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -18,6 +18,7 @@ */ #include "ColumnModel.hxx" +#include "uiservices.hxx" #include <com/sun/star/awt/FontRelief.hpp> #include <com/sun/star/awt/FontEmphasisMark.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index 230f6b04c985..ef1d0cde8bf0 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -18,6 +18,7 @@ */ #include "dbu_reghelper.hxx" +#include "uiservices.hxx" #include "DBTypeWizDlg.hxx" #include "dbwiz.hxx" #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 130bd126f265..9b030e4c0056 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -18,6 +18,7 @@ */ #include "dbu_reghelper.hxx" +#include "uiservices.hxx" #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/container/XSet.hpp> #include "DBTypeWizDlgSetup.hxx" diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index 6c4594da4367..0a2d346700ff 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -18,6 +18,7 @@ */ #include "dbu_reghelper.hxx" +#include "uiservices.hxx" #include "TableFilterDlg.hxx" #include "TablesSingleDlg.hxx" #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index 79ea8974ef72..4ab1a5fa57db 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -18,6 +18,7 @@ */ #include "dbu_reghelper.hxx" +#include "uiservices.hxx" #include "UserSettingsDlg.hxx" #include "UserAdminDlg.hxx" #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index 6f1a781aaef8..e14a46fcf8ae 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -18,6 +18,7 @@ */ #include "dbu_reghelper.hxx" +#include "uiservices.hxx" #include "admindlg.hxx" #include "dbadmin.hxx" #include <comphelper/processfactory.hxx> diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 4f690a532cb7..da7ac7e00ebf 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -23,6 +23,7 @@ #include "dbustrings.hrc" #include "moduledbu.hxx" #include "sqlmessage.hxx" +#include "uiservices.hxx" #include "WCopyTable.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -210,14 +211,6 @@ namespace dbaui OCopyTableWizard& impl_getDialog_throw(); - /** returns our typed dialog - - @throws ::com::sun::star::uno::RuntimeException - if we don't have a dialog at the moment the method is called - */ - const OCopyTableWizard& - impl_getDialog_throw() const; - /** ensures the given argument sequence contains a valid data access descriptor at the given position @param _rAllArgs the arguments as passed to ->initialize @@ -565,14 +558,6 @@ OCopyTableWizard& CopyTableWizard::impl_getDialog_throw() return *pWizard; } -const OCopyTableWizard& CopyTableWizard::impl_getDialog_throw() const -{ - const OCopyTableWizard* pWizard = dynamic_cast< const OCopyTableWizard* >( m_pDialog ); - if ( !pWizard ) - throw DisposedException( OUString(), *const_cast< CopyTableWizard* >( this ) ); - return *pWizard; -} - void CopyTableWizard::impl_attributesToDialog_nothrow( OCopyTableWizard& _rDialog ) const { // primary key column diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index e8ef525dbd78..2f807f83a6b4 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -18,6 +18,7 @@ */ #include "textconnectionsettings.hxx" +#include "uiservices.hxx" #include "dbu_reghelper.hxx" #include "moduledbu.hxx" #include "apitools.hxx" diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 6ae7c806845e..bc58efbae59e 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include "uiservices.hxx" #include "unoDirectSql.hxx" #include "dbu_reghelper.hxx" #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index a4beaa6a75ea..f13270ee7e73 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -18,6 +18,7 @@ */ #include "sqlmessage.hxx" +#include "uiservices.hxx" #include "unosqlmessage.hxx" #include "dbu_reghelper.hxx" #include "dbustrings.hrc" |