configure.ac | 3 +-
sw/qa/extras/uiwriter/data/tdf149507.docx |binary
sw/qa/extras/uiwriter/uiwriter3.cxx | 36 ++++++++++++++++++++++++++++++
3 files changed, 38 insertions(+), 1 deletion(-)
New commits:
commit 1968563b1dec40f2134a04b1241178ae27b0d6bb
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Jun 14 12:22:10 2022 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jun 15 08:42:18 2022 +0200
tdf#149507: sw_uiwriter3: Add unittest
Change-Id: I3268e2b286045257f2974b6b0397991d3aebc0eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135820
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/qa/extras/uiwriter/data/tdf149507.docx
b/sw/qa/extras/uiwriter/data/tdf149507.docx
new file mode 100644
index 000000000000..83704edfb8b3
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf149507.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 1c7c4a87d3c5..619e5c032549 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -131,6 +131,42 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf146848)
CPPUNIT_ASSERT_EQUAL(4, nFieldsCount);
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf149507)
+{
+ createSwDoc(DATA_DIRECTORY, "tdf149507.docx");
+
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
+ CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+ dispatchCommand(mxComponent, ".uno:SelectAll", {});
+ Scheduler::ProcessEventsToIdle();
+
+ dispatchCommand(mxComponent, ".uno:Cut", {});
+ Scheduler::ProcessEventsToIdle();
+
+ CPPUNIT_ASSERT_EQUAL(0, getShapes());
+ CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+ dispatchCommand(mxComponent, ".uno:Paste", {});
+ Scheduler::ProcessEventsToIdle();
+
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
+ CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+ // Without the fix in place, this test would have crashed here
+ dispatchCommand(mxComponent, ".uno:Undo", {});
+ Scheduler::ProcessEventsToIdle();
+
+ CPPUNIT_ASSERT_EQUAL(0, getShapes());
+ CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+ dispatchCommand(mxComponent, ".uno:Undo", {});
+ Scheduler::ProcessEventsToIdle();
+
+ CPPUNIT_ASSERT_EQUAL(1, getShapes());
+ CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf145321)
{
createSwDoc(DATA_DIRECTORY, "tdf145321.odt");
commit 47f1602b2681130e1400a37909fac3dfa7f667bb
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Tue Jun 14 14:10:04 2022 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Jun 15 08:41:55 2022 +0200
Fix with-vendor for cross-build targets some more
Regression from be2252c8d3e5d892ec1e6b12a2b55c2026597cb9 where spaces
in --with-vendor end up being poorly quoted.
Opted to pass down --with-vendor to sub-configure unconditionally even
if empty, due to the need of word splitting generally being needed for
the sub_conf_opts variable.
Change-Id: Id3740255bc8fbf98adf7464de7e2836fcde9f2fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135826
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index f2dded1c65c8..8c24eb84fd5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5651,7 +5651,6 @@ if test "$cross_compiling" = "yes"; then
test "$enable_wasm_strip" = "yes" && sub_conf_opts="$sub_conf_opts
--enable-wasm-strip"
test "${with_system_lockfile+set}" = set && sub_conf_opts="$sub_conf_opts
--with-system-lockfile=${with_system_lockfile}"
test "${enable_fuzzers}" = yes && sub_conf_opts="$sub_conf_opts
--without-system-libxml"
- test -n "$with_vendor" -a "$with_vendor" != "no" &&
sub_conf_opts="$sub_conf_opts --with-vendor=$with_vendor"
if test "$_os" = "Emscripten"; then
sub_conf_opts="$sub_conf_opts --without-system-libxml
--without-system-fontconfig --without-system-freetype --without-system-zlib"
fi
@@ -5689,6 +5688,7 @@ if test "$cross_compiling" = "yes"; then
$sub_conf_defaults \
--with-parallelism="'$with_parallelism'" \
--with-theme="'$with_theme'" \
+ --with-vendor="'$with_vendor'" \
$sub_conf_opts \
$with_build_platform_configure_options \
--srcdir=$srcdir
@@ -5697,6 +5697,7 @@ if test "$cross_compiling" = "yes"; then
$sub_conf_defaults \
--with-parallelism="$with_parallelism" \
--with-theme="$with_theme" \
+ "--with-vendor=$with_vendor" \
$sub_conf_opts \
$with_build_platform_configure_options \
--srcdir=$srcdir \
