Author: arielch
Date: Tue May 28 10:01:22 2013
New Revision: 1486844
URL: http://svn.apache.org/r1486844
Log:
Remove dbaui::OStatusbarController
It actually does not override any method in svt::StatusbarController, so
there is no point in keeping it.
Removed:
openoffice/trunk/main/dbaccess/source/ui/control/statusbarontroller.cxx
openoffice/trunk/main/dbaccess/source/ui/inc/statusbarontroller.hxx
Modified:
openoffice/trunk/main/dbaccess/source/ui/control/makefile.mk
openoffice/trunk/main/dbaccess/source/ui/misc/uiservices.cxx
openoffice/trunk/main/dbaccess/util/dbu.component
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
Modified: openoffice/trunk/main/dbaccess/source/ui/control/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/makefile.mk?rev=1486844&r1=1486843&r2=1486844&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/control/makefile.mk (original)
+++ openoffice/trunk/main/dbaccess/source/ui/control/makefile.mk Tue May 28
10:01:22 2013
@@ -44,7 +44,6 @@ SRC1FILES = \
# ... exception files .........................
EXCEPTIONSFILES=\
- $(SLO)$/statusbarontroller.obj \
$(SLO)$/RelationControl.obj \
$(SLO)$/toolboxcontroller.obj \
$(SLO)$/tabletree.obj \
Modified: openoffice/trunk/main/dbaccess/source/ui/misc/uiservices.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/uiservices.cxx?rev=1486844&r1=1486843&r2=1486844&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/source/ui/misc/uiservices.cxx (original)
+++ openoffice/trunk/main/dbaccess/source/ui/misc/uiservices.cxx Tue May 28
10:01:22 2013
@@ -70,7 +70,6 @@ extern "C" void SAL_CALL createRegistryI
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 createRegistryI
createRegistryInfo_OColumnControlModel();
createRegistryInfo_OColumnControl();
createRegistryInfo_OToolboxController();
- createRegistryInfo_OStatusbarController();
createRegistryInfo_CopyTableWizard();
createRegistryInfo_OTextConnectionSettingsDialog();
bInit = sal_True;
Modified: openoffice/trunk/main/dbaccess/util/dbu.component
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/util/dbu.component?rev=1486844&r1=1486843&r2=1486844&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/util/dbu.component (original)
+++ openoffice/trunk/main/dbaccess/util/dbu.component Tue May 28 10:01:22 2013
@@ -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>
Modified:
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu?rev=1486844&r1=1486843&r2=1486844&view=diff
==============================================================================
---
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
(original)
+++
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
Tue May 28 10:01:22 2013
@@ -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>
