080e455025
This reverts changes that were made to prevent process exit when an OLE client is connected. These commits had the side effect of preventing the use case of creating a document via OLE, and then allowing the user to view/edit and ultimately quit from the GUI. Revert "More hacks for quit requests from an OLE Automation client" This reverts commit05e03911cd. Revert "Veto process exit while an OLE client is connected" This reverts commit89f883bd90. Change-Id: I29a1e42a830815bc8d1ff0056c22d86b8f98cc1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118596 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
44 lines
1.6 KiB
C++
44 lines
1.6 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
|
/*
|
|
* 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/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
|
|
#include <com/sun/star/frame/Desktop.hpp>
|
|
#include <com/sun/star/frame/XDesktop2.hpp>
|
|
#include <com/sun/star/uno/Reference.hxx>
|
|
|
|
#include <comphelper/asyncquithandler.hxx>
|
|
#include <comphelper/processfactory.hxx>
|
|
|
|
AsyncQuitHandler::AsyncQuitHandler() {}
|
|
|
|
AsyncQuitHandler& AsyncQuitHandler::instance()
|
|
{
|
|
static AsyncQuitHandler aInst;
|
|
return aInst;
|
|
}
|
|
|
|
void AsyncQuitHandler::QuitApplication()
|
|
{
|
|
css::uno::Reference<css::frame::XDesktop2> xDesktop
|
|
= css::frame::Desktop::create(comphelper::getProcessComponentContext());
|
|
xDesktop->terminate();
|
|
}
|
|
|
|
IMPL_STATIC_LINK_NOARG(AsyncQuitHandler, OnAsyncQuit, void*, void) { QuitApplication(); }
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|