diff options
author | Ariel Constenla-Haile <arielch@apache.org> | 2013-05-28 10:01:22 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-24 11:25:34 +0100 |
commit | 53ef9fa167cc68969cdc953b4c0b9ad339f2d27e (patch) | |
tree | e8e83d8587c1d3cad495d46ee85acbb1d297f0d0 /dbaccess | |
parent | 57207cab004cb78c3fa6d9ed43cc4bf81f4e6981 (diff) |
Remove dbaui::OStatusbarController
It actually does not override any method in svt::StatusbarController, so there
is no point in keeping it
(cherry picked from commit 83bf5a7b85a0e3430cc807415e081a10a1775f9f)
Conflicts:
dbaccess/source/ui/control/makefile.mk
dbaccess/source/ui/control/statusbarontroller.cxx
dbaccess/source/ui/inc/statusbarontroller.hxx
Change-Id: Id6adc11c3a54f642ebdec9c6016996134908da71
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/Library_dbu.mk | 1 | ||||
-rw-r--r-- | dbaccess/source/ui/control/statusbarontroller.cxx | 40 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/statusbarontroller.hxx | 45 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/uiservices.cxx | 2 | ||||
-rw-r--r-- | dbaccess/util/dbu.component | 3 |
5 files changed, 0 insertions, 91 deletions
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index d2e928504d69..fa7211bd822d 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -116,7 +116,6 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\ dbaccess/source/ui/control/ScrollHelper \ dbaccess/source/ui/control/sqledit \ dbaccess/source/ui/control/SqlNameEdit \ - dbaccess/source/ui/control/statusbarontroller \ dbaccess/source/ui/control/TableGrantCtrl \ dbaccess/source/ui/control/tabletree \ dbaccess/source/ui/control/toolboxcontroller \ diff --git a/dbaccess/source/ui/control/statusbarontroller.cxx b/dbaccess/source/ui/control/statusbarontroller.cxx deleted file mode 100644 index c2c84ef83377..000000000000 --- a/dbaccess/source/ui/control/statusbarontroller.cxx +++ /dev/null @@ -1,40 +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 "statusbarontroller.hxx" -#include "dbu_reghelper.hxx" - -extern "C" void SAL_CALL createRegistryInfo_OStatusbarController() -{ - static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OStatusbarController> aAutoRegistration; -} -namespace dbaui -{ - using namespace svt; - using namespace com::sun::star::uno; - using namespace com::sun::star::beans; - using namespace com::sun::star::lang; - using namespace ::com::sun::star::frame; - using namespace ::com::sun::star::util; - - IMPLEMENT_SERVICE_INFO1_STATIC(OStatusbarController,"com.sun.star.sdb.ApplicationStatusbarController","com.sun.star.frame.StatusbarController") - IMPLEMENT_FORWARD_XINTERFACE2(OStatusbarController,StatusbarController,OStatusbarController_BASE) -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/statusbarontroller.hxx b/dbaccess/source/ui/inc/statusbarontroller.hxx deleted file mode 100644 index ecd10e9ea9fe..000000000000 --- a/dbaccess/source/ui/inc/statusbarontroller.hxx +++ /dev/null @@ -1,45 +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 DBAUI_STATUSBARCONTROLLER_HXX -#define DBAUI_STATUSBARCONTROLLER_HXX - -#include <svtools/statusbarcontroller.hxx> -#include <comphelper/uno3.hxx> -#include "apitools.hxx" -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase1.hxx> - -namespace dbaui -{ - typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XServiceInfo> OStatusbarController_BASE; - class OStatusbarController : public ::svt::StatusbarController, - public OStatusbarController_BASE - { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; - public: - OStatusbarController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB):m_xORB(_rxORB){} - - DECLARE_XINTERFACE() - // ::com::sun::star::lang::XServiceInfo - DECLARE_SERVICE_INFO_STATIC(); - }; -} -#endif // DBAUI_STATUSBARCONTROLLER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 40c3a7a80262..766e38ad43c9 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -54,7 +54,6 @@ 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_OStatusbarController(); extern "C" void SAL_CALL createRegistryInfo_CopyTableWizard(); extern "C" void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog(); extern "C" void SAL_CALL createRegistryInfo_LimitBoxController(); @@ -87,7 +86,6 @@ extern "C" void SAL_CALL createRegistryInfo_DBU() createRegistryInfo_OColumnControlModel(); createRegistryInfo_OColumnControl(); createRegistryInfo_OToolboxController(); - createRegistryInfo_OStatusbarController(); createRegistryInfo_CopyTableWizard(); createRegistryInfo_OTextConnectionSettingsDialog(); createRegistryInfo_LimitBoxController(); diff --git a/dbaccess/util/dbu.component b/dbaccess/util/dbu.component index afd9002407bd..73b65a1c46a4 100644 --- a/dbaccess/util/dbu.component +++ b/dbaccess/util/dbu.component @@ -42,9 +42,6 @@ <implementation name="com.sun.star.comp.sdb.DirectSQLDialog"> <service name="org.openoffice.comp.dbu.DirectSqlDialog"/> </implementation> - <implementation name="com.sun.star.sdb.ApplicationStatusbarController"> - <service name="com.sun.star.frame.StatusbarController"/> - </implementation> <implementation name="com.sun.star.sdb.ApplicationToolboxController"> <service name="com.sun.star.frame.ToolboxController"/> </implementation> |