From f2299ef98c9db7018c413b06b08baa6e2c9dd257 Mon Sep 17 00:00:00 2001 From: Ariel Constenla-Haile Date: Thu, 6 Dec 2012 12:30:14 +0000 Subject: Related: #i121442# Remove unused UNO StatusbarControllers (cherry picked from commit 06b91eb4cc81dde86875445c5acaa5c57111333b) Conflicts: framework/inc/uielement/logoimagestatusbarcontroller.hxx framework/inc/uielement/logotextstatusbarcontroller.hxx framework/inc/uielement/simpletextstatusbarcontroller.hxx framework/source/classes/resource.src framework/source/register/registerservices.cxx framework/source/uielement/logoimagestatusbarcontroller.cxx framework/source/uielement/logotextstatusbarcontroller.cxx framework/source/uielement/simpletextstatusbarcontroller.cxx officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu Change-Id: I799bd0fa29191efce4fe9a09f74247e38d8f8873 (cherry picked from commit 4fcda14828d2fa65cc2541ed3e3cb93dd7bc9ac8) --- framework/Library_fwl.mk | 3 - framework/inc/classes/resource.hrc | 4 +- framework/inc/services.h | 3 - .../inc/uielement/logoimagestatusbarcontroller.hxx | 82 --------- .../inc/uielement/logotextstatusbarcontroller.hxx | 82 --------- .../uielement/simpletextstatusbarcontroller.hxx | 84 ---------- framework/source/classes/resource.src | 11 -- framework/source/register/registerservices.cxx | 1 + framework/source/register/registertemp.cxx | 6 - .../uielement/logoimagestatusbarcontroller.cxx | 167 ------------------ .../uielement/logotextstatusbarcontroller.cxx | 170 ------------------- .../uielement/simpletextstatusbarcontroller.cxx | 186 --------------------- framework/util/fwl.component | 9 - 13 files changed, 2 insertions(+), 806 deletions(-) delete mode 100644 framework/inc/uielement/logoimagestatusbarcontroller.hxx delete mode 100644 framework/inc/uielement/logotextstatusbarcontroller.hxx delete mode 100644 framework/inc/uielement/simpletextstatusbarcontroller.hxx delete mode 100644 framework/source/uielement/logoimagestatusbarcontroller.cxx delete mode 100644 framework/source/uielement/logotextstatusbarcontroller.cxx delete mode 100644 framework/source/uielement/simpletextstatusbarcontroller.cxx (limited to 'framework') diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk index fb8b3856771d..afcb77c04945 100644 --- a/framework/Library_fwl.mk +++ b/framework/Library_fwl.mk @@ -66,12 +66,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 8d1d23632349..673e90dcaaed 100644 --- a/framework/inc/classes/resource.hrc +++ b/framework/inc/classes/resource.hrc @@ -33,7 +33,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) @@ -60,8 +60,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 cda8d13be9b2..cd3eb2b6ca22 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -108,13 +108,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 3492c8a26868..000000000000 --- a/framework/inc/uielement/logoimagestatusbarcontroller.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- 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 __FRAMEWORK_UIELEMENT_LOGOIMAGESTATUSBARCONTROLLER_HXX_ -#define __FRAMEWORK_UIELEMENT_LOGOIMAGESTATUSBARCONTROLLER_HXX_ - -#include -#include -#include -#include -#include -#include -#include - -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_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/uielement/logotextstatusbarcontroller.hxx b/framework/inc/uielement/logotextstatusbarcontroller.hxx deleted file mode 100644 index 4b52656448dd..000000000000 --- a/framework/inc/uielement/logotextstatusbarcontroller.hxx +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- 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 __FRAMEWORK_UIELEMENT_LOGOTEXTSTATUSBARCONTROLLER_HXX_ -#define __FRAMEWORK_UIELEMENT_LOGOTEXTSTATUSBARCONTROLLER_HXX_ - -#include -#include -#include -#include -#include -#include -#include - -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: - OUString m_aLogoText; -}; - -} - -#endif // __FRAMEWORK_UIELEMENT_LOGOTEXTSTATUSBARCONTROLLER_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/uielement/simpletextstatusbarcontroller.hxx b/framework/inc/uielement/simpletextstatusbarcontroller.hxx deleted file mode 100644 index a40d1229d06c..000000000000 --- a/framework/inc/uielement/simpletextstatusbarcontroller.hxx +++ /dev/null @@ -1,84 +0,0 @@ -/* -*- 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 __FRAMEWORK_UIELEMENT_SIMPLETEXTSTATUSBARCONTROLLER_HXX_ -#define __FRAMEWORK_UIELEMENT_SIMPLETEXTSTATUSBARCONTROLLER_HXX_ - -#include -#include -#include -#include -#include - -#include -#include -#include - -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: - OUString m_aText; -}; - -} - -#endif // __FRAMEWORK_UIELEMENT_SIMPLETEXTSTATUSBARCONTROLLER_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 24874e53fd3e..8b1587a3dd40 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -119,11 +119,6 @@ String STR_TOOLBAR_TITLE_ADDON Text [ en-US ] = "Add-On %num%"; }; -String STR_STATUSBAR_LOGOTEXT -{ - Text [ en-US ] = "A %PRODUCTNAME product by %OOOVENDOR"; -}; - // *********************************************************************** // License Dialog // *********************************************************************** @@ -273,12 +268,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 33ce118cec5e..8d9c058165d2 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -66,6 +66,7 @@ #include #include #include + #include #include #include diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index 9d9e673ca0b9..1f0967d3f0fe 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -42,9 +42,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -59,14 +56,11 @@ COMPONENTGETFACTORY ( fwl, 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 f2032c79cf06..000000000000 --- a/framework/source/uielement/logoimagestatusbarcontroller.cxx +++ /dev/null @@ -1,167 +0,0 @@ -/* -*- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include - -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 >(), 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) -{ - SolarMutexGuard aSolarMutexGuard; - - 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) -{ - SolarMutexGuard aGuard; - - 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(); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx deleted file mode 100644 index 32259c20e9ef..000000000000 --- a/framework/source/uielement/logotextstatusbarcontroller.cxx +++ /dev/null @@ -1,170 +0,0 @@ -/* -*- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include - -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 >(), 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) -{ - SolarMutexGuard aSolarMutexGuard; - - 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(); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx deleted file mode 100644 index e0b3807030c6..000000000000 --- a/framework/source/uielement/simpletextstatusbarcontroller.cxx +++ /dev/null @@ -1,186 +0,0 @@ -/* -*- 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include - -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 >(), 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 OUString aPropValueName( "Value" ); - - SolarMutexGuard aSolarMutexGuard; - - svt::StatusbarController::initialize( aArguments ); - - 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(); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/util/fwl.component b/framework/util/fwl.component index b4a7ed3268e8..9aaef32a1fd3 100644 --- a/framework/util/fwl.component +++ b/framework/util/fwl.component @@ -43,12 +43,6 @@ - - - - - - @@ -73,9 +67,6 @@ - - - -- cgit v1.2.3