tdf#140280 sfx2: fix crash on double-clicking a no-sign shape in read-only mode
Don't assume that all shapes provide an InteropGrabBag UNO property,
check for it.
(cherry picked from commit c76e6307b6cf33bda0cfa12647ed0342aecc1b29)
Change-Id: I6347c54b0631c37154424babbfbd52f802af57d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110751
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/sfx2/CppunitTest_sfx2_doc.mk b/sfx2/CppunitTest_sfx2_doc.mk
new file mode 100644
index 0000000..02b06df
--- /dev/null
+++ b/sfx2/CppunitTest_sfx2_doc.mk
@@ -0,0 +1,45 @@
# -*- 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,sfx2_doc))
$(eval $(call gb_CppunitTest_use_externals,sfx2_doc,\
boost_headers \
))
$(eval $(call gb_CppunitTest_add_exception_objects,sfx2_doc, \
sfx2/qa/cppunit/doc \
))
$(eval $(call gb_CppunitTest_use_libraries,sfx2_doc, \
comphelper \
cppu \
sal \
test \
unotest \
sfx \
svl \
))
$(eval $(call gb_CppunitTest_use_sdk_api,sfx2_doc))
$(eval $(call gb_CppunitTest_use_ure,sfx2_doc))
$(eval $(call gb_CppunitTest_use_vcl,sfx2_doc))
$(eval $(call gb_CppunitTest_use_rdb,sfx2_doc,services))
$(eval $(call gb_CppunitTest_use_custom_headers,sfx2_doc,\
officecfg/registry \
))
$(eval $(call gb_CppunitTest_use_configuration,sfx2_doc))
# vim: set noet sw=4 ts=4:
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index d64b871..dbab052e 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_Module_add_check_targets,sfx2,\
CppunitTest_sfx2_controlleritem \
CppunitTest_sfx2_classification \
CppunitTest_sfx2_view \
CppunitTest_sfx2_doc \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\
diff --git a/sfx2/qa/cppunit/doc.cxx b/sfx2/qa/cppunit/doc.cxx
new file mode 100644
index 0000000..01e8fd7
--- /dev/null
+++ b/sfx2/qa/cppunit/doc.cxx
@@ -0,0 +1,81 @@
/* -*- 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 <test/bootstrapfixture.hxx>
#include <unotest/macros_test.hxx>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <comphelper/propertyvalue.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/sfxbasemodel.hxx>
using namespace com::sun::star;
namespace
{
/// Covers sfx2/source/doc/ fixes.
class Test : public test::BootstrapFixture, public unotest::MacrosTest
{
private:
uno::Reference<lang::XComponent> mxComponent;
public:
void setUp() override;
void tearDown() override;
uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
};
void Test::setUp()
{
test::BootstrapFixture::setUp();
mxDesktop.set(frame::Desktop::create(mxComponentContext));
}
void Test::tearDown()
{
if (mxComponent.is())
mxComponent->dispose();
test::BootstrapFixture::tearDown();
}
CPPUNIT_TEST_FIXTURE(Test, testNoGrabBagShape)
{
// Load a document and select the first shape.
css::uno::Sequence<css::beans::PropertyValue> aArgs{ comphelper::makePropertyValue("ReadOnly",
true) };
getComponent() = loadFromDesktop("private:factory/simpress", "", aArgs);
uno::Reference<frame::XModel> xModel(getComponent(), uno::UNO_QUERY);
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(xModel, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xDrawPage(
xDrawPagesSupplier->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
uno::Any aShape = xDrawPage->getByIndex(0);
uno::Reference<view::XSelectionSupplier> xController(xModel->getCurrentController(),
uno::UNO_QUERY);
xController->select(aShape);
// See if it has a signing certificate associated.
auto pBaseModel = dynamic_cast<SfxBaseModel*>(xModel.get());
CPPUNIT_ASSERT(pBaseModel);
SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
// Without the accompanying fix in place, this test would have failed with:
// An uncaught exception of type com.sun.star.beans.UnknownPropertyException
// which was not caught later, resulting in a crash.
pObjectShell->GetSignPDFCertificate();
}
}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 5a4354b..8332710 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -428,6 +428,11 @@ uno::Reference<security::XCertificate> SfxObjectShell::GetSignPDFCertificate() c
return uno::Reference<security::XCertificate>();
}
if (!xShapeProps->getPropertySetInfo()->hasPropertyByName("InteropGrabBag"))
{
return uno::Reference<security::XCertificate>();
}
comphelper::SequenceAsHashMap aMap(xShapeProps->getPropertyValue("InteropGrabBag"));
auto it = aMap.find("SignatureCertificate");
if (it == aMap.end())
