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 83bf5a7b)

Conflicts:
	dbaccess/source/ui/control/makefile.mk
	dbaccess/source/ui/control/statusbarontroller.cxx
	dbaccess/source/ui/inc/statusbarontroller.hxx

Change-Id: Id6adc11c3a54f642ebdec9c6016996134908da71

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 \

dbaccess/source/ui/control/statusbarontroller.cxx

-/* -*- 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: */

dbaccess/source/ui/inc/statusbarontroller.hxx

-/* -*- 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: */

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();

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>

officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu

@@ -596,50 +596,6 @@
       </node>
     </node>
     <node oor:name="StatusBar">
-      <node oor:name="c1" oor:op="replace">
-        <prop oor:name="Command">
-          <value>.uno:DBStatusType</value>
-        </prop>
-        <prop oor:name="Module">
-          <value>com.sun.star.sdb.OfficeDatabaseDocument</value>
-        </prop>
-        <prop oor:name="Controller">
-          <value>com.sun.star.sdb.ApplicationStatusbarController</value>
-        </prop>
-      </node>
-      <node oor:name="c2" oor:op="replace">
-        <prop oor:name="Command">
-          <value>.uno:DBStatusDBName</value>
-        </prop>
-        <prop oor:name="Module">
-          <value>com.sun.star.sdb.OfficeDatabaseDocument</value>
-        </prop>
-        <prop oor:name="Controller">
-          <value>com.sun.star.sdb.ApplicationStatusbarController</value>
-        </prop>
-      </node>
-      <node oor:name="c3" oor:op="replace">
-        <prop oor:name="Command">
-          <value>.uno:DBStatusUserName</value>
-        </prop>
-        <prop oor:name="Module">
-          <value>com.sun.star.sdb.OfficeDatabaseDocument</value>
-        </prop>
-        <prop oor:name="Controller">
-          <value>com.sun.star.sdb.ApplicationStatusbarController</value>
-        </prop>
-      </node>
-      <node oor:name="c4" oor:op="replace">
-        <prop oor:name="Command">
-          <value>.uno:DBStatusHostName</value>
-        </prop>
-        <prop oor:name="Module">
-          <value>com.sun.star.sdb.OfficeDatabaseDocument</value>
-        </prop>
-        <prop oor:name="Controller">
-          <value>com.sun.star.sdb.ApplicationStatusbarController</value>
-        </prop>
-      </node>
       <node oor:name="c5" oor:op="replace">
         <prop oor:name="Command">
           <value>.uno:LanguageStatus</value>