svtools: fix lost replacement non-rendered graphic when updating it fails
This is similar to commit 8780fa41dcd164af244742461f4e57a4bcf4c7a4
(svtools: fix lost replacement grpahic when updating it via OLE fails,
2018-10-30), but that case was when we already had an old
mpImpl->pGraphic, the updated failed and then we already lost the old
one but didn't have a new one.
Here what happened is that in case tools -> update -> update-all was
used for an OLE object which had bad native data but a good preview,
then the result was bad preview, depending on if you first scrolled to
the OLE object to trigger rendering (good) or not (bad).
The reason for this is that scrolling to the object calls GetGraphic(),
which sets mpImpl->pGraphic using GetReplacement(bUpdate=false), which
works, but svt::EmbeddedObjectRef::UpdateReplacement() calls
GetReplacement(bUpdate=true). That explains why the update breaks the
preview, but not when scrolling to it first.
Fix the problem by improving svt::EmbeddedObjectRef::GetReplacement():
if getting an updated graphic fails, try to get a non-updated graphic.
The result is that GetGraphic() after an UpdateReplacement() not only
always return a non-nullptr Graphic, but also it's no longer of type
None.
Change-Id: I8e5ff4aaaefdc58e032b325bb4001f2a604ccc8a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130086
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
2022-02-17 11:00:24 -06:00
|
|
|
# -*- 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_CppunitTest_CppunitTest,sw_core_view))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_view))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_view, \
|
|
|
|
sw/qa/core/view/view \
|
|
|
|
))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_use_libraries,sw_core_view, \
|
|
|
|
cppu \
|
|
|
|
cppuhelper \
|
|
|
|
sal \
|
2022-11-08 11:27:05 -06:00
|
|
|
subsequenttest \
|
svtools: fix lost replacement non-rendered graphic when updating it fails
This is similar to commit 8780fa41dcd164af244742461f4e57a4bcf4c7a4
(svtools: fix lost replacement grpahic when updating it via OLE fails,
2018-10-30), but that case was when we already had an old
mpImpl->pGraphic, the updated failed and then we already lost the old
one but didn't have a new one.
Here what happened is that in case tools -> update -> update-all was
used for an OLE object which had bad native data but a good preview,
then the result was bad preview, depending on if you first scrolled to
the OLE object to trigger rendering (good) or not (bad).
The reason for this is that scrolling to the object calls GetGraphic(),
which sets mpImpl->pGraphic using GetReplacement(bUpdate=false), which
works, but svt::EmbeddedObjectRef::UpdateReplacement() calls
GetReplacement(bUpdate=true). That explains why the update breaks the
preview, but not when scrolling to it first.
Fix the problem by improving svt::EmbeddedObjectRef::GetReplacement():
if getting an updated graphic fails, try to get a non-updated graphic.
The result is that GetGraphic() after an UpdateReplacement() not only
always return a non-nullptr Graphic, but also it's no longer of type
None.
Change-Id: I8e5ff4aaaefdc58e032b325bb4001f2a604ccc8a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130086
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
2022-02-17 11:00:24 -06:00
|
|
|
svl \
|
|
|
|
svt \
|
|
|
|
sw \
|
|
|
|
swqahelper \
|
|
|
|
test \
|
|
|
|
unotest \
|
|
|
|
utl \
|
|
|
|
vcl \
|
2022-09-15 01:36:27 -05:00
|
|
|
tl \
|
svtools: fix lost replacement non-rendered graphic when updating it fails
This is similar to commit 8780fa41dcd164af244742461f4e57a4bcf4c7a4
(svtools: fix lost replacement grpahic when updating it via OLE fails,
2018-10-30), but that case was when we already had an old
mpImpl->pGraphic, the updated failed and then we already lost the old
one but didn't have a new one.
Here what happened is that in case tools -> update -> update-all was
used for an OLE object which had bad native data but a good preview,
then the result was bad preview, depending on if you first scrolled to
the OLE object to trigger rendering (good) or not (bad).
The reason for this is that scrolling to the object calls GetGraphic(),
which sets mpImpl->pGraphic using GetReplacement(bUpdate=false), which
works, but svt::EmbeddedObjectRef::UpdateReplacement() calls
GetReplacement(bUpdate=true). That explains why the update breaks the
preview, but not when scrolling to it first.
Fix the problem by improving svt::EmbeddedObjectRef::GetReplacement():
if getting an updated graphic fails, try to get a non-updated graphic.
The result is that GetGraphic() after an UpdateReplacement() not only
always return a non-nullptr Graphic, but also it's no longer of type
None.
Change-Id: I8e5ff4aaaefdc58e032b325bb4001f2a604ccc8a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130086
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
2022-02-17 11:00:24 -06:00
|
|
|
))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_use_externals,sw_core_view,\
|
|
|
|
boost_headers \
|
|
|
|
libxml2 \
|
|
|
|
))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_set_include,sw_core_view,\
|
|
|
|
-I$(SRCDIR)/sw/inc \
|
|
|
|
-I$(SRCDIR)/sw/source/core/inc \
|
|
|
|
-I$(SRCDIR)/sw/source/uibase/inc \
|
|
|
|
-I$(SRCDIR)/sw/qa/inc \
|
|
|
|
$$(INCLUDE) \
|
|
|
|
))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_use_api,sw_core_view,\
|
|
|
|
udkapi \
|
|
|
|
offapi \
|
|
|
|
oovbaapi \
|
|
|
|
))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_use_ure,sw_core_view))
|
|
|
|
$(eval $(call gb_CppunitTest_use_vcl,sw_core_view))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_use_rdb,sw_core_view,services))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_use_custom_headers,sw_core_view,\
|
|
|
|
officecfg/registry \
|
|
|
|
))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_use_configuration,sw_core_view))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_use_uiconfigs,sw_core_view, \
|
|
|
|
modules/swriter \
|
|
|
|
))
|
|
|
|
|
|
|
|
$(eval $(call gb_CppunitTest_use_more_fonts,sw_core_view))
|
|
|
|
|
|
|
|
# vim: set noet sw=4 ts=4:
|