summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-11-30 18:56:44 +0100
committerMichael Stahl <mstahl@redhat.com>2012-11-30 18:56:44 +0100
commit7a8d933585f5165393a9357edc55606c54cb36eb (patch)
tree1923b47df1088327576156dd3de8129da2df2eb1
parent3e0d7e60bc00b36cca0755a6b02879e0a1cc2484 (diff)
API CHANGE: remove com.sun.star.text.XTextEmbeddedObject
This interface was apparently never implemented in OpenOffice.org. EXISTENCE: published key "/UCR/com/sun/star/text/XTextEmbeddedObject" exists only in registry 1 Change-Id: Ib802fa3f035d1842c9ee8018ef15f35a4680fe2b
-rw-r--r--offapi/UnoApi_offapi.mk1
-rw-r--r--offapi/com/sun/star/text/XTextEmbeddedObject.idl62
-rw-r--r--offapi/type_reference/types.rdbbin7459840 -> 7459840 bytes
-rw-r--r--qadevOOo/Jar_OOoRunner.mk1
-rw-r--r--qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java51
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java1
-rw-r--r--sw/source/ui/frmdlg/cption.cxx1
7 files changed, 0 insertions, 117 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 608bfa0dc484..e0b42b3bcb5c 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3657,7 +3657,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/text,\
3657 XTextCopy \ 3657 XTextCopy \
3658 XTextCursor \ 3658 XTextCursor \
3659 XTextDocument \ 3659 XTextDocument \
3660 XTextEmbeddedObject \
3661 XTextEmbeddedObjectsSupplier \ 3660 XTextEmbeddedObjectsSupplier \
3662 XTextField \ 3661 XTextField \
3663 XTextFieldsSupplier \ 3662 XTextFieldsSupplier \
diff --git a/offapi/com/sun/star/text/XTextEmbeddedObject.idl b/offapi/com/sun/star/text/XTextEmbeddedObject.idl
deleted file mode 100644
index 1f1097acc13a..000000000000
--- a/offapi/com/sun/star/text/XTextEmbeddedObject.idl
+++ /dev/null
@@ -1,62 +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_XTextEmbeddedObject_idl__
20#define __com_sun_star_text_XTextEmbeddedObject_idl__
21
22#include <com/sun/star/text/XTextContent.idl>
23
24#include <com/sun/star/uno/XInterface.idl>
25
26
27
28 module com { module sun { module star { module text {
29
30
31// DocMerge from xml: interface com::sun::star::text::XTextEmbeddedObject
32/** f t!
33
34
35
36
37
38 @deprecated
39 */
40published interface XTextEmbeddedObject: com::sun::star::text::XTextContent
41{
42
43 // DocMerge from idl: method com::sun::star::text::XTextEmbeddedObject::getObject
44 /** @returns an interface to the linked object that is contained in
45 the TextEmbeddedObject.
46 */
47 com::sun::star::uno::XInterface getObject();
48
49
50 // DocMerge from xml: method com::sun::star::text::XTextEmbeddedObject::setObject
51 /** sets an object into the TextEmbeddedObject.
52 */
53 void setObject( [in] com::sun::star::uno::XInterface xObject );
54
55};
56
57
58}; }; }; };
59
60#endif
61
62/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index db615c6ec9d1..f4e72e555d83 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
Binary files differ
diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index eac17854d02c..c0481c103f55 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -866,7 +866,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
866 qadevOOo/tests/java/ifc/text/_XTextContent \ 866 qadevOOo/tests/java/ifc/text/_XTextContent \
867 qadevOOo/tests/java/ifc/text/_XTextCursor \ 867 qadevOOo/tests/java/ifc/text/_XTextCursor \
868 qadevOOo/tests/java/ifc/text/_XTextDocument \ 868 qadevOOo/tests/java/ifc/text/_XTextDocument \
869 qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject \
870 qadevOOo/tests/java/ifc/text/_XTextEmbeddedObjectsSupplier \ 869 qadevOOo/tests/java/ifc/text/_XTextEmbeddedObjectsSupplier \
871 qadevOOo/tests/java/ifc/text/_XTextField \ 870 qadevOOo/tests/java/ifc/text/_XTextField \
872 qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier \ 871 qadevOOo/tests/java/ifc/text/_XTextFieldsSupplier \
diff --git a/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java b/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java
deleted file mode 100644
index 43cf0fcdf56f..000000000000
--- a/qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java
+++ /dev/null
@@ -1,51 +0,0 @@
1/*
2 * This file is part of the LibreOffice project.
3 *
4 * This Source Code Form is subject to the terms of the Mozilla Public
5 * License, v. 2.0. If a copy of the MPL was not distributed with this
6 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
7 *
8 * This file incorporates work covered by the following license notice:
9 *
10 * Licensed to the Apache Software Foundation (ASF) under one or more
11 * contributor license agreements. See the NOTICE file distributed
12 * with this work for additional information regarding copyright
13 * ownership. The ASF licenses this file to you under the Apache
14 * License, Version 2.0 (the "License"); you may not use this file
15 * except in compliance with the License. You may obtain a copy of
16 * the License at http://www.apache.org/licenses/LICENSE-2.0 .
17 */
18
19package ifc.text;
20
21import lib.MultiMethodTest;
22
23import com.sun.star.text.XTextEmbeddedObject;
24
25public class _XTextEmbeddedObject extends MultiMethodTest {
26
27 public XTextEmbeddedObject oObj = null;
28 public _XTextEmbeddedObject(){
29 }
30
31
32 public void _getObject(){
33 boolean bResult = false;
34 log.println("Going to get the object");
35 //dbg.printInterfaces(oObj);
36 Object oTEobj = oObj.getObject();
37 if (!(oTEobj == null)){ bResult = true; }
38 tRes.tested("getObject", bResult );
39 return;
40 }
41
42/* public void _setObject(){
43 boolean bResult = false;
44 log.println("Going to set the object");
45 tRes.tested("setObject", bResult );
46 return;
47 }
48*/
49 } // finish class _XTextEmbeddedObject
50
51
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java
index 64ef1bfbf3ab..b44ee22d828c 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java
@@ -50,7 +50,6 @@ import com.sun.star.util.XCloseable;
50 * @see com.sun.star.lang.XComponent 50 * @see com.sun.star.lang.XComponent
51 * @see com.sun.star.text.TextEmbeddedObject 51 * @see com.sun.star.text.TextEmbeddedObject
52 * @see com.sun.star.text.XTextContent 52 * @see com.sun.star.text.XTextContent
53 * @see com.sun.star.text.XTextEmbeddedObject
54 * 53 *
55 */ 54 */
56public class SwXTextEmbeddedObject extends TestCase { 55public class SwXTextEmbeddedObject extends TestCase {
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 2e92937bd5ac..f9a3f5bb7ab7 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -39,7 +39,6 @@
39#include <com/sun/star/text/TableColumnSeparator.hpp> 39#include <com/sun/star/text/TableColumnSeparator.hpp>
40#include <com/sun/star/text/XTextTable.hpp> 40#include <com/sun/star/text/XTextTable.hpp>
41#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> 41#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp>
42#include <com/sun/star/text/XTextEmbeddedObject.hpp>
43#include <com/sun/star/text/XTextFramesSupplier.hpp> 42#include <com/sun/star/text/XTextFramesSupplier.hpp>
44#include <com/sun/star/text/XTextFrame.hpp> 43#include <com/sun/star/text/XTextFrame.hpp>
45#include <comphelper/string.hxx> 44#include <comphelper/string.hxx>