diff options
| -rw-r--r-- | framework/Library_fwl.mk | 3 | ||||
| -rw-r--r-- | framework/inc/classes/resource.hrc | 4 | ||||
| -rw-r--r-- | framework/inc/services.h | 3 | ||||
| -rw-r--r-- | framework/inc/uielement/logoimagestatusbarcontroller.hxx | 84 | ||||
| -rw-r--r-- | framework/inc/uielement/logotextstatusbarcontroller.hxx | 84 | ||||
| -rw-r--r-- | framework/inc/uielement/simpletextstatusbarcontroller.hxx | 86 | ||||
| -rw-r--r-- | framework/source/classes/resource.src | 11 | ||||
| -rw-r--r-- | framework/source/register/registerservices.cxx | 6 | ||||
| -rw-r--r-- | framework/source/register/registertemp.cxx | 6 | ||||
| -rw-r--r-- | framework/source/uielement/logoimagestatusbarcontroller.cxx | 173 | ||||
| -rw-r--r-- | framework/source/uielement/logotextstatusbarcontroller.cxx | 176 | ||||
| -rw-r--r-- | framework/source/uielement/simpletextstatusbarcontroller.cxx | 192 | ||||
| -rw-r--r-- | framework/util/fwl.component | 9 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 22 |
14 files changed, 1 insertions, 858 deletions
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index f8184c04c187..04aa70798a3b 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -71,12 +71,9 @@ $(eval $(call gb_Library_add_exception_objects,fwl,\ 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 \ )) diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc index d56d9b8f69f2..e5720ed99ecd 100644 --- a/framework/inc/classes/resource.hrc +++ b/framework/inc/classes/resource.hrc @@ -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) diff --git a/framework/inc/services.h b/framework/inc/services.h index 98de5afbac06..667a40ac7876 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -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" ) diff --git a/framework/inc/uielement/logoimagestatusbarcontroller.hxx b/framework/inc/uielement/logoimagestatusbarcontroller.hxx deleted file mode 100644 index 65446bae4d45..000000000000 --- a/framework/inc/uielement/logoimagestatusbarcontroller.hxx +++ /dev/null @@ -1,84 +0,0 @@ -/************************************************************** - * - * 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 __FRAMEWORK_UIELEMENT_LOGOIMAGESTATUSBARCONTROLLER_HXX_ -#define __FRAMEWORK_UIELEMENT_LOGOIMAGESTATUSBARCONTROLLER_HXX_ - -#include <macros/generic.hxx> -#include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> -#include <macros/xserviceinfo.hxx> -#include <stdtypes.h> -#include <svtools/statusbarcontroller.hxx> -#include <vcl/image.hxx> - -namespace framework -{ - -class LogoImageStatusbarController : public svt::StatusbarController -{ - public: - LogoImageStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); - virtual ~LogoImageStatusbarController(); - - // XServiceInfo - DECLARE_XSERVICEINFO - - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); - - // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - - // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); - - // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusbarController - virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); - - private: - Image m_aLogoImage; -}; - -} - -#endif // __FRAMEWORK_UIELEMENT_LOGOIMAGESTATUSBARCONTROLLER_HXX_ diff --git a/framework/inc/uielement/logotextstatusbarcontroller.hxx b/framework/inc/uielement/logotextstatusbarcontroller.hxx deleted file mode 100644 index 7b0490f6c775..000000000000 --- a/framework/inc/uielement/logotextstatusbarcontroller.hxx +++ /dev/null @@ -1,84 +0,0 @@ -/************************************************************** - * - * 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 __FRAMEWORK_UIELEMENT_LOGOTEXTSTATUSBARCONTROLLER_HXX_ -#define __FRAMEWORK_UIELEMENT_LOGOTEXTSTATUSBARCONTROLLER_HXX_ - -#include <macros/generic.hxx> -#include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> -#include <macros/xserviceinfo.hxx> -#include <stdtypes.h> -#include <svtools/statusbarcontroller.hxx> -#include <vcl/image.hxx> - -namespace framework -{ - -class LogoTextStatusbarController : public svt::StatusbarController -{ - public: - LogoTextStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); - virtual ~LogoTextStatusbarController(); - - // XServiceInfo - DECLARE_XSERVICEINFO - - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); - - // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - - // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); - - // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusbarController - virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); - - private: - rtl::OUString m_aLogoText; -}; - -} - -#endif // __FRAMEWORK_UIELEMENT_LOGOTEXTSTATUSBARCONTROLLER_HXX_ diff --git a/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx deleted file mode 100644 index 831eb7f7ca75..000000000000 --- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************** - * - * 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 __FRAMEWORK_UIELEMENT_SIMPLETEXTSTATUSBARCONTROLLER_HXX_ -#define __FRAMEWORK_UIELEMENT_SIMPLETEXTSTATUSBARCONTROLLER_HXX_ - -#include <macros/generic.hxx> -#include <macros/xinterface.hxx> -#include <macros/xtypeprovider.hxx> -#include <macros/xserviceinfo.hxx> -#include <stdtypes.h> - -#include <hash_map> -#include <svtools/statusbarcontroller.hxx> -#include <vcl/image.hxx> - -namespace framework -{ - -class SimpleTextStatusbarController : public svt::StatusbarController -{ - public: - SimpleTextStatusbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager ); - virtual ~SimpleTextStatusbarController(); - - // XServiceInfo - DECLARE_XSERVICEINFO - - // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); - - // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - - // XComponent - virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException ); - - // XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ); - - // XStatusbarController - virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nItemId, ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException); - - private: - rtl::OUString m_aText; -}; - -} - -#endif // __FRAMEWORK_UIELEMENT_SIMPLETEXTSTATUSBARCONTROLLER_HXX_ diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 6e039c7f6356..ae17e6a6a576 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -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" ; diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index cfedc3319ad5..d8cfd95c1eff 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -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( ::framework::URLTransformer 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 diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index 517d3f09445f..7221950a7924 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -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 diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx deleted file mode 100644 index d6dc5606fbb5..000000000000 --- a/framework/source/uielement/logoimagestatusbarcontroller.cxx +++ /dev/null @@ -1,173 +0,0 @@ -/************************************************************** - * - * 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_framework.hxx" -#include <uielement/logoimagestatusbarcontroller.hxx> -#include <classes/fwlresid.hxx> -#include <services.h> -#include <classes/resource.hrc> -#include <vos/mutex.hxx> -#include <vcl/svapp.hxx> -#include <vcl/window.hxx> -#include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> -#endif -#include <toolkit/helper/convert.hxx> - -using namespace ::rtl; -using namespace ::cppu; -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; - -namespace framework -{ - -DEFINE_XSERVICEINFO_MULTISERVICE ( LogoImageStatusbarController , - OWeakObject , - SERVICENAME_STATUSBARCONTROLLER , - IMPLEMENTATIONNAME_LOGOIMAGESTATUSBARCONTROLLER - ) - -DEFINE_INIT_SERVICE ( LogoImageStatusbarController, {} ) - -LogoImageStatusbarController::LogoImageStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) : - svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ) -{ - Image aImage( FwlResId( RID_IMAGE_STATUSBAR_LOGO )); - m_aLogoImage = aImage; -} - -LogoImageStatusbarController::~LogoImageStatusbarController() -{ -} - -// XInterface -Any SAL_CALL LogoImageStatusbarController::queryInterface( const Type& rType ) -throw ( RuntimeException ) -{ - return svt::StatusbarController::queryInterface( rType ); -} - -void SAL_CALL LogoImageStatusbarController::acquire() throw () -{ - svt::StatusbarController::acquire(); -} - -void SAL_CALL LogoImageStatusbarController::release() throw () -{ - svt::StatusbarController::release(); -} - -void SAL_CALL LogoImageStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) -{ - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - - svt::StatusbarController::initialize( aArguments ); -} - -// XComponent -void SAL_CALL LogoImageStatusbarController::dispose() -throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::dispose(); -} - -// XEventListener -void SAL_CALL LogoImageStatusbarController::disposing( const EventObject& Source ) -throw ( RuntimeException ) -{ - svt::StatusbarController::disposing( Source ); -} - -// XStatusListener -void SAL_CALL LogoImageStatusbarController::statusChanged( const FeatureStateEvent& ) -throw ( RuntimeException ) -{ -} - -// XStatusbarController -::sal_Bool SAL_CALL LogoImageStatusbarController::mouseButtonDown( - const awt::MouseEvent& ) -throw (::com::sun::star::uno::RuntimeException) -{ - return sal_False; -} - -::sal_Bool SAL_CALL LogoImageStatusbarController::mouseMove( - const awt::MouseEvent& ) -throw (::com::sun::star::uno::RuntimeException) -{ - return sal_False; -} - -::sal_Bool SAL_CALL LogoImageStatusbarController::mouseButtonUp( - const awt::MouseEvent& ) -throw (::com::sun::star::uno::RuntimeException) -{ - return sal_False; -} - -void SAL_CALL LogoImageStatusbarController::command( - const awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) -throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::command( aPos, nCommand, bMouseEvent, aData ); -} - -void SAL_CALL LogoImageStatusbarController::paint( - const ::com::sun::star::uno::Reference< awt::XGraphics >& xGraphics, - const awt::Rectangle& rOutputRectangle, - ::sal_Int32 /*nItemId*/, - ::sal_Int32 /*nStyle*/ ) -throw (::com::sun::star::uno::RuntimeException) -{ - ::vos::OGuard aGuard( Application::GetSolarMutex() ); - - OutputDevice* pOutDev = VCLUnoHelper::GetOutputDevice( xGraphics );; - if ( pOutDev ) - { - ::Rectangle aRect = VCLRectangle( rOutputRectangle ); - pOutDev->DrawImage( aRect.TopLeft(), aRect.GetSize(), m_aLogoImage ); - } -} - -void SAL_CALL LogoImageStatusbarController::click() -throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::click(); -} - -void SAL_CALL LogoImageStatusbarController::doubleClick() throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::doubleClick(); -} - -} diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx deleted file mode 100644 index 14759b3b5b97..000000000000 --- a/framework/source/uielement/logotextstatusbarcontroller.cxx +++ /dev/null @@ -1,176 +0,0 @@ -/************************************************************** - * - * 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_framework.hxx" -#include <uielement/logotextstatusbarcontroller.hxx> -#include <classes/fwlresid.hxx> -#include <services.h> -#include <classes/resource.hrc> -#include <vos/mutex.hxx> -#include <vcl/svapp.hxx> -#include <vcl/window.hxx> -#include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> -#endif -#include <toolkit/helper/convert.hxx> - -using namespace ::rtl; -using namespace ::cppu; -using namespace ::com::sun::star; -using namespace ::com::sun::star::awt; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; - -namespace framework -{ - -DEFINE_XSERVICEINFO_MULTISERVICE ( LogoTextStatusbarController , - OWeakObject , - SERVICENAME_STATUSBARCONTROLLER , - IMPLEMENTATIONNAME_LOGOTEXTSTATUSBARCONTROLLER - ) - -DEFINE_INIT_SERVICE ( LogoTextStatusbarController, {} ) - -LogoTextStatusbarController::LogoTextStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) : - svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ) -{ - m_aLogoText = String( FwlResId( STR_STATUSBAR_LOGOTEXT )); -} - -LogoTextStatusbarController::~LogoTextStatusbarController() -{ -} - -// XInterface -Any SAL_CALL LogoTextStatusbarController::queryInterface( const Type& rType ) -throw ( RuntimeException ) -{ - return svt::StatusbarController::queryInterface( rType ); -} - -void SAL_CALL LogoTextStatusbarController::acquire() throw () -{ - svt::StatusbarController::acquire(); -} - -void SAL_CALL LogoTextStatusbarController::release() throw () -{ - svt::StatusbarController::release(); -} - -void SAL_CALL LogoTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) -{ - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - - svt::StatusbarController::initialize( aArguments ); - - if ( m_xParentWindow.is() && m_nID > 0 ) - { - Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow ); - if ( pWindow && ( pWindow->GetType() == WINDOW_STATUSBAR )) - { - StatusBar* pStatusBar = (StatusBar *)pWindow; - pStatusBar->SetItemText( m_nID, m_aLogoText ); - } - } -} - -// XComponent -void SAL_CALL LogoTextStatusbarController::dispose() -throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::dispose(); -} - -// XEventListener -void SAL_CALL LogoTextStatusbarController::disposing( const EventObject& Source ) -throw ( RuntimeException ) -{ - svt::StatusbarController::disposing( Source ); -} - -// XStatusListener -void SAL_CALL LogoTextStatusbarController::statusChanged( const FeatureStateEvent& ) -throw ( RuntimeException ) -{ -} - -// XStatusbarController -::sal_Bool SAL_CALL LogoTextStatusbarController::mouseButtonDown( - const ::com::sun::star::awt::MouseEvent& ) -throw (::com::sun::star::uno::RuntimeException) -{ - return sal_False; -} - -::sal_Bool SAL_CALL LogoTextStatusbarController::mouseMove( - const ::com::sun::star::awt::MouseEvent& ) -throw (::com::sun::star::uno::RuntimeException) -{ - return sal_False; -} - -::sal_Bool SAL_CALL LogoTextStatusbarController::mouseButtonUp( - const ::com::sun::star::awt::MouseEvent& ) -throw (::com::sun::star::uno::RuntimeException) -{ - return sal_False; -} - -void SAL_CALL LogoTextStatusbarController::command( - const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) -throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::command( aPos, nCommand, bMouseEvent, aData ); -} - -void SAL_CALL LogoTextStatusbarController::paint( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nItemId, - ::sal_Int32 nStyle ) -throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::paint( xGraphics, rOutputRectangle, nItemId, nStyle ); -} - -void SAL_CALL LogoTextStatusbarController::click() -throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::click(); -} - -void SAL_CALL LogoTextStatusbarController::doubleClick() throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::doubleClick(); -} - -} diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx deleted file mode 100644 index 238fff18a7e4..000000000000 --- a/framework/source/uielement/simpletextstatusbarcontroller.cxx +++ /dev/null @@ -1,192 +0,0 @@ -/************************************************************** - * - * 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_framework.hxx" -#include <uielement/simpletextstatusbarcontroller.hxx> -#include <classes/fwkresid.hxx> -#include <services.h> -#include <classes/resource.hrc> -#include <vos/mutex.hxx> -#include <vcl/svapp.hxx> -#include <vcl/window.hxx> -#include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include <toolkit/unohlp.hxx> -#endif -#include <toolkit/helper/convert.hxx> - -using namespace ::rtl; -using namespace ::cppu; -using namespace ::com::sun::star; -using namespace ::com::sun::star::awt; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::frame; - -namespace framework -{ - -DEFINE_XSERVICEINFO_MULTISERVICE ( SimpleTextStatusbarController , - OWeakObject , - SERVICENAME_STATUSBARCONTROLLER , - IMPLEMENTATIONNAME_SIMPLETEXTSTATUSBARCONTROLLER - ) - -DEFINE_INIT_SERVICE ( SimpleTextStatusbarController, {} ) - -SimpleTextStatusbarController::SimpleTextStatusbarController( const uno::Reference< lang::XMultiServiceFactory >& xServiceManager ) : - svt::StatusbarController( xServiceManager, uno::Reference< frame::XFrame >(), rtl::OUString(), 0 ) -{ -} - -SimpleTextStatusbarController::~SimpleTextStatusbarController() -{ -} - -// XInterface -Any SAL_CALL SimpleTextStatusbarController::queryInterface( const Type& rType ) -throw ( RuntimeException ) -{ - return svt::StatusbarController::queryInterface( rType ); -} - -void SAL_CALL SimpleTextStatusbarController::acquire() throw () -{ - svt::StatusbarController::acquire(); -} - -void SAL_CALL SimpleTextStatusbarController::release() throw () -{ - svt::StatusbarController::release(); -} - -void SAL_CALL SimpleTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) -throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) -{ - const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" )); - - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - - svt::StatusbarController::initialize( aArguments ); - - rtl::OUString aValue; - beans::PropertyValue aPropValue; - - // Check arguments for optional "Value" property. We need it - // to set our internal simple text. - for ( int i = 0; i < aArguments.getLength(); i++ ) - { - if (( aArguments[i] >>= aPropValue ) && ( aPropValue.Name.equals( aPropValueName ))) - { - aPropValue.Value >>= aValue; - break; - } - } - - m_aText = aValue; - if ( m_xParentWindow.is() && m_nID > 0 ) - { - Window* pWindow = VCLUnoHelper::GetWindow( m_xParentWindow ); - if ( pWindow && ( pWindow->GetType() == WINDOW_STATUSBAR )) - { - StatusBar* pStatusBar = (StatusBar *)pWindow; - pStatusBar->SetItemText( m_nID, m_aText ); - } - } -} - -// XComponent -void SAL_CALL SimpleTextStatusbarController::dispose() -throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::dispose(); -} - -// XEventListener -void SAL_CALL SimpleTextStatusbarController::disposing( const EventObject& Source ) -throw ( RuntimeException ) -{ - svt::StatusbarController::disposing( Source ); -} - -// XStatusListener -void SAL_CALL SimpleTextStatusbarController::statusChanged( const FeatureStateEvent& ) -throw ( RuntimeException ) -{ -} - -// XStatusbarController -::sal_Bool SAL_CALL SimpleTextStatusbarController::mouseButtonDown( - const ::com::sun::star::awt::MouseEvent& ) -throw (::com::sun::star::uno::RuntimeException) -{ - return sal_False; -} - -::sal_Bool SAL_CALL SimpleTextStatusbarController::mouseMove( - const ::com::sun::star::awt::MouseEvent& ) -throw (::com::sun::star::uno::RuntimeException) -{ - return sal_False; -} - -::sal_Bool SAL_CALL SimpleTextStatusbarController::mouseButtonUp( - const ::com::sun::star::awt::MouseEvent& ) -throw (::com::sun::star::uno::RuntimeException) -{ - return sal_False; -} - -void SAL_CALL SimpleTextStatusbarController::command( - const ::com::sun::star::awt::Point& aPos, - ::sal_Int32 nCommand, - ::sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) -throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::command( aPos, nCommand, bMouseEvent, aData ); -} - -void SAL_CALL SimpleTextStatusbarController::paint( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, - const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nItemId, - ::sal_Int32 nStyle ) -throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::paint( xGraphics, rOutputRectangle, nItemId, nStyle ); -} - -void SAL_CALL SimpleTextStatusbarController::click() -throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::click(); -} - -void SAL_CALL SimpleTextStatusbarController::doubleClick() throw (::com::sun::star::uno::RuntimeException) -{ - svt::StatusbarController::doubleClick(); -} - -} diff --git a/framework/util/fwl.component b/framework/util/fwl.component index b1726343c050..4853f6d94fcd 100644 --- a/framework/util/fwl.component +++ b/framework/util/fwl.component @@ -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> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 8671486a59ed..86c10bb69653 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -460,28 +460,6 @@ </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> <prop oor:name="Module"> |