Balazs Varga
c00a23393a
After reverting 2b4cd99d, editing an OLE link whose source is already
open in this LO instance produces a sharing-violation on save (the
intra-process scenario tdf#126742 was working around).
Detect the conflict at doVerb, gated to verbs targeting a visible
state so internal RUNNING transitions aren't intercepted. If the
source is loaded as another visible frame in this LO, switch to that
window (matches MSO behaviour). Otherwise probe for any .~lock or
MSO ~$ file - foreign user, hidden own frame, or stale own lock from
a crash - and show an async warning with the lock owner. In all
cases the OLE working copy is never created. Skipped in headless
mode.
Change-Id: Ic87bb6f073b0b04ec47597cc15f2c5a83cc2bffc
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/2004
Reviewed-by: Michael Stahl <michael.stahl@collabora.com>
Tested-by: Jenkins CPCI <releng@collaboraoffice.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204940
Reviewed-by: Balazs Varga <balazs.varga@collabora.com>
Tested-by: Jenkins
60 lines
1.5 KiB
Makefile
60 lines
1.5 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,embobj))
|
|
|
|
$(eval $(call gb_Library_use_custom_headers,embobj,\
|
|
officecfg/registry \
|
|
))
|
|
|
|
$(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj,services))
|
|
|
|
$(eval $(call gb_Library_set_include,embobj,\
|
|
-I$(SRCDIR)/embeddedobj/source/inc \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,embobj,\
|
|
-DEMBOBJ_DLLIMPLEMENTATION \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_external,embobj,boost_headers))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,embobj))
|
|
|
|
$(eval $(call gb_Library_use_libraries,embobj,\
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
sal \
|
|
svl \
|
|
svt \
|
|
utl \
|
|
vcl \
|
|
tl \
|
|
i18nlangtag \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,embobj,\
|
|
embeddedobj/source/commonembedding/embedobj \
|
|
embeddedobj/source/commonembedding/inplaceobj \
|
|
embeddedobj/source/commonembedding/miscobj \
|
|
embeddedobj/source/commonembedding/persistence \
|
|
embeddedobj/source/commonembedding/specialobject \
|
|
embeddedobj/source/commonembedding/visobj \
|
|
embeddedobj/source/commonembedding/xfactory \
|
|
embeddedobj/source/general/docholder \
|
|
embeddedobj/source/general/dummyobject \
|
|
embeddedobj/source/general/intercept \
|
|
embeddedobj/source/general/xcreator \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|