mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

winaccessibility: remove global g_acc_manager

Browse Source 
It is possible to retrieve it via the AccTopWindowListener.

Change-Id: I6cc5ab25bc937d0d9f4de54a1bed09a76ce27491
This commit is contained in:
Michael Stahl 2013-11-29 22:39:33 +01:00
parent b54d441ad7
commit fabca7370e
8 changed files with 33 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winaccessibility/inc/AccObjectManagerAgent.hxx
View File

@ -20,9 +20,9 @@
#ifndef __ACCOBJECTMANAGERAGENT_HXX
#define __ACCOBJECTMANAGERAGENT_HXX
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_
#include <boost/scoped_ptr.hpp>
#include <com/sun/star/accessibility/XAccessible.hpp>
#endif
struct IMAccessible;
struct IAccessible;
@ -37,7 +37,7 @@ class AccObjectManagerAgent
{
private:
AccObjectWinManager* pWinManager;
boost::scoped_ptr<AccObjectWinManager> 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

2
winaccessibility/inc/AccObjectWinManager.hxx
View File

@ -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);

2
winaccessibility/inc/AccTopWindowListener.hxx
View File

@ -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

27
winaccessibility/inc/g_msacc.hxx
View File

@ -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: */

22
winaccessibility/source/service/AccObjectManagerAgent.cxx
View File

@ -30,19 +30,13 @@ using namespace com::sun::star::accessibility;
* @param
* @return
*/
AccObjectManagerAgent::AccObjectManagerAgent():
pWinManager(NULL)
AccObjectManagerAgent::AccObjectManagerAgent()
: pWinManager(new AccObjectWinManager(this))
{
if( pWinManager == NULL )
{
pWinManager = AccObjectWinManager::CreateAccObjectWinManagerInstance(this);
}
}
AccObjectManagerAgent::~AccObjectManagerAgent()
{
delete pWinManager;
pWinManager = NULL;
}
/**
@ -388,4 +382,16 @@ bool AccObjectManagerAgent::IsStateManageDescendant(XAccessible* pXAcc)
return false;
}
/**
* Implementation of interface XMSAAService's method getAccObjectPtr()
* that returns the corresponding COM interface with the MS event.
* @return Com interface.
*/
sal_Int64 AccObjectManagerAgent::Get_ToATInterface(
sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
{
return static_cast<sal_Int64>(pWinManager->Get_ToATInterface(
static_cast<HWND>(reinterpret_cast<void*>(hWnd)), lParam, wParam));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

33
winaccessibility/source/service/AccObjectWinManager.cxx
View File

@ -53,23 +53,6 @@ using namespace com::sun::star::accessibility::AccessibleRole;
using namespace com::sun::star::accessibility::AccessibleStateType;
using namespace com::sun::star::uno;
AccObjectWinManager* g_acc_manager = NULL;
/**
* Implementation of interface XMSAAService's method getAccObjectPtr() that return the
* corresponding com interface with the MS event.
*
* @param
* @return Com interface.
*/
sal_Int64 GetMSComPtr(sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
{
if (!g_acc_manager)
return 0;
return static_cast<sal_Int64>(g_acc_manager->Get_ToATInterface(
static_cast<HWND>(reinterpret_cast<void*>(hWnd)), lParam, wParam));
}
/**
* constructor
* @param Agent The agent kept in all listeners,it's the sole interface by which
@ -88,22 +71,6 @@ AccObjectWinManager::AccObjectWinManager( AccObjectManagerAgent* Agent ):
{
}
/**
* Public method to produce manager
* @param Agent The agent kept in all listeners,it's the sole interface by which
* listener communicate with windows manager.
* @return
*/
AccObjectWinManager* AccObjectWinManager::CreateAccObjectWinManagerInstance( AccObjectManagerAgent* Agent )
{
if (!g_acc_manager)
{
g_acc_manager = new AccObjectWinManager( Agent );
}
return g_acc_manager;
}
/**
* Destructor,clear all resource.
* @param

6
winaccessibility/source/service/AccTopWindowListener.cxx
View File

@ -255,4 +255,10 @@ void AccTopWindowListener::disposing( const ::com::sun::star::lang::EventObject&
{
}
sal_Int64 AccTopWindowListener::GetMSComPtr(
sal_Int64 hWnd, sal_Int64 lParam, sal_Int64 wParam)
{
return accManagerAgent.Get_ToATInterface(hWnd, lParam, wParam);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

7
winaccessibility/source/service/msaaservice_impl.cxx
View File

@ -42,7 +42,6 @@ using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::awt;
#include "AccTopWindowListener.hxx"
#include "g_msacc.hxx"
namespace my_sc_impl
{
@ -96,7 +95,11 @@ throw (RuntimeException)
{
SolarMutexGuard g;
return GetMSComPtr( hWnd, lParam, wParam );
if (!m_pTopWindowListener.is())
{
return 0;
}
return m_pTopWindowListener->GetMSComPtr(hWnd, lParam, wParam);
}
/**