diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-08 11:06:03 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-08 20:26:10 +0200 |
commit | d29a314300d523d29ed894f1822227497fcb68f8 (patch) | |
tree | 98eaa8e88ee29a030f34610d7bd62f7a6b037a9e /dbaccess/source/ui/inc | |
parent | cf389f2c242b82417c3c746b6a68e38d637b5101 (diff) |
dbaccess: create instances with uno constructors
See tdf#74608 for motivation
Change-Id: Ib03014444d8176417cbd00b56764ee45fdad557c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98322
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess/source/ui/inc')
-rw-r--r-- | dbaccess/source/ui/inc/RelationController.hxx | 7 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/TableController.hxx | 7 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/exsrcbrw.hxx | 7 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/querycontroller.hxx | 7 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/sbagrid.hxx | 7 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/uiservices.hxx | 55 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/unodatbr.hxx | 8 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/unosqlmessage.hxx | 10 |
8 files changed, 1 insertions, 107 deletions
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index d8901f8e91a1..b358da57541c 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -61,13 +61,6 @@ namespace dbaui // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override; - // need by registration - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static(); - /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > - Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // OJoinController overridables virtual bool allowViews() const override; diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 6e3192b6cd1a..41643d95b240 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -119,13 +119,6 @@ namespace dbaui // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override; - // need by registration - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static(); - /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > - Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); private: void startTableListening(); diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index 12333d3ef434..6a480d7238b1 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -43,13 +43,6 @@ namespace dbaui public: SbaExternalSourceBrowser(const css::uno::Reference< css::uno::XComponentContext >& _rM); - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static(); - /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > - Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); - // UNO DECLARE_UNO3_DEFAULTS(SbaExternalSourceBrowser, SbaXDataBrowserController) virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& _rType) override; diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index c3988baac8ae..dae1bffe9013 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -169,13 +169,6 @@ namespace dbaui virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() override; - // need by registration - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static(); - /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > - Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // XController virtual css::uno::Any SAL_CALL getViewData() override; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 30fb9fa73112..4e6e30e3cfef 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -72,13 +72,6 @@ namespace dbaui // css::lang::XServiceInfo OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; - // need by registration - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static(); - /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > - Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); // css::frame::XDispatch virtual void SAL_CALL dispatch(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) override; diff --git a/dbaccess/source/ui/inc/uiservices.hxx b/dbaccess/source/ui/inc/uiservices.hxx deleted file mode 100644 index da225602a0d4..000000000000 --- a/dbaccess/source/ui/inc/uiservices.hxx +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_UISERVICES_HXX -#define INCLUDED_DBACCESS_SOURCE_UI_INC_UISERVICES_HXX - -#include <sal/config.h> - -extern "C" { - -void createRegistryInfo_ComposerDialogs(); -void createRegistryInfo_CopyTableWizard(); -void createRegistryInfo_DBContentLoader(); -void createRegistryInfo_LimitBoxController(); -void createRegistryInfo_OAdvancedSettingsDialog(); -void createRegistryInfo_OBrowser(); -void createRegistryInfo_OColumnControl(); -void createRegistryInfo_OColumnControlModel(); -void createRegistryInfo_ODBApplication(); -void createRegistryInfo_ODBTypeWizDialog(); -void createRegistryInfo_ODBTypeWizDialogSetup(); -void createRegistryInfo_ODataSourcePropertyDialog(); -void createRegistryInfo_ODirectSQLDialog(); -void createRegistryInfo_OFormGridView(); -void createRegistryInfo_OInteractionHandler(); -void createRegistryInfo_OQueryControl(); -void createRegistryInfo_ORelationControl(); -void createRegistryInfo_OSQLMessageDialog(); -void createRegistryInfo_OTableControl(); -void createRegistryInfo_OTableFilterDialog(); -void createRegistryInfo_OTextConnectionSettingsDialog(); -void createRegistryInfo_OUserSettingsDialog(); -void createRegistryInfo_OViewControl(); -void createRegistryInfo_SbaXGridControl(); -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 6ea21d08b52c..498b634f2575 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -131,14 +131,6 @@ namespace dbaui */ static sal_Int32 getDatabaseObjectType( EntryType _eType ); - // need by registration - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static(); - /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static css::uno::Reference< css::uno::XInterface > - Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); - DECLARE_UNO3_DEFAULTS(SbaTableQueryBrowser,SbaXDataBrowserController) // late construction virtual bool Construct(vcl::Window* pParent) override; diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index b4d9fd279d83..bda4cbf23b90 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -37,9 +37,9 @@ class OSQLMessageDialog final OUString m_sHelpURL; // </properties> +public: OSQLMessageDialog(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); -public: // XTypeProvider virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override; @@ -47,14 +47,6 @@ public: virtual OUString SAL_CALL getImplementationName() override; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; - // XServiceInfo - static methods - /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static(); - static css::uno::Reference< css::uno::XInterface > - Create(const css::uno::Reference< css::lang::XMultiServiceFactory >&); - // XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; |