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 | 7a8d933585f5165393a9357edc55606c54cb36eb (diff) |
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 @@ | |||
27 | #include <com/sun/star/style/TabAlign.hpp> | 27 | #include <com/sun/star/style/TabAlign.hpp> |
28 | #include <com/sun/star/style/PageStyleLayout.hpp> | 28 | #include <com/sun/star/style/PageStyleLayout.hpp> |
29 | #include <com/sun/star/style/BreakType.hpp> | 29 | #include <com/sun/star/style/BreakType.hpp> |
30 | #include <com/sun/star/text/XModule.hpp> | ||
31 | #include <com/sun/star/text/XTextRangeMover.hpp> | 30 | #include <com/sun/star/text/XTextRangeMover.hpp> |
32 | #include <com/sun/star/text/XFootnotesSettingsSupplier.hpp> | 31 | #include <com/sun/star/text/XFootnotesSettingsSupplier.hpp> |
33 | #include <com/sun/star/text/XFootnote.hpp> | 32 | #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,\ | |||
3631 | XLineNumberingSupplier \ | 3631 | XLineNumberingSupplier \ |
3632 | XMailMergeBroadcaster \ | 3632 | XMailMergeBroadcaster \ |
3633 | XMailMergeListener \ | 3633 | XMailMergeListener \ |
3634 | XModule \ | ||
3635 | XMultiTextMarkup \ | 3634 | XMultiTextMarkup \ |
3636 | XNumberingFormatter \ | 3635 | XNumberingFormatter \ |
3637 | XNumberingRulesSupplier \ | 3636 | 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 @@ | |||
1 | /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ | ||
2 | /* | ||
3 | * This file is part of the LibreOffice project. | ||
4 | * | ||
5 | * This Source Code Form is subject to the terms of the Mozilla Public | ||
6 | * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
7 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
8 | * | ||
9 | * This file incorporates work covered by the following license notice: | ||
10 | * | ||
11 | * Licensed to the Apache Software Foundation (ASF) under one or more | ||
12 | * contributor license agreements. See the NOTICE file distributed | ||
13 | * with this work for additional information regarding copyright | ||
14 | * ownership. The ASF licenses this file to you under the Apache | ||
15 | * License, Version 2.0 (the "License"); you may not use this file | ||
16 | * except in compliance with the License. You may obtain a copy of | ||
17 | * the License at http://www.apache.org/licenses/LICENSE-2.0 . | ||
18 | */ | ||
19 | #ifndef __com_sun_star_text_XModule_idl__ | ||
20 | #define __com_sun_star_text_XModule_idl__ | ||
21 | |||
22 | #include <com/sun/star/uno/XInterface.idl> | ||
23 | |||
24 | |||
25 | |||
26 | module com { module sun { module star { module text { | ||
27 | |||
28 | |||
29 | // DocMerge from xml: interface com::sun::star::text::XModule | ||
30 | /** @deprecated | ||
31 | */ | ||
32 | published interface XModule: com::sun::star::uno::XInterface | ||
33 | { | ||
34 | }; | ||
35 | |||
36 | |||
37 | }; }; }; }; | ||
38 | |||
39 | |||
40 | #endif | ||
41 | |||
42 | /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ | ||
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb index f4e72e555d83..0cc9a607bde3 100644 --- a/offapi/type_reference/types.rdb +++ b/offapi/type_reference/types.rdb | |||
Binary files differ | |||
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 @@ | |||
19 | #ifndef _UNOMOD_HXX | 19 | #ifndef _UNOMOD_HXX |
20 | #define _UNOMOD_HXX | 20 | #define _UNOMOD_HXX |
21 | 21 | ||
22 | #include <com/sun/star/text/XModule.hpp> | ||
23 | #include <com/sun/star/beans/XPropertySet.hpp> | 22 | #include <com/sun/star/beans/XPropertySet.hpp> |
24 | #include <com/sun/star/view/XPrintSettingsSupplier.hpp> | 23 | #include <com/sun/star/view/XPrintSettingsSupplier.hpp> |
25 | #include <com/sun/star/view/XViewSettingsSupplier.hpp> | 24 | #include <com/sun/star/view/XViewSettingsSupplier.hpp> |
@@ -27,7 +26,6 @@ | |||
27 | #include <com/sun/star/lang/XMultiServiceFactory.hpp> | 26 | #include <com/sun/star/lang/XMultiServiceFactory.hpp> |
28 | #include <cppuhelper/implbase2.hxx> // helper for implementations | 27 | #include <cppuhelper/implbase2.hxx> // helper for implementations |
29 | #include <cppuhelper/implbase3.hxx> // helper for implementations | 28 | #include <cppuhelper/implbase3.hxx> // helper for implementations |
30 | #include <cppuhelper/implbase4.hxx> // helper for implementations | ||
31 | #include <comphelper/ChainablePropertySet.hxx> | 29 | #include <comphelper/ChainablePropertySet.hxx> |
32 | #include <comphelper/SettingsHelper.hxx> | 30 | #include <comphelper/SettingsHelper.hxx> |
33 | #include <usrpref.hxx> | 31 | #include <usrpref.hxx> |
@@ -39,9 +37,8 @@ class SwDoc; | |||
39 | 37 | ||
40 | ::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 > & ); | 38 | ::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 > & ); |
41 | 39 | ||
42 | class SwXModule : public cppu::WeakImplHelper4 | 40 | class SwXModule : public cppu::WeakImplHelper3 |
43 | < | 41 | < |
44 | ::com::sun::star::text::XModule, | ||
45 | ::com::sun::star::view::XViewSettingsSupplier, | 42 | ::com::sun::star::view::XViewSettingsSupplier, |
46 | ::com::sun::star::view::XPrintSettingsSupplier, | 43 | ::com::sun::star::view::XPrintSettingsSupplier, |
47 | ::com::sun::star::lang::XServiceInfo | 44 | ::com::sun::star::lang::XServiceInfo |