diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 066bfe02ef25..cedaf9f91ca6 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -1494,9 +1494,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/text/textfield Subject \ Title \ )) -$(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/tiledrendering,\ - XTiledRenderable \ -)) $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/ucb,\ CachedContentResultSet \ CachedContentResultSetStub \ diff --git a/offapi/com/sun/star/text/GenericTextDocument.idl b/offapi/com/sun/star/text/GenericTextDocument.idl index 6823df32f4e0..e4436fbdd320 100644 --- a/offapi/com/sun/star/text/GenericTextDocument.idl +++ b/offapi/com/sun/star/text/GenericTextDocument.idl @@ -51,9 +51,6 @@ published service GenericTextDocument interface com::sun::star::util::XRefreshable; - /** @since LibreOffice 5.0 */ - [optional] interface com::sun::star::tiledrendering::XTiledRenderable; - [optional] interface com::sun::star::text::XFootnotesSupplier; [optional] interface com::sun::star::text::XEndnotesSupplier; diff --git a/offapi/com/sun/star/tiledrendering/XTiledRenderable.idl b/offapi/com/sun/star/tiledrendering/XTiledRenderable.idl deleted file mode 100644 index 1e437d72d379..000000000000 --- a/offapi/com/sun/star/tiledrendering/XTiledRenderable.idl +++ /dev/null @@ -1,74 +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 . - */ - -module com { module sun { module star { module tiledrendering { - -/** tiled rendering using a system-specific handle to a window - */ -interface XTiledRenderable : com::sun::star::uno::XInterface -{ - - /** paint a tile to a system-specific window - * - - @param Parent - a system-specific handle to a window. - -

You must check the machine ID and the process ID.
- WIN32: HWND.
- WIN16: HWND.
- - JAVA: global reference to a java.awt.Component - object provided from the JNI-API.
- - MAC: (NSView*) pointer.

- - @param nOutputWidth - horizontal output parameter measured in pixels. - - @param nOutputHeight - vertical output parameter measured in pixels. - - @param nTilePosX - logical X position of the top left corner of the rendered rectangle, in TWIPs. - - @param nTilePosY - logical Y position of the top left corner of the rendered rectangle, in TWIPs. - - @param nTileWidth - logical width of the rendered rectangle, in TWIPs. - - @param nTileHeight - logical height of the rendered rectangle, in TWIPs. - - @since LibreOffice 5.0 - */ - void paintTile( [in] any Parent, - [in] long nOutputWidth, - [in] long nOutputHeight, - [in] long nTilePosX, - [in] long nTilePosY, - [in] long nTileWidth, - [in] long nTileHeight ); -}; - - -}; }; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/type_reference/offapi.idl b/offapi/type_reference/offapi.idl index cc97aeaed4eb..56283e8c77b4 100644 --- a/offapi/type_reference/offapi.idl +++ b/offapi/type_reference/offapi.idl @@ -14374,12 +14374,6 @@ module com { ::com::sun::star::container::XNameAccess getTextTables(); }; }; - module tiledrendering { - interface XTiledRenderable { - interface ::com::sun::star::uno::XInterface; - void paintTile([in] any Parent, [in] long nOutputWidth, [in] long nOutputHeight, [in] long nTilePosX, [in] long nTilePosY, [in] long nTileWidth, [in] long nTileHeight); - }; - }; module text { published service GenericTextDocument { service ::com::sun::star::document::OfficeDocument; @@ -14387,7 +14381,6 @@ module com { interface ::com::sun::star::text::XTextDocument; interface ::com::sun::star::util::XSearchable; interface ::com::sun::star::util::XRefreshable; - [optional] interface ::com::sun::star::tiledrendering::XTiledRenderable; [optional] interface ::com::sun::star::text::XFootnotesSupplier; [optional] interface ::com::sun::star::text::XEndnotesSupplier; [optional] interface ::com::sun::star::text::XContentControlsSupplier; diff --git a/ridljar/source/libreoffice/module-info.java b/ridljar/source/libreoffice/module-info.java index f913597600db..24e014e4f3bb 100644 --- a/ridljar/source/libreoffice/module-info.java +++ b/ridljar/source/libreoffice/module-info.java @@ -117,7 +117,6 @@ module org.libreoffice.uno exports com.sun.star.task; exports com.sun.star.text; exports com.sun.star.text.textfield; - exports com.sun.star.tiledrendering; exports com.sun.star.ucb; exports com.sun.star.ui; exports com.sun.star.ui.dialogs; diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 5815515d8d90..57f4bbd026c3 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -62,7 +62,6 @@ #include #include #include -#include #include #include "unobaseclass.hxx" @@ -173,8 +172,7 @@ SwXTextDocumentBaseClass; class SW_DLLPUBLIC SwXTextDocument final : public SwXTextDocumentBaseClass, public SvxFmMSFactory, - public vcl::ITiledRenderable, - public css::tiledrendering::XTiledRenderable + public vcl::ITiledRenderable { private: class Impl; @@ -495,9 +493,6 @@ public: /// @see vcl::ITiledRenderable::getSearchResultRectangles(). std::vector getSearchResultRectangles(const char* pPayload) override; - // css::tiledrendering::XTiledRenderable - virtual void SAL_CALL paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) override; - /// @see vcl::ITiledRenderable::executeContentControlEvent(). void executeContentControlEvent(const StringMap& aArguments) override; diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 865c789be815..a2e08a20c85a 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -319,12 +319,6 @@ Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType ) Reference xTmp = this; aRet <<= xTmp; } - if ( !aRet.hasValue() && - rType == cppu::UnoType::get()) - { - Reference xTmp = this; - aRet <<= xTmp; - } if ( !aRet.hasValue() && rType != cppu::UnoType::get() @@ -362,8 +356,7 @@ Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes() SwXTextDocumentBaseClass::getTypes(), aNumTypes, Sequence { - cppu::UnoType::get(), - cppu::UnoType::get()}); + cppu::UnoType::get()}); } SwXTextDocument::SwXTextDocument(SwDocShell* pShell) @@ -4084,28 +4077,6 @@ void SwXTextDocument::resetSelection() pWrtShell->ResetSelect(nullptr, false, ScrollSizeMode::ScrollSizeDefault); } -void SAL_CALL SwXTextDocument::paintTile( const ::css::uno::Any& Parent, ::sal_Int32 nOutputWidth, ::sal_Int32 nOutputHeight, ::sal_Int32 nTilePosX, ::sal_Int32 nTilePosY, ::sal_Int32 nTileWidth, ::sal_Int32 nTileHeight ) -{ - SystemGraphicsData aData; - aData.nSize = sizeof(SystemGraphicsData); - #if defined(_WIN32) - sal_Int64 nWindowHandle; - Parent >>= nWindowHandle; - aData.hWnd = reinterpret_cast(nWindowHandle); - ScopedVclPtrInstance xDevice(aData, Size(1, 1), DeviceFormat::WITHOUT_ALPHA); - paintTile(*xDevice, nOutputWidth, nOutputHeight, nTilePosX, nTilePosY, nTileWidth, nTileHeight); - #else - // TODO: support other platforms - (void)Parent; - (void)nOutputWidth; - (void)nOutputHeight; - (void)nTilePosX; - (void)nTilePosY; - (void)nTileWidth; - (void)nTileHeight; - #endif -} - /** * retrieve languages already used in current document */