Kaydet (Commit) b25c2938 authored tarafından Alexander Wilms's avatar Alexander Wilms Kaydeden (comit) Caolán McNamara

Remove visual noise from winaccessibility

Change-Id: If8ac2543e3dca393e14380a85547cafbb68ab8c6
Reviewed-on: https://gerrit.libreoffice.org/8340Tested-by: 's avatarLibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst ebb0c140
......@@ -26,10 +26,10 @@ class SimpleResMgr;
#define ACC_RES_STRING(id) ResourceManager::loadString(id)
//==================================================================
//= ResourceManager
//= handling ressources within the FormLayer library
//==================================================================
class ResourceManager
{
static SimpleResMgr* m_pImpl;
......
......@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
//////////////////////////////////////////////////////////////////////
// AccActionBase.cpp: implementation of the CAccActionBase class.
//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include "AccActionBase.h"
......@@ -41,9 +41,9 @@ using namespace com::sun::star::accessibility;
using namespace com::sun::star::uno;
using namespace com::sun::star::awt;
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
CAccActionBase::CAccActionBase()
{}
......
......@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
//////////////////////////////////////////////////////////////////////
// AccActionBase.h: interface for the CAccActionBase class.
//////////////////////////////////////////////////////////////////////
#if !defined(AFX_ACCACTIONBASE_H__F87FAD24_D66E_4D22_9B24_3304A303DC84__INCLUDED_)
#define AFX_ACCACTIONBASE_H__F87FAD24_D66E_4D22_9B24_3304A303DC84__INCLUDED_
......
......@@ -27,9 +27,9 @@
using namespace com::sun::star::accessibility;
using namespace com::sun::star::uno;
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
CAccComponentBase::CAccComponentBase()
{}
......
......@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
//////////////////////////////////////////////////////////////////////
// AccComponentBase.h: interface for the CAccComponentBase class.
//////////////////////////////////////////////////////////////////////
#if !defined(AFX_ACCCOMPONENTBASE_H__946BE230_1DCB_494B_ACF6_32A2E197DD2A__INCLUDED_)
#define AFX_ACCCOMPONENTBASE_H__946BE230_1DCB_494B_ACF6_32A2E197DD2A__INCLUDED_
......
......@@ -312,7 +312,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
}
else if(ouName.compareTo(L"ParaTabStops") == 0)
{
//
// Convert to the Sequence with TabStop element.
vector< ::com::sun::star::style::TabStop > vecTabStop;
::com::sun::star::style::TabStop tabStop;
......@@ -395,7 +395,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
}
while(pos < ouValue.getLength());
//
// Dump into Sequence.
int iSeqLen = (vecTabStop.size() == 0) ? 1 : vecTabStop.size();
Sequence< ::com::sun::star::style::TabStop > seqTabStop(iSeqLen);
......
......@@ -29,8 +29,8 @@
using namespace com::sun::star::accessibility;
using namespace com::sun::star::uno;
/////////////////////////////////////////////////////////////////////////////
//
/**
* Get special selection.
* @param startOffset Start selection offset.
......
......@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
//////////////////////////////////////////////////////////////////////
// AccTextBase.cpp: implementation of the CAccTextBase class.
//////////////////////////////////////////////////////////////////////
#include "stdafx.h"
#include <string>
......@@ -38,9 +38,9 @@ using namespace com::sun::star::accessibility;
using namespace com::sun::star::uno;
using namespace rtl;
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
static OUString ReplaceFourChar(OUString oldOUString);
......@@ -529,7 +529,7 @@ STDMETHODIMP CAccTextBase::get_textBeforeOffset(long offset, IA2TextBoundaryType
return E_FAIL;
// In New UNO IAccessibleText.idl these constant values are defined as follows:
//
// const long TEXT_BOUNDARY_CHAR = -1;
// const long TEXT_BOUNDARY_TO_CURSOR_POS = -2;
// const long TEXT_BOUNDARY_START_OF_WORD = -3;
......@@ -538,9 +538,9 @@ STDMETHODIMP CAccTextBase::get_textBeforeOffset(long offset, IA2TextBoundaryType
// const long TEXT_BOUNDARY_END_OF_SENTENCE = -6;
// const long TEXT_BOUNDARY_START_OF_LINE = -7;
// const long TEXT_BOUNDARY_END_OF_LINE = -8;
//
// In UNO, the corresponding values are as follows:
//
// const short CHARACTER = 1;
// const short WORD = 2;
// const short SENTENCE = 3;
......@@ -548,7 +548,7 @@ STDMETHODIMP CAccTextBase::get_textBeforeOffset(long offset, IA2TextBoundaryType
// const short LINE = 5;
// const short GLYPH = 6;
// const short ATTRIBUTE_RUN = 7;
//
long lUnoBoundaryType;
......@@ -616,7 +616,7 @@ STDMETHODIMP CAccTextBase::get_textAfterOffset(long offset, IA2TextBoundaryType
return E_FAIL;
// In New UNO IAccessibleText.idl these constant values are defined as follows:
//
// const long TEXT_BOUNDARY_CHAR = -1;
// const long TEXT_BOUNDARY_TO_CURSOR_POS = -2;
// const long TEXT_BOUNDARY_START_OF_WORD = -3;
......@@ -625,9 +625,9 @@ STDMETHODIMP CAccTextBase::get_textAfterOffset(long offset, IA2TextBoundaryType
// const long TEXT_BOUNDARY_END_OF_SENTENCE = -6;
// const long TEXT_BOUNDARY_START_OF_LINE = -7;
// const long TEXT_BOUNDARY_END_OF_LINE = -8;
//
// In UNO, the corresponding values are as follows:
//
// const short CHARACTER = 1;
// const short WORD = 2;
// const short SENTENCE = 3;
......@@ -635,7 +635,7 @@ STDMETHODIMP CAccTextBase::get_textAfterOffset(long offset, IA2TextBoundaryType
// const short LINE = 5;
// const short GLYPH = 6;
// const short ATTRIBUTE_RUN = 7;
//
long lUnoBoundaryType;
switch(boundaryType)
......@@ -702,7 +702,7 @@ STDMETHODIMP CAccTextBase::get_textAtOffset(long offset, IA2TextBoundaryType bou
return E_FAIL;
// In New UNO IAccessibleText.idl these constant values are defined as follows:
//
// const long TEXT_BOUNDARY_CHAR = -1;
// const long TEXT_BOUNDARY_TO_CURSOR_POS = -2;
// const long TEXT_BOUNDARY_START_OF_WORD = -3;
......@@ -711,9 +711,9 @@ STDMETHODIMP CAccTextBase::get_textAtOffset(long offset, IA2TextBoundaryType bou
// const long TEXT_BOUNDARY_END_OF_SENTENCE = -6;
// const long TEXT_BOUNDARY_START_OF_LINE = -7;
// const long TEXT_BOUNDARY_END_OF_LINE = -8;
//
// In UNO, the corresponding values are as follows:
//
// const short CHARACTER = 1;
// const short WORD = 2;
// const short SENTENCE = 3;
......@@ -721,7 +721,7 @@ STDMETHODIMP CAccTextBase::get_textAtOffset(long offset, IA2TextBoundaryType bou
// const short LINE = 5;
// const short GLYPH = 6;
// const short ATTRIBUTE_RUN = 7;
//
long lUnoBoundaryType;
......
......@@ -18,8 +18,8 @@
*/
// AccTextBase.h: interface for the CAccTextBase class.
//
//////////////////////////////////////////////////////////////////////
#if !defined(AFX_ACCTEXTBASE_H__B9AE05F6_E28B_4CF3_A8F2_EEE5D2E00B82__INCLUDED_)
#define AFX_ACCTEXTBASE_H__B9AE05F6_E28B_4CF3_A8F2_EEE5D2E00B82__INCLUDED_
......
......@@ -27,7 +27,7 @@
using namespace com::sun::star::uno;
using namespace com::sun::star::accessibility;
/////////////////////////////////////////////////////////////////////////////
// CEnumVariant
......
......@@ -62,27 +62,27 @@ public:
// IEnumVARIANT
//
HRESULT STDMETHODCALLTYPE Next(ULONG cElements,VARIANT __RPC_FAR *pvar,ULONG __RPC_FAR *pcElementFetched);
//
HRESULT STDMETHODCALLTYPE Skip(ULONG cElements);
//
HRESULT STDMETHODCALLTYPE Reset( void);
//
HRESULT STDMETHODCALLTYPE Clone(IEnumVARIANT __RPC_FAR *__RPC_FAR *ppenum);
// IEnumVariant
//
HRESULT STDMETHODCALLTYPE PutSelection(hyper pXSelection);
//
static HRESULT STDMETHODCALLTYPE Create(CEnumVariant __RPC_FAR *__RPC_FAR *ppenum);
//
long GetCountOfElements();
private:
......
......@@ -20,12 +20,12 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by UAccCOM.rc
//
#define IDS_PROJNAME 100
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 203
......
......@@ -58,7 +58,7 @@ OBJECT_ENTRY(CLSID_AccHyperLink, CAccHyperLink)
OBJECT_ENTRY(CLSID_AccHypertext, CAccHypertext)
END_OBJECT_MAP()
/////////////////////////////////////////////////////////////////////////////
// DLL Entry Point
extern "C"
......@@ -74,7 +74,7 @@ extern "C"
return TRUE; // ok
}
/////////////////////////////////////////////////////////////////////////////
// Used to determine whether the DLL can be unloaded by OLE
STDAPI DllCanUnloadNow(void)
......@@ -82,7 +82,7 @@ STDAPI DllCanUnloadNow(void)
return (_Module.GetLockCount()==0) ? S_OK : E_FAIL;
}
/////////////////////////////////////////////////////////////////////////////
// Returns a class factory to create an object of the requested type
STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
......
......@@ -17,20 +17,20 @@
*/
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "winres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
......@@ -40,10 +40,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
......@@ -64,9 +64,9 @@ END
#endif // APSTUDIO_INVOKED
//
// String Table
//
STRINGTABLE DISCARDABLE
BEGIN
......@@ -74,17 +74,17 @@ BEGIN
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
1 TYPELIB "UAccCOM.tlb"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
......@@ -23,7 +23,7 @@
using namespace ::com::sun::star;
/////////////////////////////////////////////////////////////////////////////
// CUNOXWrapper
STDMETHODIMP CUNOXWrapper::put_XInterface(hyper nXInterface)
......
......@@ -24,34 +24,28 @@ import "AccessibleKeyStroke.idl";
[object, uuid(6B1923AC-3E9A-4336-99E1-A69EA4E946E9)]
interface IAccessibleKeyBinding : IUnknown
{
///
/// get number of key bindings for this object
///
// get number of key bindings for this object
[propget] HRESULT nKeyBindings
(
[out, retval] long *nKeyBindings
);
///
/// get length of keystroke sequence for specified key binding
///
// get length of keystroke sequence for specified key binding
[propget] HRESULT keyStrokeSequenceLength
(
[in] long keyBindingIndex,
[out] long *sequenceLength
);
///
/// The returned sequence of key strokes describes one method
/// to invoke the associated action (the one from which you
/// obtained the object at which you called this method) by
/// pressing keys. The keys specified by each of the returned
/// key strokes have to be pressed at the same time (the
/// Control-key and the A-key for example). The keys of one key
/// stroke have to be released before pressing those of the next.
/// The order of the key strokes in the sequence define the order
/// in which to press them.
///
// The returned sequence of key strokes describes one method
// to invoke the associated action (the one from which you
// obtained the object at which you called this method) by
// pressing keys. The keys specified by each of the returned
// key strokes have to be pressed at the same time (the
// Control-key and the A-key for example). The keys of one key
// stroke have to be released before pressing those of the next.
// The order of the key strokes in the sequence define the order
// in which to press them.
[propget] HRESULT keyBinding
(
[in] long keyBindingIndex,
......
......@@ -18,8 +18,8 @@
*/
// AccObjectContainerEventListener.cpp: implementation of the AccContainerEventListener class.
//
//////////////////////////////////////////////////////////////////////
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
......
......@@ -32,11 +32,11 @@
//#include <svtools/solar.hrc>
//#endif
//.........................................................................
//==================================================================
//= ResourceManager
//==================================================================
SimpleResMgr* ResourceManager::m_pImpl = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment