diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/fmdmod.hxx | 40 | ||||
| -rw-r--r-- | include/svx/unomodel.hxx | 6 |
2 files changed, 3 insertions, 43 deletions
diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx deleted file mode 100644 index 8a5a1676a646..000000000000 --- a/include/svx/fmdmod.hxx +++ /dev/null @@ -1,40 +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_SVX_FMDMOD_HXX -#define INCLUDED_SVX_FMDMOD_HXX - -#include <svx/unomod.hxx> -#include <svx/svxdllapi.h> - -class SVX_DLLPUBLIC SvxFmMSFactory : public SvxUnoDrawMSFactory -{ - -public: - SvxFmMSFactory() {}; - - virtual ~SvxFmMSFactory() {} - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; -}; - -#endif // INCLUDED_SVX_FMDMOD_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx index 42defea33355..236d9aa75914 100644 --- a/include/svx/unomodel.hxx +++ b/include/svx/unomodel.hxx @@ -26,13 +26,13 @@ #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <sfx2/sfxbasemodel.hxx> -#include <svx/fmdmod.hxx> #include <svx/svxdllapi.h> +#include <svx/unomod.hxx> class SdrModel; class SVX_DLLPUBLIC SvxUnoDrawingModel : public SfxBaseModel, // implements SfxListener, OWEAKOBJECT & other - public SvxFmMSFactory, + public SvxUnoDrawMSFactory, public ::com::sun::star::drawing::XDrawPagesSupplier, public ::com::sun::star::lang::XServiceInfo, public ::com::sun::star::ucb::XAnyCompareFactory @@ -76,7 +76,7 @@ public: // XDrawPagesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XMultiServiceFactory ( SvxFmMSFactory ) + // XMultiServiceFactory ( SvxUnoDrawMSFactory ) virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; |