[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - accessibility/inc accessibility/source chart2/source cui/source editeng/inc editeng/source formula/source framework/source offapi/com sc/inc sc/source sd/inc sd/source sfx2/inc sfx2/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/source toolkit/inc toolkit/source vcl/inc vcl/source vcl/win winaccessibility/inc winaccessibility/source
Herbert Dürr
hdu at apache.org
Thu Nov 28 06:08:31 PST 2013
accessibility/inc/accessibility/extended/accessiblelistbox.hxx | 1
accessibility/inc/accessibility/extended/textwindowaccessibility.hxx | 3
accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx | 1
accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 1
accessibility/source/extended/accessiblelistboxentry.cxx | 8
accessibility/source/extended/textwindowaccessibility.cxx | 1
accessibility/source/helper/accessiblestrings.src | 2
accessibility/source/standard/vclxaccessiblecheckbox.cxx | 2
accessibility/source/standard/vclxaccessiblelist.cxx | 5
accessibility/source/standard/vclxaccessiblelistitem.cxx | 1
accessibility/source/standard/vclxaccessiblemenuitem.cxx | 2
accessibility/source/standard/vclxaccessiblescrollbar.cxx | 1
accessibility/source/standard/vclxaccessibletabcontrol.cxx | 1
chart2/source/controller/accessibility/AccessibleBase.cxx | 2
chart2/source/controller/dialogs/res_LegendPosition.hxx | 3
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 4
chart2/source/inc/Strings.hrc | 2
cui/source/customize/cfg.cxx | 4
cui/source/customize/cfg.hrc | 2
cui/source/customize/cfg.src | 2
cui/source/dialogs/cuigrfflt.cxx | 3
cui/source/dialogs/hlmarkwn.hrc | 2
cui/source/dialogs/linkdlg.cxx | 2
cui/source/options/optlingu.hrc | 2
cui/source/options/optlingu.src | 1
cui/source/tabpages/autocdlg.cxx | 1
cui/source/tabpages/autocdlg.hrc | 2
cui/source/tabpages/connect.hrc | 1
cui/source/tabpages/paragrph.hrc | 2
cui/source/tabpages/tabarea.hrc | 2
cui/source/tabpages/tabarea.src | 6
cui/source/tabpages/tabline.hrc | 4
cui/source/tabpages/tabstpge.hrc | 2
cui/source/tabpages/tparea.cxx | 2
editeng/inc/editeng/AccessibleEditableTextPara.hxx | 4
editeng/inc/editeng/editdata.hxx | 2
editeng/inc/editeng/editeng.hxx | 4
editeng/inc/editeng/editview.hxx | 2
editeng/inc/editeng/splwrap.hxx | 4
editeng/inc/editeng/unoedhlp.hxx | 4
editeng/inc/editeng/unoedprx.hxx | 1
editeng/inc/editeng/unoedsrc.hxx | 6
editeng/inc/editeng/unofored.hxx | 2
editeng/inc/editeng/unoforou.hxx | 2
editeng/inc/editeng/unotext.hxx | 2
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 41 ----
editeng/source/accessibility/AccessibleHyperlink.cxx | 2
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 34 ---
editeng/source/editeng/edtspell.cxx | 2
editeng/source/editeng/impedit.cxx | 2
editeng/source/editeng/impedit2.cxx | 2
editeng/source/uno/unoedhlp.cxx | 9
editeng/source/uno/unoedprx.cxx | 4
editeng/source/uno/unonrule.cxx | 2
formula/source/ui/dlg/formdlgs.src | 4
formula/source/ui/dlg/formula.cxx | 2
formula/source/ui/dlg/funcutl.cxx | 3
framework/source/loadenv/loadenv.cxx | 2
offapi/com/sun/star/accessibility/AccessibleEventId.idl | 2
sc/inc/chgtrack.hxx | 2
sc/inc/detfunc.hxx | 2
sc/inc/document.hxx | 4
sc/inc/drwlayer.hxx | 2
sc/inc/sc.hrc | 2
sc/inc/table.hxx | 2
sc/source/core/data/documen2.cxx | 6
sc/source/core/data/document.cxx | 2
sc/source/core/data/drwlayer.cxx | 2
sc/source/core/data/table2.cxx | 2
sc/source/core/tool/detfunc.cxx | 2
sc/source/ui/Accessibility/AccessibleCell.cxx | 16 -
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 10 -
sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx | 22 --
sc/source/ui/Accessibility/AccessibleDocument.cxx | 42 ----
sc/source/ui/Accessibility/AccessibleDocumentBase.cxx | 2
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 2
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 8
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 64 ------
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 8
sc/source/ui/Accessibility/AccessibleText.cxx | 10 -
sc/source/ui/app/inputhdl.cxx | 2
sc/source/ui/dbgui/dbnamdlg.cxx | 6
sc/source/ui/dbgui/scendlg.hrc | 2
sc/source/ui/docshell/docsh.cxx | 4
sc/source/ui/drawfunc/fudraw.cxx | 2
sc/source/ui/inc/AccessibleCell.hxx | 8
sc/source/ui/inc/AccessibleCellBase.hxx | 2
sc/source/ui/inc/AccessibleDocument.hxx | 10 -
sc/source/ui/inc/AccessibleDocumentBase.hxx | 2
sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 2
sc/source/ui/inc/AccessibleEditObject.hxx | 9
sc/source/ui/inc/AccessibleSpreadsheet.hxx | 6
sc/source/ui/inc/AccessibleTableBase.hxx | 6
sc/source/ui/inc/AccessibleText.hxx | 4
sc/source/ui/inc/condfrmt.hrc | 2
sc/source/ui/inc/content.hxx | 10 -
sc/source/ui/inc/dbnamdlg.hxx | 2
sc/source/ui/inc/docsh.hxx | 2
sc/source/ui/inc/drawview.hxx | 2
sc/source/ui/inc/filter.hrc | 2
sc/source/ui/inc/gridwin.hxx | 4
sc/source/ui/inc/preview.hxx | 2
sc/source/ui/inc/scuitphfedit.hxx | 2
sc/source/ui/inc/tabvwsh.hxx | 4
sc/source/ui/inc/tphfedit.hxx | 4
sc/source/ui/inc/viewfunc.hxx | 2
sc/source/ui/miscdlgs/highred.cxx | 2
sc/source/ui/miscdlgs/solveroptions.cxx | 4
sc/source/ui/navipi/content.cxx | 20 --
sc/source/ui/navipi/navipi.cxx | 4
sc/source/ui/pagedlg/scuitphfedit.cxx | 4
sc/source/ui/pagedlg/tphfedit.cxx | 6
sc/source/ui/view/drawview.cxx | 4
sc/source/ui/view/gridwin.cxx | 10 -
sc/source/ui/view/gridwin3.cxx | 2
sc/source/ui/view/gridwin5.cxx | 10 -
sc/source/ui/view/output.cxx | 2
sc/source/ui/view/preview.cxx | 8
sc/source/ui/view/select.cxx | 2
sc/source/ui/view/tabview2.cxx | 2
sc/source/ui/view/tabvwsh.cxx | 4
sc/source/ui/view/tabvwsh4.cxx | 12 -
sc/source/ui/view/tabvwshe.cxx | 6
sc/source/ui/view/viewfun2.cxx | 6
sd/inc/drawdoc.hxx | 4
sd/inc/glob.hxx | 2
sd/source/core/drawdoc2.cxx | 2
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 12 -
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx | 18 -
sd/source/ui/accessibility/AccessibleOutlineEditSource.cxx | 2
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 8
sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx | 2
sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx | 2
sd/source/ui/accessibility/AccessiblePresentationShape.cxx | 8
sd/source/ui/accessibility/accessibility.hrc | 2
sd/source/ui/accessibility/accessibility.src | 2
sd/source/ui/dlg/custsdlg.src | 2
sd/source/ui/dlg/navigatr.cxx | 8
sd/source/ui/dlg/sdtreelb.cxx | 14 -
sd/source/ui/docshell/docshel4.cxx | 8
sd/source/ui/func/fudraw.cxx | 2
sd/source/ui/func/fuediglu.cxx | 6
sd/source/ui/func/fusel.cxx | 6
sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 8
sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 12 -
sd/source/ui/inc/AccessibleOutlineView.hxx | 2
sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx | 4
sd/source/ui/inc/AccessiblePresentationOLEShape.hxx | 4
sd/source/ui/inc/AccessiblePresentationShape.hxx | 2
sd/source/ui/inc/AccessibleSlideSorterView.hxx | 1
sd/source/ui/inc/AccessibleSlideView.hxx | 12 -
sd/source/ui/inc/DrawController.hxx | 6
sd/source/ui/inc/DrawDocShell.hxx | 4
sd/source/ui/inc/DrawViewShell.hxx | 6
sd/source/ui/inc/OutlineViewShell.hxx | 2
sd/source/ui/inc/SlideSorterViewShell.hxx | 2
sd/source/ui/inc/SlideViewShell.hxx | 4
sd/source/ui/inc/TabControl.hxx | 2
sd/source/ui/inc/ViewShell.hxx | 2
sd/source/ui/inc/Window.hxx | 2
sd/source/ui/inc/animobjs.hrc | 2
sd/source/ui/inc/fuediglu.hxx | 2
sd/source/ui/inc/fusel.hxx | 4
sd/source/ui/inc/navigatr.hrc | 4
sd/source/ui/inc/navigatr.hxx | 2
sd/source/ui/inc/sdtreelb.hxx | 12 -
sd/source/ui/inc/strings.hrc | 2
sd/source/ui/inc/tpaction.hrc | 2
sd/source/ui/slideshow/showwin.cxx | 2
sd/source/ui/slideshow/showwindow.hxx | 1
sd/source/ui/slideshow/slideshow.cxx | 6
sd/source/ui/slideshow/slideshowimpl.cxx | 4
sd/source/ui/slidesorter/controller/SlsFocusManager.cxx | 2
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 4
sd/source/ui/unoidl/DrawController.cxx | 4
sd/source/ui/unoidl/SdUnoDrawView.cxx | 2
sd/source/ui/view/Outliner.cxx | 2
sd/source/ui/view/drviews4.cxx | 10 -
sd/source/ui/view/drviews5.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 4
sd/source/ui/view/sdwindow.cxx | 6
sd/source/ui/view/tabcontr.cxx | 2
sd/source/ui/view/viewshel.cxx | 8
sfx2/inc/sfx2/sfx.hrc | 2
sfx2/source/dialog/dinfdlg.hrc | 2
sfx2/source/dialog/passwd.hrc | 2
sfx2/source/dialog/tabdlg.cxx | 1
sfx2/source/menu/mnuitem.cxx | 4
sfx2/source/view/viewfrm.cxx | 4
svtools/inc/svtools/accessibleruler.hxx | 2
svtools/inc/svtools/headbar.hxx | 7
svtools/inc/svtools/ruler.hxx | 6
svtools/inc/svtools/svlbitm.hxx | 5
svtools/inc/svtools/svlbox.hxx | 2
svtools/inc/svtools/svtools.hrc | 1
svtools/inc/svtools/svtreebx.hxx | 2
svtools/inc/svtools/texteng.hxx | 1
svtools/source/brwbox/brwbox3.cxx | 4
svtools/source/brwbox/editbrowsebox.cxx | 2
svtools/source/contnr/imivctl1.cxx | 2
svtools/source/contnr/svimpbox.cxx | 12 -
svtools/source/contnr/svtabbx.cxx | 5
svtools/source/contnr/svtreebx.cxx | 15 -
svtools/source/control/accessibleruler.cxx | 2
svtools/source/control/headbar.cxx | 8
svtools/source/control/ruler.cxx | 8
svtools/source/control/valueacc.cxx | 10 -
svtools/source/control/valueimp.hxx | 2
svtools/source/control/valueset.cxx | 4
svtools/source/control/vclxaccessibleheaderbar.cxx | 2
svtools/source/control/vclxaccessibleheaderbaritem.cxx | 2
svtools/source/edit/svmedit.cxx | 4
svtools/source/inc/filectrl.hrc | 2
svtools/source/misc/acceleratorexecute.cxx | 4
svtools/source/misc/embedhlp.cxx | 4
svx/inc/svx/AccessibleControlShape.hxx | 2
svx/inc/svx/AccessibleGraphicShape.hxx | 1
svx/inc/svx/AccessibleOLEShape.hxx | 2
svx/inc/svx/AccessibleShape.hxx | 10 -
svx/inc/svx/AccessibleTableShape.hxx | 13 -
svx/inc/svx/ChildrenManager.hxx | 2
svx/inc/svx/EnhancedCustomShapeTypeNames.hxx | 1
svx/inc/svx/IAccessibleParent.hxx | 4
svx/inc/svx/ctredlin.hxx | 2
svx/inc/svx/dialogs.hrc | 4
svx/inc/svx/dlgctrl.hxx | 7
svx/inc/svx/sdr/table/tablecontroller.hxx | 2
svx/inc/svx/srchdlg.hxx | 4
svx/inc/svx/svdmodel.hxx | 4
svx/inc/svx/svdmrkv.hxx | 2
svx/inc/svx/svdoashp.hxx | 2
svx/inc/svx/svdoole2.hxx | 2
svx/inc/svx/svdstr.hrc | 2
svx/source/accessibility/AccessibleControlShape.cxx | 10 -
svx/source/accessibility/AccessibleFrameSelector.cxx | 4
svx/source/accessibility/AccessibleGraphicShape.cxx | 6
svx/source/accessibility/AccessibleOLEShape.cxx | 4
svx/source/accessibility/AccessibleShape.cxx | 38 ----
svx/source/accessibility/AccessibleTextHelper.cxx | 16 -
svx/source/accessibility/ChildrenManager.cxx | 2
svx/source/accessibility/ChildrenManagerImpl.cxx | 18 -
svx/source/accessibility/ChildrenManagerImpl.hxx | 4
svx/source/accessibility/ShapeTypeHandler.cxx | 4
svx/source/accessibility/charmapacc.cxx | 14 -
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 2
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 22 --
svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 2
svx/source/dialog/_bmpmask.cxx | 16 -
svx/source/dialog/bmpmask.hrc | 2
svx/source/dialog/ctredlin.cxx | 2
svx/source/dialog/ctredlin.hrc | 2
svx/source/dialog/ctredlin.src | 6
svx/source/dialog/dlgctrl.cxx | 16 -
svx/source/dialog/dlgctrl.src | 2
svx/source/dialog/frmsel.cxx | 12 -
svx/source/dialog/sdstring.src | 2
svx/source/dialog/srchdlg.cxx | 4
svx/source/inc/svxrectctaccessiblecontext.hxx | 12 -
svx/source/svdraw/svdoashp.cxx | 2
svx/source/svdraw/svdoole2.cxx | 2
svx/source/svdraw/svdstr.src | 2
svx/source/table/accessiblecell.cxx | 4
svx/source/table/accessibletableshape.cxx | 40 ----
svx/source/table/tablecontroller.cxx | 2
svx/source/tbxctrls/colrctrl.src | 2
svx/source/tbxctrls/tbcontrl.src | 2
svx/source/unodraw/unoprov.cxx | 1
svx/source/unodraw/unoshtxt.cxx | 3
sw/inc/PostItMgr.hxx | 2
sw/inc/access.hrc | 2
sw/inc/accmap.hxx | 12 -
sw/inc/crsrsh.hxx | 2
sw/inc/doc.hxx | 6
sw/inc/docsh.hxx | 2
sw/inc/fesh.hxx | 2
sw/inc/fldbas.hxx | 2
sw/inc/frmfmt.hxx | 10 -
sw/inc/ndole.hxx | 2
sw/inc/node.hxx | 2
sw/inc/poolfmt.hrc | 2
sw/inc/tblsel.hxx | 2
sw/inc/unomap.hxx | 2
sw/inc/viewsh.hxx | 2
sw/source/core/access/acccell.cxx | 18 -
sw/source/core/access/acccell.hxx | 6
sw/source/core/access/acccontext.cxx | 30 ---
sw/source/core/access/acccontext.hxx | 8
sw/source/core/access/accdoc.cxx | 20 --
sw/source/core/access/accdoc.hxx | 10 -
sw/source/core/access/accembedded.cxx | 6
sw/source/core/access/accembedded.hxx | 6
sw/source/core/access/accfootnote.cxx | 2
sw/source/core/access/accframe.cxx | 4
sw/source/core/access/accframe.hxx | 2
sw/source/core/access/accframebase.cxx | 12 -
sw/source/core/access/accframebase.hxx | 5
sw/source/core/access/accfrmobj.cxx | 4
sw/source/core/access/accfrmobj.hxx | 2
sw/source/core/access/accfrmobjmap.cxx | 93 ----------
sw/source/core/access/accfrmobjmap.hxx | 8
sw/source/core/access/accgraphic.cxx | 4
sw/source/core/access/accgraphic.hxx | 2
sw/source/core/access/accheaderfooter.cxx | 2
sw/source/core/access/accheaderfooter.hxx | 2
sw/source/core/access/acchyperlink.cxx | 14 -
sw/source/core/access/accmap.cxx | 54 -----
sw/source/core/access/accnotextframe.cxx | 10 -
sw/source/core/access/accnotextframe.hxx | 6
sw/source/core/access/accpara.cxx | 57 ------
sw/source/core/access/accpara.hxx | 18 -
sw/source/core/access/accportions.cxx | 9
sw/source/core/access/accportions.hxx | 6
sw/source/core/access/accpreview.cxx | 6
sw/source/core/access/accpreview.hxx | 2
sw/source/core/access/accselectionhelper.cxx | 12 -
sw/source/core/access/acctable.cxx | 22 --
sw/source/core/access/acctable.hxx | 8
sw/source/core/access/acctextframe.cxx | 6
sw/source/core/access/acctextframe.hxx | 4
sw/source/core/attr/format.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 4
sw/source/core/doc/tblcpy.cxx | 2
sw/source/core/docnode/node.cxx | 6
sw/source/core/docnode/nodes.cxx | 2
sw/source/core/frmedt/feshview.cxx | 2
sw/source/core/frmedt/tblsel.cxx | 4
sw/source/core/inc/SwPortionHandler.hxx | 2
sw/source/core/inc/doctxm.hxx | 2
sw/source/core/inc/frame.hxx | 8
sw/source/core/inc/txtfrm.hxx | 4
sw/source/core/inc/viewimp.hxx | 2
sw/source/core/layout/wsfrm.cxx | 2
sw/source/core/ole/ndole.cxx | 2
sw/source/core/text/frmform.cxx | 4
sw/source/core/text/porfld.cxx | 4
sw/source/core/text/porfld.hxx | 2
sw/source/core/text/txtfld.cxx | 10 -
sw/source/core/unocore/unomap.cxx | 4
sw/source/core/view/viewimp.cxx | 2
sw/source/ui/app/docsh.cxx | 6
sw/source/ui/cctrl/actctrl.cxx | 2
sw/source/ui/cctrl/swlbox.cxx | 2
sw/source/ui/chrdlg/swuiccoll.cxx | 2
sw/source/ui/config/optpage.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 2
sw/source/ui/docvw/access.src | 2
sw/source/ui/docvw/edtwin.cxx | 2
sw/source/ui/docvw/edtwin3.cxx | 2
sw/source/ui/frmdlg/column.cxx | 4
sw/source/ui/frmdlg/column.hrc | 4
sw/source/ui/frmdlg/column.src | 2
sw/source/ui/frmdlg/frmpage.cxx | 10 -
sw/source/ui/inc/conttree.hxx | 8
sw/source/ui/inc/edtwin.hxx | 2
sw/source/ui/inc/pview.hxx | 5
sw/source/ui/inc/swlbox.hxx | 1
sw/source/ui/inc/swuicnttab.hxx | 6
sw/source/ui/inc/view.hxx | 2
sw/source/ui/index/cnttab.cxx | 18 -
sw/source/ui/index/cnttab.hrc | 2
sw/source/ui/index/cnttab.src | 6
sw/source/ui/misc/glossary.hrc | 2
sw/source/ui/misc/glossary.src | 2
sw/source/ui/misc/insfnote.hrc | 2
sw/source/ui/misc/insfnote.src | 2
sw/source/ui/ribbar/inputwin.cxx | 2
sw/source/ui/ribbar/inputwin.hrc | 2
sw/source/ui/ribbar/inputwin.src | 2
sw/source/ui/ribbar/workctrl.cxx | 2
sw/source/ui/shells/textsh1.cxx | 4
sw/source/ui/table/convert.hrc | 2
sw/source/ui/table/convert.src | 2
sw/source/ui/table/tabledlg.cxx | 2
sw/source/ui/table/tabledlg.hrc | 2
sw/source/ui/uiview/pview.cxx | 11 -
sw/source/ui/uiview/view.cxx | 2
sw/source/ui/uiview/view2.cxx | 4
sw/source/ui/uiview/viewsrch.cxx | 8
sw/source/ui/utlui/content.cxx | 20 --
sw/source/ui/utlui/navipi.hrc | 2
sw/source/ui/utlui/navipi.src | 2
sw/source/ui/utlui/poolfmt.src | 2
sw/source/ui/wrtsh/select.cxx | 4
toolkit/inc/toolkit/awt/vclxwindows.hxx | 4
toolkit/source/awt/vclxaccessiblecomponent.cxx | 12 -
toolkit/source/awt/vclxtoolkit.cxx | 2
toolkit/source/awt/vclxwindows.cxx | 4
vcl/inc/ilstbox.hxx | 8
vcl/inc/svdata.hxx | 2
vcl/inc/vcl/combobox.hxx | 6
vcl/inc/vcl/lstbox.hxx | 4
vcl/inc/vcl/menu.hxx | 6
vcl/inc/vcl/svapp.hxx | 4
vcl/inc/vcl/vclevent.hxx | 7
vcl/inc/vcl/window.hxx | 2
vcl/source/app/svapp.cxx | 6
vcl/source/app/svdata.cxx | 10 -
vcl/source/app/svmain.cxx | 4
vcl/source/control/combobox.cxx | 8
vcl/source/control/edit.cxx | 6
vcl/source/control/ilstbox.cxx | 10 -
vcl/source/control/lstbox.cxx | 8
vcl/source/control/morebtn.cxx | 6
vcl/source/control/tabctrl.cxx | 4
vcl/source/window/btndlg.cxx | 2
vcl/source/window/dlgctrl.cxx | 3
vcl/source/window/menu.cxx | 11 -
vcl/source/window/toolbox.cxx | 2
vcl/source/window/toolbox2.cxx | 2
vcl/source/window/window.cxx | 13 -
vcl/win/source/window/salframe.cxx | 8
winaccessibility/inc/AccContainerEventListener.hxx | 2
winaccessibility/source/service/AccComponentEventListener.cxx | 2
winaccessibility/source/service/AccContainerEventListener.cxx | 2
winaccessibility/source/service/AccObject.cxx | 4
416 files changed, 17 insertions(+), 2338 deletions(-)
New commits:
commit b8354e209b88f3375635f20542096ed1dac24ba8
Author: Herbert Dürr <hdu at apache.org>
Date: Thu Nov 28 12:57:57 2013 +0000
#i123768# minor whitespace fixes needed after comment-removal
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 3972a86..0251bcd 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -136,7 +136,8 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
bIsFormatting = sal_False;
bFormatted = sal_False;
bUpdate = sal_True;
- bUpdateForAcc = TRUE; bUseAutoColor = sal_True;
+ bUpdateForAcc = TRUE;
+ bUseAutoColor = sal_True;
bForceAutoColor = sal_False;
bAddExtLeading = sal_False;
bUndoEnabled = sal_True;
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index f79cbd5..799c33e 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -163,87 +163,3 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
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
-::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 );
-}
-
-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() )
- {
- if( !bVisibleOnly || aLower.GetBox().IsOver( rVisArea ) )
- insert( nPos++, aLower.GetBounds().Pos(), aLower );
- 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();
- if( aLower.GetBox().IsOver( rVisArea ) )
- insert( aLower.GetSdrObject(), aLower, pDoc , aLower.GetBounds().Pos() );
- }
- }
- }
- 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();
- if( aLower.IsBoundAsChar() &&
- (!bVisibleOnly || aLower.GetBox().IsOver( rVisArea )) )
- insert( aLower.GetSdrObject(), aLower, pDoc , Point(aLower.GetAnchorPosition(),0) );
- }
- }
- }
-}
-
-*/
-
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 8628d20..437b2f6 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1703,7 +1703,8 @@ SwAccessibleMap::SwAccessibleMap( ViewShell *pSh ) :
mnFootnote( 1 ),
mnEndnote( 1 ),
mbShapeSelected( sal_False ),
- mpSeletedFrmMap(NULL){
+ mpSeletedFrmMap(NULL)
+{
pSh->GetLayout()->AddAccessibleShell();
}
@@ -1823,7 +1824,8 @@ SwAccessibleMap::~SwAccessibleMap()
mpEvents = 0;
}
mpVSh->GetLayout()->RemoveAccessibleShell();
- delete mpSeletedFrmMap;}
+ delete mpSeletedFrmMap;
+}
uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
sal_Bool bPagePreview )
@@ -2434,7 +2436,8 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
{
::vos::ORef< SwAccessibleContext > xAccImpl;
::vos::ORef< SwAccessibleContext > xParentAccImpl;
- const SwFrm *pParent =NULL; {
+ const SwFrm *pParent =NULL;
+ {
vos::OGuard aGuard( maMutex );
if( mpFrmMap )
@@ -2456,7 +2459,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
{
// Otherwise we look if the parent is accessible.
// If not, there is nothing to do.
- pParent = SwAccessibleFrame::GetParent( aFrmOrObj,
+ pParent = SwAccessibleFrame::GetParent( aFrmOrObj,
GetShell()->IsPreView());
if( pParent )
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 23ab6dd..ac0c5f1 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1816,7 +1816,8 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes(
const ::rtl::OUString& rText = GetString();
- if( ! IsValidChar( nIndex, rText.getLength()+1 ) ) throw lang::IndexOutOfBoundsException();
+ if( ! IsValidChar( nIndex, rText.getLength()+1 ) )
+ throw lang::IndexOutOfBoundsException();
bool bSupplementalMode = false;
uno::Sequence< ::rtl::OUString > aNames = aRequestedAttributes;
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index ec94105..4e5bd51 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -45,7 +45,8 @@ class SwTxtNode;
class SwPaM;
class SwAccessiblePortionData;
class SwAccessibleHyperTextData;
-class SwRedline;class SwXTextPortion;
+class SwRedline;
+class SwXTextPortion;
// --> OD 2010-02-19 #i108125#
class SwParaChangeTrackingInfo;
// <--
diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx
index b75f637..30b4446 100644
--- a/sw/source/ui/uiview/pview.cxx
+++ b/sw/source/ui/uiview/pview.cxx
@@ -1295,7 +1295,8 @@ void SwPagePreView::Init(const SwViewOption * pPrefs)
SwPagePreView::SwPagePreView(SfxViewFrame *pViewFrame, SfxViewShell* pOldSh):
SfxViewShell( pViewFrame, SWVIEWFLAGS ),
- pViewWin( new SwPagePreViewWin(&(GetViewFrame())->GetWindow(), *this ) ), nNewPage(USHRT_MAX),
+ pViewWin( new SwPagePreViewWin(&(GetViewFrame())->GetWindow(), *this ) ),
+ nNewPage(USHRT_MAX),
pHScrollbar(0),
pVScrollbar(0),
pPageUpBtn(0),
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 6bfc3d8..ebe1742 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -897,7 +897,8 @@ SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) :
bIsOutlineMoveable(sal_True),
bViewHasChanged(sal_False),
bIsImageListInitialized(sal_False),
- bIsKeySpace(sal_False){
+ bIsKeySpace(sal_False)
+{
sal_uInt16 i;
SetHelpId(HID_NAVIGATOR_TREELIST);
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index 098030c..4e7c78a 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -153,9 +153,6 @@ void MoreButton::Click()
mbState = !mbState;
ShowState();
- // Hier den Click-Handler rufen, damit vorher die Controls initialisiert
- // werden koennen
- //PushButton::Click();
// Je nach Status die Fenster updaten
if ( mbState )
{
diff --git a/winaccessibility/source/service/AccComponentEventListener.cxx b/winaccessibility/source/service/AccComponentEventListener.cxx
index 94e2b12..ce7f558 100644
--- a/winaccessibility/source/service/AccComponentEventListener.cxx
+++ b/winaccessibility/source/service/AccComponentEventListener.cxx
@@ -192,7 +192,8 @@ void AccComponentEventListener::setComponentState(short state, bool enable )
pAgent->DecreaseState( pAccessible, AccessibleStateType::DEFUNC);
// 8. label should have no FOCUSABLE state state, Firefox has READONLY state, we can also have.
if( getRole() != AccessibleRole::LABEL
- && getRole() != AccessibleRole::SCROLL_BAR) pAgent->IncreaseState( pAccessible, AccessibleStateType::FOCUSABLE);
+ && getRole() != AccessibleRole::SCROLL_BAR)
+ pAgent->IncreaseState( pAccessible, AccessibleStateType::FOCUSABLE);
}
else
{
commit 8591dbcbac2dadd492faab5618ac7b1810bc8304
Author: Herbert Dürr <hdu at apache.org>
Date: Thu Nov 28 12:17:31 2013 +0000
#i123768# [ia2] remove pseudo-automatic noisy comments
diff --git a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
index d4beb37..7298070 100644
--- a/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
+++ b/accessibility/inc/accessibility/extended/accessiblelistbox.hxx
@@ -116,7 +116,6 @@ namespace accessibility
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- // IA2 CWS
sal_Int32 SAL_CALL getRoleType();
private:
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 1b47dc6..6c58efb 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -52,7 +52,6 @@
#include <comphelper/accessibletexthelper.hxx>
#include <rtl/ref.hxx>
-// IAccessible2 implementation, 2009
#ifndef _SVTOOLS_HRC
#include "svtools/svtools.hrc"
#endif
@@ -594,7 +593,6 @@ private:
virtual ::css::uno::Reference< ::css::accessibility::XAccessible >
SAL_CALL getAccessibleAtPoint(::css::awt::Point const & rPoint)
throw (::css::uno::RuntimeException);
-// IAccessible2 implementation, 2009
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet );
// ??? Will be called with both the external (Solar) and internal mutex
@@ -648,7 +646,6 @@ private:
void handleSelectionChangeNotification();
void notifySelectionChange( sal_Int32 nFirst, sal_Int32 nLast );
-// IAccessible2 implementation, 2009
::sal_Int32 getSelectionType(::sal_Int32 nNewFirstPara, ::sal_Int32 nNewFirstPos, ::sal_Int32 nNewLastPara, ::sal_Int32 nNewLastPos);
void sendEvent(::sal_Int32 start, ::sal_Int32 end, ::sal_Int16 nEventId);
diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
index f956f25..bd9b016 100644
--- a/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
+++ b/accessibility/inc/accessibility/standard/vclxaccessiblebox.hxx
@@ -189,7 +189,6 @@ protected:
virtual void ProcessWindowChildEvent (const VclWindowEvent& rVclWindowEvent);
virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
-// IAccessible2 implementation, 2009
virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet );
private:
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index 1d72d51..147a936 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -130,7 +130,6 @@ namespace accessibility
SolarMethodGuard aGuard( *this );
// TODO: localize this!
-// IAccessible2 implementation, 2009
//String sName = mpBrowseBox->GetColumnDescription( getColumnPos( ) );
//if ( 0 == sName.Len() )
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index af7620c..c90b07f 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -115,7 +115,6 @@ namespace accessibility
}
}
- // IA2 CWS
void AccessibleListBoxEntry::NotifyAccessibleEvent( sal_Int16 _nEventId,
const ::com::sun::star::uno::Any& _aOldValue,
const ::com::sun::star::uno::Any& _aNewValue )
@@ -214,10 +213,8 @@ namespace accessibility
{
::rtl::OUString sRet;
SvLBoxEntry* pEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
- //IAccessibility2 Implementation 2009-----
if ( pEntry )
sRet = getListBox()->SearchEntryTextWithHeadTitle( pEntry );
- //-----IAccessibility2 Implementation 2009
return sRet;
}
// -----------------------------------------------------------------------------
@@ -390,10 +387,8 @@ namespace accessibility
SvLBoxEntry* pParentEntry = getListBox()->GetEntryFromPath( m_aEntryPath );
DBG_ASSERT( pParentEntry, "AccessibleListBoxEntry::implGetParentAccessible: could not obtain a parent entry!" );
- //IAccessibility2 Implementation 2009-----
if ( pParentEntry )
pParentEntry = getListBox()->GetParent(pParentEntry);
- //-----IAccessibility2 Implementation 2009
if ( pParentEntry )
xParent = new AccessibleListBoxEntry( *getListBox(), pParentEntry, NULL );
// note that we pass NULL here as parent-accessible:
@@ -885,9 +880,7 @@ namespace accessibility
}
}else if( (nIndex == 1 && (treeFlag & TREEFLAG_CHKBTN)) || nIndex == 0 )
{
- //IAccessibility2 Implementation 2009-----
if( pEntry->HasChilds() || pEntry->HasChildsOnDemand() )
- //-----IAccessibility2 Implementation 2009
return getListBox()->IsExpanded( pEntry ) ? \
::rtl::OUString(TK_RES_STRING(STR_SVT_ACC_ACTION_COLLAPSE)) :
::rtl::OUString(TK_RES_STRING(STR_SVT_ACC_ACTION_EXPAND));
@@ -915,7 +908,6 @@ namespace accessibility
::osl::MutexGuard aGuard( m_aMutex );
EnsureIsAlive();
-// IAccessible2 implementation, 2009
// SvLBoxEntry* pParent = getListBox()->GetEntryFromPath( m_aEntryPath );
// SvLBoxEntry* pEntry = getListBox()->GetEntry( pParent, nChildIndex );
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx
index 7d8efb1..f30f5b3 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -1540,7 +1540,6 @@ void Document::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
{
// #107179# if our parent is a compound control (e.g. MultiLineEdit),
// suppress the window focus events here
-// IAccessible2 implementation 2009
//if ( !m_bCompoundControlChild )
VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
}
diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src
index 31b6719..58cb41f 100644
--- a/accessibility/source/helper/accessiblestrings.src
+++ b/accessibility/source/helper/accessiblestrings.src
@@ -25,12 +25,10 @@
#include <accessibility/helper/accessiblestrings.hrc>
#endif
-//IAccessibility2 Impplementaton 2009-----
String RID_STR_ACC_ACTION_CLICK
{
Text = "press";
};
-//-----IAccessibility2 Impplementaton 2009
String RID_STR_ACC_ACTION_TOGGLEPOPUP
{
diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
index 139a15e..0cce238 100644
--- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx
@@ -238,9 +238,7 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw (
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
throw IndexOutOfBoundsException();
- //IAccessibility2 Implementation 2009-----
// return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) );
- //-----IAccessibility2 Implementation 2009
if(IsChecked())
return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_UNCHECK ) );
else
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 624923f..96008be 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -426,7 +426,6 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve
case VCLEVENT_COMBOBOX_SCROLLED:
UpdateEntryRange_Impl();
break;
- // IAccessible2 implementation, 2009
/*
case VCLEVENT_LISTBOX_SELECT:
if ( !m_bDisableProcessEvent )
@@ -564,7 +563,6 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
// check if position is empty and can be used else we have to adjust all entries behind this
if ( xChild.is() )
{
- // IAccessible2 implementation, 2009
/*
ListItems::iterator aIter = m_aAccessibleChildren.begin() + nPos;
::std::mem_fun_t<bool, VCLXAccessibleListItem> aTemp(&VCLXAccessibleListItem::IncrementIndexInParent);
@@ -584,7 +582,6 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
sal_Bool bNowSelected = sal_False;
if ( m_pListBoxHelper )
bNowSelected = m_pListBoxHelper->IsEntryPosSelected ((sal_uInt16)i);
- // IAccessible2 implementation 2009
if (bNowSelected)
m_nCurSelectedPos = sal_uInt16(i);
VCLXAccessibleListItem* pItem = static_cast< VCLXAccessibleListItem* >(xChild.get());
@@ -605,7 +602,6 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i)
void VCLXAccessibleList::HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex)
{
- // IAccessible2 implementation 2009
/*
if ( !bItemInserted )
{
@@ -1074,7 +1070,6 @@ awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException)
if ( pBox )
{
Size aSize = pBox->GetSubEdit()->GetSizePixel();
- // IAccessible2 implementation, 2009
//aBounds.X += aSize.Height();
//aBounds.Y += aSize.Width();
aBounds.Y += aSize.Height();
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 9c33511..84932a6 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -318,7 +318,6 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleS
{
pStateSetHelper->AddState( AccessibleStateType::TRANSIENT );
- // IAccessible2 implementation, 2009
if(m_pListBoxHelper->IsEnabled())
{
pStateSetHelper->AddState( AccessibleStateType::SELECTABLE );
diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
index e8bc42e..3bce316 100644
--- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx
@@ -465,9 +465,7 @@ sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw (
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
throw IndexOutOfBoundsException();
- //IAccessibility2 Impplementaton 2009-----
return ::rtl::OUString( TK_RES_STRING( RID_STR_ACC_ACTION_SELECT ) );
- //-----IAccessibility2 Impplementaton 2009
}
// -----------------------------------------------------------------------------
diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
index 8384a1f..4b3ab9c 100644
--- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx
+++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx
@@ -276,7 +276,6 @@ Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException)
// -----------------------------------------------------------------------------
-// IAccessible2 implementation, 2009
::rtl::OUString VCLXAccessibleScrollBar::getAccessibleName( ) throw (uno::RuntimeException)
{
OExternalLockGuard aGuard( this );
diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
index 1718a13..b6e8c7b 100644
--- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx
+++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx
@@ -81,7 +81,6 @@ void VCLXAccessibleTabControl::UpdateFocused()
void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i, bool bSelected )
{
- // IAccessible2 implementation, 2009
//NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), Any() );
if ( i >= 0 && i < (sal_Int32)m_aAccessibleChildren.size() )
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index b8c5014..149f949 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -651,9 +651,7 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent()
sal_Int16 SAL_CALL AccessibleBase::getAccessibleRole()
throw (RuntimeException)
{
- //IAccessibility2 Implementation 2009-----
return AccessibleRole::SHAPE/*LIST_ITEM*/; // #i73747# role SHAPE seems more appropriate, but is not read
- //-----IAccessibility2 Implementation 2009
}
Reference< XAccessibleRelationSet > SAL_CALL AccessibleBase::getAccessibleRelationSet()
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.hxx b/chart2/source/controller/dialogs/res_LegendPosition.hxx
index dcc7d14..45ed8af 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.hxx
@@ -63,8 +63,7 @@ public:
DECL_LINK( PositionEnableHdl, void* );
DECL_LINK( PositionChangeHdl, RadioButton* );
- void SetAccessibleRelationMemberOf(Window* pMemberOf); //IAccessibility2 Implementation 2009-----
-
+ void SetAccessibleRelationMemberOf(Window* pMemberOf);
private:
void impl_setRadioButtonToggleHdl();
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc
index 1781e58..20f0421 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hrc
@@ -38,7 +38,5 @@
#define BTN_LIGHT_6 8
#define BTN_LIGHT_7 9
#define BTN_LIGHT_8 10
-//IAccessibility2 Implementation 2009-----
#define STR_LIGHT_PREVIEW 6000
-//-----IAccessibility2 Implementation 2009
#define CTL_LIGHT_PREVIEW 1
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 08fd8eb..346ece0 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -69,13 +69,11 @@ const OUString lcl_aLabelRole( RTL_CONSTASCII_USTRINGPARAM( "label" ));
String lcl_GetRoleLBEntry(
const OUString & rRole, const OUString & rRange )
{
-//IAccessibility2 Implementation 2009-----
//String aEntry( rRole );
//aEntry += '\t';
//aEntry += String(
// ::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
String aEntry(::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
- //-----IAccessibility2 Implementation 2009
aEntry += '\t';
aEntry += String( rRange );
@@ -142,12 +140,10 @@ OUString lcl_GetSequenceNameForLabel( ::chart::SeriesEntry * pEntry )
return aResult;
}
-//IAccessibility2 Implementation 2009-----
static long lcl_pRoleListBoxTabs[] =
{ 2, // Number of Tabs
0, 75
};
-//-----IAccessibility2 Implementation 2009
void lcl_ShowChooserButton(
::chart::RangeSelectionButton & rChooserButton,
diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc
index 811f155..0c7edfa 100644
--- a/chart2/source/inc/Strings.hrc
+++ b/chart2/source/inc/Strings.hrc
@@ -338,10 +338,8 @@
#define STR_TEXT_DIRECTION_RTL (RID_APP_START + 279)
#define STR_TEXT_DIRECTION_SUPER (RID_APP_START + 280)
-//IAccessibility2 Implementation 2009-----
#define STR_BUTTON_UP (RID_APP_START + 500)
#define STR_BUTTON_DOWN (RID_APP_START + 501)
-//-----IAccessibility2 Implementation 2009
//-----------------------------------------------------------------------------
/*
////#define STR_DIAGRAM_X_AXIS (RID_APP_START + 34)
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 53b57bd..277a2c7 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1662,7 +1662,6 @@ SvxConfigPage::SvxConfigPage(
aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
aDescriptionField.SetAutoScroll( sal_True );
aDescriptionField.EnableCursor( sal_False );
- //IAccessibility2 Implementation 2009-----
aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
aMoveUpButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
@@ -1671,7 +1670,6 @@ SvxConfigPage::SvxConfigPage(
aModifyTopLevelButton.SetAccessibleRelationMemberOf(&aTopLevelSeparator);
aAddCommandsButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
aModifyCommandButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
- //-----IAccessibility2 Implementation 2009
}
SvxConfigPage::~SvxConfigPage()
@@ -2930,10 +2928,8 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
aMoveDownButton.SetClickHdl (
LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
- //IAccessibility2 Implementation 2009-----
aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
- //-----IAccessibility2 Implementation 2009
}
IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit)
diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc
index 0829ece..8dc8c98 100644
--- a/cui/source/customize/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
@@ -100,7 +100,5 @@
#define MD_BTN_OK (122 + CFG_OFFSET)
#define FI_INFO (123 + CFG_OFFSET)
-//IAccessibility2 Implementation 2009-----
#define BUTTON_STR_UP (130 + CFG_OFFSET)
#define BUTTON_STR_DOWN (131 + CFG_OFFSET)
-//-----IAccessibility2 Implementation 2009
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index d3850e4..51cc925 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -822,7 +822,6 @@ String RID_SVXSTR_RENAME_TOOLBAR
{
Text [ en-US ] = "Rename Toolbar";
};
-//IAccessibility2 Implementation 2009-----
String BUTTON_STR_UP
{
Text [ en-US ] = "Up";
@@ -831,5 +830,4 @@ String BUTTON_STR_DOWN
{
Text [ en-US ] = "Down";
};
-//-----IAccessibility2 Implementation 2009
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 79d493c..5eafd5b 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -535,7 +535,6 @@ GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rG
maCbxInvert.Check( bInvert );
maCbxInvert.SetToggleHdl( GetModifyHdl() );
- // IAccessibility2 Implementation 2009
// maMtrThreshold.GrabFocus();
}
@@ -596,7 +595,6 @@ GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic
maMtrSepia.SetValue( nSepiaPercent );
maMtrSepia.SetModifyHdl( GetModifyHdl() );
- // IAccessibility2 Implementation 2009
// maMtrSepia.GrabFocus();
}
@@ -649,7 +647,6 @@ GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraph
maNumPoster.SetValue( nPosterCount );
maNumPoster.SetModifyHdl( GetModifyHdl() );
- // IAccessibility2 Implementation 2009
// maNumPoster.GrabFocus();
}
diff --git a/cui/source/dialogs/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc
index 3f173d7..9fb75b4 100644
--- a/cui/source/dialogs/hlmarkwn.hrc
+++ b/cui/source/dialogs/hlmarkwn.hrc
@@ -24,9 +24,7 @@
#define BT_APPLY 1
#define BT_CLOSE 2
#define TLB_MARK 3
-// IAccessibility2 implementation 2009. ------
#define STR_MARK_TREE 5000
-// ------ IAccessibility2 implementation 2009.
//#define HYPERLINK_BMP_EXPAND 301
//#define HYPERLINK_BMP_COLLAPSE 302
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index faaedf8..de7906f 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -113,12 +113,10 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, sal_Bool bH
//JP 24.02.99: UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird
aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
aUpdateTimer.SetTimeout( 1000 );
- //IAccessibility2 Implementation 2009-----
// Set the ZOrder, and accessible name to the dialog's title
aTbLinks.SetZOrder(0, WINDOW_ZORDER_FIRST);
aTbLinks.SetAccessibleName(this->GetText());
aTbLinks.SetAccessibleRelationLabeledBy(&aFtFiles);
- //-----IAccessibility2 Implementation 2009
OpenSource().Hide();
diff --git a/cui/source/options/optlingu.hrc b/cui/source/options/optlingu.hrc
index b245daa..86a2e24 100644
--- a/cui/source/options/optlingu.hrc
+++ b/cui/source/options/optlingu.hrc
@@ -81,8 +81,6 @@
#define CLB_EDIT_MODULES_MODULES 320
#define FT_EDIT_MODULES_NEWDICTSLINK 321
#define FL_EDIT_MODULES_BUTTONS 322
-// IAccessibility2 implementation 2009. ------
#define STR_LINGU_MODULES_EDIT 323
#define STR_LINGU_DICS_EDIT_DIC 324
#define STR_LINGU_OPTIONS_EDIT 325
-// ------ IAccessibility2 implementation 2009.
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index 0185fae..ea8825d 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -352,7 +352,6 @@ TabPage RID_SFXPAGE_LINGU
{
Text [ en-US ] = "Edit Options";
};
- // ------ IAccessibility2 implementation 2009.
};
// end: TabPage RID_SFXPAGE_LINGU
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index c4f5a98..dd82595 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2100,7 +2100,6 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
aDblStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl));
aSglStandardPB.SetClickHdl(LINK(this, OfaQuoteTabPage, StdQuoteHdl));
- //IAccessibility2 Implementation 2009-----
// Move down from the position before FreeResource()
// For lost help ID issue
aSglStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_STD) ) );
diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc
index f8fc70a..8f71092 100644
--- a/cui/source/tabpages/autocdlg.hrc
+++ b/cui/source/tabpages/autocdlg.hrc
@@ -150,7 +150,6 @@
#define FT_SMARTTAGS 221
#define LB_SMARTTAGS 222
#define PB_SMARTTAGS 223
-//IAccessibility2 Implementation 2009-----
#define STR_PB_NEWABBREV 224
#define STR_PB_DELABBREV 225
#define STR_PB_NEWDOUBLECAPS 226
@@ -161,7 +160,6 @@
#define STR_PB_DBL_START 231
#define STR_PB_SGL_END 232
#define STR_PB_DBL_END 233
-//-----IAccessibility2 Implementation 2009
#endif
diff --git a/cui/source/tabpages/connect.hrc b/cui/source/tabpages/connect.hrc
index b208ada..303892b 100644
--- a/cui/source/tabpages/connect.hrc
+++ b/cui/source/tabpages/connect.hrc
@@ -39,5 +39,4 @@
#define FT_TYPE 8
#define LB_TYPE 1
#define CTL_PREVIEW 1
-//IAccessibility2 Implementation 2009-----
#define STR_EXAMPLE 1
diff --git a/cui/source/tabpages/paragrph.hrc b/cui/source/tabpages/paragrph.hrc
index 9904847..3e375dc 100644
--- a/cui/source/tabpages/paragrph.hrc
+++ b/cui/source/tabpages/paragrph.hrc
@@ -113,9 +113,7 @@
#define CB_AS_SCRIPT_SPACE 7
-//IAccessibility2 Implementation 2009-----
#define STR_EXAMPLE 5010
#define STR_PAGE_STYLE 5011
-//-----IAccessibility2 Implementation 2009
#endif
diff --git a/cui/source/tabpages/tabarea.hrc b/cui/source/tabpages/tabarea.hrc
index b38737d..478d029 100644
--- a/cui/source/tabpages/tabarea.hrc
+++ b/cui/source/tabpages/tabarea.hrc
@@ -181,7 +181,5 @@
#define IMG_LOAD_H 23
#define IMG_SAVE_H 24
-// IAccessibility2 implementation 2009 ------
#define STR_CUI_COLORMODEL 5030
#define STR_LB_HATCHINGSTYLE 5031
-// ------ IAccessibility2 implementation 2009.
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index 8de441b..4801941 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -875,9 +875,7 @@ TabPage RID_SVXPAGE_BITMAP
Pos = MAP_APPFONT ( 12 , 25 ) ;
Size = MAP_APPFONT ( 72 , 72 ) ;
TabStop = TRUE ;
- //IAccessibility2 Implementation 2009-----
Text [ en-US ] = "Pattern Editor";
- //-----IAccessibility2 Implementation 2009
};
FixedText FT_COLOR
{
@@ -1319,18 +1317,14 @@ TabPage RID_SVXPAGE_COLOR
Border = TRUE;
Pos = MAP_APPFONT ( 157 , 14 ) ;
Size = MAP_APPFONT ( 34 , 25 ) ;
- // IAccessibility2 implementation 2009. ------
Text [ en-US ] = "Old Color" ;
- // ------ IAccessibility2 implementation 2009.
};
Control CTL_PREVIEW_NEW
{
Border = TRUE;
Pos = MAP_APPFONT ( 157, 39 ) ;
Size = MAP_APPFONT ( 34 , 25 ) ;
- // IAccessibility2 implementation 2009. ------
Text [ en-US ] = "New Color" ;
- // ------ IAccessibility2 implementation 2009.
};
ListBox LB_COLORMODEL
{
diff --git a/cui/source/tabpages/tabline.hrc b/cui/source/tabpages/tabline.hrc
index 8319873..2e19471 100644
--- a/cui/source/tabpages/tabline.hrc
+++ b/cui/source/tabpages/tabline.hrc
@@ -37,7 +37,6 @@
#define FT_LINE_ENDS_WIDTH 6
#define LB_START_STYLE 3
#define LB_END_STYLE 4
-//IAccessibility2 Impplementaton 2009-----
#define STR_STYLE (LB_END_STYLE+1)
#define STR_LB_START_STYLE 30
#define STR_LB_END_STYLE 31
@@ -51,7 +50,6 @@
#define STR_END_NUM 39
#define STR_START_LENGTH 40
#define STR_END_LENGTH 41
-//-----IAccessibility2 Impplementaton 2009
#define MTR_FLD_START_WIDTH 3
#define MTR_FLD_END_WIDTH 2
#define CBX_SYNCHRONIZE 1
@@ -121,12 +119,10 @@
#define MN_GALLERY_ENTRY 100
/*
-//IAccessibility2 Implementation 2009-----
#define STR_START_TYPE 1
#define STR_END_TYPE 2
#define STR_START_NUM 3
#define STR_END_NUM 4
#define STR_START_LENGTH 5
#define STR_END_LENGTH 6
-//-----IAccessibility2 Implementation 2009
*/
diff --git a/cui/source/tabpages/tabstpge.hrc b/cui/source/tabpages/tabstpge.hrc
index 5fe0538..9fbd097 100644
--- a/cui/source/tabpages/tabstpge.hrc
+++ b/cui/source/tabpages/tabstpge.hrc
@@ -55,8 +55,6 @@
#define BTN_DELALL 52
#define ST_LEFTTAB_ASIAN 53
#define ST_RIGHTTAB_ASIAN 54
-//IAccessibility2 Implementation 2009-----
#define ST_FILLCHAR_OTHER 55
-//-----IAccessibility2 Implementation 2009
#endif
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 846e60a..eb2ac3a 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -2213,11 +2213,9 @@ IMPL_LINK( SvxAreaTabPage, ClickBitmapHdl_Impl, void *, EMPTYARG )
aMtrFldYOffset.Show();
aFlPosition.Show();
aRbtRow.Show();
-//IAccessible2 Implementation 2009-----
//Solution:Check one when initializing.
if(!aRbtRow.IsChecked()&&!aRbtColumn.IsChecked())
aRbtRow.Check();
-//-----IAccessible2 Implementation 2009
aRbtColumn.Show();
aMtrFldOffset.Show();
aFlOffset.Show();
diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
index fc09080..9c5d15d 100644
--- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx
+++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
@@ -373,13 +373,11 @@ namespace accessibility
/// Check whether 0<=nStart<=n and 0<=nEnd<=n
void CheckRange( sal_Int32 nStart, sal_Int32 nEnd ) SAL_THROW((::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException));
-//IAccessibility2 Implementation 2009-----
void _correctValues( const sal_Int32 nIndex, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rValues );
sal_Int32 SkipField(sal_Int32 nIndex, sal_Bool bForward);
// get overlapped field, extend return string. Only extend forward for now
sal_Bool ExtendByField( ::com::sun::star::accessibility::TextSegment& Segment );
String GetFieldTypeNameAtIndex(sal_Int32 nIndex);
-//-----IAccessibility2 Implementation 2009
// the paragraph index in the edit engine (guarded by solar mutex)
sal_Int32 mnParagraphIndex;
@@ -407,14 +405,12 @@ namespace accessibility
/// Our listeners (guarded by maMutex)
int mnNotifierClientId;
- //IAccessibility2 Implementation 2009-----
public:
void SetParagraphBackColorAccessible(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > & ref)
{ m_xAccInfo = ref ;}
private:
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccInfo;
//virtual sal_Bool IsShapeParaFocusable( );
- //-----IAccessibility2 Implementation 2009
// --> OD 2006-01-11 #i27138#
// the paragraph manager, which created this instance - is NULL, if
diff --git a/editeng/inc/editeng/editdata.hxx b/editeng/inc/editeng/editdata.hxx
index 99537eb..5d908f4 100644
--- a/editeng/inc/editeng/editdata.hxx
+++ b/editeng/inc/editeng/editdata.hxx
@@ -364,9 +364,7 @@ enum EENotifyType
/// Denotes the end of a high-level action triggered by a key press
EE_NOTIFY_INPUT_END,
-//IAccessibility2 Implementation 2009-----
EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA
-//-----IAccessibility2 Implementation 2009
};
struct EENotify
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 631acb2..8e30ed4 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -108,9 +108,7 @@ const sal_uInt8 EditEngineAttribs_OnlyHard = 2; /// returns only attributes
#define GETATTRIBS_CHARATTRIBS (sal_uInt8)0x04
#define GETATTRIBS_ALL (sal_uInt8)0xFF
-//IAccessibility2 Implementation 2009-----
class SdrObject;
-//-----IAccessibility2 Implementation 2009
class EDITENG_DLLPUBLIC EditEngine
{
friend class EditView;
@@ -475,9 +473,7 @@ public:
static void ImportBulletItem( SvxNumBulletItem& rNumBullet, sal_uInt16 nLevel, const SvxBulletItem* pOldBullet, const SvxLRSpaceItem* pOldLRSpace );
static sal_Bool IsPrintable( sal_Unicode c ) { return ( ( c >= 32 ) && ( c != 127 ) ); }
static sal_Bool HasValidData( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rTransferable );
- //IAccessibility2 Implementation 2009-----
virtual SdrObject* GetCurTextObj() { return NULL; }
- //-----IAccessibility2 Implementation 2009
/** sets a link that is called at the beginning of a drag operation at an edit view */
void SetBeginDropHdl( const Link& rLink );
Link GetBeginDropHdl() const;
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx
index 5b467db..6b6993c 100644
--- a/editeng/inc/editeng/editview.hxx
+++ b/editeng/inc/editeng/editview.hxx
@@ -219,10 +219,8 @@ public:
sal_Bool IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong = sal_False );
sal_Bool IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong = sal_False );
- //IAccessibility2 Implementation 2009-----
sal_Bool IsShapeParaFocusable( ) ;
sal_Bool WrongSpelledBreakPara(sal_Int32 nPara,sal_uInt16& nStartIndex, sal_uInt16& nEndIndex,sal_Int32 nIndex);
- //-----IAccessibility2 Implementation 2009
void SpellIgnoreWord();
void ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack = 0 );
diff --git a/editeng/inc/editeng/splwrap.hxx b/editeng/inc/editeng/splwrap.hxx
index 29ac924..79c9c5c 100644
--- a/editeng/inc/editeng/splwrap.hxx
+++ b/editeng/inc/editeng/splwrap.hxx
@@ -39,7 +39,6 @@ namespace com { namespace sun { namespace star { namespace linguistic2 {
}}}}
class Window;
-//IAccessibility2 Impplementaton 2009-----
class SdrObject;
// misc functions ---------------------------------------------------------------
@@ -62,7 +61,6 @@ private:
::com::sun::star::linguistic2::XSpellChecker1 > xSpell;
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator > xHyph;
-//IAccessibility2 Impplementaton 2009-----
SdrObject* mpTextObj;
sal_uInt16 nOldLang; // Sprache merken, nur bei Aenderung SetLanguage rufen
sal_Bool bOtherCntnt : 1; // gesetzt => Sonderbereiche zunaechst pruefen
@@ -154,10 +152,8 @@ protected:
virtual void AutoCorrect( const String& rAktStr, const String& rNewStr );
virtual void InsertHyphen( const sal_uInt16 nPos ); // Hyphen einfuegen
-//IAccessibility2 Impplementaton 2009-----
void SetCurTextObj( SdrObject* pObj ) { mpTextObj = pObj; }
SdrObject* GetCurTextObj() { return mpTextObj; }
-//-----IAccessibility2 Impplementaton 2009
};
#endif
diff --git a/editeng/inc/editeng/unoedhlp.hxx b/editeng/inc/editeng/unoedhlp.hxx
index d1f1f5f..f404960 100644
--- a/editeng/inc/editeng/unoedhlp.hxx
+++ b/editeng/inc/editeng/unoedhlp.hxx
@@ -60,7 +60,6 @@ public:
void SetStartValue( sal_uLong n );
void SetEndValue( sal_uLong n );
};
-//IAccessibility2 Implementation 2009-----
class SvxEditSourceHintEndPara :public SvxEditSourceHint
{
public:
@@ -70,7 +69,6 @@ public:
SvxEditSourceHintEndPara( sal_uInt32 nId, sal_uInt32 nValue, sal_uInt32 nStart=0, sal_uInt32 nEnd=0 )
:SvxEditSourceHint(nId,nValue,nStart){ (void)nEnd; }
};
-//-----IAccessibility2 Implementation 2009
/** Helper class for common functionality in edit sources
*/
class EDITENG_DLLPUBLIC SvxEditSourceHelper
@@ -107,10 +105,8 @@ public:
@return sal_True, if the range has been successfully determined
*/
- //IAccessibility2 Implementation 2009-----
//static sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, const EditEngine& rEE, USHORT nPara, USHORT nIndex );
static sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, const EditEngine& rEE, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell=sal_False );
- //-----IAccessibility2 Implementation 2009
/** Convert point from edit engine to user coordinate space
diff --git a/editeng/inc/editeng/unoedprx.hxx b/editeng/inc/editeng/unoedprx.hxx
index 87a37b7..d8c20ac 100644
--- a/editeng/inc/editeng/unoedprx.hxx
+++ b/editeng/inc/editeng/unoedprx.hxx
@@ -74,7 +74,6 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
- //IAccessibility2 Implementation 2009-----
virtual void SetUpdateModeForAcc( sal_Bool bUp);
virtual sal_Bool GetUpdateModeForAcc() const;
virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
diff --git a/editeng/inc/editeng/unoedsrc.hxx b/editeng/inc/editeng/unoedsrc.hxx
index 860af10..37b8039 100644
--- a/editeng/inc/editeng/unoedsrc.hxx
+++ b/editeng/inc/editeng/unoedsrc.hxx
@@ -219,12 +219,10 @@ public:
Index of paragraph to query bullet info on
*/
virtual EBulletInfo GetBulletInfo( sal_uInt16 nPara ) const = 0;
-//IAccessibility2 Implementation 2009-----
virtual String GetNumStr(sal_uInt16) const { return XubString();};
//IAccessible2 migration fix
virtual void SetUpdateModeForAcc( sal_Bool ) {};
virtual sal_Bool GetUpdateModeForAcc() const { return sal_True; };
-//-----IAccessibility2 Implementation 2009
/** Query the bounding rectangle of the given character
@param nPara[0 .. n]
@@ -336,10 +334,8 @@ public:
@return sal_True, if the range has been successfully determined
*/
- //IAccessibility2 Implementation 2009-----
// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const = 0;
virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const = 0;
- //-----IAccessibility2 Implementation 2009
/** Query number of lines in the formatted paragraph
@@ -550,11 +546,9 @@ public:
*/
virtual sal_Bool Paste() = 0;
-//IAccessibility2 Implementation 2009-----
virtual sal_Bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return sal_False; };
virtual sal_Bool IsShapeParaFocusable( ) { return sal_True; };
virtual sal_Bool BreakParaWrongList(sal_Int32, sal_uInt16&, sal_uInt16&, sal_Int32){ return sal_False; };
-//-----IAccessibility2 Implementation 2009
};
#endif
diff --git a/editeng/inc/editeng/unofored.hxx b/editeng/inc/editeng/unofored.hxx
index ca3f237..3de13bd 100644
--- a/editeng/inc/editeng/unofored.hxx
+++ b/editeng/inc/editeng/unofored.hxx
@@ -72,10 +72,8 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
- //IAccessibility2 Implementation 2009-----
// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
- //-----IAccessibility2 Implementation 2009
virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const;
virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
diff --git a/editeng/inc/editeng/unoforou.hxx b/editeng/inc/editeng/unoforou.hxx
index 0ce314d..e2bfa77 100644
--- a/editeng/inc/editeng/unoforou.hxx
+++ b/editeng/inc/editeng/unoforou.hxx
@@ -93,10 +93,8 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
- //IAccessibility2 Implementation 2009-----
// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
- //-----IAccessibility2 Implementation 2009
virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const;
virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const;
diff --git a/editeng/inc/editeng/unotext.hxx b/editeng/inc/editeng/unotext.hxx
index 7b502af..653a1d6 100644
--- a/editeng/inc/editeng/unotext.hxx
+++ b/editeng/inc/editeng/unotext.hxx
@@ -218,10 +218,8 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
- //IAccessibility2 Implementation 2009-----
// virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex, sal_Bool bInCell = sal_False ) const;
- //-----IAccessibility2 Implementation 2009
virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const;
virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 57eec8b..edaa7bd 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -76,13 +76,11 @@
#include "AccessibleHyperlink.hxx"
#include <svtools/colorcfg.hxx>
-//IAccessibility2 Implementation 2009-----
#include <algorithm>
using namespace std;
#include "editeng.hrc"
#include <editeng/eerdll.hxx>
#include <editeng/numitem.hxx>
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
@@ -97,7 +95,6 @@ using namespace ::com::sun::star::accessibility;
namespace accessibility
{
-//IAccessibility2 Implementation 2009-----
const SvxItemPropertySet* ImplGetSvxCharAndParaPropertiesSet()
{
@@ -224,12 +221,10 @@ namespace accessibility
DBG_WARNING( "AccessibleEditableTextPara::implGetParagraphBoundary: only a base implementation, ignoring the index" );
rBoundary.startPos = 0;
- //IAccessibility2 Implementation 2009-----
//rBoundary.endPos = GetTextLen();
::rtl::OUString sText( implGetText() );
sal_Int32 nLength = sText.getLength();
rBoundary.endPos = nLength;
- //-----IAccessibility2 Implementation 2009
}
void AccessibleEditableTextPara::implGetLineBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex )
@@ -387,9 +382,7 @@ namespace accessibility
Dispose();
}
-//IAccessibility2 Implementation 2009-----
mpEditSource = pEditSource;
-//-----IAccessibility2 Implementation 2009
// #108900# Init last text content
try
{
@@ -765,11 +758,9 @@ namespace accessibility
!pStateSet->contains(nStateId) )
{
pStateSet->AddState( nStateId );
-//IAccessibility2 Implementation 2009-----
// MT: Removed method IsShapeParaFocusable which was introduced with IA2 - basically it was only about figuring out wether or not the window has the focus, should be solved differently
// if(IsShapeParaFocusable())
GotPropertyEvent( uno::makeAny( nStateId ), AccessibleEventId::STATE_CHANGED );
-//-----IAccessibility2 Implementation 2009
}
}
@@ -824,10 +815,8 @@ namespace accessibility
// must provide XAccesibleText by hand, since it comes publicly inherited by XAccessibleEditableText
if ( rType == ::getCppuType((uno::Reference< XAccessibleText > *)0) )
{
- //IAccessibility2 Implementation 2009-----
// uno::Reference< XAccessibleText > aAccText = this;
uno::Reference< XAccessibleText > aAccText = static_cast< XAccessibleEditableText * >(this);
- //-----IAccessibility2 Implementation 2009
aRet <<= aAccText;
}
else if ( rType == ::getCppuType((uno::Reference< XAccessibleEditableText > *)0) )
@@ -835,13 +824,11 @@ namespace accessibility
uno::Reference< XAccessibleEditableText > aAccEditText = this;
aRet <<= aAccEditText;
}
- //IAccessibility2 Implementation 2009-----
else if ( rType == ::getCppuType((uno::Reference< XAccessibleHypertext > *)0) )
{
uno::Reference< XAccessibleHypertext > aAccHyperText = this;
aRet <<= aAccHyperText;
}
- //-----IAccessibility2 Implementation 2009
else
{
aRet = AccessibleTextParaInterfaceBase::queryInterface(rType);
@@ -939,7 +926,6 @@ namespace accessibility
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getAccessibleDescription() throw (uno::RuntimeException)
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
- //IAccessibility2 Implementation 2009-----
::vos::OGuard aGuard( Application::GetSolarMutex() );
// append first 40 characters from text, or first line, if shorter
@@ -981,7 +967,6 @@ namespace accessibility
}
return ::rtl::OUString( sStr ) + aLine;
- //-----IAccessibility2 Implementation 2009
}
::rtl::OUString SAL_CALL AccessibleEditableTextPara::getAccessibleName() throw (uno::RuntimeException)
@@ -1058,7 +1043,6 @@ namespace accessibility
if( !pStateSet )
return uno::Reference<XAccessibleStateSet>();
-//IAccessibility2 Implementation 2009-----
uno::Reference<XAccessibleStateSet> xParentStates;
if (getAccessibleParent().is())
{
@@ -1069,7 +1053,6 @@ namespace accessibility
{
pStateSet->AddState(AccessibleStateType::EDITABLE);
}
-//-----IAccessibility2 Implementation 2009
return uno::Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*pStateSet) );
}
@@ -1291,7 +1274,6 @@ namespace accessibility
GetParagraphIndex() == aSelection.nEndPara )
{
// caret is always nEndPara,nEndPos
- //IAccessibility2 Implementation 2009-----
EBulletInfo aBulletInfo = GetTextForwarder().GetBulletInfo( static_cast< sal_uInt16 >(GetParagraphIndex()) );
if( aBulletInfo.nParagraph != EE_PARA_NOT_FOUND &&
aBulletInfo.bVisible &&
@@ -1301,7 +1283,6 @@ namespace accessibility
if( aSelection.nEndPos - nBulletLen >= 0 )
return aSelection.nEndPos - nBulletLen;
}
- //-----IAccessibility2 Implementation 2009
return aSelection.nEndPos;
}
@@ -1327,7 +1308,6 @@ namespace accessibility
return OCommonAccessibleText::getCharacter( nIndex );
}
- //IAccessibility2 Implementation 2009-----
static uno::Sequence< ::rtl::OUString > getAttributeNames()
{
static uno::Sequence< ::rtl::OUString >* pNames = NULL;
@@ -1368,7 +1348,6 @@ namespace accessibility
}
return *pNames;
}
-//-----IAccessibility2 Implementation 2009
struct IndexCompare
{
const PropertyValue* pValues;
@@ -1468,7 +1447,6 @@ namespace accessibility
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
::vos::OGuard aGuard( Application::GetSolarMutex() );
- //IAccessibility2 Implementation 2009-----
//Skip the bullet range to ingnore the bullet text
SvxTextForwarder& rCacheTF = GetTextForwarder();
EBulletInfo aBulletInfo = rCacheTF.GetBulletInfo( static_cast< sal_uInt16 >(GetParagraphIndex()) );
@@ -1492,7 +1470,6 @@ namespace accessibility
// ... and override them with the direct attributes from the specific position
uno::Sequence< beans::PropertyValue > aRunAttribs( getRunAttributes( nIndex, aPropertyNames ) );
- //-----IAccessibility2 Implementation 2009
sal_Int32 nRunAttribs = aRunAttribs.getLength();
const beans::PropertyValue *pRunAttrib = aRunAttribs.getConstArray();
for (sal_Int32 k = 0; k < nRunAttribs; ++k)
@@ -1540,7 +1517,6 @@ namespace accessibility
rRes.Handle = -1;
rRes.State = bIsDirectVal ? PropertyState_DIRECT_VALUE : PropertyState_DEFAULT_VALUE;
}
- //IAccessibility2 Implementation 2009-----
if( bSupplementalMode )
{
_correctValues( nIndex, aRes );
@@ -1556,7 +1532,6 @@ namespace accessibility
rRes.Value <<= numStr;
rRes.Handle = -1;
rRes.State = PropertyState_DIRECT_VALUE;
- //-----IAccessibility2 Implementation 2009
//For field object.
String strFieldType = GetFieldTypeNameAtIndex(nIndex);
if (strFieldType.Len() > 0)
@@ -1646,10 +1621,8 @@ namespace accessibility
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
::vos::OGuard aGuard( Application::GetSolarMutex() );
- //IAccessibility2 Implementation 2009-----
if ((rPoint.X <= 0) && (rPoint.Y <= 0))
return 0;
- //-----IAccessibility2 Implementation 2009
sal_uInt16 nPara, nIndex;
// offset from surrounding cell/shape
@@ -1781,7 +1754,6 @@ namespace accessibility
return OCommonAccessibleText::getTextRange(nStartIndex, nEndIndex);
}
-//IAccessibility2 Implementation 2009-----
void AccessibleEditableTextPara::_correctValues( const sal_Int32 /* nIndex */,
uno::Sequence< PropertyValue >& rValues)
{
@@ -2051,7 +2023,6 @@ namespace accessibility
}
return bExtend;
}
-//-----IAccessibility2 Implementation 2009
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleEditableTextPara::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
@@ -2067,7 +2038,6 @@ namespace accessibility
switch( aTextType )
{
- //IAccessibility2 Implementation 2009-----
case AccessibleTextType::CHARACTER:
case AccessibleTextType::WORD:
{
@@ -2075,7 +2045,6 @@ namespace accessibility
ExtendByField( aResult );
break;
}
- //-----IAccessibility2 Implementation 2009
// Not yet handled by OCommonAccessibleText. Missing
// implGetAttributeRunBoundary() method there
case AccessibleTextType::ATTRIBUTE_RUN:
@@ -2113,7 +2082,6 @@ namespace accessibility
}
break;
}
-//IAccessibility2 Implementation 2009-----
case AccessibleTextType::LINE:
{
SvxTextForwarder& rCacheTF = GetTextForwarder();
@@ -2169,7 +2137,6 @@ namespace accessibility
}
break;
}
-//-----IAccessibility2 Implementation 2009
default:
aResult = OCommonAccessibleText::getTextAtIndex( nIndex, aTextType );
break;
@@ -2190,9 +2157,7 @@ namespace accessibility
::com::sun::star::accessibility::TextSegment aResult;
aResult.SegmentStart = -1;
aResult.SegmentEnd = -1;
-//IAccessibility2 Implementation 2009-----
i18n::Boundary aBoundary;
-//-----IAccessibility2 Implementation 2009
switch( aTextType )
{
// Not yet handled by OCommonAccessibleText. Missing
@@ -2230,7 +2195,6 @@ namespace accessibility
}
break;
}
- //IAccessibility2 Implementation 2009-----
case AccessibleTextType::LINE:
{
SvxTextForwarder& rCacheTF = GetTextForwarder();
@@ -2341,7 +2305,6 @@ namespace accessibility
ExtendByField( aResult );
break;
}
- //-----IAccessibility2 Implementation 2009
default:
aResult = OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType );
break;
@@ -2362,9 +2325,7 @@ namespace accessibility
::com::sun::star::accessibility::TextSegment aResult;
aResult.SegmentStart = -1;
aResult.SegmentEnd = -1;
-//IAccessibility2 Implementation 2009-----
i18n::Boundary aBoundary;
-//-----IAccessibility2 Implementation 2009
switch( aTextType )
{
case AccessibleTextType::ATTRIBUTE_RUN:
@@ -2387,7 +2348,6 @@ namespace accessibility
break;
}
-//IAccessibility2 Implementation 2009-----
case AccessibleTextType::LINE:
{
SvxTextForwarder& rCacheTF = GetTextForwarder();
@@ -2473,7 +2433,6 @@ namespace accessibility
ExtendByField( aResult );
break;
}
- //-----IAccessibility2 Implementation 2009
default:
aResult = OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType );
break;
diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx
index ef03ad5..08e43f1 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.cxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.cxx
@@ -141,7 +141,6 @@ namespace accessibility
// MT IA2: Accessiblehyperlink.hxx from IA2 CWS - meanwhile we also introduced one in DEV300 (above)
// Keeping this for reference - we probably should get support for image maps in our implementation...
-//IAccessibility2 Implementation 2009-----
/*
@@ -441,6 +440,5 @@ sal_Bool SAL_CALL SvxAccessibleHyperlink::isValid( )
*/
-//-----IAccessibility2 Implementation 2009
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index b9eb69a..2364219 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -83,9 +83,7 @@ namespace accessibility
return ( lhs.Name == rhs.Name && lhs.Value == rhs.Value );
}
};
-//IAccessibility2 Implementation 2009-----
sal_Unicode cNewLine(0x0a);
-//-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
//
// Static Helper
@@ -122,9 +120,7 @@ sal_Unicode cNewLine(0x0a);
*/
class AccessibleStaticTextBase_Impl
{
- //IAccessibility2 Implementation 2009-----
friend class AccessibleStaticTextBase;
- //-----IAccessibility2 Implementation 2009
public:
// receive pointer to our frontend class and view window
@@ -198,9 +194,7 @@ sal_Unicode cNewLine(0x0a);
sal_Int32 nEndPara, sal_Int32 nEndIndex );
Rectangle GetParagraphBoundingBox() const;
- //IAccessibility2 Implementation 2009-----
sal_Bool RemoveLineBreakCount( sal_Int32& rIndex );
- //-----IAccessibility2 Implementation 2009
private:
@@ -393,9 +387,7 @@ sal_Unicode cNewLine(0x0a);
{
nCurrCount = GetParagraph( nCurrPara ).getCharacterCount();
nCurrIndex += nCurrCount;
- //IAccessibility2 Implementation 2009-----
if( nCurrIndex >= nFlatIndex )
- //-----IAccessibility2 Implementation 2009
{
// check overflow
DBG_ASSERT(nCurrPara >= 0 && nCurrPara <= USHRT_MAX &&
@@ -485,7 +477,6 @@ sal_Unicode cNewLine(0x0a);
}
return aRect;
}
- //IAccessibility2 Implementation 2009-----
//the input argument is the index(including "\n" ) in the string.
//the function will calculate the actual index(not including "\n") in the string.
//and return true if the index is just at a "\n"
@@ -537,7 +528,6 @@ sal_Unicode cNewLine(0x0a);
}
return sal_False;
}
- //-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
//
// AccessibleStaticTextBase implementation
@@ -726,10 +716,8 @@ sal_Unicode cNewLine(0x0a);
uno::Sequence< beans::PropertyValue > SAL_CALL AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
- //IAccessibility2 Implementation 2009-----
//get the actual index without "\n"
mpImpl->RemoveLineBreakCount( nIndex );
- //IAccessibility2 Implementation 2009-----
EPosition aPos( mpImpl->Index2Internal(nIndex) );
@@ -761,10 +749,8 @@ sal_Unicode cNewLine(0x0a);
sal_Int32 i, nCount, nParas;
for( i=0, nCount=0, nParas=mpImpl->GetParagraphCount(); i<nParas; ++i )
nCount += mpImpl->GetParagraph(i).getCharacterCount();
- //IAccessibility2 Implementation 2009-----
//count on the number of "\n" which equals number of paragraphs decrease 1.
nCount = nCount + (nParas-1);
- //IAccessibility2 Implementation 2009-----
return nCount;
}
@@ -867,7 +853,6 @@ sal_Unicode cNewLine(0x0a);
if( nStartIndex > nEndIndex )
::std::swap(nStartIndex, nEndIndex);
- //IAccessibility2 Implementation 2009-----
//if startindex equals endindex we will get nothing. So return an empty string directly.
if ( nStartIndex == nEndIndex )
{
@@ -908,20 +893,16 @@ sal_Unicode cNewLine(0x0a);
//we don't return the string directly now for that we have to do some further process for "\n"
aRes = mpImpl->GetParagraph( aStartIndex.nPara ).getTextRange( aStartIndex.nIndex, aEndIndex.nIndex );
//return mpImpl->GetParagraph( aStartIndex.nPara ).getTextRange( aStartIndex.nIndex, aEndIndex.nIndex );
- //-----IAccessibility2 Implementation 2009
}
else
{
sal_Int32 i( aStartIndex.nPara );
- //IAccessibility2 Implementation 2009-----
aRes = mpImpl->GetParagraph(i).getTextRange( aStartIndex.nIndex,
mpImpl->GetParagraph(i).getCharacterCount()/*-1*/);
- //-----IAccessibility2 Implementation 2009
++i;
// paragraphs inbetween are fully included
for( ; i<aEndIndex.nPara; ++i )
- //IAccessibility2 Implementation 2009-----
{
aRes += rtl::OUString(cNewLine);
aRes += mpImpl->GetParagraph(i).getText();
@@ -950,16 +931,13 @@ sal_Unicode cNewLine(0x0a);
aRes += rtl::OUString(cNewLine);
}
return aRes;
- //-----IAccessibility2 Implementation 2009
}
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
- //IAccessibility2 Implementation 2009-----
::vos::OGuard aGuard( Application::GetSolarMutex() );
sal_Bool bLineBreak = mpImpl->RemoveLineBreakCount( nIndex );
- //-----IAccessibility2 Implementation 2009
EPosition aPos( mpImpl->Range2Internal(nIndex) );
::com::sun::star::accessibility::TextSegment aResult;
@@ -979,7 +957,6 @@ sal_Unicode cNewLine(0x0a);
aResult.SegmentStart = mpImpl->Internal2Index( EPosition( aPos.nPara, 0 ) );
aResult.SegmentEnd = aResult.SegmentStart + aResult.SegmentText.getLength();
}
- //IAccessibility2 Implementation 2009-----
else if ( AccessibleTextType::ATTRIBUTE_RUN == aTextType )
{
SvxAccessibleTextAdapter& rTextForwarder = mpImpl->GetParagraph( aPos.nIndex ).GetTextForwarder();
@@ -991,7 +968,6 @@ sal_Unicode cNewLine(0x0a);
aResult.SegmentEnd = nEndIndex;
}
}
- //-----IAccessibility2 Implementation 2009
else
{
// No special handling required, forward to wrapped class
@@ -999,12 +975,10 @@ sal_Unicode cNewLine(0x0a);
// #112814# Adapt the start index with the paragraph offset
mpImpl->CorrectTextSegment( aResult, aPos.nPara );
- //IAccessibility2 Implementation 2009-----
if ( bLineBreak )
{
aResult.SegmentText = rtl::OUString(cNewLine);
}
- //-----IAccessibility2 Implementation 2009
}
return aResult;
@@ -1013,10 +987,8 @@ sal_Unicode cNewLine(0x0a);
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
- //IAccessibility2 Implementation 2009-----
sal_Int32 nOldIdx = nIndex;
sal_Bool bLineBreak = mpImpl->RemoveLineBreakCount( nIndex );
- //-----IAccessibility2 Implementation 2009
EPosition aPos( mpImpl->Range2Internal(nIndex) );
::com::sun::star::accessibility::TextSegment aResult;
@@ -1048,12 +1020,10 @@ sal_Unicode cNewLine(0x0a);
// #112814# Adapt the start index with the paragraph offset
mpImpl->CorrectTextSegment( aResult, aPos.nPara );
- //IAccessibility2 Implementation 2009-----
if ( bLineBreak && (nOldIdx-1) >= 0)
{
aResult = getTextAtIndex( nOldIdx-1, aTextType );
}
- //-----IAccessibility2 Implementation 2009
}
return aResult;
@@ -1062,11 +1032,9 @@ sal_Unicode cNewLine(0x0a);
::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleStaticTextBase::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
- //IAccessibility2 Implementation 2009-----
sal_Int32 nTemp = nIndex+1;
sal_Bool bLineBreak = mpImpl->RemoveLineBreakCount( nTemp );
mpImpl->RemoveLineBreakCount( nIndex );
- //-----IAccessibility2 Implementation 2009
EPosition aPos( mpImpl->Range2Internal(nIndex) );
::com::sun::star::accessibility::TextSegment aResult;
@@ -1092,12 +1060,10 @@ sal_Unicode cNewLine(0x0a);
// #112814# Adapt the start index with the paragraph offset
mpImpl->CorrectTextSegment( aResult, aPos.nPara );
- //IAccessibility2 Implementation 2009-----
if ( bLineBreak )
{
aResult.SegmentText = rtl::OUString(cNewLine) + aResult.SegmentText;
}
- //-----IAccessibility2 Implementation 2009
}
return aResult;
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index a4aba34..ec4e4d0 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -140,9 +140,7 @@ sal_Bool __EXPORT EditSpellWrapper::SpellMore()
if ( pSpellInfo->bMultipleDoc )
{
bMore = pImpEE->GetEditEnginePtr()->SpellNextDocument();
- //IAccessibility2 Implementation 2009-----
SetCurTextObj( pImpEE->GetEditEnginePtr()->GetCurTextObj() );
- //-----IAccessibility2 Implementation 2009
if ( bMore )
{
// Der Text wurde in diese Engine getreten, bei Rueckwaerts
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 811eb9d..e2be764 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -122,7 +122,6 @@ void ImpEditView::SetEditSelection( const EditSelection& rEditSelection )
if ( pEditEngine->pImpEditEngine->GetNotifyHdl().IsSet() )
{
- //IAccessibility2 Implementation 2009-----
const EditDoc& rDoc = pEditEngine->pImpEditEngine->GetEditDoc();
const EditPaM pmEnd = rDoc.GetEndPaM();
EENotifyType eNotifyType;
@@ -138,7 +137,6 @@ void ImpEditView::SetEditSelection( const EditSelection& rEditSelection )
}
//EENotify aNotify( EE_NOTIFY_TEXTVIEWSELECTIONCHANGED );
EENotify aNotify( eNotifyType );
- //-----IAccessibility2 Implementation 2009
aNotify.pEditEngine = pEditEngine;
aNotify.pEditView = GetEditViewPtr();
pEditEngine->pImpEditEngine->CallNotify( aNotify );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index fe43ad4..3972a86 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -136,8 +136,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) :
bIsFormatting = sal_False;
bFormatted = sal_False;
bUpdate = sal_True;
- bUpdateForAcc = TRUE; //IAccessible2 implementation 2009
- bUseAutoColor = sal_True;
+ bUpdateForAcc = TRUE; bUseAutoColor = sal_True;
bForceAutoColor = sal_False;
bAddExtLeading = sal_False;
bUndoEnabled = sal_True;
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index a3d3173..e0adcb3 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -28,10 +28,8 @@
#include <editeng/unoedhlp.hxx>
#include <editeng/editdata.hxx>
#include <editeng/editeng.hxx>
-//IAccessibility2 Implementation 2009-----
#include <svl/itemset.hxx>
-//-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
TYPEINIT1( SvxEditSourceHint, TextHint );
@@ -79,9 +77,7 @@ void SvxEditSourceHint::SetEndValue( sal_uLong n )
{
mnEnd = n;
}
-//IAccessibility2 Implementation 2009-----
TYPEINIT1( SvxEditSourceHintEndPara , SvxEditSourceHint );
-//-----IAccessibility2 Implementation 2009
//------------------------------------------------------------------------
::std::auto_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify )
@@ -122,10 +118,8 @@ TYPEINIT1( SvxEditSourceHintEndPara , SvxEditSourceHint );
case EE_NOTIFY_INPUT_END:
return ::std::auto_ptr<SfxHint>( new TextHint( TEXT_HINT_INPUT_END, 0 ) );
- //IAccessibility2 Implementation 2009-----
case EE_NOTIFY_TEXTVIEWSELECTIONCHANGED_ENDD_PARA:
return ::std::auto_ptr<SfxHint>( new SvxEditSourceHintEndPara( EDITSOURCE_HINT_SELECTIONCHANGED ) );
- //-----IAccessibility2 Implementation 2009
default:
DBG_ERROR( "SvxEditSourceHelper::EENotification2Hint unknown notification" );
break;
@@ -140,8 +134,7 @@ sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt
// Need to verify implementation with AT (IA2 and ATK)
// Old implementation at the end of the method for reference...
-#if 1 // IA2 CWS
-
+#if 1
//added dummy attributes for the default text
EECharAttribArray aCharAttribs, aTempCharAttribs;
rEE.GetCharAttribs( nPara, aTempCharAttribs );
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 29acfb0..ed2203e 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -508,7 +508,6 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
EBulletInfo aBulletInfo1 = GetBulletInfo( static_cast< sal_uInt16 >(aStartIndex.GetParagraph()) );
EBulletInfo aBulletInfo2 = GetBulletInfo( static_cast< sal_uInt16 >(aEndIndex.GetParagraph()) );
- //IAccessibility2 Implementation 2009-----
// MT: This was done in OOo, commented out in IA2 CWS...
/*
if( aStartIndex.InBullet() )
@@ -525,7 +524,6 @@ String SvxAccessibleTextAdapter::GetText( const ESelection& rSel ) const
sBullet += sStr;
sStr = sBullet;
}*/
- //-----IAccessibility2 Implementation 2009
if( aEndIndex.InBullet() )
{
// append trailing bullet
@@ -754,7 +752,6 @@ EBulletInfo SvxAccessibleTextAdapter::GetBulletInfo( sal_uInt16 nPara ) const
return mrTextForwarder->GetBulletInfo( nPara );
}
-//IAccessible2 Implementation 2009----
void SvxAccessibleTextAdapter::SetUpdateModeForAcc( sal_Bool bUp)
{
return mrTextForwarder->SetUpdateModeForAcc( bUp );
@@ -763,7 +760,6 @@ sal_Bool SvxAccessibleTextAdapter::GetUpdateModeForAcc( ) const
{
return mrTextForwarder->GetUpdateModeForAcc( );
}
-//-----IAccessible2 Implementation 2009
Rectangle SvxAccessibleTextAdapter::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
{
DBG_ASSERT(mrTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 1d753ab..cc35626 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -221,9 +221,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa
}
{
- //IAccessibility2 Implementation 2009-----
if(SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType())
- //-----IAccessibility2 Implementation 2009
{
sal_Unicode nCode = rFmt.GetBulletChar();
OUString aStr( &nCode, 1 );
diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src
index 891c917..934906d 100644
--- a/formula/source/ui/dlg/formdlgs.src
+++ b/formula/source/ui/dlg/formdlgs.src
@@ -225,17 +225,13 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL
Right = TRUE ;
Text [ en-US ] = "Function result" ;
};
-//IAccessibility2 Implementation 2009-----
//Window WND_RESULT
FixedText WND_RESULT
-//-----IAccessibility2 Implementation 2009
{
Border = TRUE ;
Pos = MAP_APPFONT ( 255 , 4 ) ;
Size = MAP_APPFONT ( 60 , 12 ) ;
-//IAccessibility2 Implementation 2009-----
Text [ en-US ] = "Function result" ;
-//-----IAccessibility2 Implementation 2009
};
FixedText FT_FORMULA_RESULT
{
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index dcb5fcf..9ed1113 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -309,11 +309,9 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
aRefBtn.Hide();
pMEdit = aMEFormula.GetEdit();
- //IAccessibility2 Implementation 2009-----
aMEFormula.SetAccessibleName(aFtFormula.GetText());
if (pMEdit)
pMEdit->SetAccessibleName(aFtFormula.GetText());
- //-----IAccessibility2 Implementation 2009
m_aEditHelpId = pMEdit->GetHelpId();
pMEdit->SetUniqueId( m_aEditHelpId );
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 94162a2..ab6f1d8 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -34,9 +34,7 @@
#include "ControlHelper.hxx"
#include "ModuleHelper.hxx"
#include "ForResId.hrc"
-// IAccessibility2 implementation 2009. ------
#include "com/sun/star/accessibility/AccessibleRole.hpp"
-// ------ IAccessibility2 implementation 2009.
namespace formula
@@ -476,7 +474,6 @@ void ArgInput::Show()
pRefBtn->Show();
}
}
-//IAccessibility2 Implementation 2009-----
void ArgInput::UpdateAccessibleNames()
{
String aArgName = String::CreateFromAscii(":");
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index a86fa8a..a7bf1e5 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -187,11 +187,9 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
css::io::IOException ,
css::uno::RuntimeException )
{
- //IAccessibility2 Implementation 2009-----
#ifdef WNT
CEnableAccessInterface e;
#endif
- //-----IAccessibility2 Implementation 2009
css::uno::Reference< css::lang::XComponent > xComponent;
try
diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
index 8b483c4..d9a30f7 100644
--- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl
+++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl
@@ -377,7 +377,6 @@ published constants AccessibleEventId
*/
const short LISTBOX_ENTRY_COLLAPSED = 33;
- //IAccessibility2 Implementation 2009-----
const short ACTIVE_DESCENDANT_CHANGED_NOFOCUS = 34;
const short SELECTION_CHANGED_ADD =35;
const short SELECTION_CHANGED_REMOVE =36;
@@ -385,7 +384,6 @@ published constants AccessibleEventId
const short PAGE_CHANGED =38;
const short SECTION_CHANGED =39;
const short COLUMN_CHANGED =40;
- //-----IAccessibility2 Implementation 2009
};
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index 5b03676..67b516b 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -44,7 +44,6 @@
#endif
#define DEBUG_CHANGETRACK 0
-//IAccessibility2 Implementation 2009-----
class ScChangeAction;
class ScAppOptions;
class ScActionColorChanger
@@ -62,7 +61,6 @@ public:
void Update( const ScChangeAction& rAction );
ColorData GetColor() const { return nColor; }
};
-//-----IAccessibility2 Implementation 2009
class ScBaseCell;
class ScDocument;
diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index f3c2b4b..405e90b 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -155,9 +155,7 @@ public:
static ColorData GetCommentColor();
static void InitializeColors();
static sal_Bool IsColorsInitialized();
-//IAccessibility2 Implementation 2009-----
static void AppendChangTrackNoteSeparator(String &str);
-//-----IAccessibility2 Implementation 2009
};
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 02f1fa6..cf4ac16 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -440,7 +440,6 @@ private:
sal_Int16 mnNamedRangesLockCount;
-//IAccessibility2 Implementation 2009-----
String msDocAccTitle;
public:
// SC_DLLPUBLIC sal_Bool RowHidden( SCROW nRow, SCTAB nTab );
@@ -456,7 +455,6 @@ public:
virtual sal_Bool getDocReadOnly() const { return bReadOnly; }
sal_Bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder);
void GetCellChangeTrackNote( const ScAddress &cell,String &strTrackText,sal_Bool &pbLeftEdge);
-//-----IAccessibility2 Implementation 2009
SC_DLLPUBLIC sal_uLong GetCellCount() const; // alle Zellen
SCSIZE GetCellCount(SCTAB nTab, SCCOL nCol) const;
sal_uLong GetWeightedCount() const; // Formeln und Edit staerker gewichtet
@@ -482,9 +480,7 @@ public:
SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = NULL );
XColorListSharedPtr GetColorTable();
-//IAccessibility2 Implementation 2009-----
ScTable* GetTableByIndex(sal_Int32 nIndex);
-//-----IAccessibility2 Implementation 2009
SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager() const;
SC_DLLPUBLIC const ScDocOptions& GetDocOptions() const;
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index aab4051..df26667 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -230,10 +230,8 @@ public:
const Point& rWinPoint, const Window& rCmpWnd );
static ScMacroInfo* GetMacroInfo( SdrObject* pObj, sal_Bool bCreate = sal_False );
-//IAccessibility2 Implementation 2009-----
virtual ImageMap* GetImageMapForObject(SdrObject* pObj);
virtual sal_Int32 GetHyperlinkCount(SdrObject* pObj);
-//-----IAccessibility2 Implementation 2009
private:
static SfxObjectShell* pGlobalDrawPersist; // fuer AllocModel
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0eeaa90..1f5e9a6 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -998,13 +998,11 @@
#define STR_ACC_DATAPILOT_DATA_DESCR (STR_START + 180)
#define STR_ACC_DATAPILOT_SEL_DESCR (STR_START + 181)
-//IAccessibility2 Implementation 2009-----
#define STR_ACC_TOOLBAR_FORMULA (STR_START + 182)
#define STR_ACC_DOC_SPREADSHEET (STR_START + 185)
#define STR_ACC_DOC_PREVIEW_SUFFIX (STR_START + 186)
#define STR_ACC_DOC_SPREADSHEET_READONLY (STR_START + 187)
-//-----IAccessibility2 Implementation 2009
// --------------------------------------------------
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index d755351..0363eda 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -938,10 +938,8 @@ private:
SCROW mnUBound;
};
-//IAccessibility2 Implementation 2009-----
public :
ScColumn* GetColumnByIndex(sal_Int32 index);
-//-----IAccessibility2 Implementation 2009
};
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 311bbde..f391400 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -87,11 +87,9 @@
#include "recursionhelper.hxx"
#include "lookupcache.hxx"
#include "externalrefmgr.hxx"
-//IAccessibility2 Implementation 2009-----
#include "appoptio.hxx"
#include "scmod.hxx"
#include "../../ui/inc/viewutil.hxx"
-//-----IAccessibility2 Implementation 2009
#include "tabprotection.hxx"
#include "formulaparserpool.hxx"
#include "clipparam.hxx"
@@ -222,9 +220,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
mbStreamValidLocked( false ),
mbIsTemporary(false), // #118840#
mnNamedRangesLockCount( 0 ),
-//IAccessibility2 Implementation 2009-----
bReadOnly(sal_False)
-//-----IAccessibility2 Implementation 2009
{
SetStorageGrammar( formula::FormulaGrammar::GRAM_STORAGE_DEFAULT);
@@ -1303,7 +1299,6 @@ void ScDocument::ClearLookupCaches()
if( pLookupCacheMapImpl )
pLookupCacheMapImpl->clear();
}
-//IAccessibility2 Implementation 2009-----
sal_Bool ScDocument::IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder)
{
ScChangeTrack* pTrack = GetChangeTrack();
@@ -1457,4 +1452,3 @@ void ScDocument::GetCellChangeTrackNote( const ScAddress &aCellPos,String &aTrac
}
}
}
-//-----IAccessibility2 Implementation 2009
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 1bff8fe..f28599f 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -200,7 +200,6 @@ sal_Bool ScDocument::GetTable( const String& rName, SCTAB& rTab ) const
return sal_False;
}
-//IAccessibility2 Implementation 2009-----
ScTable* ScDocument::GetTableByIndex(sal_Int32 nIndex)
{
if ( nIndex <= MAXTAB && nIndex >= 0)
@@ -208,7 +207,6 @@ ScTable* ScDocument::GetTableByIndex(sal_Int32 nIndex)
return NULL;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool ScDocument::ValidTabName( const String& rName ) const
{
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 9948ff1..3f4e2d5 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -2027,7 +2027,6 @@ ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, sal_Bool bCreate )
}
return 0;
}
-//IAccessibility2 Implementation 2009-----
ImageMap* ScDrawLayer::GetImageMapForObject(SdrObject* pObj)
{
ScIMapInfo* pIMapInfo = const_cast<ScIMapInfo*>( GetIMapInfo( pObj ) );
@@ -2047,7 +2046,6 @@ sal_Int32 ScDrawLayer::GetHyperlinkCount(SdrObject* pObj)
nHLCount = 0; // pMacroInfo->GetHlink().getLength() > 0 ? 1 : 0;
return nHLCount;
}
-//-----IAccessibility2 Implementation 2009
void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) // static
{
DBG_ASSERT(!pGlobalDrawPersist,"SetGlobalDrawPersist mehrfach");
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index afd98fe..114c384 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3308,7 +3308,6 @@ sal_uLong ScTable::GetColOffset( SCCOL nCol ) const
return n;
}
-//IAccessibility2 Implementation 2009-----
ScColumn* ScTable::GetColumnByIndex(sal_Int32 index)
{
if( index <= MAXCOL && index >= 0 )
@@ -3317,5 +3316,4 @@ ScColumn* ScTable::GetColumnByIndex(sal_Int32 index)
}
return NULL;
}
-//-----IAccessibility2 Implementation 2009
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index b634f46..a953a53 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -1706,10 +1706,8 @@ sal_Bool ScDetectiveFunc::IsColorsInitialized()
return bColorsInitialized;
}
-//IAccessibility2 Implementation 2009-----
void ScDetectiveFunc::AppendChangTrackNoteSeparator(String &aDisplay)
{
aDisplay.AppendAscii( RTL_CONSTASCII_STRINGPARAM("\n--------\n") );
}
-//-----IAccessibility2 Implementation 2009
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 04b0c36..084b420 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -40,9 +40,7 @@
#include "editsrc.hxx"
#include "dociter.hxx"
#include "cell.hxx"
-//IAccessibility2 Implementation 2009-----
#include "validat.hxx"
-//-----IAccessibility2 Implementation 2009
#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX
#include <unotools/accessiblestatesethelper.hxx>
#endif
@@ -60,9 +58,7 @@
#include <comphelper/sequence.hxx>
#include <float.h>
-//IAccessibility2 Implementation 2009-----
#include "AccessibleSpreadsheet.hxx"
-//-----IAccessibility2 Implementation 2009
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
@@ -245,7 +241,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
pStateSet->AddState(AccessibleStateType::DEFUNC);
else
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
pStateSet->AddState(AccessibleStateType::ENABLED);
@@ -263,7 +258,6 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
pStateSet->AddState(AccessibleStateType::VISIBLE);
return pStateSet;
}
-//-----IAccessibility2 Implementation 2009
if (IsEditable(xParentStates))
{
pStateSet->AddState(AccessibleStateType::EDITABLE);
@@ -272,9 +266,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
pStateSet->AddState(AccessibleStateType::ENABLED);
pStateSet->AddState(AccessibleStateType::MULTI_LINE);
pStateSet->AddState(AccessibleStateType::MULTI_SELECTABLE);
-//IAccessibility2 Implementation 2009-----
pStateSet->AddState(AccessibleStateType::FOCUSABLE);
-//-----IAccessibility2 Implementation 2009
if (IsOpaque(xParentStates))
pStateSet->AddState(AccessibleStateType::OPAQUE);
pStateSet->AddState(AccessibleStateType::SELECTABLE);
@@ -371,7 +363,6 @@ sal_Bool ScAccessibleCell::IsOpaque(
sal_Bool ScAccessibleCell::IsSelected()
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
const ScAccessibleSpreadsheet *pSheet =static_cast<const ScAccessibleSpreadsheet*>(mxParent.get());
@@ -381,7 +372,6 @@ sal_Bool ScAccessibleCell::IsSelected()
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
sal_Bool bResult(sal_False);
if (mpViewShell && mpViewShell->GetViewData())
{
@@ -401,12 +391,10 @@ ScDocument* ScAccessibleCell::GetDocument(ScTabViewShell* pViewShell)
::std::auto_ptr< SvxEditSource > ScAccessibleCell::CreateEditSource(ScTabViewShell* pViewShell, ScAddress aCell, ScSplitPos eSplitPos)
{
-//IAccessibility2 Implementation 2009-----
if (IsFormulaMode())
{
return ::std::auto_ptr< SvxEditSource >();
}
-//-----IAccessibility2 Implementation 2009
::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData
( new ScAccessibleCellTextData( pViewShell, aCell, eSplitPos, this ) );
::std::auto_ptr< SvxEditSource > pEditSource (new ScAccessibilityEditSource(pAccessibleCellTextData));
@@ -497,7 +485,6 @@ void ScAccessibleCell::AddRelation(const ScRange& rRange,
pRelationSet->AddRelation(aRelation);
}
}
-//IAccessibility2 Implementation 2009-----
::rtl::OUString ReplaceOneChar(::rtl::OUString oldOUString, ::rtl::OUString replacedChar, ::rtl::OUString replaceStr)
{
int iReplace = -1;
@@ -591,7 +578,6 @@ sal_Bool ScAccessibleCell::IsDropdown()
sal_uInt16 nPosX = maCellAddress.Col();
sal_uInt16 nPosY = sal_uInt16(maCellAddress.Row());
sal_uInt16 nTab = maCellAddress.Tab();
- //IAccessibility2 Implementation 2009-----
sal_uInt32 nValidation = static_cast< const SfxUInt32Item* >( mpDoc->GetAttr( nPosX, nPosY, nTab, ATTR_VALIDDATA ) )->GetValue();
if( nValidation )
{
@@ -599,7 +585,6 @@ sal_Bool ScAccessibleCell::IsDropdown()
if( pData && pData->HasSelectionList() )
return sal_True;
}
- //-----IAccessibility2 Implementation 2009
ScMergeFlagAttr* pAttr;
pAttr = (ScMergeFlagAttr*)mpDoc->GetAttr( nPosX, nPosY, nTab, ATTR_MERGE_FLAG );
if( pAttr->HasAutoFilter() )
@@ -639,4 +624,3 @@ sal_Bool ScAccessibleCell::IsDropdown()
}
return sal_False;
}
-//-----IAccessibility2 Implementation 2009
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 5b24528..e43d4a2 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -38,10 +38,8 @@
#include "sc.hrc"
#endif
#include "unonames.hxx"
-//IAccessibility2 Implementation 2009-----
#include "detfunc.hxx"
#include "chgtrack.hxx"
-//-----IAccessibility2 Implementation 2009
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEROLE_HPP_
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#endif
@@ -55,11 +53,9 @@
#include <rtl/uuid.h>
#include <comphelper/sequence.hxx>
#include <sfx2/objsh.hxx>
-//IAccessibility2 Implementation 2009-----
#include <com/sun/star/sheet/XSheetAnnotation.hpp>
#include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp>
#include <com/sun/star/text/XSimpleText.hpp>
-//-----IAccessibility2 Implementation 2009
#include <float.h>
@@ -234,7 +230,6 @@ sal_Int32
ScAccessibleCellBase::createAccessibleName(void)
throw (uno::RuntimeException)
{
-//IAccessibility2 Implementation 2009-----
//String sName( ScResId(STR_ACC_CELL_NAME) );
String sAddress;
// Document not needed, because only the cell address, but not the tablename is needed
@@ -247,7 +242,6 @@ sal_Int32
//sName.Append( ' ' );
//return rtl::OUString(sName);
return rtl::OUString(sAddress);
-//-----IAccessibility2 Implementation 2009
}
//===== XAccessibleValue ================================================
@@ -260,14 +254,12 @@ uno::Any SAL_CALL
IsObjectValid();
uno::Any aAny;
if (mpDoc)
-//IAccessibility2 Implementation 2009-----
//aAny <<= mpDoc->GetValue(maCellAddress);
{
String valStr;
mpDoc->GetString(maCellAddress.Col(),maCellAddress.Row(),maCellAddress.Tab(), valStr);
aAny <<= rtl::OUString(valStr);
}
-//-----IAccessibility2 Implementation 2009
return aAny;
}
@@ -356,7 +348,6 @@ sal_Bool ScAccessibleCellBase::IsEditable(
bEditable = sal_True;
return bEditable;
}
-//IAccessibility2 Implementation 2009-----
::rtl::OUString SAL_CALL ScAccessibleCellBase::GetNote(void)
throw (::com::sun::star::uno::RuntimeException)
{
@@ -657,4 +648,3 @@ sal_Bool ScAccessibleCellBase::IsEditable(
strNote += GetNote();
return strNote;
}
-//-----IAccessibility2 Implementation 2009
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index df37633..b532783 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list