You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/12/18 14:27:25 UTC
svn commit: r1551937 [23/29] - in /openoffice/branches/ooxml-osba: ./
extras/l10n/source/bg/ extras/l10n/source/de/ extras/l10n/source/nb/
extras/l10n/source/th/ main/ main/accessibility/inc/accessibility/extended/
main/accessibility/inc/accessibility/...
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/access/accembedded.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accembedded.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accembedded.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accembedded.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accembedded.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accembedded.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accembedded.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accembedded.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accfootnote.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accfootnote.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accfootnote.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accfootnote.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accframe.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accframe.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accframe.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accframe.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accframe.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accframe.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accframe.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accframebase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accframebase.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accframebase.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accframebase.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accframebase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accframebase.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accframebase.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accframebase.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accfrmobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobj.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobj.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobj.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accfrmobj.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobj.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobj.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobj.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accfrmobjmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobjmap.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobjmap.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobjmap.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accfrmobjmap.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobjmap.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobjmap.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accfrmobjmap.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accgraphic.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accgraphic.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accgraphic.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accgraphic.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accgraphic.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accgraphic.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accgraphic.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accgraphic.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accheaderfooter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accheaderfooter.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accheaderfooter.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accheaderfooter.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accheaderfooter.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accheaderfooter.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accheaderfooter.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accheaderfooter.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/acchyperlink.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/acchyperlink.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/acchyperlink.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/acchyperlink.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accmap.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accmap.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accmap.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accnotextframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accnotextframe.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accnotextframe.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accnotextframe.cxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accnotextframe.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accnotextframe.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accnotextframe.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accnotextframe.hxx Wed Dec 18 13:27:09 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/ooxml-osba/main/sw/source/core/access/accpara.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accpara.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accpara.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accpara.cxx Wed Dec 18 13:27:09 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,40 +569,33 @@ 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()
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ if(Application::GetUnoWrapper())
+ vos::OGuard aGuard(Application::GetSolarMutex());
delete pPortionData;
delete pHyperTextData;
@@ -731,7 +714,6 @@ sal_Bool SwAccessibleParagraph::IsValidR
{
return IsValidPosition(nBegin, nLength) && IsValidPosition(nEnd, nLength);
}
-//IAccessibility2 Implementation 2009-----
SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase()
{
const SwTxtNode* pTxtNd = GetTxtNode();
@@ -800,7 +782,6 @@ const SwRedline* SwAccessibleParagraph::
return pRedline;
}
-//-----IAccessibility2 Implementation 2009
//
// text boundaries
@@ -812,10 +793,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 +855,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 +883,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 +1002,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 +1072,6 @@ sal_Bool SwAccessibleParagraph::GetTextB
}
}
}
- //-----IAccessibility2 Implementation 2009
break;
case AccessibleTextType::GLYPH:
@@ -1319,7 +1290,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 +1358,6 @@ uno::Sequence< ::rtl::OUString > getSupp
}
return *pNames;
}
-//-----IAccessibility2 Implementation 2009
//
//===== XInterface =======================================================
//
@@ -1439,7 +1408,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 +1419,6 @@ uno::Any SwAccessibleParagraph::queryInt
uno::Reference<XAccessibleExtendedAttributes> xAttr = this;
aRet <<= xAttr;
}
- //-----IAccessibility2 Implementation 2009
else
{
aRet = SwAccessibleContext::queryInterface(rType);
@@ -1576,7 +1543,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 +1591,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 +1602,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 +1632,6 @@ struct IndexCompare
return (pValues[a].Name < pValues[b].Name) ? true : false;
}
};
-//-----IAccessibility2 Implementation 2009
String SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
{
@@ -1858,10 +1821,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)
@@ -2379,7 +2341,6 @@ uno::Sequence< PropertyValue > SwAccessi
return aValues;
}
// <--
-// IAccessibility2 Implementation 2009----
void SwAccessibleParagraph::_getSupplementalAttributesImpl(
const sal_Int32,
const uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
@@ -2680,7 +2641,6 @@ void SwAccessibleParagraph::_correctValu
}
}
}
-//-----IAccessibility2 Implementation 2009
awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
sal_Int32 nIndex )
@@ -2983,12 +2943,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;
@@ -3003,7 +2961,6 @@ sal_Bool SwAccessibleParagraph::setSelec
}
// now skip to previous word
- //IAccessibility2 Implementation 2009-----
if (nTextType==2 || nTextType == 3)
{
i18n::Boundary preBound = aBound;
@@ -3043,7 +3000,6 @@ sal_Bool SwAccessibleParagraph::setSelec
aResult.SegmentEnd = aBound.endPos;
}
}
- //-----IAccessibility2 Implementation 2009
return aResult;
}
@@ -3086,7 +3042,6 @@ sal_Bool SwAccessibleParagraph::setSelec
}
/*
- //IAccessibility2 Implementation 2009-----
sal_Bool bWord = sal_False;
bWord = GetTextBoundary( aBound, rText, nIndex, nTextType );
@@ -3142,7 +3097,6 @@ sal_Bool SwAccessibleParagraph::setSelec
aResult.SegmentEnd = aBound.endPos;
}
}
- //-----IAccessibility2 Implementation 2009
*/
return aResult;
}
@@ -3461,7 +3415,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() )
{
@@ -3470,7 +3423,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
nCount++;
}
*/
- //-----IAccessibility2 Implementation 2009
return nCount;
}
@@ -3718,7 +3670,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
if( pHt )
nRet = nPos;
}
- //IAccessibility2 Implementation 2009-----
/* Added by yanjun for acc miagration
if( nRet == -1 && GetTOXSortTabBase() )
{
@@ -3733,7 +3684,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
else
return nRet;
//return nRet;
- //-----IAccessibility2 Implementation 2009
}
// --> OD 2008-05-26 #i71360#
@@ -3762,7 +3712,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)
@@ -3958,7 +3907,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
return bRet;
}
-//-----IAccessibility2 Implementation 2009
/*accessibility::*/TextSegment SAL_CALL
SwAccessibleParagraph::getTextMarkup( sal_Int32 nTextMarkupIndex,
@@ -4141,7 +4089,6 @@ void SwAccessibleParagraph::Modify( cons
}
// <--
-//IAccessibility2 Implementation 2009-----
sal_Bool SwAccessibleParagraph::GetSelectionAtIndex(
sal_Int32& nIndex, sal_Int32& nStart, sal_Int32& nEnd)
{
@@ -4403,4 +4350,3 @@ sal_Bool SwAccessibleParagraph::tabCharI
}
return bFind;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/access/accpara.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accpara.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accpara.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accpara.hxx Wed Dec 18 13:27:09 2013
@@ -29,11 +29,9 @@
#include <com/sun/star/accessibility/XAccessibleHypertext.hpp>
#include <com/sun/star/accessibility/XAccessibleTextMarkup.hpp>
#include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XAccessibleTextSelection.hpp>
#include <txmsrt.hxx>
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
-//-----IAccessibility2 Implementation 2009
#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
#include <hash_map>
#include <accselectionhelper.hxx>
@@ -47,7 +45,7 @@ class SwTxtNode;
class SwPaM;
class SwAccessiblePortionData;
class SwAccessibleHyperTextData;
-class SwRedline; //IAccessibility2 Implementation 2009
+class SwRedline;
class SwXTextPortion;
// --> OD 2010-02-19 #i108125#
class SwParaChangeTrackingInfo;
@@ -76,10 +74,8 @@ class SwAccessibleParagraph :
public com::sun::star::accessibility::XAccessibleTextMarkup,
public com::sun::star::accessibility::XAccessibleMultiLineText,
public ::com::sun::star::accessibility::XAccessibleTextAttributes,
- //IAccessibility2 Implementation 2009-----
public com::sun::star::accessibility::XAccessibleTextSelection,
public com::sun::star::accessibility::XAccessibleExtendedAttributes
- //-----IAccessibility2 Implementation 2009
{
friend class SwAccessibleHyperlink;
@@ -98,9 +94,7 @@ class SwAccessibleParagraph :
// mutex)
sal_Bool bIsHeading; // protected by base classes mutex
- //IAccessibility2 Implementation 2009-----
sal_Int32 nHeadingLevel;
- //-----IAccessibility2 Implementation 2009
// implementation for XAccessibleSelection
SwAccessibleSelectionHelper aSelectionHelper;
@@ -159,10 +153,8 @@ class SwAccessibleParagraph :
}
}
- //IAccessibility2 Implementation 2009-----
const SwRedline* GetRedlineAtIndex( sal_Int32 nPos );
String GetFieldTypeNameAtIndex(sal_Int32 nIndex);
- //-----IAccessibility2 Implementation 2009
// --> OD 2006-07-13 #i63870#
void _getDefaultAttributesImpl(
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
@@ -173,7 +165,6 @@ class SwAccessibleParagraph :
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
tAccParaPropValMap& rRunAttrSeq );
// <--
- // IAccessibility2 Implementation 2009----
void _getSupplementalAttributesImpl(
const sal_Int32 nIndex,
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes,
@@ -182,13 +173,10 @@ class SwAccessibleParagraph :
void _correctValues(
const sal_Int32 nIndex,
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues );
- // ----IAccessibility2 Implementation 2009
public:
- //IAccessibility2 Implementation 2009-----
SwTOXSortTabBase* GetTOXSortTabBase();
short GetTOCLevel();
- //-----IAccessibility2 Implementation 2009
sal_Bool IsHeading() const;
protected:
@@ -273,10 +261,8 @@ public:
virtual sal_Bool HasCursor(); // required by map to remember that object
- //IAccessibility2 Implementation 2009-----
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > GetCurrentTabStop( sal_Int32 nIndex );
virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException);
- //-----IAccessibility2 Implementation 2009
// --> OD 2010-02-19 #i108125#
// MT: Solved merge conflict - seems this was removed between 101 and 103?
// virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew);
@@ -447,7 +433,6 @@ public:
::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
// <--
- //IAccessibility2 Implementation 2009-----
//====== XAccessibleTextSelection ======================================
virtual sal_Bool SAL_CALL scrollToPosition( const ::com::sun::star::awt::Point& aPoint, sal_Bool isLeftTop )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -469,7 +454,6 @@ public:
//===== XAccessibleComponent ============================================
sal_Bool m_bLastHasSelection;
sal_Bool tabCharInWord(sal_Int32 nIndex, com::sun::star::i18n::Boundary& aBound);
- //-----IAccessibility2 Implementation 2009
// --> OD 2008-05-29 #i89175#
//===== XAccessibleMultiLineText ========================================
virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex )
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/access/accportions.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accportions.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accportions.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accportions.cxx Wed Dec 18 13:27:09 2013
@@ -64,9 +64,7 @@
using namespace ::com::sun::star;
-//IAccessibility2 Implementation 2009-----
//#include "accnote.hxx"
-//-----IAccessibility2 Implementation 2009
using rtl::OUString;
using rtl::OUStringBuffer;
@@ -144,13 +142,11 @@ void SwAccessiblePortionData::Text(sal_u
bLastIsSpecial = sal_False;
}
-//IAccessibility2 Implementation 2009-----
void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFldType )
{
aAttrFieldType.push_back(nAttrFldType);
return;
}
-//-----IAccessibility2 Implementation 2009
void SwAccessiblePortionData::Special(
sal_uInt16 nLength, const String& rText, sal_uInt16 nType)
@@ -167,7 +163,6 @@ void SwAccessiblePortionData::Special(
switch( nType )
{
case POR_POSTITS:
- //IAccessibility2 Implementation 2009-----
sDisplay = String(sal_Unicode(0xfffc));
break;
@@ -205,7 +200,6 @@ void SwAccessiblePortionData::Special(
m_vecPairPos.push_back(std::make_pair(nStart,nEnd));
break;
}
- //-----IAccessibility2 Implementation 2009
break;
case POR_NUMBER:
{
@@ -722,7 +716,6 @@ sal_uInt16 SwAccessiblePortionData::Fill
return static_cast<sal_uInt16>( nModelPos );
}
-//IAccessibility2 Implementation 2009-----
sal_uInt16 SwAccessiblePortionData::GetAttrFldType( sal_Int32 nPos )
{
if( aFieldPosition.size() < 2 ) return sal_False;
@@ -752,7 +745,6 @@ sal_Bool SwAccessiblePortionData::FillBo
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
void SwAccessiblePortionData::AdjustAndCheck(
sal_Int32 nPos,
size_t& nPortionNo,
@@ -816,7 +808,6 @@ sal_Bool SwAccessiblePortionData::IsVali
( nPos <= aModelPositions[ aModelPositions.size()-1 ] );
}
-//IAccessibility2 Implementation 2009-----
sal_Bool SwAccessiblePortionData::IsZeroCorePositionData()
{
if( aModelPositions.size() < 1 ) return sal_True;
@@ -849,7 +840,7 @@ sal_Int32 SwAccessiblePortionData::GetFi
sal_Int32 nIndex = -1;
if( aFieldPosition.size() >= 2 )
{
- for( sal_Int32 i = 0; i < aFieldPosition.size() - 1; i += 2 )
+ for( sal_uInt32 i = 0; i < aFieldPosition.size() - 1; i += 2 )
{
if( nPos <= aFieldPosition[ i + 1 ] && nPos >= aFieldPosition[ i ] )
{
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/access/accportions.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accportions.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accportions.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accportions.hxx Wed Dec 18 13:27:09 2013
@@ -61,9 +61,7 @@ class SwAccessiblePortionData : public S
Positions_t aLineBreaks; /// position of line breaks
Positions_t aModelPositions; /// position of portion breaks in the model
Positions_t aAccessiblePositions; /// portion breaks in sAccessibleString
- //IAccessibility2 Implementation 2009-----
Positions_t aFieldPosition;
- //-----IAccessibility2 Implementation 2009
Positions_t aAttrFieldType;
typedef std::vector<sal_uInt8> PortionAttrs_t;
@@ -108,13 +106,11 @@ public:
virtual void Skip(sal_uInt16 nLength);
virtual void Finish();
- //IAccessibility2 Implementation 2009-----
virtual void SetAttrFieldType( sal_uInt16 nAttrFldType );
sal_Bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos );
sal_Bool IsIndexInFootnode(sal_Int32 nIndex);
sal_Bool IsInGrayPortion( sal_Int32 nPos );
sal_Int32 GetFieldIndex(sal_Int32 nPos);
- //-----IAccessibility2 Implementation 2009
sal_Bool IsZeroCorePositionData();
// access to the portion data
@@ -177,12 +173,10 @@ public:
sal_Bool IsValidCorePosition( sal_uInt16 nPos ) const;
sal_uInt16 GetFirstValidCorePosition() const;
sal_uInt16 GetLastValidCorePosition() const;
- //IAccessibility2 Implementation 2009-----
private:
typedef std::pair<sal_Int32,sal_Int32> PAIR_POS;
typedef std::vector<PAIR_POS> VEC_PAIR_POS;
VEC_PAIR_POS m_vecPairPos;
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/access/accpreview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accpreview.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accpreview.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accpreview.cxx Wed Dec 18 13:27:09 2013
@@ -32,11 +32,9 @@
#endif
#include <accpreview.hxx>
-//IAccessibility2 Implementation 2009-----
#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#endif
-//-----IAccessibility2 Implementation 2009
const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextDocumentPageView";
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentPageView";
@@ -59,9 +57,7 @@ using ::rtl::OUString;
SwAccessiblePreview::SwAccessiblePreview( SwAccessibleMap *pMp ) :
SwAccessibleDocumentBase( pMp )
{
- //IAccessibility2 Implementation 2009-----
SetName( GetResource( STR_ACCESS_PREVIEW_DOC_NAME ) );
- //-----IAccessibility2 Implementation 2009
}
SwAccessiblePreview::~SwAccessiblePreview()
@@ -105,7 +101,6 @@ Sequence< sal_Int8 > SAL_CALL SwAccessib
}
return aId;
}
-//IAccessibility2 Implementation 2009-----
OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException)
{
return GetResource( STR_ACCESS_PREVIEW_DOC_NAME );
@@ -122,4 +117,3 @@ void SwAccessiblePreview::_InvalidateFoc
{
FireStateChangedEvent( ::com::sun::star::accessibility::AccessibleStateType::FOCUSED, sal_True );
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/access/accpreview.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accpreview.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accpreview.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accpreview.hxx Wed Dec 18 13:27:09 2013
@@ -67,11 +67,9 @@ public:
//====== XTypeProvider ====================================================
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
- //IAccessibility2 Implementation 2009-----
::rtl::OUString SAL_CALL getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException);
::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException);
virtual void _InvalidateFocus();
- //-----IAccessibility2 Implementation 2009
};
#endif
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/access/accselectionhelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/accselectionhelper.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/accselectionhelper.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/accselectionhelper.cxx Wed Dec 18 13:27:09 2013
@@ -38,12 +38,10 @@
#include <flyfrm.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
#include <fmtanchr.hxx>
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star;
@@ -125,7 +123,6 @@ void SwAccessibleSelectionHelper::select
// return bRet;
}
-//IAccessibility2 Implementation 2009-----
//When the selected state of the SwFrmOrObj is setted, return true.
static sal_Bool lcl_getSelectedState(const SwAccessibleChild& aChild,
SwAccessibleContext* pContext,
@@ -160,7 +157,6 @@ static sal_Bool lcl_getSelectedState(con
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
sal_Int32 nChildIndex )
@@ -188,14 +184,12 @@ sal_Bool SwAccessibleSelectionHelper::is
{
bRet = pFEShell->IsObjSelected( *aChild.GetDrawObject() );
}
- //IAccessibility2 Implementation 2009-----
//If the SwFrmOrObj is not selected directly in the UI, we should check whether it is selected in the selection cursor.
if( !bRet )
{
if( lcl_getSelectedState( aChild, &rContext, rContext.GetMap() ) == sal_True)
bRet = sal_True;
}
- //-----IAccessibility2 Implementation 2009
}
return bRet;
@@ -253,11 +247,9 @@ sal_Int32 SwAccessibleSelectionHelper::g
const SwFlyFrm* pFlyFrm = pFEShell->GetCurrFlyFrm();
if( pFlyFrm )
{
- //IAccessibility2 Implementation 2009-----
//if( rContext.GetParent( SwAccessibleChild(pFlyFrm), rContext.IsInPagePreview()) ==
// rContext.GetFrm() )
nCount = 1;
- //-----IAccessibility2 Implementation 2009
}
else
{
@@ -285,7 +277,6 @@ sal_Int32 SwAccessibleSelectionHelper::g
}
}
}
- //IAccessibility2 Implementation 2009-----
//If the SwFrmOrObj is not selected directly in the UI,
//we should check whether it is selected in the selection cursor.
if( nCount == 0 )
@@ -304,7 +295,6 @@ sal_Int32 SwAccessibleSelectionHelper::g
++aIter;
}
}
- //-----IAccessibility2 Implementation 2009
}
return nCount;
}
@@ -328,7 +318,6 @@ Reference<XAccessible> SwAccessibleSelec
const SwFlyFrm *pFlyFrm = pFEShell->GetCurrFlyFrm();
if( pFlyFrm )
{
- //IAccessibility2 Implementation 2009-----
if( 0 == nSelectedChildIndex )
{
if(rContext.GetParent( SwAccessibleChild(pFlyFrm), rContext.IsInPagePreview()) == rContext.GetFrm() )
@@ -349,7 +338,6 @@ Reference<XAccessible> SwAccessibleSelec
}
}
}
- //-----IAccessibility2 Implementation 2009
}
else
{
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/access/acctable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/acctable.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/acctable.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/acctable.cxx Wed Dec 18 13:27:09 2013
@@ -72,7 +72,7 @@ typedef ::std::set < sal_Int32, Int32Les
typedef ::std::pair < sal_Int32, sal_Int32 > Int32Pair_Impl;
typedef ::std::list < Int32Pair_Impl > Int32PairList_Impl;
-const int SELECTION_WITH_NUM =10;
+const unsigned int SELECTION_WITH_NUM = 10;
class SwAccTableSelHander_Impl
{
@@ -95,10 +95,8 @@ class SwAccessibleTableData_Impl
bool mbOnlyTableColumnHeader;
void CollectData( const SwFrm *pFrm );
- //IAccessibility2 Implementation 2009-----
void CollectColumnHeaderData( const SwFrm *pFrm );
void CollectRowHeaderData( const SwFrm *pFrm );
- //-----IAccessibility2 Implementation 2009
void CollectExtents( const SwFrm *pFrm );
sal_Bool FindCell( const Point& rPos, const SwFrm *pFrm ,
@@ -193,7 +191,6 @@ void SwAccessibleTableData_Impl::Collect
}
}
-//IAccessibility2 Implementation 2009-----
void SwAccessibleTableData_Impl::CollectRowHeaderData( const SwFrm *pFrm )
{
const SwAccessibleChildSList aList( *pFrm, mrAccMap );
@@ -237,7 +234,6 @@ void SwAccessibleTableData_Impl::Collect
++aIter;
}
}
-//-----IAccessibility2 Implementation 2009
void SwAccessibleTableData_Impl::CollectColumnHeaderData( const SwFrm *pFrm )
{
@@ -285,7 +281,6 @@ void SwAccessibleTableData_Impl::Collect
++aIter;
}
}
-//-----IAccessibility2 Implementation 2009
void SwAccessibleTableData_Impl::CollectExtents( const SwFrm *pFrm )
{
const SwAccessibleChildSList aList( *pFrm, mrAccMap );
@@ -500,10 +495,8 @@ const SwFrm *SwAccessibleTableData_Impl:
inline sal_Int32 SwAccessibleTableData_Impl::GetRowCount() const
{
- //IAccessibility2 Implementation 2009-----
sal_Int32 count = static_cast< sal_Int32 >( maRows.size() ) ;
count = (count <=0)? 1:count;
- //-----IAccessibility2 Implementation 2009
return count;
}
@@ -804,12 +797,10 @@ void SwAccessibleTable::GetStates(
::utl::AccessibleStateSetHelper& rStateSet )
{
SwAccessibleContext::GetStates( rStateSet );
- //IAccessibility2 Implementation 2009-----
//Solution:Add resizable state to table
rStateSet.AddState( AccessibleStateType::RESIZABLE );
// MULTISELECTABLE
rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE );
- //-----IAccessibility2 Implementation 2009
SwCrsrShell* pCrsrShell = GetCrsrShell();
if( pCrsrShell )
rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE );
@@ -839,9 +830,7 @@ SwAccessibleTable::SwAccessibleTable(
OUString sArg2( GetFormattedPageNumber() );
sDesc = GetResource( STR_ACCESS_TABLE_DESC, &sArg1, &sArg2 );
- //IAccessibility2 Implementation 2009-----
UpdateTableData();
- //-----IAccessibility2 Implementation 2009
}
SwAccessibleTable::~SwAccessibleTable()
@@ -923,13 +912,11 @@ uno::Any SwAccessibleTable::queryInterfa
uno::Reference<XAccessibleSelection> xSelection( this );
aRet <<= xSelection;
}
- //IAccessibility2 Implementation 2009-----
else if ( rType == ::getCppuType((uno::Reference<XAccessibleTableSelection> *)0) )
{
uno::Reference<XAccessibleTableSelection> xTableExtent( this );
aRet <<= xTableExtent;
}
- //-----IAccessibility2 Implementation 2009
else
{
aRet = SwAccessibleContext::queryInterface(rType);
@@ -1102,9 +1089,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::ge
CHECK_FOR_DEFUNC( XAccessibleTable )
- //IAccessibility2 Implementation 2009-----
UpdateTableData();
- //-----IAccessibility2 Implementation 2009
GetTableData().CheckRowAndCol( nRow, nColumn, this );
Int32Set_Impl::const_iterator aSttCol(
@@ -1135,9 +1120,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::ge
vos::OGuard aGuard(Application::GetSolarMutex());
CHECK_FOR_DEFUNC( XAccessibleTable )
- //IAccessibility2 Implementation 2009-----
UpdateTableData();
- //-----IAccessibility2 Implementation 2009
GetTableData().CheckRowAndCol( nRow, nColumn, this );
@@ -1492,7 +1475,6 @@ void SwAccessibleTable::InvalidatePosOrS
{
vos::OGuard aGuard(Application::GetSolarMutex());
- //IAccessibility2 Implementation 2009-----
//need to update children
SwAccessibleTableData_Impl *pNewTableData = CreateNewTableData();
if( !pNewTableData->CompareExtents( GetTableData() ) )
@@ -1557,7 +1539,6 @@ void SwAccessibleTable::InvalidateChildP
// <--
if( !pNewTableData->CompareExtents( GetTableData() ) )
{
- //IAccessibility2 Implementation 2009-----
if(pNewTableData->GetRowCount()!= mpTableData->GetRowCount())
{
Int32Set_Impl::const_iterator aSttCol( GetTableData().GetColumnIter( 0 ) );
@@ -1584,7 +1565,6 @@ void SwAccessibleTable::InvalidateChildP
}
}
else
- //-----IAccessibility2 Implementation 2009
FireTableChangeEvent( GetTableData() );
ClearTableData();
mpTableData = pNewTableData;
@@ -1857,7 +1837,6 @@ void SAL_CALL SwAccessibleTable::deselec
pCrsrShell->EndAction();
}
-//IAccessibility2 Implementation 2009-----
void SwAccessibleTable::SetTableData(SwAccessibleTableData_Impl* mpNewTableData)
{
mpTableData = mpNewTableData;
@@ -2003,7 +1982,6 @@ sal_Bool SAL_CALL SwAccessibleTable::uns
}
return sal_True;
}
-//-----IAccessibility2 Implementation 2009
// --> OD 2007-06-28 #i77106#
// implementation of class <SwAccessibleTableColHeaders>
SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2,
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/access/acctable.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/acctable.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/acctable.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/acctable.hxx Wed Dec 18 13:27:09 2013
@@ -23,12 +23,10 @@
#ifndef _ACCTABLE_HXX
#define _ACCTABLE_HXX
#include <com/sun/star/accessibility/XAccessibleTable.hpp>
-//IAccessibility2 Implementation 2009-----
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XAccessibleTableSelection_HPP_
#include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
#endif
#include <vector>
-//-----IAccessibility2 Implementation 2009
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <acccontext.hxx>
@@ -92,9 +90,7 @@ protected:
// Is table data evailable?
sal_Bool HasTableData() const { return (mpTableData != 0); }
- //IAccessibility2 Implementation 2009-----
void SetTableData(SwAccessibleTableData_Impl* mpNewTableData) ;
- //-----IAccessibility2 Implementation 2009
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
public:
@@ -197,7 +193,6 @@ public:
virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException);
- //IAccessibility2 Implementation 2009-----
//===== XAccessibleTableSelection ============================================
virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
@@ -207,7 +202,6 @@ public:
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) ;
- //-----IAccessibility2 Implementation 2009
//===== XServiceInfo ====================================================
/** Returns an identifier for the implementation of this object.
@@ -274,7 +268,6 @@ public:
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException );
- //IAccessibility2 Implementation 2009-----
//===== XAccessibleComponent ============================================
sal_Int32 SAL_CALL getBackground()
throw (::com::sun::star::uno::RuntimeException);
@@ -284,7 +277,6 @@ public:
void FireSelectionEvent( );
void ClearSelectionCellCache();
void AddSelectionCell(const SwAccessibleContext* ,sal_Bool bAddOrRemove);
- //-----IAccessibility2 Implementation 2009
};
inline SwAccessibleTableData_Impl& SwAccessibleTable::GetTableData()
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/access/acctextframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/acctextframe.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/acctextframe.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/acctextframe.cxx Wed Dec 18 13:27:09 2013
@@ -44,11 +44,9 @@
// <--
#include "acctextframe.hxx"
-//IAccessibility2 Implementation 2009-----
#ifndef _DOC_HXX
#include <doc.hxx>
#endif
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::rtl::OUString;
@@ -157,7 +155,6 @@ void SwAccessibleTextFrame::Modify( cons
}
}
-//IAccessibility2 Implementation 2009-----
//===== XInterface ==========================================================
com::sun::star::uno::Any SAL_CALL
@@ -274,7 +271,6 @@ void SAL_CALL SwAccessibleTextFrame::des
{
DBG_ASSERT( false, "<SwAccessibleTextFrame::selectAllAccessibleChildren( sal_Int32 )> - missing implementation" );
}
-//-----IAccessibility2 Implementation 2009
// --> OD 2009-07-14 #i73249#
OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void)
@@ -300,7 +296,6 @@ OUString SAL_CALL SwAccessibleTextFrame:
CHECK_FOR_DEFUNC( XAccessibleContext )
/* MT: I guess msDesc is correct noadays?
- //IAccessibility2 Implementation 2009-----
OUString longDesc;
const SwFlyFrmFmt* pFlyFmt = GetShell()->GetDoc()->FindFlyByName( GetName(), 0);
if( pFlyFmt )
@@ -311,7 +306,6 @@ OUString SAL_CALL SwAccessibleTextFrame:
return GetName() + OUString(' ') + longDesc;
else
return GetName();
- //-----IAccessibility2 Implementation 2009
*/
return msDesc;
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/access/acctextframe.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/access/acctextframe.hxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/access/acctextframe.hxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/access/acctextframe.hxx Wed Dec 18 13:27:09 2013
@@ -24,9 +24,7 @@
#define _ACCTEXTFRAME_HXX
#include "accframebase.hxx"
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-//-----IAccessibility2 Implementation 2009
class SwFlyFrm;
namespace utl { class AccessibleRelationSetHelper; }
@@ -53,7 +51,6 @@ public:
SwAccessibleTextFrame( SwAccessibleMap* pInitMap, const SwFlyFrm* pFlyFrm );
- //IAccessibility2 Implementation 2009-----
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
::com::sun::star::uno::Type const & rType )
throw (::com::sun::star::uno::RuntimeException);
@@ -88,7 +85,6 @@ public:
sal_Int32 nSelectedChildIndex )
throw ( ::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException );
- //-----IAccessibility2 Implementation 2009
//===== XAccessibleContext ==============================================
Modified: openoffice/branches/ooxml-osba/main/sw/source/core/attr/format.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ooxml-osba/main/sw/source/core/attr/format.cxx?rev=1551937&r1=1551936&r2=1551937&view=diff
==============================================================================
--- openoffice/branches/ooxml-osba/main/sw/source/core/attr/format.cxx (original)
+++ openoffice/branches/ooxml-osba/main/sw/source/core/attr/format.cxx Wed Dec 18 13:27:09 2013
@@ -257,9 +257,7 @@ SwFmt::~SwFmt()
}
else
{
- //IAccessibility2 Implementation 2009-----
while( GetDepends() && pParentFmt)
- //-----IAccessibility2 Implementation 2009
{
SwFmtChg aOldFmt(this);
SwFmtChg aNewFmt(pParentFmt);