You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ja...@apache.org on 2013/12/01 12:40:35 UTC
svn commit: r1546803 [11/14] - in /openoffice/branches/l10n40: ./ main/
main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/standard/
main/accessibility/source/extended/ main/accessibility/source/helper/
main/accessibili...
Modified: openoffice/branches/l10n40/main/sw/inc/poolfmt.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/poolfmt.hrc?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/poolfmt.hrc (original)
+++ openoffice/branches/l10n40/main/sw/inc/poolfmt.hrc Sun Dec 1 11:40:24 2013
@@ -264,14 +264,12 @@
#define STR_POOLNUMRULE_BUL3 (RC_POOLNUMRULE_BEGIN+ 7)
#define STR_POOLNUMRULE_BUL4 (RC_POOLNUMRULE_BEGIN+ 8)
#define STR_POOLNUMRULE_BUL5 (RC_POOLNUMRULE_BEGIN+ 9)
-//IAccessibility2 Impplementaton 2009-----
//Solution:Define column item's accessible name ID.
#define STR_COLUMN_VALUESET_ITEM0 (RC_POOLNUMRULE_BEGIN + 10 )
#define STR_COLUMN_VALUESET_ITEM1 (RC_POOLNUMRULE_BEGIN + 11 )
#define STR_COLUMN_VALUESET_ITEM2 (RC_POOLNUMRULE_BEGIN + 12 )
#define STR_COLUMN_VALUESET_ITEM3 (RC_POOLNUMRULE_BEGIN + 13 )
#define STR_COLUMN_VALUESET_ITEM4 (RC_POOLNUMRULE_BEGIN + 14 )
-//-----IAccessibility2 Impplementaton 2009
//-----------------
// Paragraph styles
//-----------------
Modified: openoffice/branches/l10n40/main/sw/inc/tblsel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/tblsel.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/tblsel.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/tblsel.hxx Sun Dec 1 11:40:24 2013
@@ -177,11 +177,9 @@ public:
void SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable );
void SetTableLines( const SwTable &rTable );
- //IAccessibility2 Implementation 2009-----
//Solution:Add an input param to identify if acc table should be disposed
//void DelFrms ( SwTable &rTable );
void DelFrms ( SwTable &rTable,sal_Bool bAccTableDispose = sal_False );
- //-----IAccessibility2 Implementation 2009
void MakeFrms( SwTable &rTable );
void MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber,
const sal_Bool bBehind );
Modified: openoffice/branches/l10n40/main/sw/inc/unomap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/unomap.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/unomap.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/unomap.hxx Sun Dec 1 11:40:24 2013
@@ -125,9 +125,7 @@
#define PROPERTY_MAP_PARA_AUTO_STYLE 96
#define PROPERTY_MAP_FLDTYP_DOCINFO_CUSTOM 97
#define PROPERTY_MAP_METAFIELD 98
-//IAccessibility2 Implementation 2009-----
#define PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE 99
-//-----IAccessibility2 Implementation 2009
#define PROPERTY_MAP_END 100
//S&E
Modified: openoffice/branches/l10n40/main/sw/inc/viewsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/inc/viewsh.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/inc/viewsh.hxx (original)
+++ openoffice/branches/l10n40/main/sw/inc/viewsh.hxx Sun Dec 1 11:40:24 2013
@@ -353,9 +353,7 @@ public:
OutputDevice& GetRefDev() const;
inline Window* GetWin() const { return pWin; }
inline OutputDevice* GetOut() const { return pOut; }
- //IAccessibility2 Implementation 2009-----
void SetWin(Window* win) { pWin = win; }
- //-----IAccessibility2 Implementation 2009
static inline sal_Bool IsLstEndAction() { return ViewShell::bLstAct; }
//Andern alle PageDescriptoren
Modified: openoffice/branches/l10n40/main/sw/source/core/access/acccell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/acccell.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/acccell.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/acccell.cxx Sun Dec 1 11:40:24 2013
@@ -50,13 +50,11 @@
#include <limits.h>
-//IAccessibility2 Implementation 2009-----
#include <ndtxt.hxx>
#include <editeng/brshitem.hxx>
#include <swatrset.hxx>
#include <frmatr.hxx>
#include "acctable.hxx"
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -98,10 +96,8 @@ void SwAccessibleCell::GetStates( ::utl:
DBG_ASSERT( pVSh, "no shell?" );
if( pVSh->ISA( SwCrsrShell ) )
rStateSet.AddState( AccessibleStateType::SELECTABLE );
- //IAccessibility2 Implementation 2009-----
//Solution:Add resizable state to table cell.
rStateSet.AddState( AccessibleStateType::RESIZABLE );
- //-----IAccessibility2 Implementation 2009
// SELECTED
if( IsSelected() )
@@ -125,12 +121,10 @@ SwAccessibleCell::SwAccessibleCell( SwAc
bIsSelected = IsSelected();
- //IAccessibility2 Implementation 2009-----
//Need not assign the pointer of accessible table object to m_pAccTable,
//for it already done in SwAccessibleCell::GetTable(); Former codes:
//m_pAccTable= GetTable();
GetTable();
- //-----IAccessibility2 Implementation 2009
}
sal_Bool SwAccessibleCell::_InvalidateMyCursorPos()
@@ -151,7 +145,6 @@ sal_Bool SwAccessibleCell::_InvalidateMy
}
sal_Bool bChanged = bOld != bNew;
- //IAccessibility2 Implementation 2009-----
if( bChanged )
{
FireStateChangedEvent( AccessibleStateType::SELECTED, bNew );
@@ -160,7 +153,6 @@ sal_Bool SwAccessibleCell::_InvalidateMy
m_pAccTable->AddSelectionCell(this,bNew);
}
}
- //-----IAccessibility2 Implementation 2009
return bChanged;
}
@@ -184,10 +176,8 @@ sal_Bool SwAccessibleCell::_InvalidateCh
{
ASSERT( xAccImpl->GetFrm()->IsCellFrm(),
"table child is not a cell frame" )
- //IAccessibility2 Implementation 2009-----
bChanged = static_cast< SwAccessibleCell *>(
xAccImpl.getBodyPtr() )->_InvalidateMyCursorPos();
- //-----IAccessibility2 Implementation 2009
}
else
bChanged = sal_True; // If the context is not know we
@@ -208,7 +198,6 @@ sal_Bool SwAccessibleCell::_InvalidateCh
void SwAccessibleCell::_InvalidateCursorPos()
{
- //IAccessibility2 Implementation 2009-----
if (IsSelected())
{
const SwAccessibleChild aChild( GetChild( *(GetMap()), 0 ) );
@@ -254,7 +243,6 @@ void SwAccessibleCell::_InvalidateCursor
{
m_pAccTable->FireSelectionEvent();
}
- //-----IAccessibility2 Implementation 2009
}
sal_Bool SwAccessibleCell::HasCursor()
@@ -325,7 +313,6 @@ void SwAccessibleCell::InvalidatePosOrSi
uno::Any SwAccessibleCell::queryInterface( const uno::Type& rType )
throw( uno::RuntimeException )
{
- //IAccessibility2 Implementation 2009-----
if (rType == ::getCppuType((const uno::Reference<XAccessibleExtendedAttributes>*)0))
{
uno::Any aR;
@@ -339,7 +326,6 @@ uno::Any SwAccessibleCell::queryInterfac
aR <<= uno::Reference<XAccessibleSelection>(this);
return aR;
}
- //-----IAccessibility2 Implementation 2009
if ( rType == ::getCppuType( static_cast< uno::Reference< XAccessibleValue > * >( 0 ) ) )
{
uno::Reference<XAccessibleValue> xValue = this;
@@ -393,7 +379,6 @@ SwFrmFmt* SwAccessibleCell::GetTblBoxFor
return pCellFrm->GetTabBox()->GetFrmFmt();
}
-//IAccessibility2 Implementation 2009-----
//Implement TableCell currentValue
uno::Any SwAccessibleCell::getCurrentValue( )
throw( uno::RuntimeException )
@@ -428,7 +413,6 @@ uno::Any SwAccessibleCell::getCurrentVal
}
return aAny;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber )
throw( uno::RuntimeException )
@@ -462,7 +446,6 @@ uno::Any SwAccessibleCell::getMinimumVal
return aAny;
}
-//IAccessibility2 Implementation 2009-----
::rtl::OUString ReplaceOneChar(::rtl::OUString oldOUString, ::rtl::OUString replacedChar, ::rtl::OUString replaceStr)
{
int iReplace = -1;
@@ -590,4 +573,3 @@ SwAccessibleTable *SwAccessibleCell::Get
}
return m_pAccTable;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sw/source/core/access/acccell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/acccell.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/acccell.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/acccell.hxx Sun Dec 1 11:40:24 2013
@@ -26,7 +26,6 @@
#include "acccontext.hxx"
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-//IAccessibility2 Implementation 2009-----
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XAccessibleExtendedAttributes_HPP_
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
#endif
@@ -34,7 +33,6 @@
#ifndef _ACCSELECTIONHELPER_HXX_
#include <accselectionhelper.hxx>
#endif
-//-----IAccessibility2 Implementation 2009
class SwCellFrm;
class SwAccessibleTable;
@@ -125,10 +123,8 @@ public:
//===== XAccessibleValue ================================================
//===== XAccessibleExtendedAttributes ================================================
- //IAccessibility2 Implementation 2009-----
::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
- //-----IAccessibility2 Implementation 2009
private:
SwFrmFmt* GetTblBoxFormat() const;
@@ -145,7 +141,6 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( )
throw (::com::sun::star::uno::RuntimeException);
- //IAccessibility2 Implementation 2009-----
//===== XAccessibleComponent ============================================
sal_Int32 SAL_CALL getBackground()
throw (::com::sun::star::uno::RuntimeException);
@@ -179,7 +174,6 @@ public:
SwAccessibleTable *GetTable();
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xTableReference;
SwAccessibleTable *m_pAccTable;
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/l10n40/main/sw/source/core/access/acccontext.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/acccontext.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/acccontext.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/acccontext.cxx Sun Dec 1 11:40:24 2013
@@ -60,11 +60,9 @@
#include <acccontext.hxx>
#include <svx/AccessibleShape.hxx>
#include <comphelper/accessibleeventnotifier.hxx>
-//IAccessibility2 Implementation 2009-----
#ifndef _ACCPARA_HXX
#include "accpara.hxx"
#endif
-//-----IAccessibility2 Implementation 2009
#include <PostItMgr.hxx>
using namespace sw::access;
@@ -230,11 +228,9 @@ void SwAccessibleContext::ChildrenScroll
"<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" );
const SwFrm* pLower( rLower.GetSwFrm() );
::vos::ORef< SwAccessibleContext > xAccImpl =
- //IAccessibility2 Implementation 2009-----
//O is: GetMap()->GetContextImpl( pLower, SCROLLED_OUT == eAction ||
// SCROLLED_IN == eAction );
GetMap()->GetContextImpl( pLower, sal_True );
- //-----IAccessibility2 Implementation 2009
if( xAccImpl.isValid() )
{
switch( eAction )
@@ -265,7 +261,6 @@ void SwAccessibleContext::ChildrenScroll
ASSERT( !rLower.AlwaysIncludeAsChild(),
"<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" );
::vos::ORef< ::accessibility::AccessibleShape > xAccImpl =
- //IAccessibility2 Implementation 2009-----
//O is: GetMap()->GetContextImpl( rLower.GetSdrObject(),
// this,
// SCROLLED_OUT == eAction ||
@@ -273,7 +268,6 @@ void SwAccessibleContext::ChildrenScroll
GetMap()->GetContextImpl( rLower.GetDrawObject(),
this,
sal_True );
- //-----IAccessibility2 Implementation 2009
if( xAccImpl.isValid() )
{
switch( eAction )
@@ -293,11 +287,9 @@ void SwAccessibleContext::ChildrenScroll
xAccImpl->ViewForwarderChanged(
::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA,
GetMap() );
- //IAccessibility2 Implementation 2009-----
//Remove
//DisposeShape( rLower.GetDrawObject(),
// xAccImpl.getBodyPtr() );
- //-----IAccessibility2 Implementation 2009
}
break;
case NONE:
@@ -406,11 +398,9 @@ void SwAccessibleContext::ScrolledOut( c
// the child event. In this case no listener will exist.
FireStateChangedEvent( AccessibleStateType::SHOWING, sal_False );
- //IAccessibility2 Implementation 2009-----
//Remove Dispose When scrolledout
// We now dispose the frame
// Dispose( sal_True );
- //-----IAccessibility2 Implementation 2009
}
// --> OD 2005-12-12 #i27301# - use new type definition for <_nStates>
@@ -546,14 +536,12 @@ void SwAccessibleContext::GetStates(
// EDITABLE
if( bIsEditableState )
- //IAccessibility2 Implementation 2009-----
//Solution:Set editable state to graphic and other object when the document is editable
{
rStateSet.AddState( AccessibleStateType::EDITABLE );
rStateSet.AddState( AccessibleStateType::RESIZABLE );
rStateSet.AddState( AccessibleStateType::MOVEABLE );
}
- //-----IAccessibility2 Implementation 2009
// ENABLED
rStateSet.AddState( AccessibleStateType::ENABLED );
@@ -589,12 +577,10 @@ SwAccessibleContext::SwAccessibleContext
, nRole( nR )
, bDisposing( sal_False )
, bRegisteredAtAccessibleMap( true )
- //IAccessibility2 Implementation 2009-----
//Solution:Initialize the begin document load and IfAsynLoad to true
, bBeginDocumentLoad( sal_True )
, isIfAsynLoad( sal_True )
, bIsSeletedInDoc( sal_False)
- //-----IAccessibility2 Implementation 2009
{
InitStates();
DBG_MSG_CD( "constructed" )
@@ -622,11 +608,9 @@ sal_Int32 SAL_CALL SwAccessibleContext::
vos::OGuard aGuard(Application::GetSolarMutex());
CHECK_FOR_DEFUNC( XAccessibleContext )
- //IAccessibility2 Implementation 2009-----
//Solution:Notify the frame is a document
if( nRole == AccessibleRole::DOCUMENT )
bIsAccDocUse = sal_True;
- //-----IAccessibility2 Implementation 2009
return bDisposing ? 0 : GetChildCount( *(GetMap()) );
}
@@ -639,11 +623,9 @@ uno::Reference< XAccessible> SAL_CALL
CHECK_FOR_DEFUNC( XAccessibleContext )
- //IAccessibility2 Implementation 2009-----
//Solution:Notify the frame is a document
if( nRole == AccessibleRole::DOCUMENT )
bIsAccDocUse = sal_True;
- //-----IAccessibility2 Implementation 2009
const SwAccessibleChild aChild( GetChild( *(GetMap()), nIndex ) );
if( !aChild.IsValid() )
@@ -660,7 +642,6 @@ uno::Reference< XAccessible> SAL_CALL
{
::vos::ORef < SwAccessibleContext > xChildImpl(
GetMap()->GetContextImpl( aChild.GetSwFrm(), !bDisposing ) );
- //IAccessibility2 Implementation 2009-----
//Solution:Send out accessible event when begin load.
if( bBeginDocumentLoad && nRole == AccessibleRole::DOCUMENT )
{
@@ -679,7 +660,6 @@ uno::Reference< XAccessible> SAL_CALL
}
bBeginDocumentLoad = sal_False;
}
- //-----IAccessibility2 Implementation 2009
if( xChildImpl.isValid() )
{
xChildImpl->SetParent( this );
@@ -789,10 +769,8 @@ uno::Reference<XAccessibleStateSet> SAL_
::utl::AccessibleStateSetHelper *pStateSet =
new ::utl::AccessibleStateSetHelper;
- //IAccessibility2 Implementation 2009-----
if( bIsSeletedInDoc )
pStateSet->AddState( AccessibleStateType::SELECTED );
- //-----IAccessibility2 Implementation 2009
uno::Reference<XAccessibleStateSet> xStateSet( pStateSet );
GetStates( *pStateSet );
@@ -1065,9 +1043,7 @@ uno::Any SAL_CALL SwAccessibleContext::g
sal_Int32 SAL_CALL SwAccessibleContext::getForeground()
throw (uno::RuntimeException)
{
- //IAccessibility2 Implementation 2009-----
return COL_BLACK;
- //-----IAccessibility2 Implementation 2009
}
sal_Int32 SAL_CALL SwAccessibleContext::getBackground()
@@ -1120,12 +1096,10 @@ void SwAccessibleContext::DisposeShape(
void SwAccessibleContext::ScrolledInShape( const SdrObject* ,
::accessibility::AccessibleShape *pAccImpl )
{
- //IAccessibility2 Implementation 2009-----
if(NULL == pAccImpl)
{
return ;
}
- //-----IAccessibility2 Implementation 2009
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
uno::Reference< XAccessible > xAcc( pAccImpl );
@@ -1269,10 +1243,8 @@ void SwAccessibleContext::InvalidatePosO
SwAccessibleChild( GetParent() ).IsVisibleChildrenOnly() )
{
// The frame is now invisible -> dispose it
- //IAccessibility2 Implementation 2009-----
//Remove
//Dispose( sal_True );
- //-----IAccessibility2 Implementation 2009
}
else
{
@@ -1676,7 +1648,6 @@ void lcl_SwAccessibleContext_DbgMsg( SwA
aStrm.Flush();
}
#endif
-//IAccessibility2 Implementation 2009-----
sal_Bool SwAccessibleContext::SetSelectedState(sal_Bool bSeleted)
{
if(bIsSeletedInDoc != bSeleted)
@@ -1687,4 +1658,3 @@ sal_Bool SwAccessibleContext::SetSelecte
}
return sal_False;
};
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sw/source/core/access/acccontext.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/acccontext.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/acccontext.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/acccontext.hxx Sun Dec 1 11:40:24 2013
@@ -98,10 +98,8 @@ private:
// <--
void InitStates();
- //IAccessibility2 Implementation 2009-----
//Solution:Add a member to identify the firt time that document load
sal_Bool bBeginDocumentLoad;
- //-----IAccessibility2 Implementation 2009
protected:
void SetName( const ::rtl::OUString& rName ) { sName = rName; }
@@ -109,12 +107,10 @@ protected:
{
return nRole;
}
- //IAccessibility2 Implementation 2009-----
//Solution:Add a member to identify if the document is Asyn load.
sal_Bool isIfAsynLoad;
//This flag is used to mark the object's selected state.
sal_Bool bIsSeletedInDoc;
- //-----IAccessibility2 Implementation 2009
void SetParent( SwAccessibleContext *pParent );
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetWeakParent() const;
@@ -181,9 +177,7 @@ protected:
public:
- //IAccessibility2 Implementation 2009-----
void SetMap(SwAccessibleMap *pM){pMap = pM;}
- //-----IAccessibility2 Implementation 2009
void FireAccessibleEvent( ::com::sun::star::accessibility::AccessibleEventObject& rEvent );
protected:
@@ -427,11 +421,9 @@ public:
{
return Select( 0, pObj, bAdd );
}
- //IAccessibility2 Implementation 2009-----
//This method is used to updated the selected state and fire the selected state changed event.
virtual sal_Bool SetSelectedState(sal_Bool bSeleted);
sal_Bool IsSeletedInDoc(){ return bIsSeletedInDoc; }
- //-----IAccessibility2 Implementation 2009
static ::rtl::OUString GetResource( sal_uInt16 nResId,
const ::rtl::OUString *pArg1 = 0,
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accdoc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accdoc.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accdoc.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accdoc.cxx Sun Dec 1 11:40:24 2013
@@ -45,7 +45,6 @@
#endif
#include <pagefrm.hxx>
-//IAccessibility2 Implementation 2009-----
#include <editeng/brshitem.hxx>
#include <swatrset.hxx>
#include <frmatr.hxx>
@@ -69,7 +68,6 @@
#include <dview.hxx>
#include <dcontact.hxx>
#include <svx/svdmark.hxx>
-//-----IAccessibility2 Implementation 2009
const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextDocumentView";
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentView";
@@ -203,7 +201,6 @@ sal_Int32 SAL_CALL SwAccessibleDocumentB
for( sal_Int32 i=0; i < nCount; i++ )
{
- //IAccessibility2 Implementation 2009-----
try
{
if( xAcc->getAccessibleChild( i ) == xThis )
@@ -213,7 +210,6 @@ sal_Int32 SAL_CALL SwAccessibleDocumentB
{
return -1L;
}
- //-----IAccessibility2 Implementation 2009
}
return -1L;
}
@@ -224,7 +220,6 @@ OUString SAL_CALL SwAccessibleDocumentBa
return GetResource( STR_ACCESS_DOC_DESC );
}
-//IAccessibility2 Implementation 2009-----
OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException)
{
@@ -255,12 +250,10 @@ OUString SAL_CALL SwAccessibleDocumentBa
return sAccName;
}
-//-----IAccessibility2 Implementation 2009
awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds()
throw (uno::RuntimeException)
{
- //IAccessibility2 Implementation 2009-----
try
{
vos::OGuard aGuard(Application::GetSolarMutex());
@@ -279,7 +272,6 @@ awt::Rectangle SAL_CALL SwAccessibleDocu
{
return awt::Rectangle();
}
- //-----IAccessibility2 Implementation 2009
}
@@ -379,9 +371,7 @@ void SwAccessibleDocument::GetStates(
// MULTISELECTABLE
rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE );
- //IAccessibility2 Implementation 2009-----
rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS );
- //-----IAccessibility2 Implementation 2009
}
@@ -502,7 +492,6 @@ uno::Any SwAccessibleDocument::queryInte
uno::Reference<XAccessibleSelection> aSelect = this;
aRet <<= aSelect;
}
- //IAccessibility2 Implementation 2009-----
//Solution:Add XEventListener interface support.
else if ( (rType == ::getCppuType((uno::Reference<com::sun::star::document::XEventListener> *)NULL)) )
{
@@ -519,7 +508,6 @@ uno::Any SwAccessibleDocument::queryInte
uno::Reference<XAccessibleGetAccFlowTo> AccFlowTo = this;
aRet <<= AccFlowTo;
}
- //-----IAccessibility2 Implementation 2009
else
aRet = SwAccessibleContext::queryInterface( rType );
return aRet;
@@ -532,7 +520,6 @@ uno::Sequence< uno::Type > SAL_CALL SwAc
uno::Sequence< uno::Type > aTypes( SwAccessibleDocumentBase::getTypes() );
sal_Int32 nIndex = aTypes.getLength();
- //IAccessibility2 Implementation 2009-----
//Solution:Reset types memory alloc
//aTypes.realloc( nIndex + 1 );
aTypes.realloc( nIndex + 2 );
@@ -541,7 +528,6 @@ uno::Sequence< uno::Type > SAL_CALL SwAc
pTypes[nIndex] = ::getCppuType( static_cast< uno::Reference< XAccessibleSelection > * >( 0 ) );
//Solution:Add XEventListener interface support.
pTypes[nIndex + 1 ] = ::getCppuType( static_cast< uno::Reference< com::sun::star::document::XEventListener > * >( 0 ) );
- //-----IAccessibility2 Implementation 2009
return aTypes;
}
@@ -611,7 +597,6 @@ void SwAccessibleDocument::deselectAcces
{
maSelectionHelper.deselectAccessibleChild( nChildIndex );
}
-//IAccessibility2 Implementation 2009-----
//Solution:Implement XEventListener interfaces
void SAL_CALL SwAccessibleDocument::notifyEvent( const ::com::sun::star::document::EventObject& Event )
throw (::com::sun::star::uno::RuntimeException)
@@ -687,7 +672,6 @@ uno::Any SAL_CALL SwAccessibleDocument::
SwCntntFrm* pCurrFrm = pCrsrShell->GetCurrFrm();
SwPageFrm* pCurrPage=((SwFrm*)pCurrFrm)->FindPageFrm();
sal_uLong nLineNum = 0;
- //IAccessibility2 Implementation 2009-----
SwTxtFrm* pTxtFrm = NULL;
SwTxtFrm* pCurrTxtFrm = NULL;
pTxtFrm = static_cast< SwTxtFrm* >(static_cast< SwPageFrm* > (pCurrPage)->ContainsCntnt());
@@ -777,7 +761,6 @@ uno::Any SAL_CALL SwAccessibleDocument::
++nLineNum;
}
}
- //-----IAccessibility2 Implementation 2009
sValue += sAttrName;
sValue += String::CreateFromInt32( nLineNum ) ;
@@ -891,10 +874,8 @@ uno::Any SAL_CALL SwAccessibleDocument::
sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
throw (::com::sun::star::uno::RuntimeException)
{
- //IAccessibility2 Implementation 2009-----
vos::OGuard aGuard(Application::GetSolarMutex());
return SW_MOD()->GetColorConfig().GetColorValue( ::svtools::DOCCOLOR ).nColor;
- //-----IAccessibility2 Implementation 2009
}
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
@@ -1022,4 +1003,3 @@ Rt:
uno::Sequence< uno::Any > aEmpty;
return aEmpty;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accdoc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accdoc.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accdoc.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accdoc.hxx Sun Dec 1 11:40:24 2013
@@ -26,7 +26,6 @@
#include "acccontext.hxx"
#endif
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/document/XEventListener.hpp>
#include <accselectionhelper.hxx>
@@ -37,7 +36,6 @@
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEGETACCFLOWTO_HPP_
#include <com/sun/star/accessibility/XAccessibleGetAccFlowTo.hpp>
#endif
-//-----IAccessibility2 Implementation 2009
class VclSimpleEvent;
@@ -92,9 +90,7 @@ public:
/// Return this object's description.
virtual ::rtl::OUString SAL_CALL
getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException);
- //IAccessibility2 Implementation 2009-----
virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException);
- //-----IAccessibility2 Implementation 2009
//===== XAccessibleComponent ==============================================
virtual sal_Bool SAL_CALL containsPoint(
@@ -126,10 +122,8 @@ public:
*/
class SwAccessibleDocument : public SwAccessibleDocumentBase,
public com::sun::star::accessibility::XAccessibleSelection,
- //IAccessibility2 Implementation 2009-----
public com::sun::star::document::XEventListener,
public com::sun::star::accessibility::XAccessibleExtendedAttributes,
- //-----IAccessibility2 Implementation 2009
public com::sun::star::accessibility::XAccessibleGetAccFlowTo
{
// Implementation for XAccessibleSelection interface
@@ -148,13 +142,11 @@ public:
SwAccessibleDocument( SwAccessibleMap* pInitMap );
DECL_LINK( WindowChildEventListener, VclSimpleEvent* );
- //IAccessibility2 Implementation 2009-----
//===== XEventListener====================================================
virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event )
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Event )
throw (::com::sun::star::uno::RuntimeException);
- //-----IAccessibility2 Implementation 2009
//===== XServiceInfo ====================================================
@@ -225,7 +217,6 @@ public:
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException );
- //IAccessibility2 Implementation 2009-----
virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
//====== thread safe C++ interface ========================================
@@ -241,7 +232,6 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType)
throw ( ::com::sun::star::uno::RuntimeException );
- //-----IAccessibility2 Implementation 2009
};
#endif
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accembedded.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accembedded.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accembedded.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accembedded.cxx Sun Dec 1 11:40:24 2013
@@ -31,14 +31,12 @@
#include <rtl/uuid.h>
#include <flyfrm.hxx>
#include "accembedded.hxx"
-//IAccessibility2 Implementation 2009-----
#include "cntfrm.hxx"
#include "ndole.hxx"
#include <doc.hxx>
#include <docsh.hxx>
#include <../../ui/inc/wrtsh.hxx>
#include <../../ui/inc/view.hxx>
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
@@ -59,7 +57,6 @@ SwAccessibleEmbeddedObject::~SwAccessibl
{
}
-//IAccessibility2 Implementation 2009-----
//===== XInterface ==========================================================
com::sun::star::uno::Any SAL_CALL
SwAccessibleEmbeddedObject::queryInterface (const com::sun::star::uno::Type & rType)
@@ -85,7 +82,6 @@ void SAL_CALL
{
SwAccessibleNoTextFrame::release ();
}
-//-----IAccessibility2 Implementation 2009
OUString SAL_CALL SwAccessibleEmbeddedObject::getImplementationName()
throw( uno::RuntimeException )
@@ -127,7 +123,6 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAcc
}
return aId;
}
-//IAccessibility2 Implementation 2009-----
//===== XAccessibleExtendedAttributes ========================================================
::com::sun::star::uno::Any SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
@@ -154,4 +149,3 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAcc
strRet <<= style;
return strRet;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accembedded.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accembedded.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accembedded.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accembedded.hxx Sun Dec 1 11:40:24 2013
@@ -24,9 +24,7 @@
#define _ACCEMBEDDED_HXX
#include "accnotextframe.hxx"
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
-//-----IAccessibility2 Implementation 2009
class SwAccessibleEmbeddedObject : public SwAccessibleNoTextFrame
, public ::com::sun::star::accessibility::XAccessibleExtendedAttributes
@@ -41,7 +39,6 @@ public:
SwAccessibleEmbeddedObject( SwAccessibleMap* pInitMap,
const SwFlyFrm* pFlyFrm );
- //IAccessibility2 Implementation 2009-----
//===== XInterface ======================================================
virtual com::sun::star::uno::Any SAL_CALL
@@ -55,7 +52,6 @@ public:
virtual void SAL_CALL
release (void)
throw ();
- //-----IAccessibility2 Implementation 2009
//===== XServiceInfo ====================================================
/** Returns an identifier for the implementation of this object.
@@ -80,11 +76,9 @@ public:
//===== XTypeProvider ====================================================
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
- //IAccessibility2 Implementation 2009-----
// ====== XAccessibleExtendedAttributes =====================================
virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accfootnote.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accfootnote.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accfootnote.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accfootnote.cxx Sun Dec 1 11:40:24 2013
@@ -64,7 +64,6 @@ SwAccessibleFootnote::SwAccessibleFootno
sal_uInt16 nResId = bIsEndnote ? STR_ACCESS_ENDNOTE_NAME
: STR_ACCESS_FOOTNOTE_NAME;
- //IAccessibility2 Implementation 2009-----
//OUString sArg( OUString::valueOf( nFootEndNote ) );
//old codes end
OUString sArg;
@@ -75,7 +74,6 @@ SwAccessibleFootnote::SwAccessibleFootno
const SwDoc *pDoc = GetShell()->GetDoc();
sArg = pTxtFtn->GetFtn().GetViewNumStr( *pDoc );
}
- //-----IAccessibility2 Implementation 2009
SetName( GetResource( nResId, &sArg ) );
}
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accframe.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accframe.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accframe.cxx Sun Dec 1 11:40:24 2013
@@ -165,10 +165,8 @@ using namespace sw::access;
if( SwAccessibleChildMap::IsSortingRequired( rFrm ) )
{
// We need a sorted list here
- //IAccessibility2 Implementation 2009-----
// const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
const SwAccessibleChildMap aVisMap( rFrm.PaintArea(), rFrm, rAccMap );
- //-----IAccessibility2 Implementation 2009
SwAccessibleChildMap::const_iterator aIter( aVisMap.begin() );
while( aIter != aVisMap.end() && !bFound )
{
@@ -195,10 +193,8 @@ using namespace sw::access;
// The unsorted list is sorted enough, because it return lower
// frames in the correct order.
- //IAccessibility2 Implementation 2009-----
// const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap );
const SwAccessibleChildSList aVisList( rFrm.PaintArea(), rFrm, rAccMap );
- //-----IAccessibility2 Implementation 2009
SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
while( aIter != aVisList.end() && !bFound )
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accframe.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accframe.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accframe.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accframe.hxx Sun Dec 1 11:40:24 2013
@@ -106,10 +106,8 @@ protected:
sal_Bool bIsPagePreview );
virtual ~SwAccessibleFrame();
- //IAccessibility2 Implementation 2009-----
// MT: Move to private area?
sal_Bool bIsAccDocUse;
- //-----IAccessibility2 Implementation 2009
public:
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accframebase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accframebase.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accframebase.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accframebase.cxx Sun Dec 1 11:40:24 2013
@@ -42,7 +42,6 @@
#include "accmap.hxx"
#include "accframebase.hxx"
-//IAccessibility2 Implementation 2009-----
#ifndef _CRSRSH_HXX
#include <crsrsh.hxx>
#endif
@@ -61,7 +60,6 @@
#ifndef _FMTANCHR_HXX
#include <fmtanchr.hxx>
#endif
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::rtl::OUString;
@@ -113,10 +111,8 @@ void SwAccessibleFrameBase::GetStates(
if( pWin && pWin->HasFocus() )
rStateSet.AddState( AccessibleStateType::FOCUSED );
}
- //IAccessibility2 Implementation 2009-----
if( GetSelectedState() )
rStateSet.AddState( AccessibleStateType::SELECTED );
- //-----IAccessibility2 Implementation 2009
}
@@ -190,7 +186,6 @@ void SwAccessibleFrameBase::_InvalidateC
Window *pWin = GetWindow();
if( pWin && pWin->HasFocus() && bNewSelected )
FireStateChangedEvent( AccessibleStateType::FOCUSED, bNewSelected );
- //IAccessibility2 Implementation 2009-----
//FireStateChangedEvent( AccessibleStateType::SELECTED, bNewSelected );
if( pWin && pWin->HasFocus() && !bNewSelected )
FireStateChangedEvent( AccessibleStateType::FOCUSED, bNewSelected );
@@ -209,7 +204,6 @@ void SwAccessibleFrameBase::_InvalidateC
pAcc->FireAccessibleEvent( aEvent );
}
}
- //-----IAccessibility2 Implementation 2009
}
}
@@ -303,7 +297,6 @@ void SwAccessibleFrameBase::Dispose( sal
SwAccessibleContext::Dispose( bRecursive );
}
-//IAccessibility2 Implementation 2009-----
//Get the selection cursor of the document.
SwPaM* SwAccessibleFrameBase::GetCrsr()
{
@@ -331,12 +324,10 @@ sal_Bool SwAccessibleFrameBase::GetSelec
{
vos::OGuard aGuard(Application::GetSolarMutex());
- //IAccessibility2 Implementation 2009-----
if(GetMap()->IsDocumentSelAll())
{
return sal_True;
}
- //-----IAccessibility2 Implementation 2009
// SELETED.
SwFlyFrm* pFlyFrm = getFlyFrm();
@@ -370,11 +361,9 @@ sal_Bool SwAccessibleFrameBase::GetSelec
{
if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
{
- //IAccessibility2 Implementation 2009-----
if( (nHere == nStartIndex) && (pIndex >= pStart->nContent.GetIndex()) || (nHere > nStartIndex) )
if( (nHere == nEndIndex) && (pIndex < pEnd->nContent.GetIndex()) || (nHere < nEndIndex) )
return sal_True;
- //-----IAccessibility2 Implementation 2009
}
else if( pAnchor.GetAnchorId() == FLY_AT_PARA )
{
@@ -423,4 +412,3 @@ sal_Bool SwAccessibleFrameBase::SetSelec
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accframebase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accframebase.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accframebase.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accframebase.hxx Sun Dec 1 11:40:24 2013
@@ -23,11 +23,9 @@
#ifndef _ACCFRAMEBASE_HXX
#define _ACCFRAMEBASE_HXX
-//IAccessibility2 Implementation 2009-----
#ifndef _PAM_HXX
#include <pam.hxx>
#endif
-//-----IAccessibility2 Implementation 2009
#include <acccontext.hxx>
@@ -48,11 +46,9 @@ protected:
// This drived class additionaly sets SELECTABLE(1), SELECTED(+),
// FOCUSABLE(1) and FOCUSED(+)
virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet );
- //IAccessibility2 Implementation 2009-----
SwFlyFrm* getFlyFrm() const;
sal_Bool GetSelectedState( );
SwPaM* GetCrsr();
- //-----IAccessibility2 Implementation 2009
virtual void _InvalidateCursorPos();
virtual void _InvalidateFocus();
@@ -73,7 +69,6 @@ public:
// The object is not visible an longer and should be destroyed
virtual void Dispose( sal_Bool bRecursive = sal_False );
virtual sal_Bool SetSelectedState( sal_Bool bSeleted );
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accfrmobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accfrmobj.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accfrmobj.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accfrmobj.cxx Sun Dec 1 11:40:24 2013
@@ -40,9 +40,7 @@
#include <fmtanchr.hxx>
#include <dcontact.hxx>
-//IAccessibility2 Implementation 2009-----
#include <pam.hxx>
-//-----IAccessibility2 Implementation 2009
#include <vcl/window.hxx>
@@ -178,7 +176,6 @@ bool SwAccessibleChild::IsBoundAsChar()
return bRet;
}
-//IAccessibility2 Implementation 2009-----
sal_uInt32 SwAccessibleChild::GetAnchorPosition() const
{
if( mpDrawObj )
@@ -195,7 +192,6 @@ sal_uInt32 SwAccessibleChild::GetAnchorP
}
return 0;
}
-//-----IAccessibility2 Implementation 2009
SwAccessibleChild::SwAccessibleChild( const SwAccessibleChild& r )
: mpFrm( r.mpFrm )
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accfrmobj.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accfrmobj.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accfrmobj.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accfrmobj.hxx Sun Dec 1 11:40:24 2013
@@ -64,9 +64,7 @@ class SwAccessibleChild
bool IsAccessible( sal_Bool bPagePreview ) const;
bool IsBoundAsChar() const;
- //IAccessibility2 Implementation 2009-----
sal_uInt32 GetAnchorPosition() const;
- //-----IAccessibility2 Implementation 2009
bool IsVisibleChildrenOnly() const;
SwRect GetBox( const SwAccessibleMap& rAccMap ) const;
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accfrmobjmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accfrmobjmap.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accfrmobjmap.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accfrmobjmap.cxx Sun Dec 1 11:40:24 2013
@@ -163,96 +163,3 @@ SwAccessibleChildMap::SwAccessibleChildM
rFrm.GetDrawObjs() );
}
-/* MT: The two insert methods had been introduced in the IA2 CWS (OOO310m11), but meanwhile we also have some in DEV300m80 (above)
- Not sure if they have something which needs to be update in above methods.
- Also, since there is no SwFrmOrObjMap CTOR anymore, the updated code in DEV300 might need some of the changes flagged with //IAccessibility2 Implementation 2009-----
-
-//IAccessibility2 Implementation 2009-----
-::std::pair< SwFrmOrObjMap::iterator, bool > SwFrmOrObjMap::insert(
- sal_uInt32 nOrd, Point nPos, const SwFrmOrObj& rLower )
-{
- SwFrmOrObjMapKey aKey( SwFrmOrObjMapKey::TEXT, nOrd, nPos );
- value_type aEntry( aKey, rLower );
- return _SwFrmOrObjMap::insert( aEntry );
-}
-
-::std::pair< SwFrmOrObjMap::iterator, bool > SwFrmOrObjMap::insert(
- const SdrObject *pObj, const SwFrmOrObj& rLower, const SwDoc *pDoc , Point nPos)
-{
- if( !bLayerIdsValid )
- {
- nHellId = pDoc->GetHellId();
- nControlsId = pDoc->GetControlsId();
- bLayerIdsValid = sal_True;
- }
-
- SdrLayerID nLayer = pObj->GetLayer();
- SwFrmOrObjMapKey::LayerId eLayerId = (nHellId == nLayer)
- ? SwFrmOrObjMapKey::HELL
- : ((nControlsId == nLayer) ? SwFrmOrObjMapKey::CONTROLS
- : SwFrmOrObjMapKey::HEAVEN);
- SwFrmOrObjMapKey aKey( eLayerId, pObj->GetOrdNum(), nPos );
- value_type aEntry( aKey, rLower );
- return _SwFrmOrObjMap::insert( aEntry );
-}
-//-----IAccessibility2 Implementation 2009
-
-SwFrmOrObjMap::SwFrmOrObjMap(
- const SwRect& rVisArea, const SwFrm *pFrm ) :
- bLayerIdsValid( sal_False )
-{
- SwFrmOrObj aFrm( pFrm );
- sal_Bool bVisibleOnly = aFrm.IsVisibleChildrenOnly();
-
- sal_uInt32 nPos = 0;
- SwFrmOrObj aLower( pFrm->GetLower() );
- while( aLower.GetSwFrm() )
- {
- //IAccessibility2 Implementation 2009-----
- if( !bVisibleOnly || aLower.GetBox().IsOver( rVisArea ) )
- insert( nPos++, aLower.GetBounds().Pos(), aLower );
- //-----IAccessibility2 Implementation 2009
- aLower = aLower.GetSwFrm()->GetNext();
- }
-
- if( pFrm->IsPageFrm() )
- {
- ASSERT( bVisibleOnly, "page frame within tab frame???" );
- const SwPageFrm *pPgFrm =
- static_cast< const SwPageFrm * >( pFrm );
- const SwSortedObjs *pObjs = pPgFrm->GetSortedObjs();
- if( pObjs )
- {
- const SwDoc *pDoc = pPgFrm->GetFmt()->GetDoc();
- for( sal_uInt16 i=0; i<pObjs->Count(); i++ )
- {
- aLower = (*pObjs)[i]->GetDrawObj();
- //IAccessibility2 Implementation 2009-----
- if( aLower.GetBox().IsOver( rVisArea ) )
- insert( aLower.GetSdrObject(), aLower, pDoc , aLower.GetBounds().Pos() );
- //-----IAccessibility2 Implementation 2009
- }
- }
- }
- else if( pFrm->IsTxtFrm() )
- {
- const SwDoc *pDoc = static_cast< const SwTxtFrm * >( pFrm )->GetNode()
- ->GetDoc();
- const SwSortedObjs *pObjs = pFrm->GetDrawObjs();
- if( pObjs )
- {
- for( sal_uInt16 i=0; i<pObjs->Count(); i++ )
- {
- aLower = (*pObjs)[i]->GetDrawObj();
- //IAccessibility2 Implementation 2009-----
- if( aLower.IsBoundAsChar() &&
- (!bVisibleOnly || aLower.GetBox().IsOver( rVisArea )) )
- insert( aLower.GetSdrObject(), aLower, pDoc , Point(aLower.GetAnchorPosition(),0) );
- //-----IAccessibility2 Implementation 2009
- }
- }
- }
-}
-
-*/
-
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accfrmobjmap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accfrmobjmap.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accfrmobjmap.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accfrmobjmap.hxx Sun Dec 1 11:40:24 2013
@@ -53,18 +53,15 @@ public:
, nPosNum( 0, 0 )
{}
-//IAccessibility2 Implementation 2009-----
inline SwAccessibleChildMapKey( LayerId eId, sal_uInt32 nOrd, Point nPos )
: eLayerId( eId )
, nOrdNum( nOrd )
, nPosNum( nPos )
{}
-//-----IAccessibility2 Implementation 2009
inline bool operator()( const SwAccessibleChildMapKey& r1,
const SwAccessibleChildMapKey& r2 ) const
{
-//IAccessibility2 Implementation 2009-----
// return (r1.eLayerId == r2.eLayerId)
// ? (r1.nOrdNum < r2.nOrdNum)
// : (r1.eLayerId < r2.eLayerId);
@@ -73,11 +70,9 @@ public:
(r1.nPosNum.getY() == r2.nPosNum.getY()? r1.nPosNum.getX() < r2.nPosNum.getX() :
r1.nPosNum.getY() < r2.nPosNum.getY()) ) :
(r1.eLayerId < r2.eLayerId);
-//-----IAccessibility2 Implementation 2009
}
/* MT: Need to get this position parameter stuff in dev300 somehow...
- //IAccessibility2 Implementation 2009-----
//This methods are used to insert an object to the map, adding a position parameter.
::std::pair< iterator, bool > insert( sal_uInt32 nOrd, Point nPos,
const SwFrmOrObj& rLower );
@@ -85,7 +80,6 @@ public:
const SwFrmOrObj& rLower,
const SwDoc *pDoc,
Point nPos);
- //-----IAccessibility2 Implementation 2009
*/
private:
@@ -93,9 +87,7 @@ private:
LayerId eLayerId;
sal_uInt32 nOrdNum;
- //IAccessibility2 Implementation 2009-----
Point nPosNum;
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accgraphic.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accgraphic.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accgraphic.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accgraphic.cxx Sun Dec 1 11:40:24 2013
@@ -33,11 +33,9 @@
#include "accgraphic.hxx"
using namespace ::com::sun::star;
-//IAccessibility2 Implementation 2009-----
#ifndef _FMTURL_HXX //autogen
#include <fmturl.hxx>
#endif
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::accessibility;
@@ -96,7 +94,6 @@ Sequence< sal_Int8 > SAL_CALL SwAccessib
}
return aId;
}
-//IAccessibility2 Implementation 2009-----
// Return this object's role.
sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole (void)
throw (::com::sun::star::uno::RuntimeException)
@@ -107,4 +104,3 @@ sal_Int16 SAL_CALL SwAccessibleGraphic::
return AccessibleRole::IMAGE_MAP ;
return AccessibleRole::GRAPHIC ;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accgraphic.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accgraphic.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accgraphic.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accgraphic.hxx Sun Dec 1 11:40:24 2013
@@ -59,10 +59,8 @@ public:
//===== XTypeProvider ====================================================
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
- //IAccessibility2 Implementation 2009-----
/// Return this object's role.
virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException);
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accheaderfooter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accheaderfooter.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accheaderfooter.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accheaderfooter.cxx Sun Dec 1 11:40:24 2013
@@ -140,7 +140,6 @@ Sequence< sal_Int8 > SAL_CALL SwAccessib
return aId;
}
-//IAccessibility2 Implementation 2009-----
sal_Int32 SAL_CALL SwAccessibleHeaderFooter::getBackground()
throw (::com::sun::star::uno::RuntimeException)
{
@@ -155,4 +154,3 @@ sal_Int32 SAL_CALL SwAccessibleHeaderFoo
}
return SwAccessibleContext::getBackground();
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accheaderfooter.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accheaderfooter.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accheaderfooter.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accheaderfooter.hxx Sun Dec 1 11:40:24 2013
@@ -74,11 +74,9 @@ public:
//===== XTypeProvider ====================================================
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
- //IAccessibility2 Implementation 2009-----
//===== XAccessibleComponent ============================================
sal_Int32 SAL_CALL getBackground()
throw (::com::sun::star::uno::RuntimeException);
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/l10n40/main/sw/source/core/access/acchyperlink.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/acchyperlink.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/acchyperlink.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/acchyperlink.cxx Sun Dec 1 11:40:24 2013
@@ -32,7 +32,6 @@
#include <accpara.hxx>
#include <acchyperlink.hxx>
-//IAccessibility2 Implementation 2009-----
#include <comphelper/processfactory.hxx>
#ifndef _COM_SUN_STAR_FRAME_XDESKTOP_HPP_
#include <com/sun/star/frame/XDesktop.hpp>
@@ -43,7 +42,6 @@
#ifndef _COM_SUN_STAR_DOCUMENT_XLINKTARGETSUPPLIER_HPP_
#include <com/sun/star/document/XLinkTargetSupplier.hpp>
#endif
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -92,12 +90,10 @@ sal_Bool SAL_CALL SwAccessibleHyperlink:
sal_Bool bRet = sal_False;
- //IAccessibility2 Implementation 2009-----
if(nIndex != 0)
throw new IndexOutOfBoundsException;
const SwTxtAttr *pTxtAttr = GetTxtAttr();
if( pTxtAttr /*&& 0 == nIndex*/ )
- //-----IAccessibility2 Implementation 2009
{
const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
if( rINetFmt.GetValue().Len() )
@@ -129,7 +125,6 @@ OUString SAL_CALL SwAccessibleHyperlink:
{
OUString sDesc;
- //IAccessibility2 Implementation 2009-----
if(nIndex != 0)
throw new IndexOutOfBoundsException;
const SwTxtAttr *pTxtAttr = GetTxtAttr();
@@ -138,7 +133,6 @@ OUString SAL_CALL SwAccessibleHyperlink:
const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
sDesc = OUString( rINetFmt.GetValue() );
}
- //-----IAccessibility2 Implementation 2009
return sDesc;
}
@@ -148,9 +142,7 @@ uno::Reference< XAccessibleKeyBinding >
{
uno::Reference< XAccessibleKeyBinding > xKeyBinding;
- //IAccessibility2 Implementation 2009-----
if( isValid() /*&& 0 == nIndex*/ )
- //-----IAccessibility2 Implementation 2009
{
::comphelper::OAccessibleKeyBindingHelper* pKeyBindingHelper =
new ::comphelper::OAccessibleKeyBindingHelper();
@@ -173,14 +165,12 @@ uno::Any SAL_CALL SwAccessibleHyperlink:
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
uno::Any aRet;
- //IAccessibility2 Implementation 2009-----
if(nIndex != 0)
throw new IndexOutOfBoundsException;
//End Added.
::rtl::OUString text = OUString( xPara->GetString() );
::rtl::OUString retText = text.copy(nStartIdx, nEndIdx - nStartIdx);
aRet <<= retText;
- //-----IAccessibility2 Implementation 2009
return aRet;
}
@@ -188,7 +178,6 @@ uno::Any SAL_CALL SwAccessibleHyperlink:
sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- //IAccessibility2 Implementation 2009-----
if(nIndex != 0)
throw new IndexOutOfBoundsException;
//End Added.
@@ -202,7 +191,6 @@ uno::Any SAL_CALL SwAccessibleHyperlink:
uno::Any aRet;
aRet <<= retText;
return aRet;
- //-----IAccessibility2 Implementation 2009
}
sal_Int32 SAL_CALL SwAccessibleHyperlink::getStartIndex()
@@ -221,7 +209,6 @@ sal_Bool SAL_CALL SwAccessibleHyperlink:
throw (uno::RuntimeException)
{
vos::OGuard aGuard(Application::GetSolarMutex());
- //IAccessibility2 Implementation 2009-----
// return xPara.isValid();
if (xPara.isValid())
{
@@ -271,7 +258,6 @@ sal_Bool SAL_CALL SwAccessibleHyperlink:
}
}//xpara valid
return sal_False;
- //-----IAccessibility2 Implementation 2009
}
void SwAccessibleHyperlink::Invalidate()
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accmap.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accmap.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accmap.cxx Sun Dec 1 11:40:24 2013
@@ -61,7 +61,6 @@
#include <IDocumentDrawModelAccess.hxx>
#include <svx/ShapeTypeHandler.hxx>
#include <vcl/svapp.hxx>
-//IAccessibility2 Implementation 2009-----
#ifndef _SVX_ACCESSIBILITY_SHAPE_TYPE_HANDLER_HXX
#include <svx/ShapeTypeHandler.hxx>
#endif
@@ -294,9 +293,7 @@ SwAccessibleObjShape_Impl
{
const SdrObject *pObj = (*aIter).first;
uno::Reference < XAccessible > xAcc( (*aIter).second );
- //IAccessibility2 Implementation 2009-----
if( nSelShapes && pFESh &&pFESh->IsObjSelected( *pObj ) )
- //-----IAccessibility2 Implementation 2009
{
// selected objects are inserted from the back
--pSelShape;
@@ -352,14 +349,12 @@ private:
SwAccessibleEvent_Impl& operator==( const SwAccessibleEvent_Impl& );
public:
- //IAccessibility2 Implementation 2009-----
const SwFrm* mpParentFrm; // The object that fires the event
sal_Bool IsNoXaccParentFrm() const
{
return CHILD_POS_CHANGED == meType && mpParentFrm != 0;
}
uno::WeakReference < XAccessible > GetxAcc() const { return mxAcc;}
- //-----IAccessibility2 Implementation 2009
public:
SwAccessibleEvent_Impl( EventType eT,
SwAccessibleContext *pA,
@@ -422,7 +417,6 @@ public:
"wrong event constructor, CARET_OR_STATES only" );
}
- //IAccessibility2 Implementation 2009-----
SwAccessibleEvent_Impl( EventType eT,
const SwFrm *pParentFrm,
const SwAccessibleChild& rFrmOrObj,
@@ -436,7 +430,6 @@ public:
OSL_ENSURE( SwAccessibleEvent_Impl::CHILD_POS_CHANGED == meType,
"wrong event constructor, CHILD_POS_CHANGED only" );
}
- //-----IAccessibility2 Implementation 2009
// <SetType(..)> only used in method <SwAccessibleMap::AppendEvent(..)>
inline void SetType( EventType eT )
{
@@ -540,7 +533,6 @@ public:
{
return mbFiring;
}
- //IAccessibility2 Implementation 2009-----
struct XAccisNULL
{
bool operator()(const SwAccessibleEvent_Impl& e)
@@ -549,10 +541,8 @@ public:
}
};
void MoveInvalidXAccToEnd();
- //-----IAccessibility2 Implementation 2009
};
-//IAccessibility2 Implementation 2009-----
void SwAccessibleEventList_Impl::MoveInvalidXAccToEnd()
{
int nSize = size();
@@ -580,7 +570,6 @@ void SwAccessibleEventList_Impl::MoveInv
insert(end(),lstEvent.begin(),lstEvent.end());
OSL_ENSURE(size() == nSize ,"");
}
-//-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------------
// The shape list is filled if an accessible shape is destroyed. It
// simply keeps a reference to the accessible shape's XShape. These
@@ -911,7 +900,6 @@ static sal_Bool AreInSameTable( const un
void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
{
::vos::ORef < SwAccessibleContext > xAccImpl( rEvent.GetContext() );
- //IAccessibility2 Implementation 2009-----
if (!xAccImpl.isValid() && rEvent.mpParentFrm != 0 )
{
SwAccessibleContextMap_Impl::iterator aIter =
@@ -929,7 +917,6 @@ void SwAccessibleMap::FireEvent( const S
}
}
}
- //-----IAccessibility2 Implementation 2009
if( SwAccessibleEvent_Impl::SHAPE_SELECTION == rEvent.GetType() )
{
DoInvalidateShapeSelection();
@@ -1147,7 +1134,6 @@ void SwAccessibleMap::InvalidateShapeSel
DoInvalidateShapeSelection();
}
}
-//IAccessibility2 Implementation 2009-----
//This method should implement the following functions:
//1.find the shape objects and set the selected state.
//2.find the Swframe objects and set the selected state.
@@ -1161,8 +1147,7 @@ void SwAccessibleMap::InvalidateShapeInP
const ViewShell *pVSh = GetShell();
const SwFEShell *pFESh = pVSh->ISA( SwFEShell ) ?
static_cast< const SwFEShell * >( pVSh ) : 0;
- SwPaM* pCrsr = pFESh ? pFESh->GetCrsr( sal_False /* ??? */ ) : NULL;//IAccessibility2 Implementation 2009
-
+ SwPaM* pCrsr = pFESh ? pFESh->GetCrsr( sal_False /* ??? */ ) : NULL;
//sal_uInt16 nSelShapes = pFESh ? pFESh->IsObjSelected() : 0;
{
@@ -1546,7 +1531,6 @@ void SwAccessibleMap::DoInvalidateShapeS
else
pShape->second->ResetState( AccessibleStateType::FOCUSED );
- // IA2 CWS:
if(pShape->second->SetState( AccessibleStateType::SELECTED ))
{
vecxShapeAdd.push_back(pShape->second);
@@ -1575,7 +1559,7 @@ void SwAccessibleMap::DoInvalidateShapeS
++pShape;
}
- const int SELECTION_WITH_NUM =10;
+ const unsigned int SELECTION_WITH_NUM = 10;
if (vecxShapeAdd.size() > SELECTION_WITH_NUM )
{
uno::Reference< XAccessible > xDoc = GetDocumentView( );
@@ -1703,7 +1687,6 @@ void SwAccessibleMap::DoInvalidateShapeF
}
}
*/
-//-----IAccessibility2 Implementation 2009
SwAccessibleMap::SwAccessibleMap( ViewShell *pSh ) :
mpFrmMap( 0 ),
@@ -1720,7 +1703,7 @@ SwAccessibleMap::SwAccessibleMap( ViewSh
mnFootnote( 1 ),
mnEndnote( 1 ),
mbShapeSelected( sal_False ),
- mpSeletedFrmMap(NULL)//IAccessibility2 Implementation 2009
+ mpSeletedFrmMap(NULL)
{
pSh->GetLayout()->AddAccessibleShell();
}
@@ -1741,7 +1724,6 @@ SwAccessibleMap::~SwAccessibleMap()
}
}
- //IAccessibility2 Implementation 2009-----
if(xAcc.is())
{
SwAccessibleDocument *pAcc =
@@ -1762,7 +1744,6 @@ SwAccessibleMap::~SwAccessibleMap()
++aIter;
}
}
- //-----IAccessibility2 Implementation 2009
{
vos::OGuard aGuard( maMutex );
#ifdef DBG_UTIL
@@ -1843,7 +1824,7 @@ SwAccessibleMap::~SwAccessibleMap()
mpEvents = 0;
}
mpVSh->GetLayout()->RemoveAccessibleShell();
- delete mpSeletedFrmMap;//IAccessibility2 Implementation 2009
+ delete mpSeletedFrmMap;
}
uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
@@ -2130,10 +2111,8 @@ uno::Reference< XAccessible> SwAccessibl
}
// TODO: focus!!!
}
- //IAccessibility2 Implementation 2009-----
if (xAcc.is())
AddGroupContext(pObj, xAcc);
- //-----IAccessibility2 Implementation 2009
}
}
}
@@ -2144,7 +2123,6 @@ uno::Reference< XAccessible> SwAccessibl
return xAcc;
}
-//IAccessibility2 Implementation 2009-----
sal_Bool SwAccessibleMap::IsInSameLevel(const SdrObject* pObj, const SwFEShell* pFESh)
{
if (pFESh)
@@ -2242,7 +2220,6 @@ void SwAccessibleMap::AddGroupContext(co
}
}
}
-//-----IAccessibility2 Implementation 2009
::vos::ORef < ::accessibility::AccessibleShape > SwAccessibleMap::GetContextImpl(
const SdrObject *pObj,
@@ -2305,7 +2282,6 @@ void SwAccessibleMap::RemoveContext( con
mpShapeMap->find( pObj );
if( aIter != mpShapeMap->end() )
{
- //IAccessible2 Implementation 2009 ----
uno::Reference < XAccessible > xAcc( (*aIter).second );
mpShapeMap->erase( aIter );
RemoveGroupContext(pObj, xAcc);
@@ -2314,7 +2290,6 @@ void SwAccessibleMap::RemoveContext( con
// that is selected.
if( mpShapeMap && mpShapeMap->empty() )
- //---- IAccessible2 Implementation 2009
{
delete mpShapeMap;
mpShapeMap = 0;
@@ -2461,7 +2436,7 @@ void SwAccessibleMap::InvalidatePosOrSiz
{
::vos::ORef< SwAccessibleContext > xAccImpl;
::vos::ORef< SwAccessibleContext > xParentAccImpl;
- const SwFrm *pParent =NULL; //IAccessibility2 Implementation 2009
+ const SwFrm *pParent =NULL;
{
vos::OGuard aGuard( maMutex );
@@ -2484,8 +2459,7 @@ void SwAccessibleMap::InvalidatePosOrSiz
{
// Otherwise we look if the parent is accessible.
// If not, there is nothing to do.
- pParent = //IAccessibility2 Implementation 2009
- SwAccessibleFrame::GetParent( aFrmOrObj,
+ pParent = SwAccessibleFrame::GetParent( aFrmOrObj,
GetShell()->IsPreView());
if( pParent )
@@ -2534,7 +2508,6 @@ void SwAccessibleMap::InvalidatePosOrSiz
rOldBox );
}
}
- //IAccessibility2 Implementation 2009-----
else if(pParent)
{
/*
@@ -2581,7 +2554,6 @@ so run here: save the parent's SwFrm not
}
}
}
- //-----IAccessibility2 Implementation 2009
}
void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
@@ -2716,7 +2688,6 @@ void SwAccessibleMap::InvalidateCursorPo
mpFrmMap->find( aFrmOrObj.GetSwFrm() );
if( aIter != mpFrmMap->end() )
xAcc = (*aIter).second;
- //IAccessibility2 Implementation 2009-----
else
{
SwRect rcEmpty;
@@ -2738,7 +2709,6 @@ void SwAccessibleMap::InvalidateCursorPo
xAcc = (*aIter).second;
}
}
- //-----IAccessibility2 Implementation 2009
// For cells, some extra thoughts are necessary,
// because invalidating the cursor for one cell
@@ -2767,7 +2737,6 @@ void SwAccessibleMap::InvalidateCursorPo
xAcc = GetContext( aFrmOrObj.GetSwFrm(), sal_True );
}
}
- //IAccessibility2 Implementation 2009-----
else if (bShapeSelected)
{
const SwFEShell *pFESh = pVSh ? static_cast< const SwFEShell * >( pVSh ) : NULL ;
@@ -2885,10 +2854,8 @@ void SwAccessibleMap::InvalidateCursorPo
pAccPara->FireAccessibleEvent( aEvent );
}
}
- //-----IAccessibility2 Implementation 2009
}
-//IAccessibility2 Implementation 2009-----
//Notify the page change event to bridge.
void SwAccessibleMap::FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage)
{
@@ -2944,11 +2911,9 @@ void SwAccessibleMap::FireColumnChangeEv
}
}
}
-//-----IAccessibility2 Implementation 2009
void SwAccessibleMap::InvalidateFocus()
{
- //IAccessibility2 Implementation 2009-----
if(GetShell()->IsPreView())
{
uno::Reference<XAccessible> xAcc = _GetDocumentView( sal_True );
@@ -2962,7 +2927,6 @@ void SwAccessibleMap::InvalidateFocus()
}
}
}
- //-----IAccessibility2 Implementation 2009
uno::Reference < XAccessible > xAcc;
sal_Bool bShapeSelected;
{
@@ -2978,12 +2942,10 @@ void SwAccessibleMap::InvalidateFocus()
static_cast< SwAccessibleContext *>( xAcc.get() );
pAccImpl->InvalidateFocus();
}
- //IAccessibility2 Implementation 2009-----
else
{
DoInvalidateShapeSelection(sal_True);
}
- //-----IAccessibility2 Implementation 2009
}
void SwAccessibleMap::SetCursorContext(
@@ -3266,9 +3228,7 @@ void SwAccessibleMap::FireEvents()
if( mpEvents )
{
mpEvents->SetFiring();
- //IAccessibility2 Implementation 2009-----
mpEvents->MoveInvalidXAccToEnd();
- //-----IAccessibility2 Implementation 2009
SwAccessibleEventList_Impl::iterator aIter = mpEvents->begin();
while( aIter != mpEvents->end() )
{
@@ -3459,7 +3419,6 @@ sal_Bool SwAccessibleMap::ReplaceChild (
return sal_True;
}
-//IAccessibility2 Implementation 2009-----
//Get the accessible control shape from the model object, here model object is with XPropertySet type
::accessibility::AccessibleControlShape * SwAccessibleMap::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException)
{
@@ -3544,7 +3503,6 @@ sal_Bool SwAccessibleMap::ReplaceChild (
return NULL;
}
-//-----IAccessibility2 Implementation 2009
Point SwAccessibleMap::PixelToCore( const Point& rPoint ) const
{
Point aPoint;
@@ -3870,10 +3828,8 @@ const SwRect& SwAccessibleMap::GetVisAre
: GetShell()->VisArea();
}
-//IAccessibility2 Implementation 2009-----
sal_Bool SwAccessibleMap::IsDocumentSelAll()
{
return GetShell()->GetDoc()->IsPrepareSelAll();
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accnotextframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accnotextframe.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accnotextframe.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accnotextframe.cxx Sun Dec 1 11:40:24 2013
@@ -39,7 +39,6 @@
#include <hints.hxx>
// <--
#include "accnotextframe.hxx"
-//IAccessibility2 Implementation 2009-----
#include <fmturl.hxx>
#include <accnotexthyperlink.hxx>
#include <svtools/imap.hxx>
@@ -52,7 +51,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::rtl::OUString;
using utl::AccessibleRelationSetHelper;
-//-----IAccessibility2 Implementation 2009
const SwNoTxtNode *SwAccessibleNoTextFrame::GetNoTxtNode() const
{
@@ -62,13 +60,11 @@ const SwNoTxtNode *SwAccessibleNoTextFra
{
const SwCntntFrm *pCntFrm =
static_cast<const SwCntntFrm *>( pFlyFrm->Lower() );
- //IAccessibility2 Implementation 2009-----
const SwCntntNode* pSwCntntNode = pCntFrm->GetNode();
if(pSwCntntNode != NULL)
{
pNd = pSwCntntNode->GetNoTxtNode();
}
- //-----IAccessibility2 Implementation 2009
}
return pNd;
@@ -219,12 +215,10 @@ OUString SAL_CALL SwAccessibleNoTextFram
vos::OGuard aGuard(Application::GetSolarMutex());
CHECK_FOR_DEFUNC( XAccessibleContext )
- //IAccessibility2 Implementation 2009-----
// OUString longDesc;
// const SwFlyFrmFmt* pFlyFmt = GetShell()->GetDoc()->FindFlyByName( GetName(), 0);
// longDesc = OUString( pFlyFmt->GetLongDescription() );
// return longDesc; MT: Do not return longDesc, which still is empty - why was the line above commented out?
- //-----IAccessibility2 Implementation 2009
return msDesc;
}
@@ -246,7 +240,6 @@ uno::Any SAL_CALL SwAccessibleNoTextFram
aAny <<= xImage;
return aAny;
}
- //IAccessibility2 Implementation 2009-----
else if ( aType == ::getCppuType((uno::Reference<XAccessibleHypertext> *)0) )
{
uno::Reference<XAccessibleHypertext> aAccHypertext = this;
@@ -254,7 +247,6 @@ uno::Any SAL_CALL SwAccessibleNoTextFram
aAny <<= aAccHypertext;
return aAny;
}
- //-----IAccessibility2 Implementation 2009
else
return SwAccessibleContext::queryInterface( aType );
}
@@ -300,7 +292,6 @@ sal_Int32 SAL_CALL SwAccessibleNoTextFra
{
return getSize().Width;
}
-//IAccessibility2 Implementation 2009-----
//===== XAccesibleText ==================================================
sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException){return 0;}
sal_Bool SAL_CALL SwAccessibleNoTextFrame::setCaretPosition( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException){return 0;}
@@ -433,4 +424,3 @@ uno::Reference<XAccessibleRelationSet> S
return pHelper;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accnotextframe.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accnotextframe.hxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accnotextframe.hxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accnotextframe.hxx Sun Dec 1 11:40:24 2013
@@ -24,7 +24,6 @@
#define _ACCNOTEXTFRAME_HXX
#include "accframebase.hxx"
#include <com/sun/star/accessibility/XAccessibleImage.hpp>
-//IAccessibility2 Implementation 2009-----
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEHYPERTEXT_HPP_
#include <com/sun/star/accessibility/XAccessibleHypertext.hpp>
#endif
@@ -37,17 +36,14 @@ namespace com { namespace star {
class SwFlyFrm;
class SwNoTxtNode;
class SwAccessibleNoTextHyperlink;
-//-----IAccessibility2 Implementation 2009
class SwAccessibleNoTextFrame : public SwAccessibleFrameBase,
public ::com::sun::star::accessibility::XAccessibleImage,
public ::com::sun::star::accessibility::XAccessibleHypertext//Added by yangzhh for HyperLink
{
- //IAccessibility2 Implementation 2009-----
friend class SwAccessibleNoTextHyperlink;
//HyperLinksMap alinksMap;
com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > alink;
- //-----IAccessibility2 Implementation 2009
SwDepend aDepend;
// --> OD 2009-07-14 #i73249#
::rtl::OUString msTitle;
@@ -118,7 +114,6 @@ public:
// The object is not visible an longer and should be destroyed
virtual void Dispose( sal_Bool bRecursive = sal_False );
- //IAccessibility2 Implementation 2009-----
virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);//Shen Zhen Jie changed sal_Unicode to sal_uInt32
@@ -161,7 +156,6 @@ public:
::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL
getAccessibleRelationSet (void)
throw (::com::sun::star::uno::RuntimeException);
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/l10n40/main/sw/source/core/access/accpara.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/l10n40/main/sw/source/core/access/accpara.cxx?rev=1546803&r1=1546802&r2=1546803&view=diff
==============================================================================
--- openoffice/branches/l10n40/main/sw/source/core/access/accpara.cxx (original)
+++ openoffice/branches/l10n40/main/sw/source/core/access/accpara.cxx Sun Dec 1 11:40:24 2013
@@ -75,7 +75,6 @@
#include <acchypertextdata.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
-//IAccessibility2 Implementation 2009-----
#include <section.hxx>
#include <doctxm.hxx>
#include <comphelper/accessibletexthelper.hxx>
@@ -98,7 +97,6 @@
#include <unosett.hxx>
#include <paratr.hxx>
#include <com/sun/star/container/XIndexReplace.hpp>
-//-----IAccessibility2 Implementation 2009
// --> OD 2006-07-12 #i63870#
#include <unomap.hxx>
#include <unoprnms.hxx>
@@ -183,7 +181,6 @@ sal_Int32 SwAccessibleParagraph::GetCare
// same node? Then check whether it's also within 'our' part
// of the paragraph
sal_uInt16 nIndex = pPoint->nContent.GetIndex();
- //IAccessibility2 Implementation 2009-----
if(!GetPortionData().IsValidCorePosition( nIndex ) ||
( GetPortionData().IsZeroCorePositionData() && nIndex== 0) )
{
@@ -195,7 +192,6 @@ sal_Int32 SwAccessibleParagraph::GetCare
UpdatePortionData();
}
}
- //-----IAccessibility2 Implementation 2009
if( GetPortionData().IsValidCorePosition( nIndex ) )
{
// Yes, it's us!
@@ -440,7 +436,6 @@ void SwAccessibleParagraph::_InvalidateC
aEvent.OldValue, aEvent.NewValue );
FireAccessibleEvent( aEvent );
- //IAccessibility2 Implementation 2009-----
uno::Reference< XAccessible > xparent = getAccessibleParent();
uno::Reference< XAccessibleContext > xAccContext(xparent,uno::UNO_QUERY);
if (xAccContext.is() && xAccContext->getAccessibleRole() == AccessibleRole::TABLE_CELL)
@@ -453,7 +448,6 @@ void SwAccessibleParagraph::_InvalidateC
pPara->FireAccessibleEvent(aParaEvent);
}
}
- //-----IAccessibility2 Implementation 2009
}
else if( !bVisibleDataFired )
{
@@ -461,10 +455,8 @@ void SwAccessibleParagraph::_InvalidateC
}
sal_Bool bNewIsHeading = IsHeading();
- //IAccessibility2 Implementation 2009-----
//Get the real heading level, Heading1 ~ Heading10
nHeadingLevel = GetRealHeadingLevel();
- //-----IAccessibility2 Implementation 2009
sal_Bool bOldIsHeading;
{
vos::OGuard aGuard( aMutex );
@@ -533,7 +525,6 @@ void SwAccessibleParagraph::_InvalidateC
if( pWin && pWin->HasFocus() && -1 == nNew )
FireStateChangedEvent( AccessibleStateType::FOCUSED, sal_False );
- //IAccessibility2 Implementation 2009-----
//To send TEXT_SELECTION_CHANGED event
sal_Int32 nStart=0;
sal_Int32 nEnd =0;
@@ -546,7 +537,6 @@ void SwAccessibleParagraph::_InvalidateC
FireAccessibleEvent(aEvent);
}
m_bLastHasSelection =bCurSelection;
- //-----IAccessibility2 Implementation 2009
}
}
@@ -579,35 +569,27 @@ SwAccessibleParagraph::SwAccessibleParag
, pHyperTextData( NULL )
, nOldCaretPos( -1 )
, bIsHeading( sal_False )
- //IAccessibility2 Implementation 2009-----
//Get the real heading level, Heading1 ~ Heading10
, nHeadingLevel (-1)
- //-----IAccessibility2 Implementation 2009
, aSelectionHelper( *this )
// --> OD 2010-02-19 #i108125#
, mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTxtFrm ) )
// <--
- //IAccessibility2 Implementation 2009-----
, m_bLastHasSelection(false) //To add TEXT_SELECTION_CHANGED event
- //-----IAccessibility2 Implementation 2009
{
vos::OGuard aGuard(Application::GetSolarMutex());
bIsHeading = IsHeading();
- //IAccessibility2 Implementation 2009-----
//Get the real heading level, Heading1 ~ Heading10
nHeadingLevel = GetRealHeadingLevel();
- //-----IAccessibility2 Implementation 2009
// --> OD 2004-09-27 #117970# - set an empty accessibility name for paragraphs
SetName( ::rtl::OUString() );
// <--
// If this object has the focus, then it is remembered by the map itself.
- //IAccessibility2 Implementation 2009-----
// not necessary to remember this pos here. Generally, the pos will be updated in invalidateXXX method, which may fire the
//Focus event based on the difference of new & old caret pos.
//nOldCaretPos = GetCaretPos();
- //-----IAccessibility2 Implementation 2009
}
SwAccessibleParagraph::~SwAccessibleParagraph()
@@ -731,7 +713,6 @@ sal_Bool SwAccessibleParagraph::IsValidR
{
return IsValidPosition(nBegin, nLength) && IsValidPosition(nEnd, nLength);
}
-//IAccessibility2 Implementation 2009-----
SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase()
{
const SwTxtNode* pTxtNd = GetTxtNode();
@@ -800,7 +781,6 @@ const SwRedline* SwAccessibleParagraph::
return pRedline;
}
-//-----IAccessibility2 Implementation 2009
//
// text boundaries
@@ -812,10 +792,8 @@ sal_Bool SwAccessibleParagraph::GetCharB
const ::rtl::OUString&,
sal_Int32 nPos )
{
- //IAccessibility2 Implementation 2009-----
if( GetPortionData().FillBoundaryIFDateField( rBound, nPos) )
return sal_True;
- //-----IAccessibility2 Implementation 2009
rBound.startPos = nPos;
rBound.endPos = nPos+1;
@@ -876,11 +854,9 @@ sal_Bool SwAccessibleParagraph::GetWordB
nEndPos++;
rBound.endPos = nEndPos;
}
- //IAccessibility2 Implementation 2009-----
tabCharInWord( nPos, rBound);
if( GetPortionData().FillBoundaryIFDateField( rBound, rBound.startPos) )
return sal_True;
- //-----IAccessibility2 Implementation 2009
return sal_True; // MT: So why do we need the return TRUE above???
*/
// get word boundary, as the Break-Iterator sees fit.
@@ -906,14 +882,12 @@ sal_Bool SwAccessibleParagraph::GetSente
const ::rtl::OUString& rText,
sal_Int32 nPos )
{
- //IAccessibility2 Implementation 2009-----
const sal_Unicode* pStr = rText.getStr();
if (pStr)
{
while( pStr[nPos] == sal_Unicode(' ') && nPos < rText.getLength())
nPos++;
}
- //-----IAccessibility2 Implementation 2009
GetPortionData().GetSentenceBoundary( rBound, nPos );
return sal_True;
}
@@ -1027,18 +1001,15 @@ sal_Bool SwAccessibleParagraph::GetTextB
break;
case AccessibleTextType::LINE:
- //IAccessibility2 Implementation 2009-----
//Solve the problem of returning wrong LINE and PARAGRAPH
if((nPos == rText.getLength()) && nPos > 0)
bRet = GetLineBoundary( rBound, rText, nPos - 1);
else
bRet = GetLineBoundary( rBound, rText, nPos );
- //-----IAccessibility2 Implementation 2009
break;
case AccessibleTextType::ATTRIBUTE_RUN:
bRet = GetAttributeBoundary( rBound, rText, nPos );
- //IAccessibility2 Implementation 2009-----
if(bRet)
{
SwCrsrShell* pCrsrShell = GetCrsrShell();
@@ -1100,7 +1071,6 @@ sal_Bool SwAccessibleParagraph::GetTextB
}
}
}
- //-----IAccessibility2 Implementation 2009
break;
case AccessibleTextType::GLYPH:
@@ -1319,7 +1289,6 @@ uno::Sequence< ::rtl::OUString > SAL_CAL
return aRet;
}
-//IAccessibility2 Implementation 2009-----
uno::Sequence< ::rtl::OUString > getAttributeNames()
{
static uno::Sequence< ::rtl::OUString >* pNames = NULL;
@@ -1388,7 +1357,6 @@ uno::Sequence< ::rtl::OUString > getSupp
}
return *pNames;
}
-//-----IAccessibility2 Implementation 2009
//
//===== XInterface =======================================================
//
@@ -1439,7 +1407,6 @@ uno::Any SwAccessibleParagraph::queryInt
aRet <<= aAccMultiLineText;
}
// <--
- //IAccessibility2 Implementation 2009-----
//MSAA Extension Implementation in app module
else if ( rType == ::getCppuType((uno::Reference<XAccessibleTextSelection> *)NULL) )
{
@@ -1451,7 +1418,6 @@ uno::Any SwAccessibleParagraph::queryInt
uno::Reference<XAccessibleExtendedAttributes> xAttr = this;
aRet <<= xAttr;
}
- //-----IAccessibility2 Implementation 2009
else
{
aRet = SwAccessibleContext::queryInterface(rType);
@@ -1576,7 +1542,6 @@ sal_Unicode SwAccessibleParagraph::getCh
throw lang::IndexOutOfBoundsException();
}
-//IAccessibility2 Implementation 2009-----
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessibleParagraph::GetCurrentTabStop( sal_Int32 nIndex )
{
vos::OGuard aGuard(Application::GetSolarMutex());
@@ -1625,7 +1590,6 @@ vos::OGuard aGuard(Application::GetSolar
// already get the caret postion
- //IAccessibility2 Implementation 2009-----
/*SwFrm* pTFrm = const_cast<SwFrm*>(GetFrm());
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs =
pTFrm->GetTabStopInfo(aCoreRect.Left());*/
@@ -1637,7 +1601,6 @@ vos::OGuard aGuard(Application::GetSolar
SwFrm* pTFrm = const_cast<SwFrm*>(GetFrm());
tabs = pTFrm->GetTabStopInfo(aCoreRect.Left());
}
- //-----IAccessibility2 Implementation 2009
if( tabs.hasElements() )
{
@@ -1668,7 +1631,6 @@ struct IndexCompare
return (pValues[a].Name < pValues[b].Name) ? true : false;
}
};
-//-----IAccessibility2 Implementation 2009
String SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
{
@@ -1854,10 +1816,9 @@ uno::Sequence<PropertyValue> SwAccessibl
const ::rtl::OUString& rText = GetString();
- if( ! IsValidChar( nIndex, rText.getLength()+1 ) )//IAccessibility2 Implementation 2009
+ if( ! IsValidChar( nIndex, rText.getLength()+1 ) )
throw lang::IndexOutOfBoundsException();
- //IAccessibility2 Implementation 2009-----
bool bSupplementalMode = false;
uno::Sequence< ::rtl::OUString > aNames = aRequestedAttributes;
if (aNames.getLength() == 0)
@@ -2375,7 +2336,6 @@ uno::Sequence< PropertyValue > SwAccessi
return aValues;
}
// <--
-// IAccessibility2 Implementation 2009----
void SwAccessibleParagraph::_getSupplementalAttributesImpl(
const sal_Int32,
const uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
@@ -2676,7 +2636,6 @@ void SwAccessibleParagraph::_correctValu
}
}
}
-//-----IAccessibility2 Implementation 2009
awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
sal_Int32 nIndex )
@@ -2979,12 +2938,10 @@ sal_Bool SwAccessibleParagraph::setSelec
/*accessibility::*/TextSegment aResult;
aResult.SegmentStart = -1;
aResult.SegmentEnd = -1;
- //IAccessibility2 Implementation 2009-----
//If nIndex = 0, then nobefore text so return -1 directly.
if( nIndex == 0 )
return aResult;
//Tab will be return when call WORDTYPE
- //-----IAccessibility2 Implementation 2009
// get starting pos
i18n::Boundary aBound;
@@ -2999,7 +2956,6 @@ sal_Bool SwAccessibleParagraph::setSelec
}
// now skip to previous word
- //IAccessibility2 Implementation 2009-----
if (nTextType==2 || nTextType == 3)
{
i18n::Boundary preBound = aBound;
@@ -3039,7 +2995,6 @@ sal_Bool SwAccessibleParagraph::setSelec
aResult.SegmentEnd = aBound.endPos;
}
}
- //-----IAccessibility2 Implementation 2009
return aResult;
}
@@ -3082,7 +3037,6 @@ sal_Bool SwAccessibleParagraph::setSelec
}
/*
- //IAccessibility2 Implementation 2009-----
sal_Bool bWord = sal_False;
bWord = GetTextBoundary( aBound, rText, nIndex, nTextType );
@@ -3138,7 +3092,6 @@ sal_Bool SwAccessibleParagraph::setSelec
aResult.SegmentEnd = aBound.endPos;
}
}
- //-----IAccessibility2 Implementation 2009
*/
return aResult;
}
@@ -3457,7 +3410,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
nCount++;
}
- //IAccessibility2 Implementation 2009-----
/* Can't fin the function "GetTOCFirstWordEndIndex" declaration in sym2.0 (Added by yanjun)
if( GetTOXSortTabBase() )
{
@@ -3466,7 +3418,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
nCount++;
}
*/
- //-----IAccessibility2 Implementation 2009
return nCount;
}
@@ -3714,7 +3665,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
if( pHt )
nRet = nPos;
}
- //IAccessibility2 Implementation 2009-----
/* Added by yanjun for acc miagration
if( nRet == -1 && GetTOXSortTabBase() )
{
@@ -3729,7 +3679,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
else
return nRet;
//return nRet;
- //-----IAccessibility2 Implementation 2009
}
// --> OD 2008-05-26 #i71360#
@@ -3758,7 +3707,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
return pTextMarkupHelper->getTextMarkupCount( nTextMarkupType );
}
-//IAccessibility2 Implementation 2009-----
//MSAA Extension Implementation in app module
sal_Bool SAL_CALL SwAccessibleParagraph::scrollToPosition( const ::com::sun::star::awt::Point&, sal_Bool )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
@@ -3954,7 +3902,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
return bRet;
}
-//-----IAccessibility2 Implementation 2009
/*accessibility::*/TextSegment SAL_CALL
SwAccessibleParagraph::getTextMarkup( sal_Int32 nTextMarkupIndex,
@@ -4137,7 +4084,6 @@ void SwAccessibleParagraph::Modify( cons
}
// <--
-//IAccessibility2 Implementation 2009-----
sal_Bool SwAccessibleParagraph::GetSelectionAtIndex(
sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd)
{
@@ -4399,4 +4345,3 @@ sal_Bool SwAccessibleParagraph::tabCharI
}
return bFind;
}
-//-----IAccessibility2 Implementation 2009