From 5f3d9ba0cdd82ef1e8be9b80ae8054c24653e058 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 12 Jan 2016 10:49:01 +0200 Subject: GetImageFromURL/SetImageProducer unused looks like these have been abandoned recently in the toolbar manager update Change-Id: I5556833dfef0db5958a5779bdb32482c18a46a5f --- framework/Library_fwe.mk | 1 - framework/source/classes/menumanager.cxx | 1 - framework/source/fwe/classes/addonmenu.cxx | 1 - framework/source/fwe/classes/bmkmenu.cxx | 1 - framework/source/fwe/helper/imageproducer.cxx | 49 --------------------- .../source/uielement/addonstoolbarmanager.cxx | 1 - .../source/uielement/macrosmenucontroller.cxx | 1 - framework/source/uielement/menubarmanager.cxx | 1 - framework/source/uielement/newmenucontroller.cxx | 1 - .../source/uielement/subtoolbarcontroller.cxx | 1 - framework/source/uielement/toolbarmanager.cxx | 1 - framework/source/uielement/toolbarmerger.cxx | 1 - .../source/uielement/toolbarsmenucontroller.cxx | 1 - include/framework/imageproducer.hxx | 50 ---------------------- sfx2/source/appl/app.cxx | 2 - 15 files changed, 113 deletions(-) delete mode 100644 framework/source/fwe/helper/imageproducer.cxx delete mode 100644 include/framework/imageproducer.hxx diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index ee086543aafc..848e52c71d58 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -67,7 +67,6 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/dispatch/interaction \ framework/source/fwe/helper/actiontriggerhelper \ framework/source/fwe/helper/configimporter \ - framework/source/fwe/helper/imageproducer \ framework/source/fwe/helper/propertysetcontainer \ framework/source/fwe/helper/titlehelper \ framework/source/fwe/helper/documentundoguard \ diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 8f354c6d5498..8140cdfcd391 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index c65da97c56d1..f69ae27ee94b 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -20,7 +20,6 @@ #include #include #include -#include #include #include diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index 07f91f7441c3..4b316a73c325 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -21,7 +21,6 @@ #include #include -#include #include #include diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx deleted file mode 100644 index 3c70b2256258..000000000000 --- a/framework/source/fwe/helper/imageproducer.cxx +++ /dev/null @@ -1,49 +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 - -namespace framework -{ - -static pfunc_getImage _pGetImageFunc = nullptr; - -pfunc_getImage SAL_CALL SetImageProducer( pfunc_getImage pNewGetImageFunc ) -{ - pfunc_getImage pOldFunc = _pGetImageFunc; - _pGetImageFunc = pNewGetImageFunc; - - return pOldFunc; -} - -Image SAL_CALL GetImageFromURL( - const css::uno::Reference< css::frame::XFrame >& rFrame, - const OUString& aURL, - bool bBig -) -{ - if ( _pGetImageFunc ) - return _pGetImageFunc( rFrame, aURL, bBig ); - else - return Image(); -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 80f6e803cd0e..afe155196e03 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -22,7 +22,6 @@ #include #include "services.h" -#include #include #include #include diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index badcb95b07de..d11478e77b9a 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -22,7 +22,6 @@ #include "services.h" #include #include -#include #include #include #include diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 5af937157351..39ffad09ced6 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index b9f64b67f4ef..352a531e52cd 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index 13c1fcd6bca0..9eac17cecdae 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index d20a81bd4bf4..c83bc19a3c7b 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -22,7 +22,6 @@ #include "services.h" #include "general.h" #include "properties.h" -#include #include #include #include diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 4f97ee2132c0..0a7fb0299a58 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index a963e9e15ac5..ec59424fd94e 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -24,7 +24,6 @@ #include "services.h" #include #include -#include #include #include diff --git a/include/framework/imageproducer.hxx b/include/framework/imageproducer.hxx deleted file mode 100644 index dd165433fffd..000000000000 --- a/include/framework/imageproducer.hxx +++ /dev/null @@ -1,50 +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 INCLUDED_FRAMEWORK_IMAGEPRODUCER_HXX -#define INCLUDED_FRAMEWORK_IMAGEPRODUCER_HXX - -#include -#include -#include -#include -#include - -namespace framework -{ - -typedef Image ( *pfunc_getImage)( - const css::uno::Reference< css::frame::XFrame >& rFrame, - const OUString& aURL, - bool bBig -); - -pfunc_getImage FWE_DLLPUBLIC SAL_CALL SetImageProducer( pfunc_getImage pGetImageFunc ); - -Image FWE_DLLPUBLIC SAL_CALL GetImageFromURL( - const css::uno::Reference< css::frame::XFrame >& rFrame, - const OUString& aURL, - bool bBig -); - -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index f64a1e49f219..b97e9b2c1ef1 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -136,7 +136,6 @@ namespace : public rtl::Static {}; } -#include #include #include #include "fwkhelper.hxx" @@ -161,7 +160,6 @@ SfxApplication* SfxApplication::GetOrCreate() // a fault will be moved outside the SFX g_pSfxApplication->Initialize_Impl(); - ::framework::SetImageProducer( GetImage ); ::framework::SetRefreshToolbars( RefreshToolbars ); ::framework::SetToolBoxControllerCreator( SfxToolBoxControllerFactory ); ::framework::SetStatusBarControllerCreator( SfxStatusBarControllerFactory ); -- cgit