Kaydet (Commit) 5f3d9ba0 authored tarafından Noel Grandin's avatar Noel Grandin

GetImageFromURL/SetImageProducer unused

looks like these have been abandoned recently in the toolbar manager
update

Change-Id: I5556833dfef0db5958a5779bdb32482c18a46a5f
üst fd2eb598
......@@ -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 \
......
......@@ -21,7 +21,6 @@
#include <framework/menuconfiguration.hxx>
#include <framework/bmkmenu.hxx>
#include <framework/addonmenu.hxx>
#include <framework/imageproducer.hxx>
#include <framework/addonsoptions.hxx>
#include <classes/fwkresid.hxx>
#include <services.h>
......
......@@ -20,7 +20,6 @@
#include <framework/addonmenu.hxx>
#include <framework/addonsoptions.hxx>
#include <general.h>
#include <framework/imageproducer.hxx>
#include <framework/menuconfiguration.hxx>
#include <services.h>
......
......@@ -21,7 +21,6 @@
#include <framework/bmkmenu.hxx>
#include <general.h>
#include <framework/imageproducer.hxx>
#include <framework/menuconfiguration.hxx>
#include <com/sun/star/uno/Reference.h>
......
/* -*- 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 <framework/imageproducer.hxx>
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: */
......@@ -22,7 +22,6 @@
#include <uielement/generictoolbarcontroller.hxx>
#include "services.h"
#include <framework/imageproducer.hxx>
#include <framework/sfxhelperfunctions.hxx>
#include <classes/fwkresid.hxx>
#include <classes/resource.hrc>
......
......@@ -22,7 +22,6 @@
#include "services.h"
#include <classes/resource.hrc>
#include <classes/fwkresid.hxx>
#include <framework/imageproducer.hxx>
#include <com/sun/star/awt/MenuItemStyle.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
......
......@@ -21,7 +21,6 @@
#include <framework/menuconfiguration.hxx>
#include <framework/bmkmenu.hxx>
#include <framework/addonmenu.hxx>
#include <framework/imageproducer.hxx>
#include <framework/addonsoptions.hxx>
#include <classes/fwkresid.hxx>
#include <classes/menumanager.hxx>
......
......@@ -23,7 +23,6 @@
#include <classes/resource.hrc>
#include <classes/fwkresid.hxx>
#include <framework/bmkmenu.hxx>
#include <framework/imageproducer.hxx>
#include <framework/menuconfiguration.hxx>
#include <com/sun/star/awt/XDevice.hpp>
......
......@@ -21,7 +21,6 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weakref.hxx>
#include <framework/imageproducer.hxx>
#include <svtools/toolboxcontroller.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/gen.hxx>
......
......@@ -22,7 +22,6 @@
#include "services.h"
#include "general.h"
#include "properties.h"
#include <framework/imageproducer.hxx>
#include <framework/sfxhelperfunctions.hxx>
#include <classes/fwkresid.hxx>
#include <classes/resource.hrc>
......
......@@ -19,7 +19,6 @@
#include <uielement/toolbarmerger.hxx>
#include <uielement/generictoolbarcontroller.hxx>
#include <framework/imageproducer.hxx>
#include <svtools/miscopt.hxx>
#include <comphelper/processfactory.hxx>
......
......@@ -24,7 +24,6 @@
#include "services.h"
#include <classes/resource.hrc>
#include <classes/fwkresid.hxx>
#include <framework/imageproducer.hxx>
#include <framework/sfxhelperfunctions.hxx>
#include <uiconfiguration/windowstateproperties.hxx>
......
/* -*- 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 <sal/types.h>
#include <com/sun/star/frame/XFrame.hpp>
#include <vcl/image.hxx>
#include <rtl/ustring.hxx>
#include <framework/fwedllapi.h>
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: */
......@@ -136,7 +136,6 @@ namespace
: public rtl::Static<osl::Mutex, theApplicationMutex> {};
}
#include <framework/imageproducer.hxx>
#include <framework/sfxhelperfunctions.hxx>
#include <sfx2/imagemgr.hxx>
#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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment