From 940b4d1848e8c70ab7642901a68594e8016caffc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 18:51:28 +0200 Subject: Adding upstream version 1:7.0.4. Signed-off-by: Daniel Baumann --- sw/qa/core/draw/data/as-char-textbox.docx | Bin 0 -> 6908 bytes sw/qa/core/draw/draw.cxx | 51 ++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 sw/qa/core/draw/data/as-char-textbox.docx create mode 100644 sw/qa/core/draw/draw.cxx (limited to 'sw/qa/core/draw') diff --git a/sw/qa/core/draw/data/as-char-textbox.docx b/sw/qa/core/draw/data/as-char-textbox.docx new file mode 100644 index 000000000..3edf7c632 Binary files /dev/null and b/sw/qa/core/draw/data/as-char-textbox.docx differ diff --git a/sw/qa/core/draw/draw.cxx b/sw/qa/core/draw/draw.cxx new file mode 100644 index 000000000..162bf237d --- /dev/null +++ b/sw/qa/core/draw/draw.cxx @@ -0,0 +1,51 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * 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/. + */ + +#include + +#include + +#include +#include +#include +#include + +char const DATA_DIRECTORY[] = "/sw/qa/core/draw/data/"; + +/// Covers sw/source/core/draw/ fixes. +class SwCoreDrawTest : public SwModelTestBase +{ +}; + +CPPUNIT_TEST_FIXTURE(SwCoreDrawTest, testTextboxDeleteAsChar) +{ + // Load a document with an as-char shape in it that has a textbox and an image in it. + SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "as-char-textbox.docx"); + SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); + SdrPage* pPage = pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0); + sal_Int32 nActual = pPage->GetObjCount(); + // 3 objects on the draw page: a shape + fly frame pair and a Writer image. + CPPUNIT_ASSERT_EQUAL(static_cast(3), nActual); + + // Select the shape of the textbox and delete it. + SdrObject* pObject = pPage->GetObj(0); + pWrtShell->SelectObj(Point(), 0, pObject); + pWrtShell->DelSelectedObj(); + nActual = pPage->GetObjCount(); + + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 0 + // - Actual : 2 + // i.e. the fly frame of the shape and the inner Writer image was not deleted. + CPPUNIT_ASSERT_EQUAL(static_cast(0), nActual); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3