Author: arielch
Date: Thu Dec 6 13:30:14 2012
New Revision: 1417857
URL: http://svn.apache.org/viewvc?rev=1417857&view=rev
Log:
#i121442# - Remove unused UNO StatusbarControllers
Removed:
openoffice/trunk/main/framework/inc/uielement/logoimagestatusbarcontroller.hxx
openoffice/trunk/main/framework/inc/uielement/logotextstatusbarcontroller.hxx
openoffice/trunk/main/framework/inc/uielement/simpletextstatusbarcontroller.hxx
openoffice/trunk/main/framework/source/uielement/logoimagestatusbarcontroller.cxx
openoffice/trunk/main/framework/source/uielement/logotextstatusbarcontroller.cxx
openoffice/trunk/main/framework/source/uielement/simpletextstatusbarcontroller.cxx
Modified:
openoffice/trunk/main/framework/Library_fwl.mk
openoffice/trunk/main/framework/inc/classes/resource.hrc
openoffice/trunk/main/framework/inc/services.h
openoffice/trunk/main/framework/source/classes/resource.src
openoffice/trunk/main/framework/source/register/registerservices.cxx
openoffice/trunk/main/framework/source/register/registertemp.cxx
openoffice/trunk/main/framework/util/fwl.component
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
Modified: openoffice/trunk/main/framework/Library_fwl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/Library_fwl.mk?rev=1417857&r1=1417856&r2=1417857&view=diff
==============================================================================
--- openoffice/trunk/main/framework/Library_fwl.mk (original)
+++ openoffice/trunk/main/framework/Library_fwl.mk Thu Dec 6 13:30:14 2012
@@ -71,12 +71,9 @@ $(eval $(call gb_Library_add_exception_o
framework/source/uielement/footermenucontroller \
framework/source/uielement/headermenucontroller \
framework/source/uielement/langselectionmenucontroller \
- framework/source/uielement/logoimagestatusbarcontroller \
- framework/source/uielement/logotextstatusbarcontroller \
framework/source/uielement/macrosmenucontroller \
framework/source/uielement/newmenucontroller \
framework/source/uielement/popupmenucontroller \
- framework/source/uielement/simpletextstatusbarcontroller \
framework/source/uielement/toolbarsmenucontroller \
))
Modified: openoffice/trunk/main/framework/inc/classes/resource.hrc
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/inc/classes/resource.hrc?rev=1417857&r1=1417856&r2=1417857&view=diff
==============================================================================
--- openoffice/trunk/main/framework/inc/classes/resource.hrc (original)
+++ openoffice/trunk/main/framework/inc/classes/resource.hrc Thu Dec 6
13:30:14 2012
@@ -37,7 +37,7 @@
#define STR_SAVECOPYDOC
(RID_STR_START+5)
#define STR_NODOCUMENT (RID_STR_START+6)
#define STR_TOOLBAR_TITLE_ADDON (RID_STR_START+7)
-#define STR_STATUSBAR_LOGOTEXT (RID_STR_START+8)
+
#define STR_FULL_DISC_RETRY_BUTTON (RID_STR_START+9) // used by
AuotSave to show error state: full disc
#define STR_FULL_DISC_MSG (RID_STR_START+10) // used by
AuotSave to show error state: full disc
#define STR_RESTORE_TOOLBARS (RID_STR_START+11)
@@ -64,8 +64,6 @@
#define MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION 5
#define MENUITEM_TOOLBAR_CLOSE 6
-#define RID_IMAGE_STATUSBAR_LOGO (RID_IMAGE_START+0)
-
// License Dialog
#define DLG_LICENSE (RID_FWK_DIALOG_START+256)
#define ML_LICENSE (RID_FWK_DIALOG_START+11)
Modified: openoffice/trunk/main/framework/inc/services.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/inc/services.h?rev=1417857&r1=1417856&r2=1417857&view=diff
==============================================================================
--- openoffice/trunk/main/framework/inc/services.h (original)
+++ openoffice/trunk/main/framework/inc/services.h Thu Dec 6 13:30:14 2012
@@ -195,13 +195,10 @@ namespace framework{
#define IMPLEMENTATIONNAME_SESSIONLISTENER
DECLARE_ASCII("com.sun.star.comp.frame.SessionListener" )
#define IMPLEMENTATIONNAME_HELPONSTARTUP
DECLARE_ASCII("com.sun.star.comp.framework.HelpOnStartup" )
#define IMPLEMENTATIONNAME_SHELLJOB
DECLARE_ASCII("com.sun.star.comp.framework.ShellJob" )
-#define IMPLEMENTATIONNAME_LOGOIMAGESTATUSBARCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.LogoImageStatusbarController" )
-#define IMPLEMENTATIONNAME_LOGOTEXTSTATUSBARCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.LogoTextStatusbarController" )
#define IMPLEMENTATIONNAME_FWK_TASKCREATOR
DECLARE_ASCII("com.sun.star.comp.framework.TaskCreator" )
#define IMPLEMENTATIONNAME_TABWINFACTORY
DECLARE_ASCII("com.sun.star.comp.framework.TabWindowFactory"
)
#define IMPLEMENTATIONNAME_TABWINDOW
DECLARE_ASCII("com.sun.star.comp.framework.TabWindow"
)
#define IMPLEMENTATIONNAME_SYSTEMEXEC
DECLARE_ASCII("com.sun.star.comp.framework.SystemExecute" )
-#define IMPLEMENTATIONNAME_SIMPLETEXTSTATUSBARCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.SimpleTextStatusbarController" )
#define IMPLEMENTATIONNAME_URIABBREVIATION
DECLARE_ASCII("com.sun.star.comp.framework.UriAbbreviation" )
#define IMPLEMENTATIONNAME_POPUPMENUDISPATCHER
DECLARE_ASCII("com.sun.star.comp.framework.PopupMenuControllerDispatcher" )
#define IMPLEMENTATIONNAME_LANGSELECTIONSTATUSBARCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.LangSelectionStatusbarController" )
Modified: openoffice/trunk/main/framework/source/classes/resource.src
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/classes/resource.src?rev=1417857&r1=1417856&r2=1417857&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/classes/resource.src (original)
+++ openoffice/trunk/main/framework/source/classes/resource.src Thu Dec 6
13:30:14 2012
@@ -128,11 +128,6 @@ String STR_TOOLBAR_TITLE_ADDON
Text [ en-US ] = "Add-On %num%";
};
-String STR_STATUSBAR_LOGOTEXT
-{
- Text [ en-US ] = "A %PRODUCTNAME product by Oracle";
-};
-
// ***********************************************************************
// License Dialog
// ***********************************************************************
@@ -285,12 +280,6 @@ ModalDialog DLG_LICENSE
};
-Image RID_IMAGE_STATUSBAR_LOGO
-{
- ImageBitmap = Bitmap { File = "logo.png" ; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
-};
-
String STR_FULL_DISC_RETRY_BUTTON
{
Text [ en-US ] = "Retry" ;
Modified: openoffice/trunk/main/framework/source/register/registerservices.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/register/registerservices.cxx?rev=1417857&r1=1417856&r2=1417857&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/register/registerservices.cxx
(original)
+++ openoffice/trunk/main/framework/source/register/registerservices.cxx Thu
Dec 6 13:30:14 2012
@@ -93,11 +93,8 @@
#include <uifactory/statusbarfactory.hxx>
#include <uiconfiguration/uicategorydescription.hxx>
#include <services/sessionlistener.hxx>
-//#include <uielement/logoimagestatusbarcontroller.hxx>
-//#include <uielement/logotextstatusbarcontroller.hxx>
//#include <uielement/newmenucontroller.hxx>
#include <services/taskcreatorsrv.hxx>
-//#include <uielement/simpletextstatusbarcontroller.hxx>
//#include <services/uriabbreviation.hxx>
#include <uielement/langselectionstatusbarcontroller.hxx>
@@ -154,11 +151,8 @@ COMPONENTGETFACTORY ( IFFACTORY( ::frame
IFFACTORY( ::framework::SessionListener
) else
IFFACTORY(
::framework::StatusbarControllerFactory ) else
IFFACTORY( ::framework::SessionListener
) else
- //IFFACTORY( ::framework::LogoImageStatusbarController
) else
- //IFFACTORY( ::framework::LogoTextStatusbarController
) else
IFFACTORY( ::framework::TaskCreatorService
) else
//IFFACTORY(
::framework::NewMenuController ) else
- //IFFACTORY(
::framework::SimpleTextStatusbarController ) else
//IFFACTORY( ::framework::UriAbbreviation
) else
//IFFACTORY( ::framework::PopupMenuDispatcher
) else
IFFACTORY( ::framework::ImageManager
) else
Modified: openoffice/trunk/main/framework/source/register/registertemp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/register/registertemp.cxx?rev=1417857&r1=1417856&r2=1417857&view=diff
==============================================================================
--- openoffice/trunk/main/framework/source/register/registertemp.cxx (original)
+++ openoffice/trunk/main/framework/source/register/registertemp.cxx Thu Dec 6
13:30:14 2012
@@ -58,9 +58,6 @@
#include <recording/dispatchrecordersupplier.hxx>
#include <services/license.hxx>
#include <services/uriabbreviation.hxx>
-#include <uielement/simpletextstatusbarcontroller.hxx>
-#include <uielement/logoimagestatusbarcontroller.hxx>
-#include <uielement/logotextstatusbarcontroller.hxx>
#include <uielement/fontmenucontroller.hxx>
#include <uielement/fontsizemenucontroller.hxx>
#include <uielement/footermenucontroller.hxx>
@@ -76,14 +73,11 @@ COMPONENTGETIMPLEMENTATIONENVIRONMENT
COMPONENTGETFACTORY ( IFFACTORY(
::framework::MediaTypeDetectionHelper )
IFFACTORY(
::framework::MailToDispatcher ) else
IFFACTORY( ::framework::ServiceHandler
) else
- IFFACTORY( ::framework::LogoTextStatusbarController
) else
- IFFACTORY( ::framework::LogoImageStatusbarController
) else
IFFACTORY( ::framework::License
) else
IFFACTORY( ::framework::PopupMenuDispatcher
) else
IFFACTORY( ::framework::DispatchHelper
) else
IFFACTORY( ::framework::DispatchRecorder
) else
IFFACTORY( ::framework::DispatchRecorderSupplier
) else
- IFFACTORY( ::framework::SimpleTextStatusbarController
) else
IFFACTORY( ::framework::ToolbarsMenuController
) else
IFFACTORY( ::framework::FontMenuController
) else
IFFACTORY( ::framework::MacrosMenuController
) else
Modified: openoffice/trunk/main/framework/util/fwl.component
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/util/fwl.component?rev=1417857&r1=1417856&r2=1417857&view=diff
==============================================================================
--- openoffice/trunk/main/framework/util/fwl.component (original)
+++ openoffice/trunk/main/framework/util/fwl.component Thu Dec 6 13:30:14 2012
@@ -48,12 +48,6 @@
<implementation name="com.sun.star.comp.framework.License">
<service name="com.sun.star.task.Job"/>
</implementation>
- <implementation
name="com.sun.star.comp.framework.LogoImageStatusbarController">
- <service name="com.sun.star.frame.StatusbarController"/>
- </implementation>
- <implementation
name="com.sun.star.comp.framework.LogoTextStatusbarController">
- <service name="com.sun.star.frame.StatusbarController"/>
- </implementation>
<implementation name="com.sun.star.comp.framework.MacrosMenuController">
<service name="com.sun.star.frame.PopupMenuController"/>
</implementation>
@@ -78,9 +72,6 @@
<implementation name="com.sun.star.comp.framework.ServiceHandler">
<service name="com.sun.star.frame.ProtocolHandler"/>
</implementation>
- <implementation
name="com.sun.star.comp.framework.SimpleTextStatusbarController">
- <service name="com.sun.star.frame.StatusbarController"/>
- </implementation>
<implementation name="com.sun.star.comp.framework.ToolBarsMenuController">
<service name="com.sun.star.frame.PopupMenuController"/>
</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=1417857&r1=1417856&r2=1417857&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
Thu Dec 6 13:30:14 2012
@@ -459,28 +459,6 @@
</prop>
</node>
<node oor:name="c5" oor:op="replace">
- <prop oor:name="Command">
- <value>.uno:StatusbarLogo</value>
- </prop>
- <prop oor:name="Module">
- <value/>
- </prop>
- <prop oor:name="Controller">
-
<value>com.sun.star.comp.framework.LogoImageStatusbarController</value>
- </prop>
- </node>
- <node oor:name="c6" oor:op="replace">
- <prop oor:name="Command">
- <value>.uno:StatusbarLogoText</value>
- </prop>
- <prop oor:name="Module">
- <value/>
- </prop>
- <prop oor:name="Controller">
-
<value>com.sun.star.comp.framework.LogoTextStatusbarController</value>
- </prop>
- </node>
- <node oor:name="c7" oor:op="replace">
<prop oor:name="Command">
<value>.uno:LanguageStatus</value>
</prop>
