You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/11/28 13:17:39 UTC
svn commit: r1546355 [8/9] - in /openoffice/trunk/main:
accessibility/inc/accessibility/extended/
accessibility/inc/accessibility/standard/ accessibility/source/extended/
accessibility/source/helper/ accessibility/source/standard/
chart2/source/control...
Modified: openoffice/trunk/main/sw/source/core/inc/viewimp.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/inc/viewimp.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/inc/viewimp.hxx (original)
+++ openoffice/trunk/main/sw/source/core/inc/viewimp.hxx Thu Nov 28 12:17:31 2013
@@ -286,11 +286,9 @@ public:
inline void AddAccessibleObj( const SdrObject *pObj );
- //IAccessibility2 Implementation 2009-----
void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage);
void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection);
void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn);
- //-----IAccessibility2 Implementation 2009
// Invalidate accessible frame's frame's content
void InvalidateAccessibleFrmContent( const SwFrm *pFrm );
Modified: openoffice/trunk/main/sw/source/core/layout/wsfrm.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/wsfrm.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/wsfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/wsfrm.cxx Thu Nov 28 12:17:31 2013
@@ -88,10 +88,8 @@ using namespace ::com::sun::star;
SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) :
SwClient( pMod ),
- //IAccessibility2 Implementation 2009-----
//Solution:Add a member to identify if the acc table should dispose
bIfAccTableShouldDisposing( sal_False ),
- //-----IAccessibility2 Implementation 2009
// --> OD 2006-05-10 #i65250#
mnFrmId( SwFrm::mnLastFrmId++ ),
// <--
Modified: openoffice/trunk/main/sw/source/core/ole/ndole.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/ole/ndole.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/ole/ndole.cxx (original)
+++ openoffice/trunk/main/sw/source/core/ole/ndole.cxx Thu Nov 28 12:17:31 2013
@@ -794,7 +794,6 @@ void SwOLEObj::SetNode( SwOLENode* pNode
}
}
-//IAccessibility2 Implementation 2009-----
String SwOLEObj::GetStyleString()
{
String strStyle;
@@ -802,7 +801,6 @@ String SwOLEObj::GetStyleString()
strStyle = xOLERef.GetChartType();
return strStyle;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool SwOLEObj::IsOleRef() const
{
return xOLERef.is();
Modified: openoffice/trunk/main/sw/source/core/text/frmform.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/frmform.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/frmform.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/frmform.cxx Thu Nov 28 12:17:31 2013
@@ -57,11 +57,9 @@
#include <frmfmt.hxx> // SwFrmFmt
// OD 2004-05-24 #i28701#
#include <sortedobjs.hxx>
-//IAccessibility2 Implementation 2009-----
#include <portab.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/tstpitem.hxx>
-//-----IAccessibility2 Implementation 2009
class FormatLevel
{
@@ -561,7 +559,6 @@ void SwTxtFrm::AdjustFrm( const SwTwips
UNDO_SWAP( this )
}
-//IAccessibility2 Implementation 2009-----
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwTxtFrm::GetTabStopInfo( SwTwips CurrentPos )
{
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs(1);
@@ -601,7 +598,6 @@ com::sun::star::uno::Sequence< ::com::su
tabs[0] = ts;
return tabs;
}
-//-----IAccessibility2 Implementation 2009
/*************************************************************************
* SwTxtFrm::AdjustFollow()
*************************************************************************/
Modified: openoffice/trunk/main/sw/source/core/text/porfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/porfld.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/porfld.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/porfld.cxx Thu Nov 28 12:17:31 2013
@@ -88,9 +88,7 @@ SwFldPortion::SwFldPortion( const XubStr
, m_bNoLength( sal_False )
{
SetWhichPor( POR_FLD );
- //IAccessibility2 Implementation 2009-----
m_nAttrFldType = 0;
- //-----IAccessibility2 Implementation 2009
}
SwFldPortion::SwFldPortion( const SwFldPortion& rFld )
@@ -471,12 +469,10 @@ sal_Bool SwFldPortion::GetExpTxt( const
void SwFldPortion::HandlePortion( SwPortionHandler& rPH ) const
{
rPH.Special( GetLen(), aExpand, GetWhichPor() );
- //IAccessibility2 Implementation 2009-----
if( GetWhichPor() == POR_FLD )
{
rPH.SetAttrFieldType(m_nAttrFldType);
}
- //-----IAccessibility2 Implementation 2009
}
/*************************************************************************
Modified: openoffice/trunk/main/sw/source/core/text/porfld.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/porfld.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/porfld.hxx (original)
+++ openoffice/trunk/main/sw/source/core/text/porfld.hxx Thu Nov 28 12:17:31 2013
@@ -65,9 +65,7 @@ public:
SwFldPortion( const XubString &rExpand, SwFont *pFnt = 0, sal_Bool bPlaceHolder = sal_False );
~SwFldPortion();
- //IAccessibility2 Implementation 2009-----
sal_uInt16 m_nAttrFldType;
- //-----IAccessibility2 Implementation 2009
void TakeNextOffset( const SwFldPortion* pFld );
void CheckScript( const SwTxtSizeInfo &rInf );
inline sal_Bool HasFont() const { return 0 != pFnt; }
Modified: openoffice/trunk/main/sw/source/core/text/txtfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/text/txtfld.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/text/txtfld.cxx (original)
+++ openoffice/trunk/main/sw/source/core/text/txtfld.cxx Thu Nov 28 12:17:31 2013
@@ -59,14 +59,12 @@
#include "fmtmeta.hxx" // lcl_NewMetaPortion
-//IAccessibility2 Implementation 2009-----
#ifndef _REFFLD_HXX
#include "reffld.hxx"
#endif
#ifndef _FLDDAT_HXX
#include "flddat.hxx"
#endif
-//-----IAccessibility2 Implementation 2009
/*************************************************************************
* SwTxtFormatter::NewFldPortion()
*************************************************************************/
@@ -98,9 +96,7 @@ SwExpandPortion *SwTxtFormatter::NewFldP
SwCharFmt* pChFmt = 0;
sal_Bool bNewFlyPor = sal_False,
bINet = sal_False;
- //IAccessibility2 Implementation 2009-----
sal_uInt16 subType;
- //-----IAccessibility2 Implementation 2009
// set language
((SwTxtFormatter*)this)->SeekAndChg( rInf );
if (pFld->GetLanguage() != GetFnt()->GetLanguage())
@@ -172,10 +168,8 @@ SwExpandPortion *SwTxtFormatter::NewFldP
: pFld->ExpandField(bInClipboard) );
pRet = new SwFldPortion( str );
}
- //IAccessibility2 Implementation 2009-----
if(pRet)
((SwFldPortion*)pRet)->m_nAttrFldType= ATTR_PAGECOOUNTFLD;
- //-----IAccessibility2 Implementation 2009
break;
case RES_PAGENUMBERFLD:
@@ -202,10 +196,8 @@ SwExpandPortion *SwTxtFormatter::NewFldP
: pFld->ExpandField(bInClipboard) );
pRet = new SwFldPortion( str );
}
- //IAccessibility2 Implementation 2009-----
if(pRet)
((SwFldPortion*)pRet)->m_nAttrFldType= ATTR_PAGENUMBERFLD;
- //-----IAccessibility2 Implementation 2009
break;
}
case RES_GETEXPFLD:
@@ -281,7 +273,6 @@ SwExpandPortion *SwTxtFormatter::NewFldP
bNewFlyPor = sal_True;
bPlaceHolder = sal_True;
break;
- //IAccessibility2 Implementation 2009-----
case RES_GETREFFLD:
subType = ((SwGetRefField*)pFld)->GetSubType();
{
@@ -314,7 +305,6 @@ SwExpandPortion *SwTxtFormatter::NewFldP
((SwFldPortion*)pRet)->m_nAttrFldType = ATTR_TIMEFLD;
break;
}
- //-----IAccessibility2 Implementation 2009
default:
{
String const str( (bName)
Modified: openoffice/trunk/main/sw/source/core/unocore/unomap.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/unomap.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/unocore/unomap.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/unomap.cxx Thu Nov 28 12:17:31 2013
@@ -482,7 +482,6 @@ SwUnoPropertyMapProvider::~SwUnoProperty
{ SW_PROP_NMID(UNO_NAME_IS_FIELD_USED), FIELD_PROP_IS_FIELD_USED, CPPU_E2T(CPPUTYPE_FLOAT), PropertyAttribute::READONLY, 0},\
{ SW_PROP_NMID(UNO_NAME_IS_FIELD_DISPLAYED), FIELD_PROP_IS_FIELD_DISPLAYED, CPPU_E2T(CPPUTYPE_INT16), PropertyAttribute::READONLY, 0},\
-//IAccessibility2 Implementation 2009-----
#define COMMON_ACCESSIBILITY_TEXT_ATTRIBUTE \
{ SW_PROP_NMID(UNO_NAME_CHAR_BACK_COLOR), RES_CHRATR_BACKGROUND, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE ,MID_BACK_COLOR }, \
{ SW_PROP_NMID(UNO_NAME_CHAR_COLOR), RES_CHRATR_COLOR, CPPU_E2T(CPPUTYPE_INT32), PROPERTY_NONE, 0}, \
@@ -507,7 +506,6 @@ SwUnoPropertyMapProvider::~SwUnoProperty
{ SW_PROP_NMID(UNO_NAME_PARA_RIGHT_MARGIN), RES_LR_SPACE, CPPU_E2T(CPPUTYPE_INT32), PropertyAttribute::MAYBEVOID, MID_R_MARGIN|CONVERT_TWIPS}, \
{ SW_PROP_NMID(UNO_NAME_TABSTOPS), RES_PARATR_TABSTOP, CPPU_E2T(CPPUTYPE_SEQTABSTOP), PropertyAttribute::MAYBEVOID, CONVERT_TWIPS}, \
-//-----IAccessibility2 Implementation 2009
const SfxItemPropertyMapEntry* SwUnoPropertyMapProvider::GetPropertyMapEntries(sal_uInt16 nPropertyId)
{
@@ -526,7 +524,6 @@ const SfxItemPropertyMapEntry* SwUnoProp
aMapEntriesArr[nPropertyId] = aCharAndParaMap_Impl;
}
break;
- //IAccessibility2 Implementation 2009-----
case PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE:
{
static SfxItemPropertyMapEntry aAccessibilityTextAttrMap_Impl[] =
@@ -537,7 +534,6 @@ const SfxItemPropertyMapEntry* SwUnoProp
aMapEntriesArr[nPropertyId] = aAccessibilityTextAttrMap_Impl;
}
break;
- //-----IAccessibility2 Implementation 2009
case PROPERTY_MAP_PARAGRAPH:
{
static SfxItemPropertyMapEntry aParagraphMap_Impl[] =
Modified: openoffice/trunk/main/sw/source/core/view/viewimp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/view/viewimp.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/view/viewimp.cxx (original)
+++ openoffice/trunk/main/sw/source/core/view/viewimp.cxx Thu Nov 28 12:17:31 2013
@@ -446,7 +446,6 @@ void SwViewImp::MoveAccessible( const Sw
} while ( pTmp != pVSh );
}
-//IAccessibility2 Implementation 2009-----
void SwViewImp::FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage)
{
if( IsAccessible() )
@@ -463,7 +462,6 @@ void SwViewImp::FireColumnChangeEvent(sa
if( IsAccessible() )
GetAccessibleMap().FireColumnChangeEvent(nOldColumn, nNewColumn);
}
-//-----IAccessibility2 Implementation 2009
void SwViewImp::InvalidateAccessibleFrmContent( const SwFrm *pFrm )
{
ASSERT( pFrm->IsAccessibleFrm(), "frame is not accessible" );
Modified: openoffice/trunk/main/sw/source/ui/app/docsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/app/docsh.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/app/docsh.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/app/docsh.cxx Thu Nov 28 12:17:31 2013
@@ -103,9 +103,7 @@
#include <unotools/fltrcfg.hxx>
#include <svtools/htmlcfg.hxx>
#include <sfx2/fcontnr.hxx>
-//IAccessibility2 Implementation 2009-----
#include <sfx2/viewfrm.hxx>
-//-----IAccessibility2 Implementation 2009
#include <sfx2/objface.hxx>
#include <comphelper/storagehelper.hxx>
@@ -404,7 +402,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium&
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::SaveAs" );
- //IAccessibility2 Implementation 2009-----
pDoc->setDocAccTitle(String());
SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this );
if (pFrame1)
@@ -419,7 +416,6 @@ sal_Bool SwDocShell::SaveAs( SfxMedium&
}
}
}
- //-----IAccessibility2 Implementation 2009
SwWait aWait( *this, sal_True );
//#i3370# remove quick help to prevent saving of autocorrection suggestions
if(pView)
@@ -1285,7 +1281,6 @@ uno::Reference< frame::XController >
/* -----------------------------12.02.01 12:08--------------------------------
---------------------------------------------------------------------------*/
-//IAccessibility2 Implementation 2009-----
void SwDocShell::setDocAccTitle( const String& rTitle )
{
if (pDoc )
@@ -1320,7 +1315,6 @@ sal_Bool SwDocShell::getDocReadOnly() co
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
static const char* s_EventNames[] =
{
Modified: openoffice/trunk/main/sw/source/ui/cctrl/actctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/cctrl/actctrl.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/cctrl/actctrl.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/cctrl/actctrl.cxx Thu Nov 28 12:17:31 2013
@@ -105,13 +105,11 @@ void NoSpaceEdit::Modify()
SetText(sTemp);
SetSelection(aSel);
}
-//IAccessibility2 Impplementaton 2009-----
Edit::Modify();
/*
if(GetModifyHdl().IsSet())
GetModifyHdl().Call(this);
*/
-//-----IAccessibility2 Impplementaton 2009
}
/* -----------------25.06.2003 15:57-----------------
Modified: openoffice/trunk/main/sw/source/ui/cctrl/swlbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/cctrl/swlbox.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/cctrl/swlbox.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/cctrl/swlbox.cxx Thu Nov 28 12:17:31 2013
@@ -223,11 +223,9 @@ String SwComboBox::GetText() const
return aTxt;
}
-//IAccessibility2 Impplementaton 2009-----
void SwComboBox::SetText( const XubString& rStr )
{
ComboBox::SetText(rStr);
// MT: CallEventListeners stay protected for now. Probably not needed at all, as the implementation of VCLXAccessibelEdit/ComboBox should do it on text changed nowadays anyway. Verify.
// CallEventListeners( VCLEVENT_EDIT_MODIFY );
}
-//-----IAccessibility2 Impplementaton 2009
Modified: openoffice/trunk/main/sw/source/ui/chrdlg/swuiccoll.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/chrdlg/swuiccoll.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/chrdlg/swuiccoll.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/chrdlg/swuiccoll.cxx Thu Nov 28 12:17:31 2013
@@ -127,7 +127,6 @@ SwCondCollPage::SwCondCollPage(Window *p
break;
}
-//IAccessibility2 Impplementaton 2009-----
if( pFamilyItem )
{
const SfxStyleFilter& rFilterList = pFamilyItem->GetFilterList();
@@ -137,7 +136,6 @@ SwCondCollPage::SwCondCollPage(Window *p
sal_uInt16* pFilter = new sal_uInt16(rFilterList.GetObject(i)->nFlags);
aFilterLB.SetEntryData(i, pFilter);
}
-//-----IAccessibility2 Impplementaton 2009
}
aFilterLB.SelectEntryPos(1);
Modified: openoffice/trunk/main/sw/source/ui/config/optpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/config/optpage.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/config/optpage.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/config/optpage.cxx Thu Nov 28 12:17:31 2013
@@ -1974,13 +1974,11 @@ SwRedlineOptionsTabPage::SwRedlineOption
aLk = LINK(this, SwRedlineOptionsTabPage, ChangedMaskPrevHdl);
aMarkPosLB.SetSelectHdl( aLk );
aMarkColorLB.SetSelectHdl( aLk );
-//IAccessibility2 Impplementaton 2009-----
//solution: set different accessible name of four color box
aInsertColorLB.SetAccessibleName(::rtl::OUString( aInsertFT.GetDisplayText()) + ::rtl::OUString(aInsertColorFT.GetDisplayText()));
aDeletedColorLB.SetAccessibleName(::rtl::OUString( aDeletedFT.GetDisplayText()) + ::rtl::OUString( aDeletedColorFT.GetDisplayText()));
aChangedColorLB.SetAccessibleName(::rtl::OUString( aChangedFT.GetDisplayText()) + ::rtl::OUString( aChangedColorFT.GetDisplayText()));
aMarkColorLB.SetAccessibleName(::rtl::OUString( aMarkPosFT.GetDisplayText()) + ::rtl::OUString( aMarkColorFT.GetDisplayText()));
-//-----IAccessibility2 Impplementaton 2009
}
SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage()
Modified: openoffice/trunk/main/sw/source/ui/dialog/uiregionsw.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/dialog/uiregionsw.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/dialog/uiregionsw.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/dialog/uiregionsw.cxx Thu Nov 28 12:17:31 2013
@@ -457,9 +457,7 @@ SwEditRegionDlg::SwEditRegionDlg( Window
aPasswdPB.SetAccessibleRelationMemberOf(&aProtectFL);
aPasswdPB.SetAccessibleRelationLabeledBy(&aPasswdCB);
aSubRegionED.SetAccessibleName(aSubRegionFT.GetText());
-//IAccessibility2 Impplementaton 2009-----
aTree.SetAllEntriesAccessibleRoleType(TREEBOX_ALLITEM_ACCROLE_TYPE_TREE);
-//-----IAccessibility2 Impplementaton 2009
}
/* -----------------------------26.04.01 14:56--------------------------------
Modified: openoffice/trunk/main/sw/source/ui/docvw/access.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/docvw/access.src?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/docvw/access.src (original)
+++ openoffice/trunk/main/sw/source/ui/docvw/access.src Thu Nov 28 12:17:31 2013
@@ -96,7 +96,6 @@ String STR_ACCESS_ANNOTATION_BUTTON_DESC
Text [ en-US ] = "Activate this button to open a list of actions which can be performed on this comment and other comments";
};
-//IAccessibility2 Implementation 2009-----
String STR_ACCESS_PREVIEW_DOC_NAME
{
Text [ en-US ] = "Document preview";
@@ -113,5 +112,4 @@ String STR_ACCESS_DOC_WORDPROCESSING_REA
{
Text [ en-US ] = "(read-only)";
};
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx Thu Nov 28 12:17:31 2013
@@ -5759,7 +5759,6 @@ Selection SwEditWin::GetSurroundingTextS
return Selection( nPos - nStartPos, nPos - nStartPos );
}
}
-//IAccessibility2 Implementation 2009-----
// MT: Removed Windows::SwitchView() introduced with IA2 CWS.
// There are other notifications for this when the active view has chnaged, so please update the code to use that event mechanism
void SwEditWin::SwitchView()
@@ -5772,4 +5771,3 @@ void SwEditWin::SwitchView()
rView.GetWrtShell().InvalidateAccessibleFocus();
#endif
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/trunk/main/sw/source/ui/docvw/edtwin3.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/docvw/edtwin3.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/docvw/edtwin3.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/docvw/edtwin3.cxx Thu Nov 28 12:17:31 2013
@@ -142,7 +142,6 @@ sal_Bool SwEditWin::RulerMarginDrag( con
return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
}
// <--
-//IAccessibility2 Impplementaton 2009-----
void AccessibilityScrollMDI(ViewShell* pVwSh, const SwRect& rRect , sal_uInt16 nRangeX, sal_uInt16 nRangeY, sal_Bool isLeftTop)
{
SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
@@ -169,7 +168,6 @@ void AccessibilityScrollMDI(ViewShell* p
}
}
-//-----IAccessibility2 Impplementaton 2009
LAYOUT_NS Dialog* GetSearchDialog()
{
Modified: openoffice/trunk/main/sw/source/ui/frmdlg/column.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/frmdlg/column.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/frmdlg/column.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/frmdlg/column.cxx Thu Nov 28 12:17:31 2013
@@ -517,7 +517,6 @@ SwColumnPage::SwColumnPage(Window *pPare
| WB_ITEMBORDER
| WB_DOUBLEBORDER );
-//IAccessibility2 Impplementaton 2009-----
for( i = 0; i < 5; i++)
//Solution:Set accessible name one be one
//aDefaultVS.InsertItem( i + 1, i );
@@ -545,7 +544,6 @@ SwColumnPage::SwColumnPage(Window *pPare
}
aDefaultVS.InsertItem( i + 1, aItemText, i );
}
-//-----IAccessibility2 Impplementaton 2009
aDefaultVS.SetSelectHdl(LINK(this, SwColumnPage, SetDefaultsHdl));
@@ -995,14 +993,12 @@ IMPL_LINK( SwColumnPage, ColModify, Nume
// #i17816# changing the displayed types within the ValueSet
//from two columns to two columns with different settings doesn't invalidate the
// example windows in ::ColModify()
-//IAccessibility2 Impplementaton 2009-----
// the pColMgr->GetCount()'s return is some how bugged,
// it will return 0 when actual count is 1, so fix it.
//if(!pNF ||(pColMgr->GetCount() != nCols))
int nTemp = pColMgr->GetCount();
if(nTemp == 0) nTemp = 1;
if( nTemp != nCols )
-//-----IAccessibility2 Impplementaton 2009
{
if(pNF)
aDefaultVS.SetNoSelection();
Modified: openoffice/trunk/main/sw/source/ui/frmdlg/column.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/frmdlg/column.hrc?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/frmdlg/column.hrc (original)
+++ openoffice/trunk/main/sw/source/ui/frmdlg/column.hrc Thu Nov 28 12:17:31 2013
@@ -75,15 +75,11 @@
#define FT_TEXTDIRECTION 60
#define LB_TEXTDIRECTION 61
#define FL_VERT 62
-//IAccessibility2 Impplementaton 2009-----
#define STR_PAGESETUP_SPACING 32765
-//-----IAccessibility2 Impplementaton 2009
#define LISTBOX_SELECTION 0
#define LISTBOX_SECTION 1
#define LISTBOX_SECTIONS 2
#define LISTBOX_PAGE 3
#define LISTBOX_FRAME 4
-//IAccessibility2 Impplementaton 2009-----
#define STR_COLUMN_WIDTH 63
-//-----IAccessibility2 Impplementaton 2009
Modified: openoffice/trunk/main/sw/source/ui/frmdlg/column.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/frmdlg/column.src?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/frmdlg/column.src (original)
+++ openoffice/trunk/main/sw/source/ui/frmdlg/column.src Thu Nov 28 12:17:31 2013
@@ -414,7 +414,6 @@ ModalDialog DLG_COLUMN
Text [ en-US ] = "Columns";
};
-//IAccessibility2 Impplementaton 2009-----
String STR_ACCESS_PAGESETUP_SPACING
{
Text [ en-US ] = "Spacing between %1 and %2";
@@ -424,4 +423,3 @@ String STR_ACCESS_COLUMN_WIDTH
{
Text [ en-US ] = "Column %1 Width";
};
-//-----IAccessibility2 Impplementaton 2009
Modified: openoffice/trunk/main/sw/source/ui/frmdlg/frmpage.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/frmdlg/frmpage.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/frmdlg/frmpage.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/frmdlg/frmpage.cxx Thu Nov 28 12:17:31 2013
@@ -639,7 +639,6 @@ sal_uLong lcl_GetLBRelationsForStrID( co
namespace
{
- //IAccessibility2 Implementation 2009-----
void HandleAutoCB( sal_Bool _bChecked, FixedText& _rFT_man, FixedText& _rFT_auto, PercentField& _rPF_Edit)
{
_rFT_man.Show( !_bChecked );
@@ -647,7 +646,6 @@ namespace
String accName = _bChecked ? _rFT_auto.GetText() : _rFT_man.GetText();
_rPF_Edit.SetAccessibleName(accName);
}
- //-----IAccessibility2 Implementation 2009
}
@@ -2095,18 +2093,14 @@ IMPL_LINK_INLINE_END( SwFrmPage, RealSiz
IMPL_LINK( SwFrmPage, AutoWidthClickHdl, void*, EMPTYARG )
{
if( !IsInGraficMode() )
- //IAccessibility2 Implementation 2009-----
HandleAutoCB( aAutoWidthCB.IsChecked(), aWidthFT, aWidthAutoFT, aWidthED );
- //-----IAccessibility2 Implementation 2009
return 0;
}
IMPL_LINK( SwFrmPage, AutoHeightClickHdl, void*, EMPTYARG )
{
if( !IsInGraficMode() )
- //IAccessibility2 Implementation 2009-----
HandleAutoCB( aAutoHeightCB.IsChecked(), aHeightFT, aHeightAutoFT, aWidthED );
- //-----IAccessibility2 Implementation 2009
return 0;
}
@@ -2255,18 +2249,14 @@ void SwFrmPage::Init(const SfxItemSet& r
SwFrmSize eSize = rSize.GetHeightSizeType();
sal_Bool bCheck = eSize != ATT_FIX_SIZE;
aAutoHeightCB.Check( bCheck );
- //IAccessibility2 Implementation 2009-----
HandleAutoCB( bCheck, aHeightFT, aHeightAutoFT, aWidthED );
- //-----IAccessibility2 Implementation 2009
if( eSize == ATT_VAR_SIZE )
aHeightED.SetValue( aHeightED.GetMin(), FUNIT_NONE );
eSize = rSize.GetWidthSizeType();
bCheck = eSize != ATT_FIX_SIZE;
aAutoWidthCB.Check( bCheck );
- //IAccessibility2 Implementation 2009-----
HandleAutoCB( bCheck, aWidthFT, aWidthAutoFT, aWidthED );
- //-----IAccessibility2 Implementation 2009
if( eSize == ATT_VAR_SIZE )
aWidthED.SetValue( aWidthED.GetMin(), FUNIT_NONE );
Modified: openoffice/trunk/main/sw/source/ui/inc/conttree.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/inc/conttree.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/inc/conttree.hxx (original)
+++ openoffice/trunk/main/sw/source/ui/inc/conttree.hxx Thu Nov 28 12:17:31 2013
@@ -36,10 +36,8 @@ class SwGlblDocContents;
class SwGlblDocContent;
class SfxObjectShell;
-//IAccessibility2 Implementation 2009-----
//Solution: Include SdrObject class
class SdrObject;
-//-----IAccessibility2 Implementation 2009
#define EDIT_MODE_EDIT 0
#define EDIT_MODE_UPD_IDX 1
@@ -93,10 +91,8 @@ class SwContentTree : public SvTreeListB
sal_Bool bIsImageListInitialized : 1;
static sal_Bool bIsInDrag;
- //IAccessibility2 Implementation 2009-----
sal_Bool bIsKeySpace;
Rectangle oldRectangle;
- //-----IAccessibility2 Implementation 2009
void FindActiveTypeAndRemoveUserData();
using SvLBox::ExecuteDrop;
@@ -151,11 +147,9 @@ protected:
public:
SwContentTree(Window* pParent, const ResId& rResId);
~SwContentTree();
- //IAccessibility2 Implementation 2009-----
String GetEntryAltText( SvLBoxEntry* pEntry ) const;
String GetEntryLongDescription( SvLBoxEntry* pEntry ) const;
SdrObject* GetDrawingObjectsByContent(const SwContent *pCnt);
- //-----IAccessibility2 Implementation 2009
sal_Bool ToggleToRoot();
sal_Bool IsRoot() const {return bIsRoot;}
@@ -208,9 +202,7 @@ public:
virtual void KeyInput(const KeyEvent& rKEvt);
virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
- //IAccessibility2 Implementation 2009-----
virtual sal_Int32 GetEntryRealChildsNum( SvLBoxEntry* pEntry ) const;
- //-----IAccessibility2 Implementation 2009
};
Modified: openoffice/trunk/main/sw/source/ui/inc/edtwin.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/inc/edtwin.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/inc/edtwin.hxx (original)
+++ openoffice/trunk/main/sw/source/ui/inc/edtwin.hxx Thu Nov 28 12:17:31 2013
@@ -297,9 +297,7 @@ public:
SwEditWin(Window *pParent, SwView &);
virtual ~SwEditWin();
- //IAccessibility2 Implementation 2009-----
virtual void SwitchView();
- //-----IAccessibility2 Implementation 2009
};
#endif
Modified: openoffice/trunk/main/sw/source/ui/inc/pview.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/inc/pview.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/inc/pview.hxx (original)
+++ openoffice/trunk/main/sw/source/ui/inc/pview.hxx Thu Nov 28 12:17:31 2013
@@ -164,9 +164,7 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
CreateAccessible();
- //IAccessibility2 Implementation 2009-----
virtual void SwitchView();
- //-----IAccessibility2 Implementation 2009
};
@@ -178,8 +176,7 @@ class SW_DLLPUBLIC SwPagePreView: public
{
// ViewWindow und Henkel zur Core
// aktuelle Dispatcher-Shell
- SwPagePreViewWin* pViewWin;//IAccessibility2 Implementation 2009
- //viewdata of the previous SwView and the new crsrposition
+ SwPagePreViewWin* pViewWin; //viewdata of the previous SwView and the new crsrposition
String sSwViewData,
//and the new cursor position if the user double click in the PagePreView
sNewCrsrPos;
Modified: openoffice/trunk/main/sw/source/ui/inc/swlbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/inc/swlbox.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/inc/swlbox.hxx (original)
+++ openoffice/trunk/main/sw/source/ui/inc/swlbox.hxx Thu Nov 28 12:17:31 2013
@@ -115,7 +115,6 @@ public:
void SetStyle(const sal_uInt16 nSt) { nStyle = nSt; }
String GetText() const;
-//IAccessibility2 Impplementaton 2009-----
void SetText( const XubString& rStr );
void SetText( const XubString& rStr, const Selection& rNewSelection ) { ComboBox::SetText( rStr, rNewSelection ); };
};
Modified: openoffice/trunk/main/sw/source/ui/inc/swuicnttab.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/inc/swuicnttab.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/inc/swuicnttab.hxx (original)
+++ openoffice/trunk/main/sw/source/ui/inc/swuicnttab.hxx Thu Nov 28 12:17:31 2013
@@ -286,12 +286,10 @@ class SwTokenWindow : public Window
Link aButtonSelectedHdl;
Control* pActiveCtrl;
Link aModifyHdl;
-//IAccessibility2 Impplementaton 2009-----
String accessibleName;
String sAdditionalAccnameString1;
String sAdditionalAccnameString2;
String sAdditionalAccnameString3;
-//-----IAccessibility2 Impplementaton 2009
SwTOXEntryTabPage* m_pParent;
@@ -343,11 +341,9 @@ public:
virtual void Resize();
virtual void GetFocus();
-//IAccessibility2 Impplementaton 2009-----
void SetFocus2theAllBtn();
private:
sal_uInt32 GetControlIndex(FormTokenType eType, const Control* pCurControl) const;
-//-----IAccessibility2 Impplementaton 2009
};
/* -----------------------------23.12.99 14:16--------------------------------
@@ -493,10 +489,8 @@ public:
String GetLevelHelp(sal_uInt16 nLevel) const;
void PreTokenButtonRemoved(const SwFormToken& rToken);
-//IAccessibility2 Impplementaton 2009-----
void SetFocus2theAllBtn();
virtual long Notify( NotifyEvent& rNEvt );
-//-----IAccessibility2 Impplementaton 2009
};
/* -----------------05.07.99 13:00-------------------
Modified: openoffice/trunk/main/sw/source/ui/inc/view.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/inc/view.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/inc/view.hxx (original)
+++ openoffice/trunk/main/sw/source/ui/inc/view.hxx Thu Nov 28 12:17:31 2013
@@ -200,10 +200,8 @@ class SW_DLLPUBLIC SwView: public SfxVie
sNewCrsrPos;
// to support keyboard the number of the page to go to can be set too
sal_uInt16 nNewPage;
- //IAccessibility2 Implementation 2009-----
sal_uInt16 nOldPageNum;
String nOldSectionName;
- //-----IAccessibility2 Implementation 2009
Point aTabColFromDocPos; //Verschieben von Tabellenspalten aus
//aus dem Dokument heraus.
SwTxtNode * pNumRuleNodeFromDoc; // Moving indent of numrule #i23726#
Modified: openoffice/trunk/main/sw/source/ui/index/cnttab.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/index/cnttab.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/index/cnttab.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/index/cnttab.cxx Thu Nov 28 12:17:31 2013
@@ -1860,7 +1860,6 @@ void SwTOXEdit::KeyInput( const KeyEvent
bNextControl = sal_False;
bCall = sal_True;
}
-//IAccessibility2 Impplementaton 2009-----
else if ( (aCode.GetCode() == KEY_F3) && aCode.IsShift() && !aCode.IsMod1() && !aCode.IsMod2() )
{
if ( m_pParent )
@@ -1868,7 +1867,6 @@ void SwTOXEdit::KeyInput( const KeyEvent
m_pParent->SetFocus2theAllBtn();
}
}
-//-----IAccessibility2 Impplementaton 2009
if(bCall && aPrevNextControlLink.IsSet())
aPrevNextControlLink.Call(this);
@@ -2004,7 +2002,6 @@ void SwTOXButton::KeyInput( const KeyEve
//this is invalid here
return;
}
-//IAccessibility2 Impplementaton 2009-----
else if ( (aCode.GetCode() == KEY_F3) && aCode.IsShift() && !aCode.IsMod1() && !aCode.IsMod2() )
{
if ( m_pParent )
@@ -2012,7 +2009,6 @@ void SwTOXButton::KeyInput( const KeyEve
m_pParent->SetFocus2theAllBtn();
}
}
-//-----IAccessibility2 Impplementaton 2009
if(bCall && aPrevNextControlLink.IsSet())
aPrevNextControlLink.Call(this);
else
@@ -2661,7 +2657,6 @@ void SwTOXEntryTabPage::PreTokenButtonRe
sal_uInt16 nPos = aAuthFieldsLB.InsertEntry(sTemp);
aAuthFieldsLB.SetEntryData(nPos, (void*)(nData));
}
-//IAccessibility2 Impplementaton 2009-----
void SwTOXEntryTabPage::SetFocus2theAllBtn()
{
aAllLevelsPB.GrabFocus();
@@ -2684,7 +2679,6 @@ long SwTOXEntryTabPage::Notify( NotifyEv
return SfxTabPage::Notify( rNEvt );
}
-//-----IAccessibility2 Impplementaton 2009
/*-- 16.06.99 10:47:35---------------------------------------------------
This function inizializes the default value in the Token
@@ -3178,12 +3172,10 @@ SwTokenWindow::SwTokenWindow(SwTOXEntryT
nHelpId = STR_TOKEN_HELP_ENTRY;
aButtonHelpTexts[i] = String(ResId(nHelpId, *rResId.GetResMgr()));
}
-//IAccessibility2 Impplementaton 2009-----
accessibleName = String(SW_RES(STR_STRUCTURE));
sAdditionalAccnameString1 = String(SW_RES(STR_ADDITIONAL_ACCNAME_STRING1));
sAdditionalAccnameString2 = String(SW_RES(STR_ADDITIONAL_ACCNAME_STRING2));
sAdditionalAccnameString3 = String(SW_RES(STR_ADDITIONAL_ACCNAME_STRING3));
-//-----IAccessibility2 Impplementaton 2009
FreeResource();
Link aLink(LINK(this, SwTokenWindow, ScrollHdl));
@@ -3341,7 +3333,6 @@ Control* SwTokenWindow::InsertItem(const
pEdit->SetPosPixel(aControlPos);
aControlList.Insert(pEdit, aControlList.Count());
pEdit->SetText(rText);
-//IAccessibility2 Impplementaton 2009-----
sal_uInt32 nIndex = GetControlIndex( TOKEN_TEXT, pEdit );
String s1 = String::CreateFromAscii(" (");
String s2 = String::CreateFromAscii(")");
@@ -3366,7 +3357,6 @@ Control* SwTokenWindow::InsertItem(const
{
pEdit->SetAccessibleName(strName);
}
-//-----IAccessibility2 Impplementaton 2009
Size aEditSize(aControlSize);
aEditSize.Width() = pEdit->GetTextWidth(rText) + EDIT_MINWIDTH;
pEdit->SetSizePixel(aEditSize);
@@ -3397,7 +3387,6 @@ Control* SwTokenWindow::InsertItem(const
(ToxAuthorityField)rToken.nAuthorityField));
pButton->SetText(sTmp.Copy(0, 2));
}
-//IAccessibility2 Impplementaton 2009-----
String sSpace = String::CreateFromAscii(" ");
sal_uInt32 nIndex = GetControlIndex( rToken.eTokenType, pButton );
String sAccName = aButtonHelpTexts[rToken.eTokenType];
@@ -3407,7 +3396,6 @@ Control* SwTokenWindow::InsertItem(const
sAccName += String::CreateFromInt32(nIndex);
}
pButton->SetAccessibleName( sAccName );
-//-----IAccessibility2 Impplementaton 2009
pButton->Show();
pRet = pButton;
}
@@ -3549,7 +3537,6 @@ void SwTokenWindow::InsertAtSelection(
SwTOXEdit* pEdit = new SwTOXEdit(&aCtrlParentWin, this, aTmpToken);
aControlList.Insert(pEdit, nActivePos + 1);
pEdit->SetText(sRight);
-//IAccessibility2 Impplementaton 2009-----
sal_uInt32 nIndex = GetControlIndex( TOKEN_TEXT, pEdit );
String s1 = String::CreateFromAscii(" (");
String s2 = String::CreateFromAscii(")");
@@ -3574,7 +3561,6 @@ void SwTokenWindow::InsertAtSelection(
{
pEdit->SetAccessibleName(strName);
}
-//-----IAccessibility2 Impplementaton 2009
pEdit->SetSizePixel(aControlSize);
pEdit->AdjustSize();
pEdit->SetModifyHdl(LINK(this, SwTokenWindow, EditResize ));
@@ -3604,7 +3590,6 @@ void SwTokenWindow::InsertAtSelection(
pButton->SetText(sTmp.Copy(0, 2));
}
-//IAccessibility2 Impplementaton 2009-----
String sSpace = String::CreateFromAscii(" ");
sal_uInt32 nIndex = GetControlIndex( rToken.eTokenType, pButton );
String sAccName = aButtonHelpTexts[rToken.eTokenType];
@@ -3614,7 +3599,6 @@ void SwTokenWindow::InsertAtSelection(
sAccName += String::CreateFromInt32(nIndex);
}
pButton->SetAccessibleName( sAccName );
-//-----IAccessibility2 Impplementaton 2009
Size aEditSize(GetOutputSizePixel());
aEditSize.Width() = pButton->GetTextWidth(rText) + 5;
pButton->SetSizePixel(aEditSize);
@@ -4045,7 +4029,6 @@ void SwTokenWindow::GetFocus()
}
}
}
-//IAccessibility2 Impplementaton 2009-----
void SwTokenWindow::SetFocus2theAllBtn()
{
if (m_pParent)
@@ -4079,7 +4062,6 @@ sal_uInt32 SwTokenWindow::GetControlInde
return nIndex;
}
-//-----IAccessibility2 Impplementaton 2009
/* -----------------25.03.99 15:17-------------------
*
* --------------------------------------------------*/
Modified: openoffice/trunk/main/sw/source/ui/index/cnttab.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/index/cnttab.hrc?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/index/cnttab.hrc (original)
+++ openoffice/trunk/main/sw/source/ui/index/cnttab.hrc Thu Nov 28 12:17:31 2013
@@ -169,12 +169,10 @@
#define STR_TOKEN_HELP_AUTHORITY (STR_BUTTON_HELP_TEXT_START + 9)
#define STR_CHARSTYLE (STR_TOKEN_HELP_AUTHORITY + 1)
-//IAccessibility2 Impplementaton 2009-----
#define STR_STRUCTURE (STR_TOKEN_HELP_AUTHORITY + 2)
#define STR_ADDITIONAL_ACCNAME_STRING1 (STR_TOKEN_HELP_AUTHORITY + 3)
#define STR_ADDITIONAL_ACCNAME_STRING2 (STR_TOKEN_HELP_AUTHORITY + 4)
#define STR_ADDITIONAL_ACCNAME_STRING3 (STR_TOKEN_HELP_AUTHORITY + 5)
-//-----IAccessibility2 Impplementaton 2009
#define TLB_STYLES 100
#define FL_STYLES 101
#define PB_OK 102
Modified: openoffice/trunk/main/sw/source/ui/index/cnttab.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/index/cnttab.src?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/index/cnttab.src (original)
+++ openoffice/trunk/main/sw/source/ui/index/cnttab.src Thu Nov 28 12:17:31 2013
@@ -674,7 +674,6 @@ TabPage TP_TOX_ENTRY
{
Text [ en-US ] = "Character Style: ";
};
-//IAccessibility2 Impplementaton 2009-----
String STR_STRUCTURE
{
Text [ en-US ] = "Structure text";
@@ -691,7 +690,6 @@ TabPage TP_TOX_ENTRY
{
Text [ en-US ] = "Press Ctrl+Alt+B to move focus back to the current structure control";
};
-//-----IAccessibility2 Impplementaton 2009
};
PushButton PB_ALL_LEVELS
{
@@ -1232,9 +1230,7 @@ ModalDialog DLG_ADD_IDX_STYLES
};
MaskColor = IMAGE_MASK_COLOR ;
};
- //IAccessibility2 Implementation 2009-----
QuickHelpText [ en-US ] = "Left" ;
- //-----IAccessibility2 Implementation 2009
};
ImageButton PB_RIGHT
{
@@ -1250,9 +1246,7 @@ ModalDialog DLG_ADD_IDX_STYLES
};
MaskColor = IMAGE_MASK_COLOR ;
};
- //IAccessibility2 Implementation 2009-----
QuickHelpText [ en-US ] = "Right" ;
- //-----IAccessibility2 Implementation 2009
};
FixedLine FL_STYLES
{
Modified: openoffice/trunk/main/sw/source/ui/misc/glossary.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/misc/glossary.hrc?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/misc/glossary.hrc (original)
+++ openoffice/trunk/main/sw/source/ui/misc/glossary.hrc Thu Nov 28 12:17:31 2013
@@ -84,6 +84,4 @@
#define FL_NN 9
#define BT_CANCEL 10
#define BT_OKNEW 11
-//IAccessibility2 Implementation 2009-----
#define STR_SW_CATEGORY 12
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/trunk/main/sw/source/ui/misc/glossary.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/misc/glossary.src?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/misc/glossary.src (original)
+++ openoffice/trunk/main/sw/source/ui/misc/glossary.src Thu Nov 28 12:17:31 2013
@@ -286,12 +286,10 @@ String STR_GLOSSARY
{
Text [ en-US ] = "AutoText :" ;
};
-/*IAccessibility2 Implementation 2009-----*/
String STR_ACCESS_SW_CATEGORY
{
Text [ en-US ] = "Category" ;
};
-/*-----IAccessibility2 Implementation 2009*/
ModalDialog DLG_RENAME_GLOS
{
OutputSize = TRUE ;
Modified: openoffice/trunk/main/sw/source/ui/misc/insfnote.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/misc/insfnote.hrc?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/misc/insfnote.hrc (original)
+++ openoffice/trunk/main/sw/source/ui/misc/insfnote.hrc Thu Nov 28 12:17:31 2013
@@ -36,6 +36,4 @@
#define BT_PREV 103
#define BT_NEXT 104
-//IAccessibility2 Implementation 2009-----
#define STR_CHAR 105
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/trunk/main/sw/source/ui/misc/insfnote.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/misc/insfnote.src?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/misc/insfnote.src (original)
+++ openoffice/trunk/main/sw/source/ui/misc/insfnote.src Thu Nov 28 12:17:31 2013
@@ -45,12 +45,10 @@ ModalDialog DLG_INS_FOOTNOTE
Group = TRUE ;
Left = TRUE ;
};
- //IAccessibility2 Implementation 2009-----
String STR_CHAR
{
Text [ en-US ] = "Character" ;
};
- //-----IAccessibility2 Implementation 2009
OKButton BT_OK
{
Pos = MAP_APPFONT ( 104 , 6 ) ;
Modified: openoffice/trunk/main/sw/source/ui/ribbar/inputwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/ribbar/inputwin.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/ribbar/inputwin.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/ribbar/inputwin.cxx Thu Nov 28 12:17:31 2013
@@ -91,7 +91,6 @@ SwInputWindow::SwInputWindow( Window* pP
pWrtShell = pView ? pView->GetWrtShellPtr() : 0;
InsertWindow( ED_POS, &aPos, 0, 0);
- //IAccessibility2 Implementation 2009-----
SetItemText(ED_POS, String(SW_RES(STR_ACCESS_FORMULA_TYPE)));
aPos.SetAccessibleName(String(SW_RES(STR_ACCESS_FORMULA_TYPE)));
SetAccessibleName(String(SW_RES(STR_ACCESS_FORMULA_TOOLBAR)));
@@ -100,7 +99,6 @@ SwInputWindow::SwInputWindow( Window* pP
InsertWindow( ED_FORMULA, &aEdit);
SetItemText(ED_FORMULA, String(SW_RES(STR_ACCESS_FORMULA_TEXT)));
aEdit.SetAccessibleName(String(SW_RES(STR_ACCESS_FORMULA_TEXT)));
- //-----IAccessibility2 Implementation 2009
SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
Modified: openoffice/trunk/main/sw/source/ui/ribbar/inputwin.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/ribbar/inputwin.hrc?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/ribbar/inputwin.hrc (original)
+++ openoffice/trunk/main/sw/source/ui/ribbar/inputwin.hrc Thu Nov 28 12:17:31 2013
@@ -60,11 +60,9 @@
#define ED_POS 2
#define ED_FORMULA 3
-//IAccessibility2 Impplementaton 2009-----
#define STR_ED_POS 1
#define STR_ED_FORMULA 2
#define STR_TOOLBAR_FORMULA 35
-//-----IAccessibility2 Impplementaton 2009
#endif
Modified: openoffice/trunk/main/sw/source/ui/ribbar/inputwin.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/ribbar/inputwin.src?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/ribbar/inputwin.src (original)
+++ openoffice/trunk/main/sw/source/ui/ribbar/inputwin.src Thu Nov 28 12:17:31 2013
@@ -281,7 +281,6 @@ String STR_TBL_FORMULA
{
Text [ en-US ] = "Text formula" ;
};
-//IAccessibility2 Impplementaton 2009-----
String STR_ACCESS_FORMULA_TOOLBAR
{
Text [ en-US ] = "Formula Tool Bar" ;
@@ -294,7 +293,6 @@ String STR_ACCESS_FORMULA_TEXT
{
Text [ en-US ] = "Formula Text" ;
};
-//-----IAccessibility2 Impplementaton 2009
#define TB_INPUT \
ToolBoxItem\
{\
Modified: openoffice/trunk/main/sw/source/ui/ribbar/workctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/ribbar/workctrl.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/ribbar/workctrl.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/ribbar/workctrl.cxx Thu Nov 28 12:17:31 2013
@@ -503,7 +503,6 @@ SwScrollNaviPopup::SwScrollNaviPopup( sa
sText = String(SW_RES(nResStr));
nTbxBits = TIB_CHECKABLE;
}
- //IAccessibility2 Impplementaton 2009-----
else
{
if (nNaviId == NID_PREV)
@@ -511,7 +510,6 @@ SwScrollNaviPopup::SwScrollNaviPopup( sa
else if (nNaviId == NID_NEXT)
sText = String(SW_RES(STR_IMGBTN_PGE_DOWN));
}
- //-----IAccessibility2 Impplementaton 2009
aToolBox.InsertItem(nNaviId, sText, nTbxBits);
aToolBox.SetHelpId( nNaviId, aNavigationHelpIds[i] );
}
Modified: openoffice/trunk/main/sw/source/ui/shells/textsh1.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/textsh1.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/textsh1.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/textsh1.cxx Thu Nov 28 12:17:31 2013
@@ -1119,7 +1119,6 @@ void SwTextShell::Execute(SfxRequest &rR
case SID_DEC_INDENT:
case SID_INC_INDENT:
-//IAccessibility2 Implementation 2009-----
//According to the requirement, modified the behavior when user
//using the indent button on the toolbar. Now if we increase/decrease indent for a
//paragraph which has bullet style it will increase/decrease the bullet level.
@@ -1147,7 +1146,6 @@ void SwTextShell::Execute(SfxRequest &rR
}
//rWrtSh.MoveLeftMargin( SID_INC_INDENT == nSlot,
// rReq.GetModifier() != KEY_MOD1 );
-//-----IAccessibility2 Implementation 2009
rReq.Done();
break;
case FN_DEC_INDENT_OFFSET:
@@ -1558,7 +1556,6 @@ void SwTextShell::GetState( SfxItemSet &
case SID_DEC_INDENT:
case SID_INC_INDENT:
{
-//IAccessibility2 Implementation 2009-----
//if the paragrah has bullet we'll do the following things:
//1: if the bullet level is the first level, disable the decrease-indent button
//2: if the bullet level is the last level, disable the increase-indent button
@@ -1587,7 +1584,6 @@ void SwTextShell::GetState( SfxItemSet &
// SID_INC_INDENT == nWhich, TRUE ))
// rSet.DisableItem( nWhich );
//old code ends
-//-----IAccessibility2 Implementation 2009
}
break;
Modified: openoffice/trunk/main/sw/source/ui/table/convert.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/table/convert.hrc?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/table/convert.hrc (original)
+++ openoffice/trunk/main/sw/source/ui/table/convert.hrc Thu Nov 28 12:17:31 2013
@@ -47,6 +47,4 @@
#define BT_AUTOFORMAT 102
#define BT_HELP 103
#define WIN_REPEAT_HEADER 104
-//IAccessibility2 Implementation 2009-----
#define STR_SYMBOL 105
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/trunk/main/sw/source/ui/table/convert.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/table/convert.src?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/table/convert.src (original)
+++ openoffice/trunk/main/sw/source/ui/table/convert.src Thu Nov 28 12:17:31 2013
@@ -187,12 +187,10 @@ ModalDialog DLG_CONV_TEXT_TABLE
Hide = TRUE ;
Text [ en-US ] = "Auto~Format..." ;
};
- /*IAccessibility2 Implementation 2009-----*/
String STR_SYMBOL
{
Text [ en-US ] = "Symbol" ;
};
- /*-----IAccessibility2 Implementation 2009*/
};
Modified: openoffice/trunk/main/sw/source/ui/table/tabledlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/table/tabledlg.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/table/tabledlg.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/table/tabledlg.cxx Thu Nov 28 12:17:31 2013
@@ -990,11 +990,9 @@ IMPL_LINK( SwTableColumnPage, AutoClickH
String sIndex = String::CreateFromInt32( aValueTbl[i] + 1 );
sEntry += sIndex;
pTextArr[i]->SetText( sEntry );
-//IAccessibility2 Impplementaton 2009-----
String sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH);
sColumnWidth.SearchAndReplace( DEFINE_CONST_UNICODE("%1"), sIndex );
pFieldArr[i]->SetAccessibleName( sColumnWidth );
-//-----IAccessibility2 Impplementaton 2009
}
aDownBtn.Enable(aValueTbl[0] > 0);
Modified: openoffice/trunk/main/sw/source/ui/table/tabledlg.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/table/tabledlg.hrc?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/table/tabledlg.hrc (original)
+++ openoffice/trunk/main/sw/source/ui/table/tabledlg.hrc Thu Nov 28 12:17:31 2013
@@ -102,9 +102,7 @@
#define FL_VERT_ORIENT 140
#define RB_FROM_LEFT 144
-//IAccessibility2 Impplementaton 2009-----
#define STR_COLUMN_WIDTH 145
-//-----IAccessibility2 Impplementaton 2009
#define FT_VERTORIENT 150
#define LB_VERTORIENT 151
Modified: openoffice/trunk/main/sw/source/ui/uiview/pview.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/pview.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/pview.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/pview.cxx Thu Nov 28 12:17:31 2013
@@ -240,11 +240,9 @@ SwPagePreViewWin::SwPagePreViewWin( Wind
SwPagePreViewWin::~SwPagePreViewWin()
{
- //IAccessibility2 Implementation 2009-----
// Remove to the deconstruction of SwPagePreView.
//if( mpViewShell)
// delete mpViewShell;
- //-----IAccessibility2 Implementation 2009
}
/*--------------------------------------------------------------------
@@ -1297,8 +1295,7 @@ void SwPagePreView::Init(const SwViewOpt
SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
SfxViewShell( pViewFrame, SWVIEWFLAGS ),
- pViewWin( new SwPagePreViewWin(&(GetViewFrame())->GetWindow(), *this ) ),//IAccessibility2 Implementation 2009
- nNewPage(USHRT_MAX),
+ pViewWin( new SwPagePreViewWin(&(GetViewFrame())->GetWindow(), *this ) ), nNewPage(USHRT_MAX),
pHScrollbar(0),
pVScrollbar(0),
pPageUpBtn(0),
@@ -1381,7 +1378,6 @@ SwPagePreView::SwPagePreView(SfxViewFram
SwPagePreView::~SwPagePreView()
{
SetWindow( 0 );
- //IAccessibility2 Implementation 2009-----
ViewShell* pVShell = pViewWin->GetViewShell();
pVShell->SetWin(0);
//pViewWin->Hide();
@@ -1389,7 +1385,6 @@ SwPagePreView::SwPagePreView(SfxViewFram
delete pVShell;
delete pViewWin;
//pViewWin->Hide();
- //-----IAccessibility2 Implementation 2009
delete pScrollFill;
delete pHScrollbar;
@@ -2106,7 +2101,6 @@ sal_Bool SwPagePreView::HandleWheelComma
//IAccessibility2 Implementation 2009-----, only the Preference shouldn't control the Zoom, it is better to detect AT tools running. So the bridge can be used here
//if(!Application::GetSettings().GetMiscSettings().GetEnableATToolSupport())
if ( !Application::IsAccessibilityEnabled() )
- //-----IAccessibility2 Implementation 2009
{
sal_uInt16 nFactor = GetViewShell()->GetViewOptions()->GetZoom();
const sal_uInt16 nOffset = 10;
@@ -2139,7 +2133,6 @@ uno::Reference< ::com::sun::star::access
// happend already!!!
DBG_ASSERT( GetViewShell() != NULL, "We need a view shell" );
- //IAccessibility2 Implementation 2009-----
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible( sal_False );
if (xAcc.is())
{
@@ -2151,9 +2144,7 @@ uno::Reference< ::com::sun::star::access
SetAccessible(xAccPreview);
}
return GetAccessible( sal_False );
- //-----IAccessibility2 Implementation 2009
}
-//IAccessibility2 Implementation 2009-----
// MT: Removed Windows::SwitchView() introduced with IA2 CWS.
// There are other notifications for this when the active view has chnaged, so please update the code to use that event mechanism
void SwPagePreViewWin::SwitchView()
@@ -2169,7 +2160,6 @@ void SwPagePreViewWin::SwitchView()
}
#endif
}
-//-----IAccessibility2 Implementation 2009
/* -----------------------------06.05.2002 13:18------------------------------
Modified: openoffice/trunk/main/sw/source/ui/uiview/view.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/view.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/view.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/view.cxx Thu Nov 28 12:17:31 2013
@@ -727,9 +727,7 @@ SwView::SwView( SfxViewFrame *_pFrame, S
: SfxViewShell( _pFrame, SWVIEWFLAGS ),
aPageStr( SW_RES( STR_PAGE )),
nNewPage(USHRT_MAX),
- //IAccessibility2 Implementation 2009-----
nOldPageNum(0),
- //-----IAccessibility2 Implementation 2009
pNumRuleNodeFromDoc(0), // #i23726#
pEditWin( new SwEditWin( &_pFrame->GetWindow(), *this ) ),
pWrtShell(0),
Modified: openoffice/trunk/main/sw/source/ui/uiview/view2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/view2.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/view2.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/view2.cxx Thu Nov 28 12:17:31 2013
@@ -1179,7 +1179,6 @@ void SwView::StateStatusLine(SfxItemSet
SfxWhichIter aIter( rSet );
sal_uInt16 nWhich = aIter.FirstWhich();
ASSERT( nWhich, "leeres Set");
- //IAccessibility2 Implementation 2009-----
if (Application::IsAccessibilityEnabled())
{
//get section chang event
@@ -1204,7 +1203,6 @@ void SwView::StateStatusLine(SfxItemSet
rShell.FireColumnChangeEvent(2, 1);
}
}
- //-----IAccessibility2 Implementation 2009
while( nWhich )
{
@@ -1229,7 +1227,6 @@ void SwView::StateStatusLine(SfxItemSet
rShell.GetPageNumber( -1, rShell.IsCrsrVisible(), nPage, nLogPage, sDisplay );
rSet.Put( SfxStringItem( FN_STAT_PAGE,
GetPageStr( nPage, nLogPage, sDisplay) ));
- //IAccessibility2 Implementation 2009-----
//if existing page number is not equal to old page number, send out this event.
if (nOldPageNum != nLogPage )
{
@@ -1237,7 +1234,6 @@ void SwView::StateStatusLine(SfxItemSet
rShell.FirePageChangeEvent(nOldPageNum, nLogPage);
nOldPageNum = nLogPage;
}
- //-----IAccessibility2 Implementation 2009
sal_uInt16 nCnt = GetWrtShell().GetPageCnt();
if (nPageCnt != nCnt) // Basic benachrichtigen
{
Modified: openoffice/trunk/main/sw/source/ui/uiview/viewsrch.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/viewsrch.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/viewsrch.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/viewsrch.cxx Thu Nov 28 12:17:31 2013
@@ -213,7 +213,6 @@ void SwView::ExecSearch(SfxRequest& rReq
if( bRet )
Scroll(pWrtShell->GetCharRect().SVRect());
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
- //IAccessibility2 Implementation 2009-----
if ( Application::IsAccessibilityEnabled() )
{
const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
@@ -225,7 +224,6 @@ void SwView::ExecSearch(SfxRequest& rReq
pSrchDlg->SetSrchFlag();
}
}
- //-----IAccessibility2 Implementation 2009
}
break;
case SVX_SEARCHCMD_FIND_ALL:
@@ -241,7 +239,6 @@ void SwView::ExecSearch(SfxRequest& rReq
bFound = sal_False;
}
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
- //IAccessibility2 Implementation 2009-----
if ( Application::IsAccessibilityEnabled() )
{
const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
@@ -254,7 +251,6 @@ void SwView::ExecSearch(SfxRequest& rReq
pSrchDlg->SetSrchFlag();
}
}
- //-----IAccessibility2 Implementation 2009
}
break;
case SVX_SEARCHCMD_REPLACE:
@@ -306,7 +302,6 @@ void SwView::ExecSearch(SfxRequest& rReq
pSrchItem->SetCommand( nOldCmd );
rReq.SetReturnValue(SfxBoolItem(nSlot, bRet));
}
- //IAccessibility2 Implementation 2009-----
{
const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
SvxSearchDialogWrapper *pWrp = (SvxSearchDialogWrapper*)GetViewFrame()->GetChildWindow(nId);
@@ -318,7 +313,6 @@ void SwView::ExecSearch(SfxRequest& rReq
pSrchDlg->SetSrchFlag();
}
}
- //-----IAccessibility2 Implementation 2009
break;
case SVX_SEARCHCMD_REPLACE_ALL:
@@ -368,7 +362,6 @@ void SwView::ExecSearch(SfxRequest& rReq
InfoBox( pParentWindow, aText ).Execute();
}
}
- //IAccessibility2 Implementation 2009-----
const sal_uInt16 nId = SvxSearchDialogWrapper::GetChildWindowId();
SvxSearchDialogWrapper *pWrp = (SvxSearchDialogWrapper*)GetViewFrame()->GetChildWindow(nId);
@@ -378,7 +371,6 @@ void SwView::ExecSearch(SfxRequest& rReq
pSrchDlg->SetDocWin( (Window*)pEditWin );
pSrchDlg->SetSrchFlag();
}
- //-----IAccessibility2 Implementation 2009
break;
}
Modified: openoffice/trunk/main/sw/source/ui/utlui/content.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/utlui/content.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/utlui/content.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/utlui/content.cxx Thu Nov 28 12:17:31 2013
@@ -85,14 +85,12 @@
#include <numrule.hxx>
#include <swundo.hxx>
#include <ndtxt.hxx>
-//IAccessibility2 Implementation 2009-----
//#include <ndgrf.hxx>
#include <fmtcntnt.hxx>
#include <PostItMgr.hxx>
//#include <../../core/inc/flyfrm.hxx>
//#include <../../core/inc/cntfrm.hxx>
//#include <ndnotxt.hxx>
-//-----IAccessibility2 Implementation 2009
//#include <postit.hxx>
#include <postithelper.hxx>
#include <redline.hxx>
@@ -899,8 +897,7 @@ SwContentTree::SwContentTree(Window* pPa
bIsOutlineMoveable(sal_True),
bViewHasChanged(sal_False),
bIsImageListInitialized(sal_False),
- bIsKeySpace(sal_False) //IAccessibility2 Implementation 2009
-{
+ bIsKeySpace(sal_False){
sal_uInt16 i;
SetHelpId(HID_NAVIGATOR_TREELIST);
@@ -936,7 +933,6 @@ SwContentTree::~SwContentTree()
bIsInDrag = sal_False;
}
-//IAccessibility2 Implementation 2009-----
String SwContentTree::GetEntryAltText( SvLBoxEntry* pEntry ) const
{
if( pEntry == NULL)
@@ -1108,7 +1104,6 @@ String SwContentTree::GetEntryLongDescri
return String();
}
-//-----IAccessibility2 Implementation 2009
/***************************************************************************
Drag&Drop methods
***************************************************************************/
@@ -1394,7 +1389,6 @@ void SwContentTree::RequestingChilds( S
sEntry = sSpace;
SvLBoxEntry* pChild = InsertEntry(sEntry, pParent,
sal_False, LIST_APPEND, (void*)pCnt);
- //IAccessibility2 Implementation 2009-----
//Solution: If object is marked , the corresponding entry is set true ,
//else the corresponding entry is set false .
//==================================================
@@ -1416,7 +1410,6 @@ void SwContentTree::RequestingChilds( S
}
}
- //-----IAccessibility2 Implementation 2009
}
}
}
@@ -1426,7 +1419,6 @@ void SwContentTree::RequestingChilds( S
Beschreibung: Expand - Zustand fuer Inhaltstypen merken
***************************************************************************/
-//IAccessibility2 Implementation 2009-----
//Solution: Get drawing Objects by content .
SdrObject* SwContentTree::GetDrawingObjectsByContent(const SwContent *pCnt)
{
@@ -1460,7 +1452,6 @@ SdrObject* SwContentTree::GetDrawingObje
}
return pRetObj;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent )
{
@@ -2460,7 +2451,6 @@ IMPL_LINK( SwContentTree, TimerUpdate, T
{
FindActiveTypeAndRemoveUserData();
Display(sal_True);
- //IAccessibility2 Implementation 2009-----
//Solution: Set focus
if( bIsKeySpace )
{
@@ -2468,7 +2458,6 @@ IMPL_LINK( SwContentTree, TimerUpdate, T
ShowFocus( oldRectangle);
bIsKeySpace = sal_False;
}
- //-----IAccessibility2 Implementation 2009
}
}
else if(!pView && bIsActive && !bIsIdleClear)
@@ -2691,7 +2680,6 @@ void SwContentTree::KeyInput(const KeyE
GrabFocus();
}
}
- //IAccessibility2 Implementation 2009-----
//Solution: Make KEY_SPACE has same function as DoubleClick ,
//and realize multi-selection .
else if(aCode.GetCode() == KEY_SPACE && 0 == aCode.GetModifier())
@@ -2774,7 +2762,6 @@ void SwContentTree::KeyInput(const KeyE
break;
default:
nCmpId = pTemp->GetObjIdentifier();
- //IAccessibility2 Implementation 2009-----
if ( bMark )
{
SdrPageView* pPV = pDrawView->GetSdrPageView/*GetPageViewPvNum*/(/*0*/);
@@ -2783,7 +2770,6 @@ void SwContentTree::KeyInput(const KeyE
pDrawView->MarkObj(pTemp, pPV, sal_True);
}
}
- //-----IAccessibility2 Implementation 2009
}
//mod end
}
@@ -2811,7 +2797,6 @@ void SwContentTree::KeyInput(const KeyE
}
}
- //-----IAccessibility2 Implementation 2009
else
SvTreeListBox::KeyInput(rEvent);
@@ -3574,7 +3559,6 @@ void SwContentLBoxString::Paint( const P
rDev.DrawText( rPos, GetText() );
rDev.SetFont( aOldFont );
}
- //IAccessibility2 Implementation 2009-----
// IA2 CWS. MT: Removed for now (also in SvLBoxEntry) - only used in Sw/Sd/ScContentLBoxString, they should decide if they need this
/*
else if (pEntry->IsMarked())
@@ -3592,7 +3576,6 @@ void SwContentLBoxString::Paint( const P
rDev.DrawText( rPosStar, str);
rDev.SetFont( aOldFont );
}
- //-----IAccessibility2 Implementation 2009
*/
else
SvLBoxString::Paint( rPos, rDev, nFlags, pEntry);
@@ -3614,7 +3597,6 @@ void SwContentTree::DataChanged( cons
}
-//IAccessibility2 Implementation 2009-----
sal_Int32 SwContentTree::GetEntryRealChildsNum( SvLBoxEntry* pParent ) const
{
// ist es ein Inhaltstyp?
@@ -3628,4 +3610,3 @@ sal_Int32 SwContentTree::GetEntryRealCh
}
return 0;
}
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/trunk/main/sw/source/ui/utlui/navipi.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/utlui/navipi.hrc?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/utlui/navipi.hrc (original)
+++ openoffice/trunk/main/sw/source/ui/utlui/navipi.hrc Thu Nov 28 12:17:31 2013
@@ -85,7 +85,5 @@
#define ST_POSTIT_HIDE (ST_GLOBAL_CONTEXT_FIRST +36)
#define ST_POSTIT_DELETE (ST_GLOBAL_CONTEXT_FIRST +37)
-//IAccessibility2 Implementation 2009-----
#define ST_TL_GLOBAL ST_GLOBAL_CONTEXT_FIRST +38
#define ST_TL_CONTENT ST_GLOBAL_CONTEXT_FIRST +39
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/trunk/main/sw/source/ui/utlui/navipi.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/utlui/navipi.src?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/utlui/navipi.src (original)
+++ openoffice/trunk/main/sw/source/ui/utlui/navipi.src Thu Nov 28 12:17:31 2013
@@ -532,7 +532,6 @@ ImageList IMG_NAVI_ENTRYBMPH
NAVI_ENTRY_IDS
};
-//IAccessibility2 Implementation 2009-----
String STR_ACCESS_TL_GLOBAL
{
Text [ en-US ] = "Global View";
@@ -541,5 +540,4 @@ String STR_ACCESS_TL_CONTENT
{
Text [ en-US ] = "Content View";
};
-//-----IAccessibility2 Implementation 2009
Modified: openoffice/trunk/main/sw/source/ui/utlui/poolfmt.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/utlui/poolfmt.src?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/utlui/poolfmt.src (original)
+++ openoffice/trunk/main/sw/source/ui/utlui/poolfmt.src Thu Nov 28 12:17:31 2013
@@ -734,7 +734,6 @@ String STR_POOLCHR_RUBYTEXT
{
Text [ en-US ] = "Rubies";
};
-//IAccessibility2 Implementation 2009-----
String STR_COLUMN_VALUESET_ITEM0
{
Text [ en-US ] = "1 column";
@@ -755,7 +754,6 @@ String STR_COLUMN_VALUESET_ITEM4
{
Text [ en-US ] = "2 columns with different size (left < right)";
};
-//-----IAccessibility2 Implementation 2009
String STR_POOLCHR_VERT_NUM
{
Text [ en-US ] = "Vertical Numbering Symbols";
Modified: openoffice/trunk/main/sw/source/ui/wrtsh/select.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/wrtsh/select.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/wrtsh/select.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/wrtsh/select.cxx Thu Nov 28 12:17:31 2013
@@ -46,11 +46,9 @@
#include <swdtflvr.hxx>
#include <crsskip.hxx>
-//IAccessibility2 Implementation 2009-----
#ifndef _DOC_HXX
#include <doc.hxx>
#endif
-//-----IAccessibility2 Implementation 2009
#if OSL_DEBUG_LEVEL > 1
#include <pam.hxx>
#endif
@@ -172,13 +170,11 @@ long SwWrtShell::SelAll()
SttSelect();
GoEnd(sal_True, &bMoveTable);
- //IAccessibility2 Implementation 2009-----
SwDoc *pDoc = GetDoc();
if ( pDoc )
{
pDoc->SetPrepareSelAll();
}
- //-----IAccessibility2 Implementation 2009
if( pStartPos )
{
pTmpCrsr = getShellCrsr( false );
Modified: openoffice/trunk/main/toolkit/inc/toolkit/awt/vclxwindows.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/inc/toolkit/awt/vclxwindows.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/inc/toolkit/awt/vclxwindows.hxx (original)
+++ openoffice/trunk/main/toolkit/inc/toolkit/awt/vclxwindows.hxx Thu Nov 28 12:17:31 2013
@@ -876,10 +876,8 @@ public:
class TOOLKIT_DLLPUBLIC VCLXDateField : public ::com::sun::star::awt::XDateField,
public VCLXFormattedSpinField
{
-//IAccessibility2 Impplementaton 2009-----
protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext();
-//-----IAccessibility2 Impplementaton 2009
public:
VCLXDateField();
~VCLXDateField();
@@ -926,10 +924,8 @@ public:
class VCLXTimeField : public ::com::sun::star::awt::XTimeField,
public VCLXFormattedSpinField
{
-//IAccessibility2 Impplementaton 2009-----
protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext();
-//-----IAccessibility2 Impplementaton 2009
public:
VCLXTimeField();
~VCLXTimeField();
Modified: openoffice/trunk/main/toolkit/source/awt/vclxaccessiblecomponent.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/awt/vclxaccessiblecomponent.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/awt/vclxaccessiblecomponent.cxx (original)
+++ openoffice/trunk/main/toolkit/source/awt/vclxaccessiblecomponent.cxx Thu Nov 28 12:17:31 2013
@@ -37,10 +37,8 @@
#include <toolkit/awt/vclxfont.hxx>
#include <vcl/dialog.hxx>
#include <vcl/window.hxx>
-//IAccessibility2 Implementation 2009-----
//Solution:Need methods in Edit.
#include <vcl/edit.hxx>
-//-----IAccessibility2 Implementation 2009
#include <tools/debug.hxx>
#include <unotools/accessiblestatesethelper.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
@@ -445,9 +443,7 @@ void VCLXAccessibleComponent::FillAccess
Window* pWindow = GetWindow();
if ( pWindow )
{
-//IAccessibility2 Implementation 2009-----
Window *pLabeledBy = pWindow->GetAccessibleRelationLabeledBy();
-//-----IAccessibility2 Implementation 2009
if ( pLabeledBy && pLabeledBy != pWindow )
{
uno::Sequence< uno::Reference< uno::XInterface > > aSequence(1);
@@ -462,7 +458,6 @@ void VCLXAccessibleComponent::FillAccess
aSequence[0] = pLabelFor->GetAccessible();
rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::LABEL_FOR, aSequence ) );
}
-//IAccessibility2 Implementation 2009-----
Window* pMemberOf = pWindow->GetAccessibleRelationMemberOf();
if ( pMemberOf && pMemberOf != pWindow )
{
@@ -475,7 +470,6 @@ void VCLXAccessibleComponent::FillAccess
{
rRelationSet.AddRelation( accessibility::AccessibleRelation( accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aFlowToSequence ) );
}
-//-----IAccessibility2 Implementation 2009
}
}
@@ -524,19 +518,16 @@ void VCLXAccessibleComponent::FillAccess
if ( pWindow->GetStyle() & WB_SIZEABLE )
rStateSet.AddState( accessibility::AccessibleStateType::RESIZABLE );
-//IAccessibility2 Implementation 2009-----
// 6. frame doesn't have MOVABLE state
// 10. for password text, where is the sensitive state?
if( ( getAccessibleRole() == accessibility::AccessibleRole::FRAME ||getAccessibleRole() == accessibility::AccessibleRole::DIALOG )&& pWindow->GetStyle() & WB_MOVEABLE )
rStateSet.AddState( accessibility::AccessibleStateType::MOVEABLE );
-//-----IAccessibility2 Implementation 2009
if( pWindow->IsDialog() )
{
Dialog *pDlg = static_cast< Dialog* >( pWindow );
if( pDlg->IsInExecute() )
rStateSet.AddState( accessibility::AccessibleStateType::MODAL );
}
-//IAccessibility2 Implementation 2009-----
//Solution:If a combobox or list's edit child isn't read-only,EDITABLE state
// should be set.
if( pWindow && pWindow->GetType() == WINDOW_COMBOBOX )
@@ -567,7 +558,6 @@ void VCLXAccessibleComponent::FillAccess
}
pChild = pChild->GetWindow( WINDOW_NEXT );
}
-//-----IAccessibility2 Implementation 2009
}
else
{
@@ -903,11 +893,9 @@ sal_Int32 SAL_CALL VCLXAccessibleCompone
else
aFont = pWindow->GetFont();
nColor = aFont.GetColor().GetColor();
-//IAccessibility2 Implementation 2009-----
// COL_AUTO is not very meaningful for AT
if ( nColor == (sal_Int32)COL_AUTO)
nColor = pWindow->GetTextColor().GetColor();
-//-----IAccessibility2 Implementation 2009
}
}
Modified: openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx (original)
+++ openoffice/trunk/main/toolkit/source/awt/vclxtoolkit.cxx Thu Nov 28 12:17:31 2013
@@ -632,11 +632,9 @@ void SAL_CALL VCLXToolkit::disposing()
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > VCLXToolkit::createWindow( const ::com::sun::star::awt::WindowDescriptor& rDescriptor ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
#ifdef WNT
CEnableAccessInterface e;
#endif
-//-----IAccessibility2 Implementation 2009
return ImplCreateWindow( rDescriptor, WinBits(0) );
}
Modified: openoffice/trunk/main/toolkit/source/awt/vclxwindows.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/awt/vclxwindows.cxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/awt/vclxwindows.cxx (original)
+++ openoffice/trunk/main/toolkit/source/awt/vclxwindows.cxx Thu Nov 28 12:17:31 2013
@@ -4505,7 +4505,6 @@ VCLXDateField::~VCLXDateField()
{
}
-//IAccessibility2 Implementation 2009-----
//change the window type here to match the role
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXDateField::CreateAccessibleContext()
{
@@ -4516,7 +4515,6 @@ VCLXDateField::~VCLXDateField()
}
return getAccessibleFactory().createAccessibleContext( this );
}
-//-----IAccessibility2 Implementation 2009
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any VCLXDateField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
@@ -4859,7 +4857,6 @@ VCLXTimeField::VCLXTimeField()
VCLXTimeField::~VCLXTimeField()
{
}
-//IAccessibility2 Implementation 2009-----
//change the window type here to match the role
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXTimeField::CreateAccessibleContext()
{
@@ -4870,7 +4867,6 @@ VCLXTimeField::~VCLXTimeField()
}
return getAccessibleFactory().createAccessibleContext( this );
}
-//-----IAccessibility2 Implementation 2009
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any VCLXTimeField::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
Modified: openoffice/trunk/main/vcl/inc/ilstbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/ilstbox.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/ilstbox.hxx (original)
+++ openoffice/trunk/main/vcl/inc/ilstbox.hxx Thu Nov 28 12:17:31 2013
@@ -250,10 +250,8 @@ private:
Link maDoubleClickHdl;
Link maUserDrawHdl;
Link maMRUChangedHdl;
-//IAccessibility2 Implementation 2009-----
Link maFocusHdl;
Link maListItemSelectHdl;
-//-----IAccessibility2 Implementation 2009
::vcl::QuickSelectionEngine maQuickSelectionEngine;
@@ -267,10 +265,8 @@ protected:
virtual void GetFocus();
virtual void LoseFocus();
- //IAccessibility2 Implementation 2009-----
//sal_Bool SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False );
sal_Bool SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False, sal_Bool bSelectPosChange = sal_False );
- //-----IAccessibility2 Implementation 2009
void ImplPaint( sal_uInt16 nPos, sal_Bool bErase = sal_False, bool bLayout = false );
void ImplDoPaint( const Rectangle& rRect, bool bLayout = false );
void ImplCalcMetrics();
@@ -367,13 +363,11 @@ public:
const Link& GetUserDrawHdl() const { return maUserDrawHdl; }
void SetMRUChangedHdl( const Link& rLink ) { maMRUChangedHdl = rLink; }
const Link& GetMRUChangedHdl() const { return maMRUChangedHdl; }
-//IAccessibility2 Implementation 2009-----
void SetFocusHdl( const Link& rLink ) { maFocusHdl = rLink ; }
const Link& GetFocusHdl() const { return maFocusHdl; }
void SetListItemSelectHdl( const Link& rLink ) { maListItemSelectHdl = rLink ; }
const Link& GetListItemSelectHdl() const { return maListItemSelectHdl; }
-//-----IAccessibility2 Implementation 2009
bool IsSelectionChanged() const { return mbSelectionChanged; }
sal_uInt16 GetSelectModifier() const { return mnSelectModifier; }
@@ -510,12 +504,10 @@ public:
void SetUserDrawHdl( const Link& rLink ) { maLBWindow.SetUserDrawHdl( rLink ); }
const Link& GetUserDrawHdl() const { return maLBWindow.GetUserDrawHdl(); }
-//IAccessibility2 Implementation 2009-----
void SetFocusHdl( const Link& rLink ) { maLBWindow.SetFocusHdl( rLink ); }
const Link& GetFocusHdl() const { return maLBWindow.GetFocusHdl(); }
void SetListItemSelectHdl( const Link& rLink ) { maLBWindow.SetListItemSelectHdl( rLink ); }
const Link& GetListItemSelectHdl() const { return maLBWindow.GetListItemSelectHdl(); }
-//-----IAccessibility2 Implementation 2009
void SetSelectionChangedHdl( const Link& rLnk ) { maLBWindow.GetEntryList()->SetSelectionChangedHdl( rLnk ); }
void SetCallSelectionChangedHdl( sal_Bool bCall ) { maLBWindow.GetEntryList()->SetCallSelectionChangedHdl( bCall ); }
sal_Bool IsSelectionChanged() const { return maLBWindow.IsSelectionChanged(); }
Modified: openoffice/trunk/main/vcl/inc/svdata.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/svdata.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/svdata.hxx (original)
+++ openoffice/trunk/main/vcl/inc/svdata.hxx Thu Nov 28 12:17:31 2013
@@ -182,9 +182,7 @@ struct ImplSVAppData
*/
ImeStatusWindowMode meShowImeStatusWindow;
-//IAccessibility2 Implementation 2009-----
long m_bEnableAccessInterface;
-//-----IAccessibility2 Implementation 2009
DECL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void* );
};
Modified: openoffice/trunk/main/vcl/inc/vcl/combobox.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/combobox.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/vcl/combobox.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/combobox.hxx Thu Nov 28 12:17:31 2013
@@ -67,9 +67,7 @@ private:
DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* );
DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent* );
DECL_DLLPRIVATE_LINK( ImplAutocompleteHdl, Edit* );
- //IAccessibility2 Implementation 2009-----
DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* );
- //-----IAccessibility2 Implementation 2009
protected:
using Window::ImplInit;
@@ -185,9 +183,7 @@ public:
XubString GetMRUEntries( xub_Unicode cSep = ';' ) const;
void SetMaxMRUCount( sal_uInt16 n );
sal_uInt16 GetMaxMRUCount() const;
-//IAccessibility2 Implementation 2009-----
sal_uInt16 GetMRUCount() const;
-//-----IAccessibility2 Implementation 2009
void SetEntryData( sal_uInt16 nPos, void* pNewData );
void* GetEntryData( sal_uInt16 nPos ) const;
@@ -227,9 +223,7 @@ public:
*/
using Control::GetIndexForPoint;
long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPos ) const;
-//IAccessibility2 Implementation 2009-----
void SetMpSubEditAccessibleName(String &aName);
-//-----IAccessibility2 Implementation 2009
};
#endif // _COMBOBOX_HXX
Modified: openoffice/trunk/main/vcl/inc/vcl/lstbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/lstbox.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/vcl/lstbox.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/lstbox.hxx Thu Nov 28 12:17:31 2013
@@ -67,10 +67,8 @@ private:
DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, void* );
DECL_DLLPRIVATE_LINK( ImplSelectionChangedHdl, void* );
DECL_DLLPRIVATE_LINK( ImplUserDrawHdl, UserDrawEvent* );
-//IAccessibility2 Implementation 2009-----
DECL_DLLPRIVATE_LINK( ImplFocusHdl, void* );
DECL_DLLPRIVATE_LINK( ImplListItemSelectHdl , void* );
-//-----IAccessibility2 Implementation 2009
protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
@@ -220,9 +218,7 @@ public:
XubString GetMRUEntries( xub_Unicode cSep = ';' ) const;
void SetMaxMRUCount( sal_uInt16 n );
sal_uInt16 GetMaxMRUCount() const;
-//IAccessibility2 Implementation 2009-----
sal_uInt16 GetMRUCount() const;
-//-----IAccessibility2 Implementation 2009
sal_uInt16 GetDisplayLineCount() const;
void EnableMirroring();
Modified: openoffice/trunk/main/vcl/inc/vcl/menu.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/menu.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/vcl/menu.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/menu.hxx Thu Nov 28 12:17:31 2013
@@ -151,9 +151,7 @@ private:
sal_uInt16 nMenuFlags;
sal_uInt16 nDefaultItem; // Id vom Default-Item
sal_uInt16 nSelectedId;
-//IAccessibility2 Implementation 2009-----
sal_uInt16 nHighlightedItem;
-//-----IAccessibility2 Implementation 2009
// Fuer Ausgabe:
sal_uInt16 nCheckPos;
sal_uInt16 nImagePos;
@@ -244,14 +242,12 @@ public:
sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
MenuItemType GetItemType( sal_uInt16 nPos ) const;
sal_uInt16 GetCurItemId() const;
-//IAccessibility2 Implementation 2009-----
void SetHightlightItem( sal_uInt16 nHighlightedItem );
sal_uInt16 GetHighlightItem() const;
XubString GetItemAccKeyStrFromPos(sal_uInt16 nPos ) const ;
sal_Bool IsTemporaryItemFromPos(sal_uInt16 nPos ) const;
-//-----IAccessibility2 Implementation 2009
void SetDefaultItem( sal_uInt16 nItemId ) { nDefaultItem = nItemId; }
sal_uInt16 GetDefaultItem() const { return nDefaultItem; }
@@ -380,9 +376,7 @@ public:
void SetAccessibleDescription( sal_uInt16 nItemId, const XubString& rStr );
XubString GetAccessibleDescription( sal_uInt16 nItemId ) const;
-//IAccessibility2 Implementation 2009
Menu* GetStartedFromMenu(){ return pStartedFrom ;}
-//-----IAccessibility2 Implementation 2009
// returns whether the item a position nItemPos is highlighted or not.
bool IsHighlighted( sal_uInt16 nItemPos ) const;
Modified: openoffice/trunk/main/vcl/inc/vcl/svapp.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/svapp.hxx?rev=1546355&r1=1546354&r2=1546355&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/vcl/svapp.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/svapp.hxx Thu Nov 28 12:17:31 2013
@@ -448,10 +448,8 @@ public:
static void ShowNativeErrorBox(const String& sTitle ,
const String& sMessage);
-//IAccessibility2 Implementation 2009-----
static bool EnableAccessInterface(bool bEnable);
static bool IsEnableAccessInterface();
-//-----IAccessibility2 Implementation 2009
// IME Status Window Control:
@@ -518,7 +516,6 @@ inline void Application::EndYield()
PostUserEvent( Link() );
}
-//IAccessibility2 Implementation 2009-----
#ifdef WNT
VCL_DLLPUBLIC sal_Bool HasAtHook();
VCL_DLLPUBLIC bool IsWNTInitAccessBridge();
@@ -540,5 +537,4 @@ private:
bool m_bIsEnableAccessInterface;
};
#endif
-//-----IAccessibility2 Implementation 2009
#endif // _APP_HXX