[Libreoffice-commits] core.git: svx/inc svx/source
Noel Grandin
noel at peralex.com
Sat Oct 31 12:56:48 UTC 2015
svx/inc/AccessibleSvxFindReplaceDialog.hxx | 7
svx/inc/AccessibleTableShape.hxx | 193 +--
svx/inc/galbrws2.hxx | 12
svx/inc/sdr/contact/viewcontactofunocontrol.hxx | 4
svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx | 6
svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 2
svx/inc/sxcikitm.hxx | 4
svx/inc/sxmkitm.hxx | 4
svx/inc/tbunosearchcontrollers.hxx | 14
svx/inc/unomlstr.hxx | 10
svx/source/accessibility/AccessibleControlShape.cxx | 6
svx/source/accessibility/AccessibleGraphicShape.cxx | 26
svx/source/accessibility/AccessibleOLEShape.cxx | 30
svx/source/accessibility/AccessibleShape.cxx | 167 +--
svx/source/accessibility/AccessibleShapeInfo.cxx | 12
svx/source/accessibility/ChildrenManager.cxx | 22
svx/source/accessibility/ChildrenManagerImpl.cxx | 24
svx/source/accessibility/ChildrenManagerImpl.hxx | 101 --
svx/source/accessibility/DescriptionGenerator.cxx | 10
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 4
svx/source/accessibility/ShapeTypeHandler.cxx | 2
svx/source/accessibility/SvxShapeTypes.cxx | 4
svx/source/accessibility/charmapacc.cxx | 12
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 16
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 8
svx/source/customshapes/EnhancedCustomShape2d.cxx | 24
svx/source/customshapes/EnhancedCustomShape3d.cxx | 10
svx/source/customshapes/EnhancedCustomShape3d.hxx | 2
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 2
svx/source/customshapes/EnhancedCustomShapeFontWork.hxx | 4
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 14
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 6
svx/source/customshapes/EnhancedCustomShapeHandle.cxx | 24
svx/source/customshapes/EnhancedCustomShapeHandle.hxx | 22
svx/source/dialog/charmap.cxx | 4
svx/source/dialog/dlgctrl.cxx | 4
svx/source/dialog/graphctl.cxx | 4
svx/source/dialog/imapdlg.cxx | 4
svx/source/dialog/imapwnd.hxx | 4
svx/source/dialog/langbox.cxx | 6
svx/source/dialog/rulritem.cxx | 32
svx/source/dialog/srchdlg.cxx | 7
svx/source/engine3d/extrud3d.cxx | 2
svx/source/engine3d/lathe3d.cxx | 2
svx/source/engine3d/view3d1.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 96 -
svx/source/fmcomp/fmgridif.cxx | 172 +--
svx/source/fmcomp/gridcell.cxx | 274 ++---
svx/source/fmcomp/gridctrl.cxx | 14
svx/source/form/ParseContext.cxx | 2
svx/source/form/fmPropBrw.cxx | 4
svx/source/form/fmcontrolbordermanager.cxx | 2
svx/source/form/fmdpage.cxx | 28
svx/source/form/fmexch.cxx | 8
svx/source/form/fmexpl.cxx | 2
svx/source/form/fmobj.cxx | 10
svx/source/form/fmobjfac.cxx | 4
svx/source/form/fmpage.cxx | 4
svx/source/form/fmpgeimp.cxx | 28
svx/source/form/fmshell.cxx | 4
svx/source/form/fmshimp.cxx | 54 -
svx/source/form/fmsrcimp.cxx | 66 -
svx/source/form/fmtextcontrolshell.cxx | 12
svx/source/form/fmtools.cxx | 54 -
svx/source/form/fmundo.cxx | 12
svx/source/form/fmview.cxx | 6
svx/source/form/formcontroller.cxx | 10
svx/source/form/legacyformcontroller.cxx | 4
svx/source/form/navigatortreemodel.cxx | 2
svx/source/form/sdbdatacolumn.cxx | 6
svx/source/form/sqlparserclient.cxx | 4
svx/source/form/tabwin.cxx | 8
svx/source/gallery2/gallery1.cxx | 8
svx/source/gengal/gengal.cxx | 2
svx/source/inc/AccessibleFrameSelector.hxx | 64 -
svx/source/inc/GraphCtlAccessibleContext.hxx | 107 +-
svx/source/inc/charmapacc.hxx | 164 +--
svx/source/inc/datalistener.hxx | 18
svx/source/inc/filtnav.hxx | 32
svx/source/inc/fmPropBrw.hxx | 24
svx/source/inc/fmcontrolbordermanager.hxx | 34
svx/source/inc/fmcontrollayout.hxx | 6
svx/source/inc/fmdocumentclassification.hxx | 4
svx/source/inc/fmexch.hxx | 16
svx/source/inc/fmexpl.hxx | 76 -
svx/source/inc/fmitems.hxx | 6
svx/source/inc/fmobj.hxx | 24
svx/source/inc/fmpgeimp.hxx | 32
svx/source/inc/fmscriptingenv.hxx | 16
svx/source/inc/fmshimp.hxx | 132 +-
svx/source/inc/fmtextcontrolfeature.hxx | 20
svx/source/inc/fmtextcontrolshell.hxx | 58 -
svx/source/inc/fmundo.hxx | 68 -
svx/source/inc/fmvwimp.hxx | 98 -
svx/source/inc/formcontrolfactory.hxx | 20
svx/source/inc/formcontroller.hxx | 362 +++----
svx/source/inc/formcontrolling.hxx | 36
svx/source/inc/formdispatchinterceptor.hxx | 40
svx/source/inc/formfeaturedispatcher.hxx | 28
svx/source/inc/formtoolbars.hxx | 5
svx/source/inc/gridcell.hxx | 498 +++++-----
svx/source/inc/sdbdatacolumn.hxx | 12
svx/source/inc/sqlparserclient.hxx | 8
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 169 +--
svx/source/inc/svxrectctaccessiblecontext.hxx | 260 ++---
svx/source/inc/tabwin.hxx | 4
svx/source/inc/unogalthemeprovider.hxx | 32
svx/source/inc/xfm_addcondition.hxx | 22
svx/source/inc/xmlxtexp.hxx | 16
svx/source/inc/xmlxtimp.hxx | 14
svx/source/items/SmartTagItem.cxx | 12
svx/source/items/chrtitem.cxx | 26
svx/source/items/clipfmtitem.cxx | 8
svx/source/items/customshapeitem.cxx | 50 -
svx/source/items/drawitem.cxx | 4
svx/source/items/hlnkitem.cxx | 6
svx/source/items/numfmtsh.cxx | 4
svx/source/items/viewlayoutitem.cxx | 8
svx/source/items/zoomslideritem.cxx | 12
svx/source/sdr/attribute/sdrformtextattribute.cxx | 20
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx | 2
svx/source/sdr/contact/viewcontactofe3dscene.cxx | 4
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 6
svx/source/sdr/primitive2d/primitivefactory2d.cxx | 8
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 30
svx/source/sdr/primitive3d/sdrattributecreator3d.cxx | 30
svx/source/sdr/properties/measureproperties.cxx | 2
svx/source/sdr/properties/textproperties.cxx | 2
svx/source/sidebar/PanelLayout.cxx | 2
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 4
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 2
svx/source/smarttags/SmartTagMgr.cxx | 14
svx/source/stbctrls/pszctrl.cxx | 4
svx/source/stbctrls/selctrl.cxx | 4
svx/source/stbctrls/xmlsecctrl.cxx | 4
svx/source/stbctrls/zoomctrl.cxx | 8
svx/source/stbctrls/zoomsliderctrl.cxx | 2
svx/source/svdraw/svdattr.cxx | 2
svx/source/svdraw/svdedtv1.cxx | 2
svx/source/svdraw/svdedxv.cxx | 6
svx/source/svdraw/svdfmtf.cxx | 12
svx/source/svdraw/svdfmtf.hxx | 2
svx/source/svdraw/svdlayer.cxx | 8
svx/source/svdraw/svdmodel.cxx | 6
svx/source/svdraw/svdoashp.cxx | 84 -
svx/source/svdraw/svdobj.cxx | 6
svx/source/svdraw/svdograf.cxx | 10
svx/source/svdraw/svdoole2.cxx | 48
svx/source/svdraw/svdotext.cxx | 4
svx/source/svdraw/svdotextdecomposition.cxx | 4
svx/source/svdraw/svdotextpathdecomposition.cxx | 12
svx/source/svdraw/svdotxln.cxx | 10
svx/source/svdraw/svdouno.cxx | 8
svx/source/svdraw/svdpage.cxx | 2
svx/source/svdraw/svdpagv.cxx | 4
svx/source/table/accessiblecell.cxx | 48
svx/source/table/accessiblecell.hxx | 52 -
svx/source/table/accessibletableshape.cxx | 16
svx/source/table/cell.cxx | 28
svx/source/table/cell.hxx | 116 +-
svx/source/table/cellcursor.hxx | 24
svx/source/table/cellrange.hxx | 10
svx/source/table/propertyset.hxx | 46
svx/source/table/svdotable.cxx | 26
svx/source/table/tablecolumn.cxx | 4
svx/source/table/tablecolumn.hxx | 18
svx/source/table/tablecolumns.cxx | 2
svx/source/table/tablecolumns.hxx | 16
svx/source/table/tablecontroller.cxx | 12
svx/source/table/tabledesign.cxx | 10
svx/source/table/tablemodel.hxx | 72 -
svx/source/table/tablerow.cxx | 4
svx/source/table/tablerow.hxx | 18
svx/source/table/tablerows.cxx | 2
svx/source/table/tablerows.hxx | 16
svx/source/table/tableundo.hxx | 8
svx/source/table/viewcontactoftableobj.cxx | 4
svx/source/tbxctrls/colorwindow.hxx | 2
svx/source/tbxctrls/colrctrl.cxx | 4
svx/source/tbxctrls/extrusioncontrols.cxx | 22
svx/source/tbxctrls/extrusioncontrols.hxx | 40
svx/source/tbxctrls/fontworkgallery.cxx | 16
svx/source/tbxctrls/layctrl.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 4
svx/source/tbxctrls/tbunocontroller.cxx | 46
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 12
svx/source/tbxctrls/tbxcolor.cxx | 4
svx/source/toolbars/extrusionbar.cxx | 36
svx/source/toolbars/fontworkbar.cxx | 6
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx | 63 -
svx/source/unodraw/UnoGraphicExporter.cxx | 10
svx/source/unodraw/UnoNameItemTable.hxx | 20
svx/source/unodraw/XPropertyTable.cxx | 2
svx/source/unodraw/recoveryui.cxx | 2
svx/source/unodraw/shapeimpl.hxx | 26
svx/source/unodraw/tableshape.cxx | 8
svx/source/unodraw/unomlstr.cxx | 4
svx/source/unodraw/unomod.cxx | 36
svx/source/unodraw/unopage.cxx | 22
svx/source/unodraw/unoprov.cxx | 180 +--
svx/source/unodraw/unoshap2.cxx | 58 -
svx/source/unodraw/unoshap3.cxx | 36
svx/source/unodraw/unoshap4.cxx | 34
svx/source/unodraw/unoshape.cxx | 84 -
svx/source/unodraw/unoshcol.cxx | 34
svx/source/unogallery/unogalitem.hxx | 28
svx/source/unogallery/unogaltheme.hxx | 36
svx/source/xml/xmlgrhlp.cxx | 8
svx/source/xml/xmlxtexp.cxx | 2
svx/source/xml/xmlxtimp.cxx | 4
svx/source/xoutdev/_xoutbmp.cxx | 2
svx/source/xoutdev/xattr.cxx | 128 +-
svx/source/xoutdev/xattr2.cxx | 68 -
svx/source/xoutdev/xattrbmp.cxx | 10
214 files changed, 3209 insertions(+), 3254 deletions(-)
New commits:
commit 4530451d40470bf5359645de0c142ddf9dc329b6
Author: Noel Grandin <noel at peralex.com>
Date: Fri Oct 30 14:59:47 2015 +0200
com::sun::star->css in svx
Change-Id: If2c11fa548c5ebef2297d2491edd837b54e3707c
Reviewed-on: https://gerrit.libreoffice.org/19690
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/svx/inc/AccessibleSvxFindReplaceDialog.hxx b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
index a69480e..0cfc90e 100644
--- a/svx/inc/AccessibleSvxFindReplaceDialog.hxx
+++ b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
@@ -31,8 +31,8 @@ public:
virtual ~VCLXAccessibleSvxFindReplaceDialog();
virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override;
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
};
@@ -47,8 +47,7 @@ public:
virtual ~VCLXSvxFindReplaceDialog()
{};
private:
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() override
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > CreateAccessibleContext() override
{
return new VCLXAccessibleSvxFindReplaceDialog(this);
}
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx
index 4215c54..68ce6eb 100644
--- a/svx/inc/AccessibleTableShape.hxx
+++ b/svx/inc/AccessibleTableShape.hxx
@@ -46,12 +46,12 @@ namespace accessibility
class AccessibleCell;
typedef ::cppu::ImplInheritanceHelper< AccessibleShape,
- ::com::sun::star::accessibility::XAccessibleTable,
- ::com::sun::star::view::XSelectionChangeListener
+ css::accessibility::XAccessibleTable,
+ css::view::XSelectionChangeListener
> AccessibleTableShape_Base;
/** @descr
*/
-class AccessibleTableShape : boost::noncopyable, public AccessibleTableShape_Base, public ::com::sun::star::accessibility::XAccessibleTableSelection
+class AccessibleTableShape : boost::noncopyable, public AccessibleTableShape_Base, public css::accessibility::XAccessibleTableSelection
{
public:
AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo );
@@ -60,76 +60,76 @@ public:
virtual void Init() override;
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL acquire( ) throw () override;
virtual void SAL_CALL release( ) throw () override;
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleTable
- virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
// XAccessibleSelection
- virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL clearAccessibleSelection( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL selectAllAccessibleChildren( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual ::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, std::exception) override;
- virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL clearAccessibleSelection( ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL selectAllAccessibleChildren( ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override;
// XAccessibleTableSelection
virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
// XComponent
virtual void SAL_CALL disposing( ) override;
// XSelectionChangeListener
virtual void SAL_CALL
- disposing (const ::com::sun::star::lang::EventObject& Source)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ disposing (const css::lang::EventObject& Source)
+ throw (css::uno::RuntimeException, std::exception) override;
virtual void SAL_CALL
- selectionChanged (const ::com::sun::star::lang::EventObject& rEvent)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ selectionChanged (const css::lang::EventObject& rEvent)
+ throw (css::uno::RuntimeException, std::exception) override;
sal_Int32 mnPreviousSelectionCount;
using AccessibleShape::disposing;
friend class AccessibleTableHeaderShape;
- void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException );
+ void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (css::lang::IndexOutOfBoundsException );
// overwrite the SetState & ResetState to do special operation for table cell's internal text
virtual bool SetState (sal_Int16 aState) override;
virtual bool ResetState (sal_Int16 aState) override;
@@ -140,11 +140,11 @@ public:
AccessibleCell* GetActiveAccessibleCell();
protected:
- virtual OUString CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) override;
+ virtual OUString CreateAccessibleBaseName() throw (css::uno::RuntimeException) override;
sdr::table::SvxTableController* getTableController();
- void checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException );
+ void checkCellPosition( sal_Int32 nCol, sal_Int32 nRow ) throw ( css::lang::IndexOutOfBoundsException );
private:
rtl::Reference< AccessibleTableShapeImpl > mxImpl;
@@ -152,11 +152,11 @@ private:
};
typedef ::cppu::WeakImplHelper<
- ::com::sun::star::accessibility::XAccessible,
- ::com::sun::star::accessibility::XAccessibleComponent,
- ::com::sun::star::accessibility::XAccessibleContext,
- ::com::sun::star::accessibility::XAccessibleTable,
- ::com::sun::star::accessibility::XAccessibleTableSelection >
+ css::accessibility::XAccessible,
+ css::accessibility::XAccessibleComponent,
+ css::accessibility::XAccessibleContext,
+ css::accessibility::XAccessibleTable,
+ css::accessibility::XAccessibleTableSelection >
AccessibleTableHeaderShape_BASE;
class AccessibleTableHeaderShape : boost::noncopyable,
@@ -169,64 +169,63 @@ public:
virtual ~AccessibleTableHeaderShape();
// XAccessible
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(css::uno::RuntimeException, std::exception) override;
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override;
//XAccessibleComponent
- virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override;
// XAccessibleTable
- virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override;
// XAccessibleTableSelection
virtual sal_Bool SAL_CALL selectRow( sal_Int32 row )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override ;
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override ;
private:
- SVX_DLLPRIVATE explicit AccessibleTableHeaderShape( const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>& rxParent );
+ SVX_DLLPRIVATE explicit AccessibleTableHeaderShape( const css::uno::Reference<css::accessibility::XAccessible>& rxParent );
bool mbRow;
rtl::Reference< AccessibleTableShape > mpTable;
};
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 7e31440..3eea509 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -120,8 +120,8 @@ private:
GalleryBrowserMode meMode;
GalleryBrowserMode meLastMode;
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
- com::sun::star::uno::Reference< com::sun::star::util::XURLTransformer > m_xTransformer;
+ css::uno::Reference< css::uno::XComponentContext > m_xContext;
+ css::uno::Reference< css::util::XURLTransformer > m_xTransformer;
void InitSettings();
@@ -175,13 +175,13 @@ public:
void ShowContextMenu( vcl::Window* pWindow, const Point* pContextPoint = NULL );
bool KeyInput( const KeyEvent& rEvt, vcl::Window* pWindow );
- static com::sun::star::uno::Reference< com::sun::star::frame::XFrame > GetFrame();
- com::sun::star::uno::Reference< com::sun::star::util::XURLTransformer > GetURLTransformer() const { return m_xTransformer; }
+ static css::uno::Reference< css::frame::XFrame > GetFrame();
+ css::uno::Reference< css::util::XURLTransformer > GetURLTransformer() const { return m_xTransformer; }
void Execute( sal_uInt16 nId );
void Dispatch( sal_uInt16 nId,
- const com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > &rxDispatch = com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >(),
- const com::sun::star::util::URL &rURL = com::sun::star::util::URL() );
+ const css::uno::Reference< css::frame::XDispatch > &rxDispatch = css::uno::Reference< css::frame::XDispatch >(),
+ const css::util::URL &rURL = css::util::URL() );
DECL_STATIC_LINK_TYPED( GalleryBrowser2, AsyncDispatch_Impl, void*, void );
};
diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
index bc11faf..a2d8d31 100644
--- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx
@@ -66,8 +66,8 @@ namespace sdr { namespace contact {
/** retrieves a temporary XControl instance, whose parent is the given window
@seealso SdrUnoObj::GetTemporaryControlForWindow
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
- getTemporaryControlForWindow( const vcl::Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const;
+ css::uno::Reference< css::awt::XControl >
+ getTemporaryControlForWindow( const vcl::Window& _rWindow, css::uno::Reference< css::awt::XControlContainer >& _inout_ControlContainer ) const;
protected:
virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) override;
diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
index 395baf0..a6b8284 100644
--- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -55,16 +55,16 @@ namespace sdr { namespace contact {
ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact );
/// returns the ->XControl instance belonging to the instance, creates it if necessary
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
+ css::uno::Reference< css::awt::XControl >
getControl();
/** retrieves a temporary XControl instance, whose parent is the given device
@seealso SdrUnoObj::GetTemporaryControlForWindow
*/
- static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
+ static css::uno::Reference< css::awt::XControl >
getTemporaryControlForWindow(
const vcl::Window& _rWindow,
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer,
+ css::uno::Reference< css::awt::XControlContainer >& _inout_ControlContainer,
const SdrUnoObj& _rUnoObject
);
diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
index 1cb5edf1..eced60a 100644
--- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -56,7 +56,7 @@ namespace drawinglayer
// is not given or different, the decomposition needs to be potentially removed
// for supporting e.g. page number change on MasterPage objects or the different
// field renderings in SubGeometry and MasterPage node
- com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxLastVisualizingPage;
+ css::uno::Reference< css::drawing::XDrawPage > mxLastVisualizingPage;
// remember last PageNumber for which a decomposition was made. This is only used
// when mbContainsPageField is true, else it is 0
diff --git a/svx/inc/sxcikitm.hxx b/svx/inc/sxcikitm.hxx
index de2e65c..4b01026 100644
--- a/svx/inc/sxcikitm.hxx
+++ b/svx/inc/sxcikitm.hxx
@@ -37,8 +37,8 @@ public:
virtual sal_uInt16 GetValueCount() const override; // { return 4; }
SdrCircKind GetValue() const { return (SdrCircKind)SfxEnumItem::GetValue(); }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override;
diff --git a/svx/inc/sxmkitm.hxx b/svx/inc/sxmkitm.hxx
index 1ee1994..e8a893c 100644
--- a/svx/inc/sxmkitm.hxx
+++ b/svx/inc/sxmkitm.hxx
@@ -37,8 +37,8 @@ public:
virtual sal_uInt16 GetValueCount() const override; // { return 2; }
SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
+ virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
+ virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
virtual OUString GetValueTextByPos(sal_uInt16 nPos) const override;
virtual bool GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const override;
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index f7477df..efa07be 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -132,7 +132,7 @@ public:
virtual ~ExitSearchToolboxController();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
@@ -164,7 +164,7 @@ public:
virtual ~UpDownSearchToolboxController();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
@@ -197,7 +197,7 @@ public:
virtual ~MatchCaseToolboxController();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
@@ -230,7 +230,7 @@ public:
virtual ~SearchFormattedToolboxController();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
@@ -263,7 +263,7 @@ public:
virtual ~FindAllToolboxController();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
@@ -293,7 +293,7 @@ public:
virtual ~SearchLabelToolboxController();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
@@ -329,7 +329,7 @@ public:
virtual ~FindbarDispatcher();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx
index f722f13..42bf502 100644
--- a/svx/inc/unomlstr.hxx
+++ b/svx/inc/unomlstr.hxx
@@ -25,7 +25,7 @@
class SdrObject;
-class SvxUnoShapeModifyListener : public ::cppu::WeakAggImplHelper1< ::com::sun::star::util::XModifyListener >
+class SvxUnoShapeModifyListener : public ::cppu::WeakAggImplHelper1< css::util::XModifyListener >
{
SdrObject* mpObj;
@@ -33,11 +33,11 @@ public:
SvxUnoShapeModifyListener( SdrObject* pObj ) throw();
virtual ~SvxUnoShapeModifyListener() throw();
- // ::com::sun::star::util::XModifyListener
- virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::util::XModifyListener
+ virtual void SAL_CALL modified(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception) override;
- // ::com::sun::star::lang::XEventListener
- virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception) override;
+ // css::lang::XEventListener
+ virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception) override;
// internal
void invalidate() throw();
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index d40771a..7077f77 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -842,7 +842,7 @@ void AccessibleControlShape::initializeComposedState()
}
}
-void SAL_CALL AccessibleControlShape::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleControlShape::elementInserted( const css::container::ContainerEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception)
{
Reference< XContainer > xContainer( _rEvent.Source, UNO_QUERY );
Reference< XControl > xControl( _rEvent.Element, UNO_QUERY );
@@ -875,12 +875,12 @@ void SAL_CALL AccessibleControlShape::elementInserted( const ::com::sun::star::c
}
}
-void SAL_CALL AccessibleControlShape::elementRemoved( const ::com::sun::star::container::ContainerEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleControlShape::elementRemoved( const css::container::ContainerEvent& ) throw (css::uno::RuntimeException, std::exception)
{
// not interested in
}
-void SAL_CALL AccessibleControlShape::elementReplaced( const ::com::sun::star::container::ContainerEvent& ) throw (::com::sun::star::uno::RuntimeException, std::exception)
+void SAL_CALL AccessibleControlShape::elementReplaced( const css::container::ContainerEvent& ) throw (css::uno::RuntimeException, std::exception)
{
// not interested in
}
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index d24b15e..f567582 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -47,7 +47,7 @@ AccessibleGraphicShape::~AccessibleGraphicShape()
// XAccessibleImage
OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
if (m_pShape)
return m_pShape->GetTitle();
@@ -58,7 +58,7 @@ OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription()
sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return AccessibleShape::getSize().Height;
}
@@ -67,17 +67,17 @@ sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight()
sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return AccessibleShape::getSize().Width;
}
// XInterface
-com::sun::star::uno::Any SAL_CALL
- AccessibleGraphicShape::queryInterface (const com::sun::star::uno::Type & rType)
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL
+ AccessibleGraphicShape::queryInterface (const css::uno::Type & rType)
+ throw (css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Any aReturn = AccessibleShape::queryInterface (rType);
+ css::uno::Any aReturn = AccessibleShape::queryInterface (rType);
if ( ! aReturn.hasValue())
aReturn = ::cppu::queryInterface (rType,
static_cast<XAccessibleImage*>(this));
@@ -105,7 +105,7 @@ void SAL_CALL
// XServiceInfo
OUString SAL_CALL
AccessibleGraphicShape::getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return OUString("AccessibleGraphicShape");
}
@@ -113,9 +113,9 @@ OUString SAL_CALL
-::com::sun::star::uno::Sequence< OUString> SAL_CALL
+css::uno::Sequence< OUString> SAL_CALL
AccessibleGraphicShape::getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed ();
// Get list of supported service names from base class...
@@ -153,7 +153,7 @@ uno::Sequence<uno::Type> SAL_CALL
/// Create the base name of this object, i.e. the name without appended number.
OUString
AccessibleGraphicShape::CreateAccessibleBaseName()
- throw (::com::sun::star::uno::RuntimeException)
+ throw (css::uno::RuntimeException)
{
OUString sName;
@@ -175,7 +175,7 @@ OUString
}
OUString AccessibleGraphicShape::CreateAccessibleDescription()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
//Don't use the same information for accessible name and accessible description.
OUString sDesc;
@@ -188,7 +188,7 @@ OUString AccessibleGraphicShape::CreateAccessibleDescription()
// Return this object's role.
sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != NULL )
return AccessibleRole::IMAGE_MAP;
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index 7cc19ff..4577ccf 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -47,7 +47,7 @@ AccessibleOLEShape::~AccessibleOLEShape()
// XAccessibleAction
sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return 0;
}
@@ -65,8 +65,8 @@ sal_Bool SAL_CALL AccessibleOLEShape::doAccessibleAction (sal_Int32 /*nIndex*/)
OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32 /*nIndex*/)
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception)
{
throw lang::IndexOutOfBoundsException();
}
@@ -75,18 +75,18 @@ OUString SAL_CALL AccessibleOLEShape::getAccessibleActionDescription (sal_Int32
Reference<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActionKeyBinding (sal_Int32 /*nIndex*/)
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
- ::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::lang::IndexOutOfBoundsException,
+ css::uno::RuntimeException, std::exception)
{
throw lang::IndexOutOfBoundsException();
}
// XInterface
-com::sun::star::uno::Any SAL_CALL
- AccessibleOLEShape::queryInterface (const com::sun::star::uno::Type & rType)
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL
+ AccessibleOLEShape::queryInterface (const css::uno::Type & rType)
+ throw (css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Any aReturn = AccessibleShape::queryInterface (rType);
+ css::uno::Any aReturn = AccessibleShape::queryInterface (rType);
if ( ! aReturn.hasValue())
aReturn = ::cppu::queryInterface (rType,
static_cast<XAccessibleAction*>(this));
@@ -114,7 +114,7 @@ void SAL_CALL
// XServiceInfo
OUString SAL_CALL
AccessibleOLEShape::getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return OUString("AccessibleOLEShape");
}
@@ -122,9 +122,9 @@ OUString SAL_CALL
-::com::sun::star::uno::Sequence< OUString> SAL_CALL
+css::uno::Sequence< OUString> SAL_CALL
AccessibleOLEShape::getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed();
// Get list of supported service names from base class...
@@ -158,7 +158,7 @@ uno::Sequence<uno::Type> SAL_CALL
// XAccessibleExtendedAttributes
uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
uno::Any strRet;
::rtl::OUString style;
@@ -174,7 +174,7 @@ uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes()
/// Set this object's name if is different to the current name.
OUString
AccessibleOLEShape::CreateAccessibleBaseName()
- throw (::com::sun::star::uno::RuntimeException)
+ throw (css::uno::RuntimeException)
{
OUString sName;
@@ -206,7 +206,7 @@ OUString
OUString
AccessibleOLEShape::CreateAccessibleDescription()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return CreateAccessibleName ();
}
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 8ec7594..9fd40a5 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -219,7 +219,7 @@ void AccessibleShape::UpdateStates()
bShapeIsOpaque = ( xSet->getPropertyValue ("FillStyle") >>= aFillStyle)
&& aFillStyle == drawing::FillStyle_SOLID;
}
- catch (::com::sun::star::beans::UnknownPropertyException&)
+ catch (css::beans::UnknownPropertyException&)
{
// Ignore.
}
@@ -314,7 +314,7 @@ bool AccessibleShape::GetState (sal_Int16 aState)
// OverWrite the parent's getAccessibleName method
OUString SAL_CALL AccessibleShape::getAccessibleName()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed ();
if (m_pShape && !m_pShape->GetTitle().isEmpty())
@@ -324,7 +324,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleName()
}
OUString SAL_CALL AccessibleShape::getAccessibleDescription()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed ();
if( m_pShape && !m_pShape->GetDescription().isEmpty())
@@ -339,7 +339,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleDescription()
*/
sal_Int32 SAL_CALL
AccessibleShape::getAccessibleChildCount ()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed ();
sal_Int32 nChildCount = 0;
@@ -362,7 +362,7 @@ sal_Int32 SAL_CALL
*/
uno::Reference<XAccessible> SAL_CALL
AccessibleShape::getAccessibleChild (sal_Int32 nIndex)
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed ();
@@ -392,7 +392,7 @@ uno::Reference<XAccessible> SAL_CALL
uno::Reference<XAccessibleRelationSet> SAL_CALL
AccessibleShape::getAccessibleRelationSet()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard (maMutex);
if (mpParent == NULL)
@@ -418,7 +418,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL
*/
uno::Reference<XAccessibleStateSet> SAL_CALL
AccessibleShape::getAccessibleStateSet()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard (maMutex);
Reference<XAccessibleStateSet> xStateSet;
@@ -429,34 +429,35 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
xStateSet = AccessibleContextBase::getAccessibleStateSet ();
::utl::AccessibleStateSetHelper* pStateSet =
static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
- ::com::sun::star::uno::Reference<XAccessible> xTempAcc = getAccessibleParent();
- if( xTempAcc.is() )
+ css::uno::Reference<XAccessible> xTempAcc = getAccessibleParent();
+ if( xTempAcc.is() )
+ {
+ css::uno::Reference<XAccessibleContext>
+ xTempAccContext = xTempAcc->getAccessibleContext();
+ if( xTempAccContext.is() )
{
- ::com::sun::star::uno::Reference<XAccessibleContext>
- xTempAccContext = xTempAcc->getAccessibleContext();
- if( xTempAccContext.is() )
- {
- ::com::sun::star::uno::Reference<XAccessibleStateSet> rState =
- xTempAccContext->getAccessibleStateSet();
- if( rState.is() ) {
- com::sun::star::uno::Sequence<short> pStates = rState->getStates();
- int count = pStates.getLength();
- for( int iIndex = 0;iIndex < count;iIndex++ )
+ css::uno::Reference<XAccessibleStateSet> rState =
+ xTempAccContext->getAccessibleStateSet();
+ if( rState.is() ) {
+ css::uno::Sequence<short> pStates = rState->getStates();
+ int count = pStates.getLength();
+ for( int iIndex = 0;iIndex < count;iIndex++ )
+ {
+ if( pStates[iIndex] == AccessibleStateType::EDITABLE )
{
- if( pStates[iIndex] == AccessibleStateType::EDITABLE )
- {
- pStateSet->AddState (AccessibleStateType::EDITABLE);
- pStateSet->AddState (AccessibleStateType::RESIZABLE);
- pStateSet->AddState (AccessibleStateType::MOVEABLE);
- break;
- }
+ pStateSet->AddState (AccessibleStateType::EDITABLE);
+ pStateSet->AddState (AccessibleStateType::RESIZABLE);
+ pStateSet->AddState (AccessibleStateType::MOVEABLE);
+ break;
}
}
}
}
- xStateSet = Reference<XAccessibleStateSet>(
+ }
+ xStateSet = Reference<XAccessibleStateSet>(
new ::utl::AccessibleStateSetHelper (*pStateSet));
- }else
+ }
+ else
{
::utl::AccessibleStateSetHelper* pStateSet =
static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
@@ -472,17 +473,17 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
pStateSet->RemoveState (AccessibleStateType::FOCUSED);
}
//Just when the document is not read-only,set states EDITABLE,RESIZABLE,MOVEABLE
- ::com::sun::star::uno::Reference<XAccessible> xTempAcc = getAccessibleParent();
+ css::uno::Reference<XAccessible> xTempAcc = getAccessibleParent();
if( xTempAcc.is() )
{
- ::com::sun::star::uno::Reference<XAccessibleContext>
+ css::uno::Reference<XAccessibleContext>
xTempAccContext = xTempAcc->getAccessibleContext();
if( xTempAccContext.is() )
{
- ::com::sun::star::uno::Reference<XAccessibleStateSet> rState =
+ css::uno::Reference<XAccessibleStateSet> rState =
xTempAccContext->getAccessibleStateSet();
if( rState.is() ) {
- com::sun::star::uno::Sequence<short> pStates = rState->getStates();
+ css::uno::Sequence<short> pStates = rState->getStates();
int count = pStates.getLength();
for( int iIndex = 0;iIndex < count;iIndex++ )
{
@@ -552,7 +553,7 @@ uno::Reference<XAccessible > SAL_CALL
awt::Rectangle SAL_CALL AccessibleShape::getBounds()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard (maMutex);
@@ -667,7 +668,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds()
awt::Point SAL_CALL AccessibleShape::getLocation()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed ();
awt::Rectangle aBoundingBox (getBounds());
@@ -678,7 +679,7 @@ awt::Point SAL_CALL AccessibleShape::getLocation()
awt::Point SAL_CALL AccessibleShape::getLocationOnScreen()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed ();
@@ -714,7 +715,7 @@ awt::Size SAL_CALL AccessibleShape::getSize()
sal_Int32 SAL_CALL AccessibleShape::getForeground()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed ();
sal_Int32 nColor (0x0ffffffL);
@@ -729,7 +730,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground()
aColor >>= nColor;
}
}
- catch (const ::com::sun::star::beans::UnknownPropertyException &)
+ catch (const css::beans::UnknownPropertyException &)
{
// Ignore exception and return default color.
}
@@ -740,7 +741,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground()
sal_Int32 SAL_CALL AccessibleShape::getBackground()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed ();
sal_Int32 nColor (0L);
@@ -769,7 +770,7 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground()
nColor = crBk.GetColor();
}
}
- catch (const ::com::sun::star::beans::UnknownPropertyException &)
+ catch (const css::beans::UnknownPropertyException &)
{
// Ignore exception and return default color.
}
@@ -808,17 +809,17 @@ void SAL_CALL AccessibleShape::removeAccessibleEventListener (
}
// XInterface
-com::sun::star::uno::Any SAL_CALL
- AccessibleShape::queryInterface (const com::sun::star::uno::Type & rType)
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+css::uno::Any SAL_CALL
+ AccessibleShape::queryInterface (const css::uno::Type & rType)
+ throw (css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::uno::Any aReturn = AccessibleContextBase::queryInterface (rType);
+ css::uno::Any aReturn = AccessibleContextBase::queryInterface (rType);
if ( ! aReturn.hasValue())
aReturn = ::cppu::queryInterface (rType,
static_cast<XAccessibleComponent*>(this),
static_cast<XAccessibleExtendedComponent*>(this),
- static_cast< ::com::sun::star::accessibility::XAccessibleSelection* >(this),
- static_cast< ::com::sun::star::accessibility::XAccessibleExtendedAttributes* >(this),
+ static_cast< css::accessibility::XAccessibleSelection* >(this),
+ static_cast< css::accessibility::XAccessibleExtendedAttributes* >(this),
static_cast<lang::XEventListener*>(this),
static_cast<document::XEventListener*>(this),
static_cast<lang::XUnoTunnel*>(this),
@@ -870,7 +871,7 @@ throw ( IndexOutOfBoundsException,
{
if( xContext->getAccessibleRole() == AccessibleRole::PARAGRAPH )
{
- uno::Reference< ::com::sun::star::accessibility::XAccessibleText >
+ uno::Reference< css::accessibility::XAccessibleText >
xText(xAcc, uno::UNO_QUERY);
if( xText.is() )
{
@@ -948,7 +949,7 @@ void SAL_CALL AccessibleShape::deselectAccessibleChild( sal_Int32 )
// XAccessibleExtendedAttributes
uno::Any SAL_CALL AccessibleShape::getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
uno::Any strRet;
OUString style;
@@ -965,7 +966,7 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes()
// XServiceInfo
OUString SAL_CALL
AccessibleShape::getImplementationName()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return OUString("AccessibleShape");
}
@@ -975,7 +976,7 @@ OUString SAL_CALL
uno::Sequence<OUString> SAL_CALL
AccessibleShape::getSupportedServiceNames()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed ();
// Get list of supported service names from base class...
@@ -1146,20 +1147,20 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType,
// protected internal
// Set this object's name if is different to the current name.
OUString AccessibleShape::CreateAccessibleBaseName()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return ShapeTypeHandler::CreateAccessibleBaseName( mxShape );
}
OUString AccessibleShape::CreateAccessibleName()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
return GetFullAccessibleName(this);
}
OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape)
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
OUString sName (shape->CreateAccessibleBaseName());
// Append the shape's index to the name to disambiguate between shapes
@@ -1196,7 +1197,7 @@ OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape)
OUString
AccessibleShape::CreateAccessibleDescription()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
DescriptionGenerator aDG (mxShape);
aDG.Initialize (CreateAccessibleBaseName());
@@ -1311,7 +1312,7 @@ void AccessibleShape::disposing()
sal_Int32 SAL_CALL
AccessibleShape::getAccessibleIndexInParent()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
ThrowIfDisposed ();
// Use a simple but slow solution for now. Optimize later.
@@ -1359,7 +1360,7 @@ void AccessibleShape::UpdateNameAndDescription()
// Return this object's role.
sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
sal_Int16 nAccessibleRole = AccessibleRole::SHAPE ;
switch (ShapeTypeHandler::Instance().GetTypeId (mxShape))
@@ -1423,7 +1424,7 @@ throw (uno::RuntimeException, std::exception)
aRet[1] = 0;
aRet[2] = 0;
- ::com::sun::star::uno::Reference<XAccessible> xParent = getAccessibleParent();
+ css::uno::Reference<XAccessible> xParent = getAccessibleParent();
if (!xParent.is())
{
return aRet;
@@ -1445,7 +1446,7 @@ throw (uno::RuntimeException, std::exception)
pUper = pUper->GetUpGroup();
}
- ::com::sun::star::uno::Reference<XAccessibleContext> xParentContext = xParent->getAccessibleContext();
+ css::uno::Reference<XAccessibleContext> xParentContext = xParent->getAccessibleContext();
if( xParentContext->getAccessibleRole() == AccessibleRole::DOCUMENT ||
xParentContext->getAccessibleRole() == AccessibleRole::DOCUMENT_PRESENTATION ||
xParentContext->getAccessibleRole() == AccessibleRole::DOCUMENT_SPREADSHEET ||
@@ -1528,7 +1529,7 @@ OUString AccessibleShape::getObjectLink( const uno::Any& )
// XAccesibleHypertext
sal_Int32 SAL_CALL AccessibleShape::getHyperLinkCount()
- throw (::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::uno::RuntimeException, std::exception)
{
// MT: Introduced with IA2 CWS, but SvxAccessibleHyperlink was redundant to svx::AccessibleHyperlink which we introduced meanwhile.
// Code need to be adapted....
@@ -1544,7 +1545,7 @@ sal_Int32 SAL_CALL AccessibleShape::getHyperLinkCount()
}
uno::Reference< XAccessibleHyperlink > SAL_CALL
AccessibleShape::getHyperLink( sal_Int32 )
- throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+ throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
uno::Reference< XAccessibleHyperlink > xRet;
// MT: Introduced with IA2 CWS, but SvxAccessibleHyperlink was redundant to svx::AccessibleHyperlink which we introduced meanwhile.
@@ -1554,53 +1555,53 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
if (pLink->IsValidHyperlink())
xRet = pLink;
if( !xRet.is() )
- throw ::com::sun::star::lang::IndexOutOfBoundsException();
+ throw css::lang::IndexOutOfBoundsException();
*/
return xRet;
}
sal_Int32 SAL_CALL AccessibleShape::getHyperLinkIndex( sal_Int32 )
-throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
sal_Int32 nRet = 0;
return nRet;
}
// XAccesibleText
-sal_Int32 SAL_CALL AccessibleShape::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-sal_Bool SAL_CALL AccessibleShape::setCaretPosition( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-sal_Unicode SAL_CALL AccessibleShape::getCharacter( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleShape::getCharacterAttributes( sal_Int32, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleShape::getCaretPosition( ) throw (css::uno::RuntimeException, std::exception){return 0;}
+sal_Bool SAL_CALL AccessibleShape::setCaretPosition( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;}
+sal_Unicode SAL_CALL AccessibleShape::getCharacter( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;}
+css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleShape::getCharacterAttributes( sal_Int32, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
- uno::Sequence< ::com::sun::star::beans::PropertyValue > aValues(0);
+ uno::Sequence< css::beans::PropertyValue > aValues(0);
return aValues;
}
-::com::sun::star::awt::Rectangle SAL_CALL AccessibleShape::getCharacterBounds( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::awt::Rectangle SAL_CALL AccessibleShape::getCharacterBounds( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception)
{
- return com::sun::star::awt::Rectangle(0, 0, 0, 0 );
+ return css::awt::Rectangle(0, 0, 0, 0 );
}
-sal_Int32 SAL_CALL AccessibleShape::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const ::com::sun::star::awt::Point& ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-OUString SAL_CALL AccessibleShape::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return OUString();}
-sal_Int32 SAL_CALL AccessibleShape::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;}
-sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return sal_True;}
-OUString SAL_CALL AccessibleShape::getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return OUString();}
-OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return OUString();}
-::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL AccessibleShape::getCharacterCount( ) throw (css::uno::RuntimeException, std::exception){return 0;}
+sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception){return 0;}
+OUString SAL_CALL AccessibleShape::getSelectedText( ) throw (css::uno::RuntimeException, std::exception){return OUString();}
+sal_Int32 SAL_CALL AccessibleShape::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception){return 0;}
+sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception){return 0;}
+sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;}
+OUString SAL_CALL AccessibleShape::getText( ) throw (css::uno::RuntimeException, std::exception){return OUString();}
+OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return OUString();}
+css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::accessibility::TextSegment aResult;
+ css::accessibility::TextSegment aResult;
return aResult;
}
-::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::accessibility::TextSegment aResult;
+ css::accessibility::TextSegment aResult;
return aResult;
}
-::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception)
+css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception)
{
- ::com::sun::star::accessibility::TextSegment aResult;
+ css::accessibility::TextSegment aResult;
return aResult;
}
-sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return sal_True;}
+sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;}
} // end of namespace accessibility
diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx
index d2e324c..8ecbdfd 100644
--- a/svx/source/accessibility/AccessibleShapeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeInfo.cxx
@@ -23,10 +23,8 @@
namespace accessibility {
AccessibleShapeInfo::AccessibleShapeInfo (
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& rxShape,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>& rxParent,
+ const css::uno::Reference<css::drawing::XShape>& rxShape,
+ const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
IAccessibleParent* pChildrenManager,
sal_Int32 nIndex)
: mxShape (rxShape),
@@ -41,10 +39,8 @@ AccessibleShapeInfo::AccessibleShapeInfo (
AccessibleShapeInfo::AccessibleShapeInfo (
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& rxShape,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>& rxParent,
+ const css::uno::Reference<css::drawing::XShape>& rxShape,
+ const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
sal_Int32 nIndex)
: mxShape (rxShape),
mxParent (rxParent),
diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx
index ada8b29..49f193e0 100644
--- a/svx/source/accessibility/ChildrenManager.cxx
+++ b/svx/source/accessibility/ChildrenManager.cxx
@@ -29,8 +29,8 @@ namespace accessibility {
// AccessibleChildrenManager
ChildrenManager::ChildrenManager (
- const ::com::sun::star::uno::Reference<XAccessible>& rxParent,
- const ::com::sun::star::uno::Reference<drawing::XShapes>& rxShapeList,
+ const css::uno::Reference<XAccessible>& rxParent,
+ const css::uno::Reference<drawing::XShapes>& rxShapeList,
const AccessibleShapeTreeInfo& rShapeTreeInfo,
AccessibleContextBase& rContext)
: mpImpl (NULL)
@@ -61,25 +61,24 @@ long ChildrenManager::GetChildCount() const throw ()
return mpImpl->GetChildCount();
}
-::com::sun::star::uno::Reference<XAccessible> ChildrenManager::GetChild (long nIndex)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException)
+css::uno::Reference<XAccessible> ChildrenManager::GetChild (long nIndex)
+ throw (css::uno::RuntimeException,
+ css::lang::IndexOutOfBoundsException)
{
assert(mpImpl != NULL);
return mpImpl->GetChild (nIndex);
}
Reference<XAccessible> ChildrenManager::GetChild (const Reference<drawing::XShape>& xShape)
- throw (::com::sun::star::uno::RuntimeException)
+ throw (css::uno::RuntimeException)
{
assert(mpImpl != NULL);
return mpImpl->GetChild (xShape);
}
-::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape> ChildrenManager::GetChildShape(long nIndex)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException)
+css::uno::Reference<css::drawing::XShape> ChildrenManager::GetChildShape(long nIndex)
+ throw (css::uno::RuntimeException,
+ css::lang::IndexOutOfBoundsException)
{
assert(mpImpl != NULL);
return mpImpl->GetChildShape(nIndex);
@@ -91,8 +90,7 @@ void ChildrenManager::Update (bool bCreateNewObjectsOnDemand)
mpImpl->Update (bCreateNewObjectsOnDemand);
}
-void ChildrenManager::SetShapeList (const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes>& xShapeList)
+void ChildrenManager::SetShapeList (const css::uno::Reference<css::drawing::XShapes>& xShapeList)
{
assert(mpImpl != NULL);
mpImpl->SetShapeList (xShapeList);
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 45b37c0..3117101 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -59,8 +59,8 @@ ChildrenManagerImpl::ChildrenManagerImpl (
const AccessibleShapeTreeInfo& rShapeTreeInfo,
AccessibleContextBase& rContext)
: ::cppu::WeakComponentImplHelper<
- ::com::sun::star::document::XEventListener,
- ::com::sun::star::view::XSelectionChangeListener>(maMutex),
+ css::document::XEventListener,
+ css::view::XSelectionChangeListener>(maMutex),
mxShapeList (rxShapeList),
mxParent (rxParent),
maShapeTreeInfo (rShapeTreeInfo),
@@ -112,10 +112,9 @@ long ChildrenManagerImpl::GetChildCount() const throw ()
}
-::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape> ChildrenManagerImpl::GetChildShape(long nIndex)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException)
+css::uno::Reference<css::drawing::XShape> ChildrenManagerImpl::GetChildShape(long nIndex)
+ throw (css::uno::RuntimeException,
+ css::lang::IndexOutOfBoundsException)
{
uno::Reference<XAccessible> xAcc = GetChild(nIndex);
ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
@@ -132,8 +131,8 @@ long ChildrenManagerImpl::GetChildCount() const throw ()
*/
uno::Reference<XAccessible>
ChildrenManagerImpl::GetChild (long nIndex)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException)
+ throw (css::uno::RuntimeException,
+ css::lang::IndexOutOfBoundsException)
{
// Check whether the given index is valid.
if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size())
@@ -152,7 +151,7 @@ uno::Reference<XAccessible>
*/
uno::Reference<XAccessible>
ChildrenManagerImpl::GetChild (ChildDescriptor& rChildDescriptor,sal_Int32 _nIndex)
- throw (::com::sun::star::uno::RuntimeException)
+ throw (css::uno::RuntimeException)
{
if ( ! rChildDescriptor.mxAccessibleShape.is())
{
@@ -538,8 +537,7 @@ void ChildrenManagerImpl::RemoveShape (const Reference<drawing::XShape>& rxShape
-void ChildrenManagerImpl::SetShapeList (const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes>& xShapeList)
+void ChildrenManagerImpl::SetShapeList (const css::uno::Reference<css::drawing::XShapes>& xShapeList)
{
mxShapeList = xShapeList;
}
@@ -793,7 +791,7 @@ void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType,
// IAccessibleParent
bool ChildrenManagerImpl::ReplaceChild (
AccessibleShape* pCurrentChild,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
+ const css::uno::Reference< css::drawing::XShape >& _rxShape,
const long _nIndex,
const AccessibleShapeTreeInfo& _rShapeTreeInfo)
throw (uno::RuntimeException)
@@ -845,7 +843,7 @@ bool ChildrenManagerImpl::ReplaceChild (
}
// Add the impl method for IAccessibleParent interface
-AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException)
+AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException)
{
sal_Int32 count = GetChildCount();
for (sal_Int32 index=0;index<count;index++)
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index 86a1b8d..c6a94c6 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -74,8 +74,8 @@ typedef ::std::vector<ChildDescriptor> ChildDescriptorListType;
class ChildrenManagerImpl
: public MutexOwner,
public cppu::WeakComponentImplHelper<
- ::com::sun::star::document::XEventListener,
- ::com::sun::star::view::XSelectionChangeListener>,
+ css::document::XEventListener,
+ css::view::XSelectionChangeListener>,
public IAccessibleViewForwarderListener,
public IAccessibleParent
{
@@ -97,10 +97,8 @@ public:
for new and deleted children, i.e. that holds a list of
listeners to be informed.
*/
- ChildrenManagerImpl (const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>& rxParent,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes>& rxShapeList,
+ ChildrenManagerImpl (const css::uno::Reference<css::accessibility::XAccessible>& rxParent,
+ const css::uno::Reference<css::drawing::XShapes>& rxShapeList,
const AccessibleShapeTreeInfo& rShapeTreeInfo,
AccessibleContextBase& rContext);
@@ -120,10 +118,9 @@ public:
*/
long GetChildCount() const throw ();
- ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape> GetChildShape(long nIndex)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException);
+ css::uno::Reference<css::drawing::XShape> GetChildShape(long nIndex)
+ throw (css::uno::RuntimeException,
+ css::lang::IndexOutOfBoundsException);
/** Return the requested accessible child or throw and
IndexOutOfBoundsException if the given index is invalid.
@param nIndex
@@ -137,11 +134,10 @@ public:
@raises
Throws an IndexOutOfBoundsException if the index is not valid.
*/
- ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>
+ css::uno::Reference<css::accessibility::XAccessible>
GetChild (long nIndex)
- throw (::com::sun::star::uno::RuntimeException,
- ::com::sun::star::lang::IndexOutOfBoundsException);
+ throw (css::uno::RuntimeException,
+ css::lang::IndexOutOfBoundsException);
/** Return the requested accessible child.
@param aChildDescriptor
@@ -154,10 +150,9 @@ public:
reference is empty if it has not been possible to create the
accessible object of the corresponding shape.
*/
- ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>
+ css::uno::Reference<css::accessibility::XAccessible>
GetChild (ChildDescriptor& aChildDescriptor,sal_Int32 _nIndex)
- throw (::com::sun::star::uno::RuntimeException);
+ throw (css::uno::RuntimeException);
/** Return the requested accessible child given a shape. This method
searches the list of descriptors for the one that holds the
@@ -171,11 +166,9 @@ public:
reference is empty if there is no shape descriptor that
associates the shape with an accessible object.
*/
- ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>
- GetChild (const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& xShape)
- throw (::com::sun::star::uno::RuntimeException);
+ css::uno::Reference<css::accessibility::XAccessible>
+ GetChild (const css::uno::Reference<css::drawing::XShape>& xShape)
+ throw (css::uno::RuntimeException);
/** Update the child manager. Take care of a modified set of children
and modified visible area. This method can optimize the update
@@ -198,8 +191,7 @@ public:
@param xShapeList
The list of UNO shapes that replaces the old list.
*/
- void SetShapeList (const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes>& xShapeList);
+ void SetShapeList (const css::uno::Reference<css::drawing::XShapes>& xShapeList);
/** Add a accessible shape. This does not modify the list of UNO shapes
or the list of visible shapes. Accessible shapes are, at the
@@ -245,18 +237,18 @@ public:
// lang::XEventListener
virtual void SAL_CALL
- disposing (const ::com::sun::star::lang::EventObject& rEventObject)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ disposing (const css::lang::EventObject& rEventObject)
+ throw (css::uno::RuntimeException, std::exception) override;
// document::XEventListener
virtual void SAL_CALL
- notifyEvent (const ::com::sun::star::document::EventObject& rEventObject)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ notifyEvent (const css::document::EventObject& rEventObject)
+ throw (css::uno::RuntimeException, std::exception) override;
// view::XSelectionChangeListener
virtual void SAL_CALL
- selectionChanged (const ::com::sun::star::lang::EventObject& rEvent)
- throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+ selectionChanged (const css::lang::EventObject& rEvent)
+ throw (css::uno::RuntimeException, std::exception) override;
// IAccessibleViewForwarderListener
/** Informs this children manager and its children about a change of one
@@ -285,20 +277,18 @@ public:
*/
virtual bool ReplaceChild (
AccessibleShape* pCurrentChild,
- const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape,
+ const css::uno::Reference< css::drawing::XShape >& _rxShape,
const long _nIndex,
const AccessibleShapeTreeInfo& _rShapeTreeInfo
- ) throw (::com::sun::star::uno::RuntimeException) override;
+ ) throw (css::uno::RuntimeException) override;
// Add the impl method for IAccessibleParent interface
virtual AccessibleControlShape* GetAccControlShapeFromModel
- (::com::sun::star::beans::XPropertySet* pSet)
- throw (::com::sun::star::uno::RuntimeException) override;
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>
- GetAccessibleCaption (const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& xShape)
- throw (::com::sun::star::uno::RuntimeException) override;
+ (css::beans::XPropertySet* pSet)
+ throw (css::uno::RuntimeException) override;
+ virtual css::uno::Reference<css::accessibility::XAccessible>
+ GetAccessibleCaption (const css::uno::Reference<css::drawing::XShape>& xShape)
+ throw (css::uno::RuntimeException) override;
protected:
/** This list holds the descriptors of all currently visible shapes and
associated accessible object.
@@ -318,14 +308,12 @@ protected:
into the list of visible children
<member>maVisibleChildren</member>.
*/
- ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes> mxShapeList;
+ css::uno::Reference<css::drawing::XShapes> mxShapeList;
/** This list of additional accessible shapes that can or shall not be
created by the shape factory.
*/
- typedef std::vector< ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible> > AccessibleShapeList;
+ typedef std::vector< css::uno::Reference< css::accessibility::XAccessible> > AccessibleShapeList;
AccessibleShapeList maAccessibleShapes;
/** Rectangle that describes the visible area in which a shape has to lie
@@ -337,8 +325,7 @@ protected:
/** The parent of the shapes. It is used for creating accessible
objects for given shapes.
*/
- ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible> mxParent;
+ css::uno::Reference<css::accessibility::XAccessible> mxParent;
/** Bundel of information passed down the shape tree.
*/
@@ -425,15 +412,13 @@ private:
accordingly. Use this method instead of <member>Update()</member>
when only a single shape has been added.
*/
- void AddShape (const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& xShape);
+ void AddShape (const css::uno::Reference<css::drawing::XShape>& xShape);
/** Remove a single shape. Update all relevant data structures
accordingly. Use this method instead of <member>Update()</member>
when only a single shape has been removed.
*/
- void RemoveShape (const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& xShape);
+ void RemoveShape (const css::uno::Reference<css::drawing::XShape>& xShape);
/** Add the children manager as dispose listener at the given shape so
that the associated accessible object can be disposed when the shape
@@ -441,15 +426,13 @@ private:
@param xShape
Register at this shape as dispose listener.
*/
- void RegisterAsDisposeListener (const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& xShape);
+ void RegisterAsDisposeListener (const css::uno::Reference<css::drawing::XShape>& xShape);
/** Remove the children manager as dispose listener at the given shape
@param xShape
Unregister at this shape as dispose listener.
*/
- void UnregisterAsDisposeListener (const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& xShape);
+ void UnregisterAsDisposeListener (const css::uno::Reference<css::drawing::XShape>& xShape);
};
@@ -470,15 +453,13 @@ class ChildDescriptor
public:
/** Reference to a (partially) visible shape.
*/
- ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape> mxShape;
+ css::uno::Reference<css::drawing::XShape> mxShape;
/** The corresponding accessible object. This reference is initially
empty and only replaced by a reference to a new object when that is
requested from the outside.
*/
- ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible> mxAccessibleShape;
+ css::uno::Reference<css::accessibility::XAccessible> mxAccessibleShape;
/** Return a pointer to the implementation object of the accessible
shape of this descriptor.
@@ -506,14 +487,12 @@ public:
/** Create a new descriptor for the specified shape with empty reference
to accessible object.
*/
- explicit ChildDescriptor (const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShape>& xShape);
+ explicit ChildDescriptor (const css::uno::Reference<css::drawing::XShape>& xShape);
/** Create a new descriptor for the specified shape with empty reference
to the original shape.
*/
- explicit ChildDescriptor (const ::com::sun::star::uno::Reference<
- ::com::sun::star::accessibility::XAccessible>& rxAccessibleShape);
+ explicit ChildDescriptor (const css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleShape);
~ChildDescriptor();
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index ebb3fe3..9b2ad6b 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -115,7 +115,7 @@ void DescriptionGenerator::Initialize (const OUString& sPrefix)
else
msDescription.append ("<no style>");
}
- catch (const ::com::sun::star::beans::UnknownPropertyException &)
+ catch (const css::beans::UnknownPropertyException &)
{
msDescription.append ("<unknown>");
}
@@ -265,7 +265,7 @@ void DescriptionGenerator::AddColor (const OUString& sPropertyName,
msDescription.append (lookUpColorName(nValue));
}
- catch (const ::com::sun::star::beans::UnknownPropertyException &)
+ catch (const css::beans::UnknownPropertyException &)
{
msDescription.append ("<unknown>");
}
@@ -290,7 +290,7 @@ void DescriptionGenerator::AddInteger (const OUString& sPropertyName,
msDescription.append (nValue);
}
}
- catch (const ::com::sun::star::beans::UnknownPropertyException &)
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list