Skip to content

C
core
Kaydet (Commit) 90a1232f authored tarafından Matúš Kukan's avatar Matúš Kukan
Dosyalara gözat
Seçenekler

sfx: Use constructor feature for SfxMacroLoader. 

Extract that class to its own source file.

Change-Id: Idc192354b88d4489db22f6f6e9b7f5178f4030e4
üst 4337a066
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 37 deletions
include/sfx2/appuno.hxx
Dosyayı görüntüle @ 90a1232f
......@@ -46,41 +46,6 @@
#include <tools/errcode.hxx>
#include <sfx2/sfxuno.hxx>
class SfxObjectShell;
class SfxMacroLoader : public ::cppu::WeakImplHelper5<
css::frame::XDispatchProvider,
css::frame::XNotifyingDispatch,
css::frame::XSynchronousDispatch,
css::lang::XServiceInfo,
css::lang::XInitialization >
{
::com::sun::star::uno::WeakReference < ::com::sun::star::frame::XFrame > m_xFrame;
SfxObjectShell* GetObjectShell_Impl();
public:
// XInterface, XTypeProvider, XServiceInfo
SFX_DECL_XSERVICEINFO
SfxMacroLoader( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& )
{}
static ErrCode loadMacro( const OUString& aURL, ::com::sun::star::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > SAL_CALL
queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& sTargetFrameName,
FrameSearchFlags eSearchFlags ) throw( ::com::sun::star::uno::RuntimeException ) ;
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > > SAL_CALL
queryDispatches( const ::com::sun::star::uno::Sequence < ::com::sun::star::frame::DispatchDescriptor >& seqDescriptor )
throw( ::com::sun::star::uno::RuntimeException ) ;
virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArgs, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& Listener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArgs ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL dispatchWithReturnValue( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArgs ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw (::com::sun::star::uno::RuntimeException);
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);
};
class SfxAppDispatchProvider : public ::cppu::WeakImplHelper3< ::com::sun::star::frame::XAppDispatchProvider,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XInitialization >
......
sfx2/Library_sfx.mk
Dosyayı görüntüle @ 90a1232f
......@@ -107,6 +107,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/appl/linkmgr2 \
sfx2/source/appl/linksrc \
sfx2/source/appl/lnkbase2 \
sfx2/source/appl/macroloader \
sfx2/source/appl/module \
sfx2/source/appl/newhelp \
sfx2/source/appl/opengrf \
......
sfx2/source/appl/appuno.cxx
Dosyayı görüntüle @ 90a1232f
This diff is collapsed.
sfx2/source/appl/macroloader.cxx 0 → 100644
Dosyayı görüntüle @ 90a1232f
This diff is collapsed.
sfx2/source/inc/macroloader.hxx 0 → 100644
Dosyayı görüntüle @ 90a1232f
/* -*- 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_SFXMACROLOADER_HXX
#define INCLUDED_SFXMACROLOADER_HXX
#include <sal/config.h>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/DispatchDescriptor.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XNotifyingDispatch.hpp>
#include <com/sun/star/frame/XDispatchResultListener.hpp>
#include <com/sun/star/frame/XSynchronousDispatch.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/util/URL.hpp>
#include <cppuhelper/implbase4.hxx>
#include <sfx2/sfxuno.hxx>
#include <tools/errcode.hxx>
class SfxObjectShell;
class SfxMacroLoader : public cppu::WeakImplHelper4<
css::frame::XDispatchProvider,
css::frame::XNotifyingDispatch,
css::frame::XSynchronousDispatch,
css::lang::XServiceInfo>
{
css::uno::WeakReference < css::frame::XFrame > m_xFrame;
SfxObjectShell* GetObjectShell_Impl();
public:
SfxMacroLoader(const css::uno::Sequence< css::uno::Any >& aArguments )
throw (css::uno::Exception, css::uno::RuntimeException);
virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
throw (css::uno::RuntimeException);
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
throw (css::uno::RuntimeException);
static ErrCode loadMacro( const OUString& aURL, css::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) throw( css::uno::RuntimeException );
virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch(
const css::util::URL& aURL, const OUString& sTargetFrameName,
FrameSearchFlags eSearchFlags )
throw( css::uno::RuntimeException );
virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches(
const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor )
throw( css::uno::RuntimeException );
virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener )
throw (css::uno::RuntimeException);
virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
throw (css::uno::RuntimeException);
virtual css::uno::Any SAL_CALL dispatchWithReturnValue( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs )
throw (css::uno::RuntimeException);
virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL )
throw (css::uno::RuntimeException);
virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL )
throw (css::uno::RuntimeException);
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sfx2/source/notify/eventsupplier.cxx
Dosyayı görüntüle @ 90a1232f
......@@ -28,7 +28,6 @@
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
#include <svl/macitem.hxx>
#include <sfx2/appuno.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/sfxbasemodel.hxx>
#include <sfx2/evntconf.hxx>
......@@ -47,6 +46,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/frame.hxx>
#include <macroloader.hxx>
//--------------------------------------------------------------------------------------------------------
......
sfx2/util/sfx.component
Dosyayı görüntüle @ 90a1232f
......@@ -66,7 +66,8 @@
<implementation name="com.sun.star.comp.sfx2.PluginObject">
<service name="com.sun.star.frame.SpecialEmbeddedObject"/>
</implementation>
<implementation name="com.sun.star.comp.sfx2.SfxMacroLoader">
<implementation name="com.sun.star.comp.sfx2.SfxMacroLoader"
constructor="com_sun_star_comp_sfx2_SfxMacroLoader_get_implementation">
<service name="com.sun.star.frame.ProtocolHandler"/>
</implementation>
</component>
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