Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 70 insertions, 0 deletions

diff --git a/sw/qa/core/view/data/update-ole-object-previews.odt b/sw/qa/core/view/data/update-ole-object-previews.odt
new file mode 100644
index 000000000..e6004afcb
--- /dev/null
+++ b/sw/qa/core/view/data/update-ole-object-previews.odt
diff --git a/sw/qa/core/view/view.cxx b/sw/qa/core/view/view.cxx
new file mode 100644
index 000000000..3ff399a0f
--- /dev/null
+++ b/sw/qa/core/view/view.cxx
@@ -0,0 +1,70 @@
+/* -*- 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 <swmodeltestbase.hxx>
+
+#include <svtools/embedhlp.hxx>
+#include <vcl/graph.hxx>
+
+#include <doc.hxx>
+#include <docsh.hxx>
+#include <fmtcntnt.hxx>
+#include <frameformats.hxx>
+#include <frmfmt.hxx>
+#include <ndarr.hxx>
+#include <ndindex.hxx>
+#include <ndole.hxx>
+#include <node.hxx>
+#include <nodeoffset.hxx>
+#include <wrtsh.hxx>
+
+constexpr OUStringLiteral DATA_DIRECTORY = u"/sw/qa/core/view/data/";
+
+namespace
+{
+/// Covers sw/source/core/view/ fixes.
+class Test : public SwModelTestBase
+{
+};
+}
+
+CPPUNIT_TEST_FIXTURE(Test, testUpdateOleObjectPreviews)
+{
+    // Given a document with two embedded objects, both with broken native data:
+    SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "update-ole-object-previews.odt");
+    SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+    // When updating the previews of those embedded objects (right after document load, before
+    // painting the OLE objects):
+    pWrtShell->UpdateOleObjectPreviews();
+
+    // Then make sure that the working preview of those objects are not lost:
+    const SwFrameFormats* pFormats = pDoc->GetSpzFrameFormats();
+    CPPUNIT_ASSERT(pFormats);
+    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), pFormats->size());
+    for (size_t i = 0; i < pFormats->size(); ++i)
+    {
+        SwFrameFormat* pFormat = (*pFormats)[i];
+
+        const SwNodeIndex* pNodeIndex = pFormat->GetContent().GetContentIdx();
+        CPPUNIT_ASSERT(pNodeIndex);
+        SwNode* pNode = pDoc->GetNodes()[pNodeIndex->GetIndex() + 1];
+        SwOLENode* pOleNode = pNode->GetOLENode();
+        CPPUNIT_ASSERT(pOleNode);
+        SwOLEObj& rOleObj = pOleNode->GetOLEObj();
+        svt::EmbeddedObjectRef& rObject = rOleObj.GetObject();
+        // Without the accompanying fix in place, this test would have failed, the update broke the
+        // preview of the second embedded object.
+        CPPUNIT_ASSERT(!rObject.GetGraphic()->IsNone());
+    }
+}
+
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */