diff options
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 1 | ||||
| -rw-r--r-- | offapi/com/sun/star/text/XTextEmbeddedObject.idl | 62 | ||||
| -rw-r--r-- | offapi/type_reference/types.rdb | bin | 7459840 -> 7459840 bytes | |||
| -rw-r--r-- | qadevOOo/Jar_OOoRunner.mk | 1 | ||||
| -rw-r--r-- | qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject.java | 51 | ||||
| -rw-r--r-- | qadevOOo/tests/java/mod/_sw/SwXTextEmbeddedObject.java | 1 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/cption.cxx | 1 |
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,\ XTextCopy \ XTextCursor \ XTextDocument \ - XTextEmbeddedObject \ XTextEmbeddedObjectsSupplier \ XTextField \ 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 @@ -/* -*- 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_XTextEmbeddedObject_idl__ -#define __com_sun_star_text_XTextEmbeddedObject_idl__ - -#include <com/sun/star/text/XTextContent.idl> - -#include <com/sun/star/uno/XInterface.idl> - - - - module com { module sun { module star { module text { - - -// DocMerge from xml: interface com::sun::star::text::XTextEmbeddedObject -/** f t! - - - - - - @deprecated - */ -published interface XTextEmbeddedObject: com::sun::star::text::XTextContent -{ - - // DocMerge from idl: method com::sun::star::text::XTextEmbeddedObject::getObject - /** @returns an interface to the linked object that is contained in - the TextEmbeddedObject. - */ - com::sun::star::uno::XInterface getObject(); - - - // DocMerge from xml: method com::sun::star::text::XTextEmbeddedObject::setObject - /** sets an object into the TextEmbeddedObject. - */ - void setObject( [in] com::sun::star::uno::XInterface xObject ); - -}; - - -}; }; }; }; - -#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 db615c6ec9d1..f4e72e555d83 100644 --- a/offapi/type_reference/types.rdb +++ b/offapi/type_reference/types.rdb 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,\ qadevOOo/tests/java/ifc/text/_XTextContent \ qadevOOo/tests/java/ifc/text/_XTextCursor \ qadevOOo/tests/java/ifc/text/_XTextDocument \ - qadevOOo/tests/java/ifc/text/_XTextEmbeddedObject \ qadevOOo/tests/java/ifc/text/_XTextEmbeddedObjectsSupplier \ qadevOOo/tests/java/ifc/text/_XTextField \ 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 @@ -/* - * 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 . - */ - -package ifc.text; - -import lib.MultiMethodTest; - -import com.sun.star.text.XTextEmbeddedObject; - -public class _XTextEmbeddedObject extends MultiMethodTest { - - public XTextEmbeddedObject oObj = null; - public _XTextEmbeddedObject(){ - } - - - public void _getObject(){ - boolean bResult = false; - log.println("Going to get the object"); - //dbg.printInterfaces(oObj); - Object oTEobj = oObj.getObject(); - if (!(oTEobj == null)){ bResult = true; } - tRes.tested("getObject", bResult ); - return; - } - -/* public void _setObject(){ - boolean bResult = false; - log.println("Going to set the object"); - tRes.tested("setObject", bResult ); - return; - } -*/ - } // finish class _XTextEmbeddedObject - - 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; * @see com.sun.star.lang.XComponent * @see com.sun.star.text.TextEmbeddedObject * @see com.sun.star.text.XTextContent - * @see com.sun.star.text.XTextEmbeddedObject * */ public 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 @@ #include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> -#include <com/sun/star/text/XTextEmbeddedObject.hpp> #include <com/sun/star/text/XTextFramesSupplier.hpp> #include <com/sun/star/text/XTextFrame.hpp> #include <comphelper/string.hxx> |