You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/10/29 08:15:47 UTC
svn commit: r1536599 [1/5] - in /openoffice/branches/ia2/main:
sal/rtl/source/ scp2/source/ooo/ vcl/inc/vcl/ vcl/source/app/
vcl/win/source/window/ winaccessibility/inc/
winaccessibility/source/UAccCOM/ winaccessibility/source/UAccCOMIDL/
winaccessibil...
Author: steve_y
Date: Tue Oct 29 07:15:44 2013
New Revision: 1536599
URL: http://svn.apache.org/r1536599
Log:
sal: commented WaitForSingleObject (g_cache_list.m_update_thread, INFINITE), which can lead a deadlock when unloading the sal3.dll after register UAccCOM.dll.
vcl: removed all unused UAccCOM.dll registration lines.
winaccessibility: updated to Apache License.
Modified:
openoffice/branches/ia2/main/sal/rtl/source/alloc_cache.c
openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp
openoffice/branches/ia2/main/vcl/inc/vcl/svapp.hxx
openoffice/branches/ia2/main/vcl/source/app/svapp.cxx
openoffice/branches/ia2/main/vcl/source/app/svdata.cxx
openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx
openoffice/branches/ia2/main/winaccessibility/inc/AccComponentEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccContainerEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccDescendantManagerEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccDialogEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccFrameEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccListEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccMenuEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccObject.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccObjectContainerEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccObjectManagerAgent.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccObjectWinManager.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccParagraphEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccResource.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccTableEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccTextComponentEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccTopWindowListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccTreeEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/AccWindowEventListener.hxx
openoffice/branches/ia2/main/winaccessibility/inc/ResIDGenerator.hxx
openoffice/branches/ia2/main/winaccessibility/inc/UAccCOM2.h
openoffice/branches/ia2/main/winaccessibility/inc/accHelper.hxx
openoffice/branches/ia2/main/winaccessibility/inc/g_msacc.hxx
openoffice/branches/ia2/main/winaccessibility/inc/unomsaaevent.hxx
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccAction.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccAction.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccActionBase.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccActionBase.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccComponent.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccComponent.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccComponentBase.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccComponentBase.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccEditableText.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccEditableText.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccHyperLink.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccHyperLink.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccHypertext.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccHypertext.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccImage.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccImage.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccRelation.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccRelation.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccTable.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccTable.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccText.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccText.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccTextBase.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccTextBase.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccValue.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccValue.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccessibleKeyStroke.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/CheckEnableAccessible.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/CheckEnableAccessible.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/EnumVariant.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/EnumVariant.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/Resource.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/StdAfx.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.def
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.rc
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UNOXWrapper.cpp
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UNOXWrapper.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/acccommon.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/makefile.mk
openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/stdafx.h
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/Accessible2.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleAction.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleApplication.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleComponent.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleEditableText.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleEventId.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleHyperlink.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleHypertext.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleImage.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleKeyBinding.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleKeyStroke.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleRelation.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleRole.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleStates.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleTable.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleText.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleValue.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/Charset.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/IA2CommonTypes.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/IA2TypeLibrary.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/defines.idl
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/dlldata.c
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/makefile.mk
openoffice/branches/ia2/main/winaccessibility/source/service/AccComponentEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccContainerEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccDescendantManagerEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccDialogEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccFrameEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccListEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccMenuEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccObject.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccObjectContainerEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccObjectManagerAgent.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccObjectWinManager.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccParagraphEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccResource.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccTableEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccTextComponentEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccTopWindowListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccTreeEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/AccWindowEventListener.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/ResIDGenerator.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.hxx
openoffice/branches/ia2/main/winaccessibility/source/service/exports.dxp
openoffice/branches/ia2/main/winaccessibility/source/service/makefile.mk
openoffice/branches/ia2/main/winaccessibility/source/service/msaaservice_impl.cxx
openoffice/branches/ia2/main/winaccessibility/source/service/winaccessibility.component
Modified: openoffice/branches/ia2/main/sal/rtl/source/alloc_cache.c
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sal/rtl/source/alloc_cache.c?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sal/rtl/source/alloc_cache.c (original)
+++ openoffice/branches/ia2/main/sal/rtl/source/alloc_cache.c Tue Oct 29 07:15:44 2013
@@ -1464,12 +1464,16 @@ rtl_cache_wsupdate_wait (unsigned int se
static void
rtl_cache_wsupdate_fini (void)
{
+ DWORD dwRet = 0;
RTL_MEMORY_LOCK_ACQUIRE(&(g_cache_list.m_lock));
g_cache_list.m_update_done = 1;
SetEvent (g_cache_list.m_update_cond);
RTL_MEMORY_LOCK_RELEASE(&(g_cache_list.m_lock));
- WaitForSingleObject (g_cache_list.m_update_thread, INFINITE);
+ dwRet = WaitForSingleObject (g_cache_list.m_update_thread, 0);
+
+ // #i107562#, it seems no need to wait the thread. Windows will do the clean work after terminating the main process.
+ //WaitForSingleObject (g_cache_list.m_update_thread, INFINITE);
}
#endif /* SAL_UNX || SAL_W32 */
Modified: openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp Tue Oct 29 07:15:44 2013
@@ -32,7 +32,7 @@ File gid_File_Lib_Winaccessibility
End
File gid_File_Lib_UAccCOM
BIN_FILE_BODY;
- Styles = (PACKED);
+ Styles = (PACKED, SELFREG);
Dir = SCP2_OOO_BIN_DIR;
Name = "UAccCOM.dll";
End
Modified: openoffice/branches/ia2/main/vcl/inc/vcl/svapp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/vcl/svapp.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/inc/vcl/svapp.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/vcl/svapp.hxx Tue Oct 29 07:15:44 2013
@@ -542,7 +542,6 @@ private:
VCL_DLLPUBLIC bool TestBridgeRegistered();
VCL_DLLPUBLIC bool IsBridgeRegistered();
-VCL_DLLPUBLIC bool RegAccBridge();
#endif
//-----IAccessibility2 Implementation 2009
#endif // _APP_HXX
Modified: openoffice/branches/ia2/main/vcl/source/app/svapp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/app/svapp.cxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/source/app/svapp.cxx (original)
+++ openoffice/branches/ia2/main/vcl/source/app/svapp.cxx Tue Oct 29 07:15:44 2013
@@ -2049,13 +2049,13 @@ void Application::AddToRecentDocumentLis
sal_Bool Application::IsAccessibilityEnabled()
{
-//IAccessibility2 Implementation 2009-----
+//IAccessible2 Implementation 2009-----
#ifdef WNT
return IsWNTInitAccessBridge();
#else
return sal_False;
#endif
-//-----IAccessibility2 Implementation 2009
+//-----IAccessible2 Implementation 2009
}
sal_Bool InitAccessBridge( sal_Bool bShowCancel, sal_Bool &rCancelled )
@@ -2092,7 +2092,7 @@ sal_Bool InitAccessBridge( sal_Bool bSho
return bRet;
}
-//IAccessibility2 Implementation 2009-----
+//IAccessible2 Implementation 2009-----
#ifdef WNT
sal_Bool HasAtHook()
{
@@ -2113,7 +2113,7 @@ sal_Bool HasAtHook()
return sal_False;
}
#endif
-//-----IAccessibility2 Implementation 2009
+//-----IAccessible2 Implementation 2009
// MT: AppProperty, AppEvent was in oldsv.cxx, but is still needed...
// ------------------------------------------------------------------------
@@ -2135,7 +2135,7 @@ void Application::SetPropertyHandler( Pr
delete pHandler;
pHandler = p;
}
-//IAccessibility2 Implementation 2009-----
+//IAccessible2 Implementation 2009-----
bool Application::EnableAccessInterface(bool bEnable)
{
#ifdef WNT
@@ -2156,7 +2156,7 @@ bool Application::IsEnableAccessInterfac
void Application::AppEvent( const ApplicationEvent& /*rAppEvent*/ )
{
}
-//IAccessibility2 Implementation 2009-----
+//IAccessible2 Implementation 2009-----
#ifdef WNT
bool TestBridgeRegistered()
{
@@ -2182,243 +2182,5 @@ bool IsBridgeRegistered()
{
return ImplGetSVData()->maAppData.m_mbIsBridgeRegistered;;
}
-
-namespace uacc
-{
-
-//#define BASIS_LINK _T("\\basis-link")
-
-TCHAR * filename(TCHAR * path) {
- TCHAR * f = path;
- for (TCHAR * p = path;;) {
- switch (*p++) {
- case L'\0':
- return f;
- case L'\\':
- f = p;
- break;
- }
- }
-}
-
-TCHAR * buildPath(
- TCHAR * path, TCHAR const * frontBegin, TCHAR const * frontEnd,
- TCHAR const * backBegin, std::size_t backLength)
-{
- // Remove leading ".." segments in the second path together with matching
- // segments in the first path that are neither empty nor "." nor ".." nor
- // end in ":" (which is not foolprove, as it can erroneously erase the start
- // of a UNC path, but only if the input is bad data):
- while (backLength >= 2 && backBegin[0] == L'.' && backBegin[1] == L'.' &&
- (backLength == 2 || backBegin[2] == L'\\'))
- {
- if (frontEnd - frontBegin < 2 || frontEnd[-1] != L'\\' ||
- frontEnd[-2] == L'\\' || frontEnd[-2] == L':' ||
- (frontEnd[-2] == L'.' &&
- (frontEnd - frontBegin < 3 || frontEnd[-3] == L'\\' ||
- (frontEnd[-3] == L'.' &&
- (frontEnd - frontBegin < 4 || frontEnd[-4] == L'\\')))))
- {
- break;
- }
- TCHAR const * p = frontEnd - 1;
- while (p != frontBegin && p[-1] != L'\\') {
- --p;
- }
- if (p == frontBegin) {
- break;
- }
- frontEnd = p;
- if (backLength == 2) {
- backBegin += 2;
- backLength -= 2;
- } else {
- backBegin += 3;
- backLength -= 3;
- }
- }
- if (backLength <
- static_cast< std::size_t >(MAX_PATH - (frontEnd - frontBegin)))
- // hopefully std::size_t is large enough
- {
- TCHAR * p;
- if (frontBegin == path) {
- p = const_cast< TCHAR * >(frontEnd);
- } else {
- p = path;
- while (frontBegin != frontEnd) {
- *p++ = *frontBegin++;
- }
- }
- for (; backLength > 0; --backLength) {
- *p++ = *backBegin++;
- }
- *p = L'\0';
- return p;
- } else {
- SetLastError(ERROR_FILENAME_EXCED_RANGE);
- return NULL;
- }
-}
-
-TCHAR * resolveLink(TCHAR * path) {
- HANDLE h = CreateFile(
- path, FILE_READ_DATA, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
- if (h == INVALID_HANDLE_VALUE) {
- return NULL;
- }
- char p1[MAX_PATH];
- DWORD n;
- BOOL ok = ReadFile(h, p1, MAX_PATH, &n, NULL);
- CloseHandle(h);
- if (!ok) {
- return NULL;
- }
- TCHAR p2[MAX_PATH];
- std::size_t n2 = 0;
- bool colon = false;
- for (DWORD i = 0; i < n;) {
- unsigned char c = static_cast< unsigned char >(p1[i++]);
- switch (c) {
- case '\0':
- SetLastError(ERROR_BAD_PATHNAME);
- return NULL;
- case '\x0A':
- case '\x0D':
- if (n2 == MAX_PATH) {
- SetLastError(ERROR_FILENAME_EXCED_RANGE);
- return NULL;
- }
- p2[n2] = L'\0';
- break;
- case ':':
- colon = true;
- // fall through
- default:
- // Convert from UTF-8 to UTF-16:
- if (c <= 0x7F) {
- p2[n2++] = c;
- } else if (c >= 0xC2 && c <= 0xDF && i < n &&
- static_cast< unsigned char >(p1[i]) >= 0x80 &&
- static_cast< unsigned char >(p1[i]) <= 0xBF)
- {
- p2[n2++] = ((c & 0x1F) << 6) |
- (static_cast< unsigned char >(p1[i++]) & 0x3F);
- } else if (n - i > 1 &&
- ((c == 0xE0 &&
- static_cast< unsigned char >(p1[i]) >= 0xA0 &&
- static_cast< unsigned char >(p1[i]) <= 0xBF) ||
- ((c >= 0xE1 && c <= 0xEC || c >= 0xEE && c <= 0xEF) &&
- static_cast< unsigned char >(p1[i]) >= 0x80 &&
- static_cast< unsigned char >(p1[i]) <= 0xBF) ||
- (c == 0xED &&
- static_cast< unsigned char >(p1[i]) >= 0x80 &&
- static_cast< unsigned char >(p1[i]) <= 0x9F)) &&
- static_cast< unsigned char >(p1[i + 1]) >= 0x80 &&
- static_cast< unsigned char >(p1[i + 1]) <= 0xBF)
- {
- p2[n2++] = ((c & 0x0F) << 12) |
- ((static_cast< unsigned char >(p1[i]) & 0x3F) << 6) |
- (static_cast< unsigned char >(p1[i + 1]) & 0x3F);
- i += 2;
- } else if (n - 2 > 1 &&
- ((c == 0xF0 &&
- static_cast< unsigned char >(p1[i]) >= 0x90 &&
- static_cast< unsigned char >(p1[i]) <= 0xBF) ||
- (c >= 0xF1 && c <= 0xF3 &&
- static_cast< unsigned char >(p1[i]) >= 0x80 &&
- static_cast< unsigned char >(p1[i]) <= 0xBF) ||
- (c == 0xF4 &&
- static_cast< unsigned char >(p1[i]) >= 0x80 &&
- static_cast< unsigned char >(p1[i]) <= 0x8F)) &&
- static_cast< unsigned char >(p1[i + 1]) >= 0x80 &&
- static_cast< unsigned char >(p1[i + 1]) <= 0xBF &&
- static_cast< unsigned char >(p1[i + 2]) >= 0x80 &&
- static_cast< unsigned char >(p1[i + 2]) <= 0xBF)
- {
- sal_Int32 u = ((c & 0x07) << 18) |
- ((static_cast< unsigned char >(p1[i]) & 0x3F) << 12) |
- ((static_cast< unsigned char >(p1[i + 1]) & 0x3F) << 6) |
- (static_cast< unsigned char >(p1[i + 2]) & 0x3F);
- i += 3;
- p2[n2++] = static_cast< TCHAR >(((u - 0x10000) >> 10) | 0xD800);
- p2[n2++] = static_cast< TCHAR >(
- ((u - 0x10000) & 0x3FF) | 0xDC00);
- } else {
- SetLastError(ERROR_BAD_PATHNAME);
- return NULL;
- }
- break;
- }
- }
- TCHAR * end;
- if (colon || p2[0] == L'\\') {
- // Interpret p2 as an absolute path:
- end = path;
- } else {
- // Interpret p2 as a relative path:
- end = filename(path);
- }
- return buildPath(path, path, end, p2, n2);
-}
-
-/* If the path does not end with '\' the las segment will be removed.
- path: C:\a\b
- -> C:\a
- @param io_path
- in/out parameter. The string is not reallocated. Simply a '\0'
- will be inserted to shorten the string.
-*/
-void oneDirUp(LPTSTR io_path)
-{
- TCHAR * pEnd = io_path + lstrlen(io_path) - 1;
- while (pEnd > io_path //prevent crashing if provided string does not contain a backslash
- && *pEnd != L'\\')
- pEnd --;
- *pEnd = L'\0';
-}
-
-}
-
-bool RegAccBridge()
-{
- bool bResult = false;
-
- TCHAR szbasisPath[1024];
- ::GetCurrentDirectory(1024,szbasisPath);
- uacc::oneDirUp(szbasisPath);
- //lstrcat(szbasisPath, BASIS_LINK);
- /*if (!uacc::resolveLink(szbasisPath))
- return bResult;*/
- LPTSTR pszDllPath = szbasisPath;
- lstrcat(pszDllPath, _T("\\program\\UAccCOM.dll"));
- HMODULE hMod=::LoadLibraryEx(pszDllPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
- if(hMod==NULL)
- return bResult;
-
- // Initialize OLE.
- HRESULT hResult = ::OleInitialize(NULL);
- if(hResult != S_OK && hResult != S_FALSE)
- {
- ::OleUninitialize();
- ::FreeLibrary(hMod);
- return bResult;
- }
-
- typedef HRESULT (STDAPICALLTYPE *DLLREGISTERSERVER)(void);
- BOOL bRet=FALSE;
- DLLREGISTERSERVER DllRegisterSrverFunc=(DLLREGISTERSERVER)::GetProcAddress(hMod,"DllRegisterServer");
- if(DllRegisterSrverFunc == NULL)
- {
- ::OleUninitialize();
- FreeLibrary(hMod);
- return bResult;
- }
- bResult=(S_OK == DllRegisterSrverFunc());
- ::OleUninitialize();
- FreeLibrary(hMod);
- return bResult;
-}
-
#endif
-//-----IAccessibility2 Implementation 2009
+//-----IAccessible2 Implementation 2009
Modified: openoffice/branches/ia2/main/vcl/source/app/svdata.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/app/svdata.cxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/source/app/svdata.cxx (original)
+++ openoffice/branches/ia2/main/vcl/source/app/svdata.cxx Tue Oct 29 07:15:44 2013
@@ -36,7 +36,7 @@
#include "unotools/fontcfg.hxx"
-//IAccessibility2 Implementation 2009-----
+//IAccessible2 Implementation 2009-----
#ifdef WNT
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_
#include <com/sun/star/accessibility/XAccessible.hpp>
@@ -45,7 +45,7 @@
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#endif
#endif
-//-----IAccessibility2 Implementation 2009
+//-----IAccessible2 Implementation 2009
#include "vos/mutex.hxx"
#include "cppuhelper/implbase1.hxx"
@@ -77,13 +77,13 @@
#include "com/sun/star/java/JavaDisabledException.hpp"
#include <stdio.h>
-//IAccessibility2 Implementation 2009-----
+//IAccessible2 Implementation 2009-----
#ifdef WNT
#include <unotools/processfactory.hxx>
#include <com/sun/star/accessibility/XMSAAService.hpp>
#include <win/g_msaasvc.h>
#endif
-//-----IAccessibility2 Implementation 2009
+//-----IAccessible2 Implementation 2009
namespace {
@@ -149,10 +149,12 @@ void ImplInitSVData()
break;
}
}
-//IAccessibility2 Implementation 2009-----
+//IAccessible2 Implementation 2009-----
+#ifdef WNT
//Default enable the acc bridge interface
pImplSVData->maAppData.m_bEnableAccessInterface =true;
-//-----IAccessibility2 Implementation 2009
+#endif
+//-----IAccessible2 Implementation 2009
// mark default layout border as unitialized
pImplSVData->maAppData.mnDefaultLayoutBorder = -1;
@@ -360,7 +362,7 @@ com::sun::star::uno::Any AccessBridgeCur
}
return ret;
}
-//IAccessibility2 Implementation 2009-----
+//IAccessible2 Implementation 2009-----
#ifdef WNT
void AccessBridgehandleExistingWindow(Window * pWindow, bool bShow)
{
@@ -442,7 +444,7 @@ void AccessBridgeupdateOldTopWindows()
}
}
#endif
-//-----IAccessibility2 Implementation 2009
+//-----IAccessible2 Implementation 2009
bool ImplInitAccessBridge(sal_Bool bAllowCancel, sal_Bool &rCancelled)
{
@@ -474,8 +476,8 @@ bool ImplInitAccessBridge(sal_Bool bAllo
if( xFactory.is() )
{
-//IAccessibility2 Implementation 2009-----
- #ifdef WNT
+//IAccessible2 Implementation 2009-----
+#ifdef WNT
pSVData->mxAccessBridge = xFactory->createInstance(
OUString::createFromAscii( "com.sun.star.accessibility.MSAAService" ) );
if( pSVData->mxAccessBridge.is() )
@@ -488,8 +490,8 @@ bool ImplInitAccessBridge(sal_Bool bAllo
if( !pSVData->mxAccessBridge.is() )
bSuccess = false;
return bSuccess;
- #endif
-//-----IAccessibility2 Implementation 2009
+#endif
+//-----IAccessible2 Implementation 2009
css::uno::Reference< XExtendedToolkit > xToolkit =
css::uno::Reference< XExtendedToolkit >(Application::GetVCLToolkit(), UNO_QUERY);
Modified: openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx (original)
+++ openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx Tue Oct 29 07:15:44 2013
@@ -6218,16 +6218,13 @@ LRESULT CALLBACK SalFrameWndProc( HWND h
}
else
{
- //if (Application::GetSettings().GetMiscSettings().GetEnableATToolSupport())
- {
+ if (Application::GetSettings().GetMiscSettings().GetEnableATToolSupport())
+ {
if (!TestBridgeRegistered())
- {
- if( RegAccBridge())
- TestBridgeRegistered();
- }
+ break;
// Make sure to launch Accessibiliity only the following criterias are satisfied to avoid RFT interrupts regular acc processing
if (g_acc_manager1 == NULL &&
- IsBridgeRegistered() /* && HasAtHook() */ )
+ IsBridgeRegistered() )
{
sal_Bool bCancelled;
InitAccessBridge(sal_False,bCancelled);
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccComponentEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccComponentEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccComponentEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccComponentEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCCOMPONENTEVENTLISTENER_HXX
#define __ACCCOMPONENTEVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccContainerEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccContainerEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccContainerEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccContainerEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCCONTAINEREVENTLISTENERHXX
#define __ACCCONTAINEREVENTLISTENERHXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccDescendantManagerEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccDescendantManagerEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccDescendantManagerEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccDescendantManagerEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCDESCENDANTMANAGEREVENTLISTENER_HXX
#define __ACCDESCENDANTMANAGEREVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccDialogEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccDialogEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccDialogEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccDialogEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCDIALOGEVENTLISTENER_HXX
#define __ACCDIALOGEVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCEVENTLISTENER_HXX
#define __ACCEVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccFrameEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccFrameEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccFrameEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccFrameEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCFRAMEEVENTLISTENER_HXX
#define __ACCFRAMEEVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccListEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccListEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccListEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccListEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCLISTEVENTLISTENER_HXX
#define __ACCLISTEVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccMenuEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccMenuEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccMenuEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccMenuEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCMENUEVENTLISTENER_HXX
#define __ACCMENUEVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccObject.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccObject.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccObject.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccObject.hxx Tue Oct 29 07:15:44 2013
@@ -1,31 +1,24 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
#ifndef __ACCOBJECT_HXX
#define __ACCOBJECT_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccObjectContainerEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccObjectContainerEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccObjectContainerEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccObjectContainerEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef _ACCOBJECTCONTAINEREVENTLISTENER_HXX
#define _ACCOBJECTCONTAINEREVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccObjectManagerAgent.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccObjectManagerAgent.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccObjectManagerAgent.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccObjectManagerAgent.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCOBJECTMANAGERAGENT_HXX
#define __ACCOBJECTMANAGERAGENT_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccObjectWinManager.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccObjectWinManager.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccObjectWinManager.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccObjectWinManager.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCOBJECTWINMANAGER_HXX
#define __ACCOBJECTWINMANAGER_HXX
@@ -35,6 +28,7 @@
#include <map>
#include <windows.h>
#include <vos/mutex.hxx>
+#include <vcl/dllapi.h>
#include "ResIDGenerator.hxx"
#include "UAccCOM2.h"
@@ -132,11 +126,8 @@ public:
void DeleteAccObj( com::sun::star::accessibility::XAccessible* pXAcc );
void DeleteChildrenAccObj(com::sun::star::accessibility::XAccessible* pAccObj);
-public:
static AccObjectWinManager* CreateAccObjectWinManagerInstance(AccObjectManagerAgent* Agent);
-public:
-
sal_Bool NotifyAccEvent( com::sun::star::accessibility::XAccessible* pXAcc,short state = 0 );
long Get_ToATInterface( HWND hWnd, long lParam, long wParam);
@@ -184,5 +175,4 @@ public:
bool IsStateManageDescendant(com::sun::star::accessibility::XAccessible* pAccessible);
};
-
#endif
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccParagraphEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccParagraphEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccParagraphEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccParagraphEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCPARAGRAPHEVENTLISTENER_HXX
#define __ACCPARAGRAPHEVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccResource.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccResource.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccResource.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccResource.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef _ACCRESOURCE_HXX
#define _ACCRESOURCE_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccTableEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccTableEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccTableEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccTableEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+/**************************************************************
*
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCTABLEEVENTLISTENER_HXX
#define __ACCTABLEEVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccTextComponentEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccTextComponentEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccTextComponentEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccTextComponentEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCTEXTCOMPONENTEVENTLISTENER_HXX
#define __ACCTEXTCOMPONENTEVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccTopWindowListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccTopWindowListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccTopWindowListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccTopWindowListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCTOPWINDOWLISTENER_HXX
#define __ACCTOPWINDOWLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccTreeEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccTreeEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccTreeEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccTreeEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCTREEEVENTLISTENER_HXX
#define __ACCTREEEVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/AccWindowEventListener.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/AccWindowEventListener.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/AccWindowEventListener.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/AccWindowEventListener.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCWINDOWEVENTLISTENER_HXX
#define __ACCWINDOWEVENTLISTENER_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/ResIDGenerator.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/ResIDGenerator.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/ResIDGenerator.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/ResIDGenerator.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __RESIDGENERATOR_HXX
#define __RESIDGENERATOR_HXX
Modified: openoffice/branches/ia2/main/winaccessibility/inc/UAccCOM2.h
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/UAccCOM2.h?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/UAccCOM2.h (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/UAccCOM2.h Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+/**************************************************************
*
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __UACCCOM2_H
#define __UACCCOM2_H
Modified: openoffice/branches/ia2/main/winaccessibility/inc/accHelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/inc/accHelper.hxx?rev=1536599&r1=1536598&r2=1536599&view=diff
==============================================================================
--- openoffice/branches/ia2/main/winaccessibility/inc/accHelper.hxx (original)
+++ openoffice/branches/ia2/main/winaccessibility/inc/accHelper.hxx Tue Oct 29 07:15:44 2013
@@ -1,30 +1,23 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright IBM Corporation 2010.
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
#ifndef __ACCHELPER_HXX
#define __ACCHELPER_HXX