diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-04-02 20:20:10 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-04-06 14:00:14 +0200 |
| commit | 4083ee2e8b0d59860e9f2161989ceed1ca384068 (patch) | |
| tree | e8f3c9cb67c8923a26b36612029c18c3714a6388 /sw/qa/extras/layout | |
| parent | fdfc672dde686d18e6213e642967bbdcdcc86146 (diff) | |
forcepoint#100 drop SwBorderAttrAccess to allow cache entry to be removed
for SwBorderAttr which gets deleted during this call
also includes...
Related: forcepoint#100 we don't need pAttrs for the duration of the full scope
similar to the case of
commit 6b1eae0334ba8bad7656a859695551ce51b62f95
Date: Fri May 18 08:26:14 2001 +0000
Fix #87058#: Locked boraderattribut
the SwCache object cannot be deleted if its locked, leading to a leak,
we don't need pAttrs for the entire scope here so we can defer to the
end of the scope the reacquire the lock to set pAttrs
and also includes...
Related: forcepoint#100 don't reacquire after every release
instead release when we have to, and only reacquire if necessary
before use of pAttrs
Change-Id: Ie52aab7e5933d76b0c055389798104e4d93f39e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132461
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/qa/extras/layout')
| -rw-r--r-- | sw/qa/extras/layout/data/forcepoint100.html | bin | 0 -> 21531 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 6 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sw/qa/extras/layout/data/forcepoint100.html b/sw/qa/extras/layout/data/forcepoint100.html Binary files differnew file mode 100644 index 000000000000..6e9b83a6c95e --- /dev/null +++ b/sw/qa/extras/layout/data/forcepoint100.html diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 11d2ffa7b570..3619b0ac84f4 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2530,6 +2530,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint94) } //just care it doesn't crash/assert +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint100) +{ + createSwWebDoc(DATA_DIRECTORY, "forcepoint100.html"); +} + +//just care it doesn't crash/assert CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf147485Forcepoint) { createSwDoc(DATA_DIRECTORY, "tdf147485-forcepoint.doc"); |