From fabca7370e22f96ae041dc179475b35c87ac53ec Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 29 Nov 2013 22:39:33 +0100 Subject: winaccessibility: remove global g_acc_manager It is possible to retrieve it via the AccTopWindowListener. Change-Id: I6cc5ab25bc937d0d9f4de54a1bed09a76ce27491 --- winaccessibility/inc/AccObjectManagerAgent.hxx | 9 ++++++--- winaccessibility/inc/AccObjectWinManager.hxx | 2 -- winaccessibility/inc/AccTopWindowListener.hxx | 2 ++ winaccessibility/inc/g_msacc.hxx | 27 -------------------------- 4 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 winaccessibility/inc/g_msacc.hxx (limited to 'winaccessibility/inc') diff --git a/winaccessibility/inc/AccObjectManagerAgent.hxx b/winaccessibility/inc/AccObjectManagerAgent.hxx index fd61c4047afb..5aa9f81e4abb 100644 --- a/winaccessibility/inc/AccObjectManagerAgent.hxx +++ b/winaccessibility/inc/AccObjectManagerAgent.hxx @@ -20,9 +20,9 @@ #ifndef __ACCOBJECTMANAGERAGENT_HXX #define __ACCOBJECTMANAGERAGENT_HXX -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_ +#include + #include -#endif struct IMAccessible; struct IAccessible; @@ -37,7 +37,7 @@ class AccObjectManagerAgent { private: - AccObjectWinManager* pWinManager; + boost::scoped_ptr pWinManager; public: @@ -96,6 +96,9 @@ public: bool IsTopWinAcc( com::sun::star::accessibility::XAccessible* pXAcc ); bool IsStateManageDescendant(com::sun::star::accessibility::XAccessible* pXAcc); + + sal_Int64 Get_ToATInterface(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam); + }; #endif diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx index f58a858d7c2d..84bfca64d879 100644 --- a/winaccessibility/inc/AccObjectWinManager.hxx +++ b/winaccessibility/inc/AccObjectWinManager.hxx @@ -97,8 +97,6 @@ public: void DeleteAccObj( com::sun::star::accessibility::XAccessible* pXAcc ); void DeleteChildrenAccObj(com::sun::star::accessibility::XAccessible* pAccObj); - static AccObjectWinManager* CreateAccObjectWinManagerInstance(AccObjectManagerAgent* Agent); - sal_Bool NotifyAccEvent( com::sun::star::accessibility::XAccessible* pXAcc,short state = 0 ); LPARAM Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam); diff --git a/winaccessibility/inc/AccTopWindowListener.hxx b/winaccessibility/inc/AccTopWindowListener.hxx index 9babd67d9065..278232003585 100644 --- a/winaccessibility/inc/AccTopWindowListener.hxx +++ b/winaccessibility/inc/AccTopWindowListener.hxx @@ -59,6 +59,8 @@ public: virtual void AddAllListeners(com::sun::star::accessibility::XAccessible* pAccessible,com::sun::star::accessibility::XAccessible* pParentXAcc,HWND pWND ); //for On-Demand load. virtual void HandleWindowOpened( com::sun::star::accessibility::XAccessible* pAccessible ); + + sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam); }; #endif diff --git a/winaccessibility/inc/g_msacc.hxx b/winaccessibility/inc/g_msacc.hxx deleted file mode 100644 index b9670cfa50bb..000000000000 --- a/winaccessibility/inc/g_msacc.hxx +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- 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 . - */ - -#ifndef __G_MSACC_HXX -#define __G_MSACC_HXX - -extern sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam); - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit