[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - winaccessibility/source
Michael Stahl
mstahl at redhat.com
Wed Nov 27 16:06:05 PST 2013
winaccessibility/source/UAccCOM/AccHypertext.cxx | 2 --
winaccessibility/source/UAccCOM/AccTable.cxx | 6 ------
winaccessibility/source/UAccCOM/EnumVariant.cxx | 2 --
winaccessibility/source/UAccCOM/MAccessible.cxx | 6 ------
winaccessibility/source/service/AccObject.cxx | 2 --
5 files changed, 18 deletions(-)
New commits:
commit f74f9e85fca5a84b62a442d04d47aafa4c3a34ec
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Nov 25 13:39:22 2013 +0100
winaccessibility: remove ActivateActContext calls
Obsolete since 732ec36edfd09d2091d70c4d71b5f182fe279c45
Change-Id: I32e880f6a35ffd628b5873a4a7e05def73b939ca
diff --git a/winaccessibility/source/UAccCOM/AccHypertext.cxx b/winaccessibility/source/UAccCOM/AccHypertext.cxx
index ae9e86a..7214493 100644
--- a/winaccessibility/source/UAccCOM/AccHypertext.cxx
+++ b/winaccessibility/source/UAccCOM/AccHypertext.cxx
@@ -325,11 +325,9 @@ STDMETHODIMP CAccHypertext::get_hyperlink(long index,IAccessibleHyperlink **hype
}
IAccessibleHyperlink* plink = NULL;
- ActivateActContext();
HRESULT hr = CoCreateInstance( CLSID_AccHyperLink, NULL, CLSCTX_SERVER ,
IID_IAccessibleHyperlink,
(void **)&plink);
- DeactivateActContext();
if( SUCCEEDED(hr) )
{
IUNOXWrapper* wrapper = NULL;
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx
index f3a1558..0debddf 100644
--- a/winaccessibility/source/UAccCOM/AccTable.cxx
+++ b/winaccessibility/source/UAccCOM/AccTable.cxx
@@ -214,13 +214,10 @@ STDMETHODIMP CAccTable::get_columnHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *
*startingRowIndex = 0 ;
IMAccessible* pIMacc = NULL;
- ActivateActContext();
HRESULT hr = CoCreateInstance( CLSID_MAccessible, NULL, CLSCTX_ALL ,
IID_IMAccessible,
(void **)&pIMacc
);
- DeactivateActContext();
-
if (!SUCCEEDED(hr))
{
return E_FAIL;
@@ -448,13 +445,10 @@ STDMETHODIMP CAccTable::get_rowHeader(IAccessibleTable __RPC_FAR *__RPC_FAR *acc
*startingColumnIndex = 0 ;
IMAccessible* pIMacc = NULL;
- ActivateActContext();
HRESULT hr = CoCreateInstance( CLSID_MAccessible, NULL, CLSCTX_ALL ,
IID_IMAccessible,
(void **)&pIMacc
);
- DeactivateActContext();
-
if (!SUCCEEDED(hr))
{
return E_FAIL;
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx b/winaccessibility/source/UAccCOM/EnumVariant.cxx
index f588dd2..d0afe3e 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.cxx
+++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx
@@ -155,10 +155,8 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Clone(IEnumVARIANT __RPC_FAR *__RPC_FAR
*/
HRESULT STDMETHODCALLTYPE CEnumVariant::Create(CEnumVariant __RPC_FAR *__RPC_FAR *ppenum)
{
- ActivateActContext();
HRESULT hr = CoCreateInstance(CLSID_EnumVariant,NULL,
CLSCTX_SERVER,IID_IEnumVariant,(void **)ppenum);
- DeactivateActContext();
if (S_OK != hr)
{
return E_FAIL;
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index ba6a5cd..d2005e2 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -1720,11 +1720,9 @@ STDMETHODIMP CMAccessible::get_relation( long relationIndex, IAccessibleRelation
}
IAccessibleRelation* pRelation = NULL;
- ActivateActContext();
HRESULT hr = CoCreateInstance( CLSID_AccRelation, NULL, CLSCTX_SERVER ,
IID_IAccessibleRelation,
(void **)&pRelation);
- DeactivateActContext();
if(SUCCEEDED(hr))
{
IUNOXWrapper* wrapper = NULL;
@@ -1784,11 +1782,9 @@ STDMETHODIMP CMAccessible::get_relations( long, IAccessibleRelation __RPC_FAR *_
for(int i=0; i<nCount ; i++)
{
IAccessibleRelation* pRelation = NULL;
- ActivateActContext();
HRESULT hr = CoCreateInstance( CLSID_AccRelation, NULL, CLSCTX_SERVER ,
IID_IAccessibleRelation,
(void **)&pRelation);
- DeactivateActContext();
if(SUCCEEDED(hr))
{
IUNOXWrapper* wrapper = NULL;
@@ -2589,9 +2585,7 @@ HRESULT WINAPI CMAccessible::SmartQI(void* pv, REFIID iid, void** ppvObject)
}
else
{
- ActivateActContext();
HRESULT hr = pMap->pfnCreateInstance(pv, iid, ppvObject);
- DeactivateActContext();
if(hr == S_OK)
{
m_containedObjects.insert(XGUIDToComObjHash::value_type(*pMap->piid,(IUnknown*)*ppvObject));
diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx
index b5c65b3..faf068f 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -244,14 +244,12 @@ void AccObject::UpdateValidWindow()
*/
sal_Bool AccObject::ImplInitializeCreateObj()
{
- ActivateActContext();
HRESULT hr = CoCreateInstance( CLSID_MAccessible, NULL, CLSCTX_ALL,
IID_IMAccessible,
(void **)&m_pIMAcc);
SAL_WARN_IF(
m_pIMAcc == 0, "iacc2",
"Failed to create IAccessible2 instance: 0x" << std::hex << hr);
- DeactivateActContext();
if ( S_OK != hr )
{
More information about the Libreoffice-commits
mailing list