diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-11-30 19:15:12 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-11-30 19:15:12 +0100 |
commit | 8231ae65cdcd587ee8982df72c7c45361a374127 (patch) | |
tree | bcca6911da2ff543e9ed8d634e91ace02c50885c | |
parent | API CHANGE: remove com.sun.star.text.XTextEmbeddedObject (diff) | |
download | core-8231ae65cdcd587ee8982df72c7c45361a374127.tar.gz core-8231ae65cdcd587ee8982df72c7c45361a374127.zip |
API CHANGE: remove com.sun.star.text.XModule
This interface has been deprecated since OpenOffice.org initial CVS
import and the purpose of an empty interface is dubious anyway.
EXISTENCE: published key "/UCR/com/sun/star/text/XModule" exists only in
registry 1
Change-Id: If3c849d61d5433b8d426e2e89c3b818a7fff1e7d
-rw-r--r-- | comphelper/source/property/TypeGeneration.cxx | 1 | ||||
-rw-r--r-- | offapi/UnoApi_offapi.mk | 1 | ||||
-rw-r--r-- | offapi/com/sun/star/text/XModule.idl | 42 | ||||
-rw-r--r-- | offapi/type_reference/types.rdb | bin | 7459840 -> 7459840 bytes | |||
-rw-r--r-- | sw/inc/unomod.hxx | 5 |
5 files changed, 1 insertions, 48 deletions
diff --git a/comphelper/source/property/TypeGeneration.cxx b/comphelper/source/property/TypeGeneration.cxx index a6e8e172b05d..1dd04e43049b 100644 --- a/comphelper/source/property/TypeGeneration.cxx +++ b/comphelper/source/property/TypeGeneration.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/style/TabAlign.hpp> #include <com/sun/star/style/PageStyleLayout.hpp> #include <com/sun/star/style/BreakType.hpp> -#include <com/sun/star/text/XModule.hpp> #include <com/sun/star/text/XTextRangeMover.hpp> #include <com/sun/star/text/XFootnotesSettingsSupplier.hpp> #include <com/sun/star/text/XFootnote.hpp> diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index e0b42b3bcb5c..67a29e215e9f 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -3631,7 +3631,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\ XLineNumberingSupplier \ XMailMergeBroadcaster \ XMailMergeListener \ - XModule \ XMultiTextMarkup \ XNumberingFormatter \ XNumberingRulesSupplier \ diff --git a/offapi/com/sun/star/text/XModule.idl b/offapi/com/sun/star/text/XModule.idl deleted file mode 100644 index 575e54310ae6..000000000000 --- a/offapi/com/sun/star/text/XModule.idl +++ /dev/null @@ -1,42 +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 __com_sun_star_text_XModule_idl__ -#define __com_sun_star_text_XModule_idl__ - -#include <com/sun/star/uno/XInterface.idl> - - - - module com { module sun { module star { module text { - - -// DocMerge from xml: interface com::sun::star::text::XModule -/** @deprecated - */ -published interface XModule: com::sun::star::uno::XInterface -{ -}; - - -}; }; }; }; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb Binary files differindex f4e72e555d83..0cc9a607bde3 100644 --- a/offapi/type_reference/types.rdb +++ b/offapi/type_reference/types.rdb diff --git a/sw/inc/unomod.hxx b/sw/inc/unomod.hxx index 9bac96e15ecc..e807e22e7805 100644 --- a/sw/inc/unomod.hxx +++ b/sw/inc/unomod.hxx @@ -19,7 +19,6 @@ #ifndef _UNOMOD_HXX #define _UNOMOD_HXX -#include <com/sun/star/text/XModule.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/view/XPrintSettingsSupplier.hpp> #include <com/sun/star/view/XViewSettingsSupplier.hpp> @@ -27,7 +26,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase2.hxx> // helper for implementations #include <cppuhelper/implbase3.hxx> // helper for implementations -#include <cppuhelper/implbase4.hxx> // helper for implementations #include <comphelper/ChainablePropertySet.hxx> #include <comphelper/SettingsHelper.hxx> #include <usrpref.hxx> @@ -39,9 +37,8 @@ class SwDoc; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SwXModule_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); -class SwXModule : public cppu::WeakImplHelper4 +class SwXModule : public cppu::WeakImplHelper3 < - ::com::sun::star::text::XModule, ::com::sun::star::view::XViewSettingsSupplier, ::com::sun::star::view::XPrintSettingsSupplier, ::com::sun::star::lang::XServiceInfo |