4521cb0c40
Inspired by <https://gcc.gnu.org/pipermail/gcc-patches/2022-November/607102.html> "[PATCH] doc: -Wdelete-non-virtual-dtor supersedes -Wnon-virtual-dtor", drop explicitly enabling -Wnon-virtual-dtor in favor of -Wdelete-non-virtual-dtor, which is already enabled by -Wall. (-Wdelete-non-virtual-dtor first appeared in Clang 3.0, <8bd428574c> "Add new warning that warns when invoking 'delete' on a polymorphic, non-final, class without a virtual destructor", and GCC 4.7, <https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=014ab419efc12a59efebd2720d79e1c055675c85> "invoke.texi: Document -Wdelete-non-virtual-dtor. [...]") Dropping the explicit setting of -Wnon-virtual-dtor (and nowhere setting it implicitly via -Weffc++) means we can get rid of lots of places that either set -Wno-non-virtual-dtor or use some pragma to ignore -Wnon-virtual-dtor. (In various places across extensions/source/activex/ and winaccessibility/, the commitsf26996bd33"Silence -Werror,-Wnon-virtual-dtor in generated so_activex.h (clang-cl)" andc6086ca653"Silence -Werror,-Wnon-virtual-dtor in generated UAccCOM.h (clang-cl)" had singled out some includes to wrap them in pragmas. Now that those pragmas are gone again, move those includes back to where they had been prior to being singled out. And the -Wno-non-virtual-dtor in external/firebird/macos-arm64.patch.0 appeared first inccd0e5f445"Make firebird build for macOS on arm64", which, though it doesn't state it explicitly, apparently created that patch's builds/posix/prefix.darwin_arm64 as a copy of firebird's already existing builds/posix/prefix.* files, which routinely include that warning option too, so keep it there too even if it is probably irrelevant throughout.) Change-Id: I7e4fa9f2c07e267b2ed15607905027f6b78142f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143182 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
98 lines
3 KiB
C++
98 lines
3 KiB
C++
/* -*- 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/.
|
|
*
|
|
* 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 .
|
|
*/
|
|
|
|
// SOActionsApproval.h: Definition of the SOActionsApproval class
|
|
|
|
#pragma once
|
|
|
|
#ifdef _MSC_VER
|
|
#pragma once
|
|
#endif
|
|
|
|
#include "resource.h"
|
|
#include <ExDispID.h>
|
|
#include <ExDisp.h>
|
|
#include <shlguid.h>
|
|
|
|
#include <atlctl.h>
|
|
|
|
#include <so_activex.h>
|
|
|
|
// SOActionsApproval
|
|
|
|
class SOActionsApproval :
|
|
public IDispatchImpl<ISOActionsApproval, &IID_ISOActionsApproval, &LIBID_SO_ACTIVEXLib>,
|
|
public ISupportErrorInfo,
|
|
public CComObjectRoot,
|
|
public CComCoClass<SOActionsApproval,&CLSID_SOActionsApproval>
|
|
{
|
|
public:
|
|
SOActionsApproval() {}
|
|
virtual ~SOActionsApproval() {}
|
|
|
|
BEGIN_COM_MAP(SOActionsApproval)
|
|
COM_INTERFACE_ENTRY(IDispatch)
|
|
COM_INTERFACE_ENTRY(ISOActionsApproval)
|
|
COM_INTERFACE_ENTRY(ISupportErrorInfo)
|
|
#if defined __clang__
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Winconsistent-missing-override"
|
|
#endif
|
|
END_COM_MAP()
|
|
#if defined __clang__
|
|
#pragma clang diagnostic pop
|
|
#endif
|
|
DECLARE_NOT_AGGREGATABLE(SOActionsApproval)
|
|
// Remove the comment from the line above if you don't want your object to
|
|
// support aggregation.
|
|
|
|
DECLARE_REGISTRY_RESOURCEID(IDR_SODOCUMENTEVENTLISTENER)
|
|
|
|
// ISupportsErrorInfo
|
|
STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid) override;
|
|
|
|
// ISOActionsApproval
|
|
virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE approveAction(
|
|
/* [in] */ long nActionID,
|
|
/* [retval][out] */ boolean *pbApproval) override
|
|
{
|
|
// only PreventClose is approved
|
|
USES_CONVERSION;
|
|
*pbApproval = ( nActionID == 1 );
|
|
|
|
return S_OK;
|
|
}
|
|
|
|
virtual /* [helpstring][id][propget] */ HRESULT STDMETHODCALLTYPE get_Bridge_implementedInterfaces(
|
|
/* [retval][out] */ SAFEARRAY __RPC_FAR * __RPC_FAR *pVal) override
|
|
{
|
|
*pVal = SafeArrayCreateVector( VT_BSTR, 0, 1 );
|
|
|
|
if( !*pVal )
|
|
return E_FAIL;
|
|
|
|
LONG ix = 0;
|
|
CComBSTR aInterface( OLESTR( "com.sun.star.embed.XActionsApproval" ) );
|
|
SafeArrayPutElement( *pVal, &ix, aInterface );
|
|
|
|
return S_OK;
|
|
}
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|