Skip to content

C
core
Kaydet (Commit) 83bf5a7b authored tarafından Ariel Constenla-Haile's avatar Ariel Constenla-Haile
Dosyalara gözat
Seçenekler

Remove dbaui::OStatusbarController 

It actually does not override any method in svt::StatusbarController, so
there is no point in keeping it.
üst 0b373b3e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 154 deletions
dbaccess/source/ui/control/makefile.mk
Dosyayı görüntüle @ 83bf5a7b
......@@ -44,7 +44,6 @@ SRC1FILES = \
# ... exception files .........................
EXCEPTIONSFILES=\
$(SLO)$/statusbarontroller.obj \
$(SLO)$/RelationControl.obj \
$(SLO)$/toolboxcontroller.obj \
$(SLO)$/tabletree.obj \
......
dbaccess/source/ui/control/statusbarontroller.cxx deleted 100644 → 0
Dosyayı görüntüle @ 0b373b3e
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
#include "statusbarontroller.hxx"
#ifndef _DBU_REGHELPER_HXX_
#include "dbu_reghelper.hxx"
#endif
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)
}
dbaccess/source/ui/inc/statusbarontroller.hxx deleted 100644 → 0
Dosyayı görüntüle @ 0b373b3e
/**************************************************************
*
* 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
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*************************************************************/
#ifndef DBAUI_STATUSBARCONTROLLER_HXX
#define DBAUI_STATUSBARCONTROLLER_HXX
#ifndef _SVTOOLS_STATUSBARCONTROLLER_HXX
#include <svtools/statusbarcontroller.hxx>
#endif
#ifndef _COMPHELPER_UNO3_HXX_
#include <comphelper/uno3.hxx>
#endif
#ifndef _DBASHARED_APITOOLS_HXX_
#include "apitools.hxx"
#endif
#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
#include <com/sun/star/lang/XServiceInfo.hpp>
#endif
#ifndef _CPPUHELPER_IMPLBASE1_HXX_
#include <cppuhelper/implbase1.hxx>
#endif
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
dbaccess/source/ui/misc/uiservices.cxx
Dosyayı görüntüle @ 83bf5a7b
......@@ -70,7 +70,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();
......@@ -102,7 +101,6 @@ extern "C" void SAL_CALL createRegistryInfo_DBU()
createRegistryInfo_OColumnControlModel();
createRegistryInfo_OColumnControl();
createRegistryInfo_OToolboxController();
createRegistryInfo_OStatusbarController();
createRegistryInfo_CopyTableWizard();
createRegistryInfo_OTextConnectionSettingsDialog();
bInit = sal_True;
......
dbaccess/util/dbu.component
Dosyayı görüntüle @ 83bf5a7b
......@@ -47,9 +47,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
Dosyayı görüntüle @ 83bf5a7b
......@@ -447,50 +447,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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment