[API CHANGE] remove XTiledRenderable
which is an abandoned experiment, the tiled rendering for LOK moved in a different direction Change-Id: Idccd22d5124cc7c7add55b76edc75ef27df59a9f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181862 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
@@ -1494,9 +1494,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/text/textfield
|
|||||||
Subject \
|
Subject \
|
||||||
Title \
|
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,\
|
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/ucb,\
|
||||||
CachedContentResultSet \
|
CachedContentResultSet \
|
||||||
CachedContentResultSetStub \
|
CachedContentResultSetStub \
|
||||||
|
@@ -51,9 +51,6 @@ published service GenericTextDocument
|
|||||||
|
|
||||||
interface com::sun::star::util::XRefreshable;
|
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::XFootnotesSupplier;
|
||||||
|
|
||||||
[optional] interface com::sun::star::text::XEndnotesSupplier;
|
[optional] interface com::sun::star::text::XEndnotesSupplier;
|
||||||
|
@@ -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.
|
|
||||||
|
|
||||||
<p>You must check the machine ID and the process ID.<BR>
|
|
||||||
WIN32: HWND.<BR>
|
|
||||||
WIN16: HWND.<BR>
|
|
||||||
|
|
||||||
JAVA: global reference to a java.awt.Component
|
|
||||||
object provided from the JNI-API.<BR>
|
|
||||||
|
|
||||||
MAC: (NSView*) pointer.<BR></p>
|
|
||||||
|
|
||||||
@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: */
|
|
@@ -14374,12 +14374,6 @@ module com {
|
|||||||
::com::sun::star::container::XNameAccess getTextTables();
|
::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 {
|
module text {
|
||||||
published service GenericTextDocument {
|
published service GenericTextDocument {
|
||||||
service ::com::sun::star::document::OfficeDocument;
|
service ::com::sun::star::document::OfficeDocument;
|
||||||
@@ -14387,7 +14381,6 @@ module com {
|
|||||||
interface ::com::sun::star::text::XTextDocument;
|
interface ::com::sun::star::text::XTextDocument;
|
||||||
interface ::com::sun::star::util::XSearchable;
|
interface ::com::sun::star::util::XSearchable;
|
||||||
interface ::com::sun::star::util::XRefreshable;
|
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::XFootnotesSupplier;
|
||||||
[optional] interface ::com::sun::star::text::XEndnotesSupplier;
|
[optional] interface ::com::sun::star::text::XEndnotesSupplier;
|
||||||
[optional] interface ::com::sun::star::text::XContentControlsSupplier;
|
[optional] interface ::com::sun::star::text::XContentControlsSupplier;
|
||||||
|
@@ -117,7 +117,6 @@ module org.libreoffice.uno
|
|||||||
exports com.sun.star.task;
|
exports com.sun.star.task;
|
||||||
exports com.sun.star.text;
|
exports com.sun.star.text;
|
||||||
exports com.sun.star.text.textfield;
|
exports com.sun.star.text.textfield;
|
||||||
exports com.sun.star.tiledrendering;
|
|
||||||
exports com.sun.star.ucb;
|
exports com.sun.star.ucb;
|
||||||
exports com.sun.star.ui;
|
exports com.sun.star.ui;
|
||||||
exports com.sun.star.ui.dialogs;
|
exports com.sun.star.ui.dialogs;
|
||||||
|
@@ -62,7 +62,6 @@
|
|||||||
#include <editeng/UnoForbiddenCharsTable.hxx>
|
#include <editeng/UnoForbiddenCharsTable.hxx>
|
||||||
#include <cppuhelper/implbase.hxx>
|
#include <cppuhelper/implbase.hxx>
|
||||||
#include <vcl/ITiledRenderable.hxx>
|
#include <vcl/ITiledRenderable.hxx>
|
||||||
#include <com/sun/star/tiledrendering/XTiledRenderable.hpp>
|
|
||||||
#include <com/sun/star/text/XPasteBroadcaster.hpp>
|
#include <com/sun/star/text/XPasteBroadcaster.hpp>
|
||||||
|
|
||||||
#include "unobaseclass.hxx"
|
#include "unobaseclass.hxx"
|
||||||
@@ -173,8 +172,7 @@ SwXTextDocumentBaseClass;
|
|||||||
|
|
||||||
class SW_DLLPUBLIC SwXTextDocument final : public SwXTextDocumentBaseClass,
|
class SW_DLLPUBLIC SwXTextDocument final : public SwXTextDocumentBaseClass,
|
||||||
public SvxFmMSFactory,
|
public SvxFmMSFactory,
|
||||||
public vcl::ITiledRenderable,
|
public vcl::ITiledRenderable
|
||||||
public css::tiledrendering::XTiledRenderable
|
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
class Impl;
|
class Impl;
|
||||||
@@ -495,9 +493,6 @@ public:
|
|||||||
/// @see vcl::ITiledRenderable::getSearchResultRectangles().
|
/// @see vcl::ITiledRenderable::getSearchResultRectangles().
|
||||||
std::vector<basegfx::B2DRange> getSearchResultRectangles(const char* pPayload) override;
|
std::vector<basegfx::B2DRange> 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().
|
/// @see vcl::ITiledRenderable::executeContentControlEvent().
|
||||||
void executeContentControlEvent(const StringMap& aArguments) override;
|
void executeContentControlEvent(const StringMap& aArguments) override;
|
||||||
|
|
||||||
|
@@ -319,12 +319,6 @@ Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType )
|
|||||||
Reference<lang::XMultiServiceFactory> xTmp = this;
|
Reference<lang::XMultiServiceFactory> xTmp = this;
|
||||||
aRet <<= xTmp;
|
aRet <<= xTmp;
|
||||||
}
|
}
|
||||||
if ( !aRet.hasValue() &&
|
|
||||||
rType == cppu::UnoType<tiledrendering::XTiledRenderable>::get())
|
|
||||||
{
|
|
||||||
Reference<tiledrendering::XTiledRenderable> xTmp = this;
|
|
||||||
aRet <<= xTmp;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( !aRet.hasValue()
|
if ( !aRet.hasValue()
|
||||||
&& rType != cppu::UnoType<css::document::XDocumentEventBroadcaster>::get()
|
&& rType != cppu::UnoType<css::document::XDocumentEventBroadcaster>::get()
|
||||||
@@ -362,8 +356,7 @@ Sequence< uno::Type > SAL_CALL SwXTextDocument::getTypes()
|
|||||||
SwXTextDocumentBaseClass::getTypes(),
|
SwXTextDocumentBaseClass::getTypes(),
|
||||||
aNumTypes,
|
aNumTypes,
|
||||||
Sequence {
|
Sequence {
|
||||||
cppu::UnoType<lang::XMultiServiceFactory>::get(),
|
cppu::UnoType<lang::XMultiServiceFactory>::get()});
|
||||||
cppu::UnoType<tiledrendering::XTiledRenderable>::get()});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SwXTextDocument::SwXTextDocument(SwDocShell* pShell)
|
SwXTextDocument::SwXTextDocument(SwDocShell* pShell)
|
||||||
@@ -4084,28 +4077,6 @@ void SwXTextDocument::resetSelection()
|
|||||||
pWrtShell->ResetSelect(nullptr, false, ScrollSizeMode::ScrollSizeDefault);
|
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<HWND>(nWindowHandle);
|
|
||||||
ScopedVclPtrInstance<VirtualDevice> 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
|
* retrieve languages already used in current document
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user