52eba79371
LOKClipboard has higher level dependencies (sfx2) so it cannot be moved to the vcl where SystemClibpoard instance is created. - introduce new interface LokClipboard to differentiate from SystemClipboard so we can have vcl's and lok's implementations at the same time - publish LOKClipboard using new interface for other modules by adding component file in desktop module Thanks to that when code calls GetClipboard and we cannot get clipboard assigned to the vcl::Window* (for welded widgets) in GetSystemClipboard correct instance is returned (shared clipboard for current view) so we can access content which was copied before. Previously always a new instance was created (with empty content). test ScTiledRenderingTest::testPasteIntoWrapTextCell was broken add some content to clipboard to simulate more real case and test the content copied Change-Id: I23c0298960a710c498646493f33122b908864cba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126310 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131644 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135198 Tested-by: Jenkins
152 lines
3.7 KiB
Makefile
152 lines
3.7 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# 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/.
|
|
#
|
|
|
|
$(eval $(call gb_Library_Library,sofficeapp))
|
|
|
|
$(eval $(call gb_Library_set_include,sofficeapp,\
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR)/desktop/inc \
|
|
-I$(SRCDIR)/desktop/source/inc \
|
|
-I$(SRCDIR)/desktop/source/deployment/inc \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_externals,sofficeapp, \
|
|
$(if $(ENABLE_BREAKPAD),breakpad) \
|
|
$(if $(filter OPENCL,$(BUILD_TYPE)),clew) \
|
|
boost_headers \
|
|
dbus \
|
|
icu_headers \
|
|
icui18n \
|
|
icuuc \
|
|
$(if $(filter-out EMSCRIPTEN iOS,$(OS)), \
|
|
curl \
|
|
)\
|
|
$(if $(ENABLE_ONLINE_UPDATE_MAR),\
|
|
orcus-parser \
|
|
orcus )\
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_custom_headers,sofficeapp,\
|
|
officecfg/registry \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_api,sofficeapp,\
|
|
udkapi \
|
|
offapi \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,sofficeapp,\
|
|
-DDESKTOP_DLLIMPLEMENTATION \
|
|
$(if $(filter WNT,$(OS)),-DENABLE_QUICKSTART_APPLET) \
|
|
$(if $(filter MACOSX,$(OS)),-DENABLE_QUICKSTART_APPLET) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_set_precompiled_header,sofficeapp,desktop/inc/pch/precompiled_sofficeapp))
|
|
|
|
$(eval $(call gb_Library_use_libraries,sofficeapp,\
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
$(if $(ENABLE_BREAKPAD), \
|
|
crashreport \
|
|
) \
|
|
deploymentmisc \
|
|
editeng \
|
|
fwk \
|
|
i18nlangtag \
|
|
$(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
|
|
sal \
|
|
salhelper \
|
|
sb \
|
|
sfx \
|
|
svl \
|
|
svx \
|
|
svxcore \
|
|
svt \
|
|
tk \
|
|
tl \
|
|
ucbhelper \
|
|
utl \
|
|
vcl \
|
|
))
|
|
|
|
ifeq ($(OS),WNT)
|
|
$(eval $(call gb_Library_use_static_libraries,sofficeapp,\
|
|
$(if $(ENABLE_ONLINE_UPDATE_MAR),\
|
|
windows_process )\
|
|
))
|
|
endif
|
|
|
|
ifeq ($(OS),MACOSX)
|
|
|
|
$(eval $(call gb_Library_add_cxxflags,sofficeapp,\
|
|
$(gb_OBJCXXFLAGS) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_system_darwin_frameworks,sofficeapp,\
|
|
Foundation \
|
|
))
|
|
|
|
endif
|
|
|
|
ifeq ($(OS),iOS)
|
|
|
|
$(eval $(call gb_Library_add_cflags,sofficeapp,\
|
|
$(gb_OBJCFLAGS) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_cxxflags,sofficeapp,\
|
|
$(gb_OBJCXXFLAGS) \
|
|
))
|
|
|
|
endif
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
|
|
desktop/source/app/app \
|
|
desktop/source/app/appinit \
|
|
desktop/source/app/check_ext_deps \
|
|
desktop/source/app/cmdlineargs \
|
|
desktop/source/app/cmdlinehelp \
|
|
desktop/source/app/desktopcontext \
|
|
desktop/source/app/dispatchwatcher \
|
|
desktop/source/app/langselect \
|
|
desktop/source/app/lockfile2 \
|
|
desktop/source/app/officeipcthread \
|
|
desktop/source/app/opencl \
|
|
desktop/source/app/sofficemain \
|
|
$(if $(ENABLE_ONLINE_UPDATE_MAR),\
|
|
desktop/source/app/updater )\
|
|
desktop/source/app/userinstall \
|
|
desktop/source/migration/migration \
|
|
))
|
|
|
|
# LibreOfficeKit bits
|
|
ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),)
|
|
$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
|
|
desktop/source/lib/init \
|
|
desktop/source/lib/lokinteractionhandler \
|
|
$(if $(filter-out $(OS),iOS), \
|
|
desktop/source/lib/lokclipboard) \
|
|
$(if $(filter $(OS),ANDROID), \
|
|
desktop/source/lib/lokandroid) \
|
|
))
|
|
$(if $(filter-out $(OS),IOS), \
|
|
$(eval $(call gb_Library_set_componentfile,sofficeapp,desktop/lokclipboard,services)))
|
|
else
|
|
ifneq ($(filter TRUE,$(USING_X11) $(DISABLE_GUI))($filter EMSCRIPTEN,$(OS)),)
|
|
$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
|
|
desktop/source/lib/init \
|
|
desktop/source/lib/lokinteractionhandler \
|
|
desktop/source/lib/lokclipboard \
|
|
))
|
|
$(eval $(call gb_Library_set_componentfile,sofficeapp,desktop/lokclipboard,services))
|
|
endif
|
|
endif
|
|
|
|
# vim: set ts=4 sw=4 et:
|