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>
122 lines
3.9 KiB
C++
122 lines
3.9 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 .
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <vector>
|
|
#include <map>
|
|
#if !defined WIN32_LEAN_AND_MEAN
|
|
# define WIN32_LEAN_AND_MEAN
|
|
#endif
|
|
#include <windows.h>
|
|
#include <oleacc.h>
|
|
|
|
#include <rtl/ref.hxx>
|
|
|
|
#include <com/sun/star/accessibility/XAccessible.hpp>
|
|
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
|
|
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
|
|
|
|
#include "accHelper.hxx"
|
|
#include <UAccCOM.h>
|
|
|
|
class AccEventListener;
|
|
class AccObjectManagerAgent;
|
|
class AccObject;
|
|
|
|
typedef std::vector<AccObject *> IAccChildList;
|
|
|
|
|
|
class AccObject
|
|
{
|
|
private:
|
|
|
|
short m_accRole;
|
|
long m_resID;
|
|
HWND m_pParantID;
|
|
IMAccessible* m_pIMAcc;
|
|
AccObject* m_pParentObj;
|
|
IAccChildList m_childrenList;
|
|
::rtl::Reference<AccEventListener> m_pListener;
|
|
|
|
css::uno::Reference < css::accessibility::XAccessible > m_xAccRef;
|
|
css::uno::Reference < css::accessibility::XAccessibleAction > m_xAccActionRef;
|
|
css::uno::Reference < css::accessibility::XAccessibleContext > m_xAccContextRef;
|
|
|
|
void ImplInitializeCreateObj();//create COM object
|
|
|
|
void UpdateActionDesc();
|
|
void UpdateRole();
|
|
|
|
DWORD GetMSAAStateFromUNO(sal_Int64 xState);//translate state from UNO to MSAA value
|
|
css::accessibility::XAccessibleSelection* GetXAccessibleSelection();
|
|
void GetExpandedState(sal_Bool* isExpandable, sal_Bool* isExpanded);
|
|
OUString GetMAccessibleValueFromAny(css::uno::Any pAny);
|
|
|
|
public:
|
|
|
|
AccObject ( css::accessibility::XAccessible* pXAcc = nullptr,AccObjectManagerAgent* pAgent = nullptr ,AccEventListener* accListener=nullptr);
|
|
virtual ~AccObject();
|
|
|
|
bool UpdateAccessibleInfoFromUnoToMSAA( ); //implement accessible information mapping
|
|
void UpdateDefaultAction();
|
|
|
|
IMAccessible* GetIMAccessible(); //return COM interface in acc object
|
|
css::uno::Reference<css::accessibility::XAccessible> const& GetXAccessible();
|
|
|
|
void SetResID(long id);//ResID means ChildID in MSAA
|
|
long GetResID();
|
|
|
|
|
|
void SetParentHWND(HWND hWnd);//need to set top window handle when send event to AT
|
|
HWND GetParentHWND();
|
|
|
|
void SetListener(::rtl::Reference<AccEventListener> const& pListener);
|
|
AccEventListener* getListener();
|
|
|
|
void SetParentObj(AccObject* pParentAccObj);
|
|
AccObject* GetParentObj();
|
|
|
|
void InsertChild( AccObject* pChild,short pos = LAST_CHILD);
|
|
void DeleteChild( AccObject* pChild );
|
|
AccObject* NextChild();
|
|
|
|
void NotifyDestroy();
|
|
|
|
void DecreaseState( sal_Int64 xState );//call COM interface DecreaseState method
|
|
void IncreaseState( sal_Int64 xState );//call COM interface IncreaseState method
|
|
|
|
void SetName( css::uno::Any newName);
|
|
void SetValue( css::uno::Any pAny );
|
|
|
|
short GetRole() const;
|
|
|
|
void UpdateState();
|
|
void UpdateName();
|
|
void UpdateValue();
|
|
void UpdateAction();
|
|
void UpdateValidWindow();
|
|
|
|
void setFocus();
|
|
void unsetFocus();
|
|
|
|
void setLocalizedResourceString();
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|