From 4530451d40470bf5359645de0c142ddf9dc329b6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 30 Oct 2015 14:59:47 +0200 Subject: com::sun::star->css in svx Change-Id: If2c11fa548c5ebef2297d2491edd837b54e3707c Reviewed-on: https://gerrit.libreoffice.org/19690 Tested-by: Jenkins Reviewed-by: Noel Grandin --- .../accessibility/AccessibleControlShape.cxx | 6 +- .../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 +- .../accessibility/GraphCtlAccessibleContext.cxx | 4 +- svx/source/accessibility/ShapeTypeHandler.cxx | 2 +- svx/source/accessibility/SvxShapeTypes.cxx | 4 +- svx/source/accessibility/charmapacc.cxx | 12 +- .../accessibility/svxpixelctlaccessiblecontext.cxx | 16 +- .../accessibility/svxrectctaccessiblecontext.cxx | 8 +- svx/source/customshapes/EnhancedCustomShape2d.cxx | 24 +- svx/source/customshapes/EnhancedCustomShape3d.cxx | 10 +- svx/source/customshapes/EnhancedCustomShape3d.hxx | 2 +- .../customshapes/EnhancedCustomShapeFontWork.cxx | 2 +- .../customshapes/EnhancedCustomShapeFontWork.hxx | 4 +- .../EnhancedCustomShapeFunctionParser.cxx | 14 +- .../customshapes/EnhancedCustomShapeGeometry.cxx | 6 +- .../customshapes/EnhancedCustomShapeHandle.cxx | 24 +- .../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 +- .../sdr/contact/objectcontactofobjlistpainter.cxx | 2 +- svx/source/sdr/contact/viewcontactofe3dscene.cxx | 4 +- .../sdr/contact/viewobjectcontactofunocontrol.cxx | 6 +- svx/source/sdr/primitive2d/primitivefactory2d.cxx | 8 +- svx/source/sdr/primitive2d/sdrattributecreator.cxx | 30 +- .../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 +- .../sidebar/possize/PosSizePropertyPanel.cxx | 4 +- .../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 +- .../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 +- 204 files changed, 3082 insertions(+), 3125 deletions(-) (limited to 'svx/source') diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index d40771a562b1..7077f77eb321 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 d24b15ee3a10..f5675824ee7d 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(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 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 7cc19ff44dab..4577ccf6bb1a 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 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(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 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 8ec75945cfc7..9fd40a52d78f 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 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 SAL_CALL uno::Reference 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 SAL_CALL */ uno::Reference SAL_CALL AccessibleShape::getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); Reference xStateSet; @@ -429,34 +429,35 @@ uno::Reference SAL_CALL xStateSet = AccessibleContextBase::getAccessibleStateSet (); ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); - ::com::sun::star::uno::Reference xTempAcc = getAccessibleParent(); - if( xTempAcc.is() ) + css::uno::Reference xTempAcc = getAccessibleParent(); + if( xTempAcc.is() ) + { + css::uno::Reference + xTempAccContext = xTempAcc->getAccessibleContext(); + if( xTempAccContext.is() ) { - ::com::sun::star::uno::Reference - xTempAccContext = xTempAcc->getAccessibleContext(); - if( xTempAccContext.is() ) - { - ::com::sun::star::uno::Reference rState = - xTempAccContext->getAccessibleStateSet(); - if( rState.is() ) { - com::sun::star::uno::Sequence pStates = rState->getStates(); - int count = pStates.getLength(); - for( int iIndex = 0;iIndex < count;iIndex++ ) + css::uno::Reference rState = + xTempAccContext->getAccessibleStateSet(); + if( rState.is() ) { + css::uno::Sequence 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( + } + xStateSet = Reference( new ::utl::AccessibleStateSetHelper (*pStateSet)); - }else + } + else { ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); @@ -472,17 +473,17 @@ uno::Reference SAL_CALL pStateSet->RemoveState (AccessibleStateType::FOCUSED); } //Just when the document is not read-only,set states EDITABLE,RESIZABLE,MOVEABLE - ::com::sun::star::uno::Reference xTempAcc = getAccessibleParent(); + css::uno::Reference xTempAcc = getAccessibleParent(); if( xTempAcc.is() ) { - ::com::sun::star::uno::Reference + css::uno::Reference xTempAccContext = xTempAcc->getAccessibleContext(); if( xTempAccContext.is() ) { - ::com::sun::star::uno::Reference rState = + css::uno::Reference rState = xTempAccContext->getAccessibleStateSet(); if( rState.is() ) { - com::sun::star::uno::Sequence pStates = rState->getStates(); + css::uno::Sequence pStates = rState->getStates(); int count = pStates.getLength(); for( int iIndex = 0;iIndex < count;iIndex++ ) { @@ -552,7 +553,7 @@ uno::Reference 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(this), static_cast(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(this), static_cast(this), static_cast(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 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 xParent = getAccessibleParent(); + css::uno::Reference xParent = getAccessibleParent(); if (!xParent.is()) { return aRet; @@ -1445,7 +1446,7 @@ throw (uno::RuntimeException, std::exception) pUper = pUper->GetUpGroup(); } - ::com::sun::star::uno::Reference xParentContext = xParent->getAccessibleContext(); + css::uno::Reference 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 d2e324c80217..8ecbdfd146c2 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& rxShape, + const css::uno::Reference& 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& rxShape, + const css::uno::Reference& rxParent, sal_Int32 nIndex) : mxShape (rxShape), mxParent (rxParent), diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index ada8b29df564..49f193e0f4c4 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& rxParent, - const ::com::sun::star::uno::Reference& rxShapeList, + const css::uno::Reference& rxParent, + const css::uno::Reference& 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 ChildrenManager::GetChild (long nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException) +css::uno::Reference ChildrenManager::GetChild (long nIndex) + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException) { assert(mpImpl != NULL); return mpImpl->GetChild (nIndex); } Reference ChildrenManager::GetChild (const Reference& 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 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& xShapeList) { assert(mpImpl != NULL); mpImpl->SetShapeList (xShapeList); diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 45b37c0f7ea7..3117101f0bc6 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 ChildrenManagerImpl::GetChildShape(long nIndex) + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException) { uno::Reference xAcc = GetChild(nIndex); ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end(); @@ -132,8 +131,8 @@ long ChildrenManagerImpl::GetChildCount() const throw () */ uno::Reference 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 */ uno::Reference 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& rxShape -void ChildrenManagerImpl::SetShapeList (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes>& xShapeList) +void ChildrenManagerImpl::SetShapeList (const css::uno::Reference& 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 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& rxParent, + const css::uno::Reference& 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 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 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 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 + GetChild (const css::uno::Reference& 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& 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 + GetAccessibleCaption (const css::uno::Reference& 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 maVisibleChildren. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes> mxShapeList; + css::uno::Reference 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 mxParent; /** Bundel of information passed down the shape tree. */ @@ -425,15 +412,13 @@ private: accordingly. Use this method instead of Update() 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& xShape); /** Remove a single shape. Update all relevant data structures accordingly. Use this method instead of Update() 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& 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& 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& 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 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 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& 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& rxAccessibleShape); ~ChildDescriptor(); diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index ebb3fe34f809..9b2ad6bc067c 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 (""); } - catch (const ::com::sun::star::beans::UnknownPropertyException &) + catch (const css::beans::UnknownPropertyException &) { msDescription.append (""); } @@ -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 (""); } @@ -290,7 +290,7 @@ void DescriptionGenerator::AddInteger (const OUString& sPropertyName, msDescription.append (nValue); } } - catch (const ::com::sun::star::beans::UnknownPropertyException &) + catch (const css::beans::UnknownPropertyException &) { msDescription.append (""); } @@ -325,7 +325,7 @@ void DescriptionGenerator::AddString (const OUString& sPropertyName, msDescription.append (sValue); } } - catch (const ::com::sun::star::beans::UnknownPropertyException &) + catch (const css::beans::UnknownPropertyException &) { msDescription.append (""); } @@ -401,7 +401,7 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName, } } } - catch (const ::com::sun::star::beans::UnknownPropertyException &) + catch (const css::beans::UnknownPropertyException &) { msDescription.append (""); } diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 5667292e7ddf..7bed55b7f3bf 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -482,7 +482,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException } sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { svtools::ColorConfig aColorConfig; sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; @@ -490,7 +490,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground() } sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); return static_cast(nColor); diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 57e8b3efb8b3..bacd47c1ad9a 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -219,7 +219,7 @@ long ShapeTypeHandler::GetSlotId (const uno::Reference& rxShape /// get the accessible base name for an object OUString ShapeTypeHandler::CreateAccessibleBaseName (const uno::Reference& rxShape) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { sal_Int32 nResourceId; OUString sName; diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index 261c7fd6527e..308950f2997d 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -57,10 +57,10 @@ AccessibleShape* CreateSvxAccessibleShape ( case DRAWING_RECTANGLE: case DRAWING_TEXT: // Default accessiblility shape for - // com::sun::star::drawing::CustomShape (#i37790#) + // css::drawing::CustomShape (#i37790#) case DRAWING_CUSTOM: // Default accessiblility shape for - // com::sun::star::drawing::MediaShape (#i85429#) + // css::drawing::MediaShape (#i85429#) case DRAWING_MEDIA: return new AccessibleShape (rShapeInfo, rShapeTreeInfo); diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index a959ce60f151..d2bed5cb1581 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -66,8 +66,8 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetVirtualAcc, OAccessibleComponent void SAL_CALL SvxShowCharSetVirtualAcc::fireEvent( const sal_Int16 _nEventId, - const ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rNewValue + const css::uno::Any& _rOldValue, + const css::uno::Any& _rNewValue ) { if ( m_pTable ) @@ -148,9 +148,9 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( return xRet; } -::com::sun::star::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds( ) throw (RuntimeException) +css::awt::Rectangle SvxShowCharSetVirtualAcc::implGetBounds( ) throw (RuntimeException) { - ::com::sun::star::awt::Rectangle aBounds ( 0, 0, 0, 0 ); + css::awt::Rectangle aBounds ( 0, 0, 0, 0 ); vcl::Window* pWindow = mpParent; if ( pWindow ) { @@ -160,7 +160,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent( if ( pParent ) { Rectangle aParentRect = pParent->GetWindowExtentsRelative( NULL ); - ::com::sun::star::awt::Point aParentScreenLoc = AWTPoint( aParentRect.TopLeft() ); + css::awt::Point aParentScreenLoc = AWTPoint( aParentRect.TopLeft() ); aBounds.X -= aParentScreenLoc.X; aBounds.Y -= aParentScreenLoc.Y; } @@ -328,7 +328,7 @@ void SvxShowCharSetAcc::implSelect(sal_Int32 nAccessibleChildIndex, bool bSelect } } -::com::sun::star::awt::Rectangle SvxShowCharSetAcc::implGetBounds( ) throw (RuntimeException) +css::awt::Rectangle SvxShowCharSetAcc::implGetBounds( ) throw (RuntimeException) { const Point aOutPos;//( m_pParent->getCharSetControl()->GetPosPixel() ); Size aOutSize( m_pParent->getCharSetControl()->GetOutputSizePixel()); diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 065d688a94e8..95ae358444f9 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -190,7 +190,7 @@ uno::Reference< XAccessibleStateSet > SvxPixelCtlAccessible::getAccessibleStateS } -com::sun::star::lang::Locale SvxPixelCtlAccessible::getLocale( ) +css::lang::Locale SvxPixelCtlAccessible::getLocale( ) throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -276,14 +276,14 @@ void SvxPixelCtlAccessible::grabFocus( ) throw (uno::RuntimeException, std::exc } sal_Int32 SvxPixelCtlAccessible::getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetControlForeground().GetColor(); } sal_Int32 SvxPixelCtlAccessible::getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return mrPixelCtl.GetControlBackground().GetColor(); @@ -406,7 +406,7 @@ void SvxPixelCtlAccessible::CommitChange( const AccessibleEventObject& rEvent ) } //Solution:Add the event handling method -void SvxPixelCtlAccessible::FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew) +void SvxPixelCtlAccessible::FireAccessibleEvent (short nEventId, const css::uno::Any& rOld, const css::uno::Any& rNew) { const uno::Reference< XInterface > xSource( *this ); CommitChange( AccessibleEventObject( xSource, nEventId, rNew,rOld ) ); @@ -539,8 +539,8 @@ void SvxPixelCtlAccessibleChild::SelectChild( bool bSelect) } void SvxPixelCtlAccessibleChild::FireAccessibleEvent ( short nEventId, - const ::com::sun::star::uno::Any& rOld, - const ::com::sun::star::uno::Any& rNew) + const css::uno::Any& rOld, + const css::uno::Any& rNew) { const uno::Reference< XInterface > xSource( *this ); CommitChange( AccessibleEventObject( xSource, nEventId, rNew,rOld ) ); @@ -626,14 +626,14 @@ void SAL_CALL SvxPixelCtlAccessibleChild::grabFocus() throw( RuntimeException, s } sal_Int32 SvxPixelCtlAccessibleChild::getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); ThrowExceptionIfNotAlive(); return mrParentWindow.GetControlForeground().GetColor(); } sal_Int32 SvxPixelCtlAccessibleChild::getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 396952641f01..79ca4715d12e 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -448,7 +448,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::grabFocus() throw( RuntimeException, } sal_Int32 SvxRectCtlAccessibleContext::getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -457,7 +457,7 @@ sal_Int32 SvxRectCtlAccessibleContext::getForeground( ) return mpRepr->GetControlForeground().GetColor(); } sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -790,7 +790,7 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::grabFocus() throw( RuntimeExcept } sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( maMutex ); @@ -798,7 +798,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getForeground( ) return mrParentWindow.GetControlForeground().GetColor(); } sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( maMutex ); diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index a5c4d3cfdc10..c30f499ce7a4 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -430,7 +430,7 @@ void EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( EnhancedCusto } bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle( - const com::sun::star::beans::PropertyValues& rHandleProperties, + const css::beans::PropertyValues& rHandleProperties, EnhancedCustomShape2d::Handle& rDestinationHandle ) { bool bRetValue = false; @@ -440,7 +440,7 @@ bool EnhancedCustomShape2d::ConvertSequenceToEnhancedCustomShape2dHandle( rDestinationHandle.nFlags = HandleFlags::NONE; for ( i = 0; i < nProperties; i++ ) { - const com::sun::star::beans::PropertyValue& rPropVal = rHandleProperties[ i ]; + const css::beans::PropertyValue& rPropVal = rHandleProperties[ i ]; if ( rPropVal.Name == "Position" ) { @@ -550,7 +550,7 @@ const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomSha // Coordsize const Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( "ViewBox" ); - com::sun::star::awt::Rectangle aViewBox; + css::awt::Rectangle aViewBox; if ( pViewBox && (*pViewBox >>= aViewBox ) ) { nCoordLeft = aViewBox.X; @@ -912,13 +912,13 @@ bool EnhancedCustomShape2d::SetAdjustValueAsDouble( const double& rValue, const { // updating our local adjustment sequence seqAdjustmentValues[ nIndex ].Value <<= rValue; - seqAdjustmentValues[ nIndex ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; + seqAdjustmentValues[ nIndex ].State = css::beans::PropertyState_DIRECT_VALUE; bRetValue = true; } return bRetValue; } -Point EnhancedCustomShape2d::GetPoint( const com::sun::star::drawing::EnhancedCustomShapeParameterPair& rPair, +Point EnhancedCustomShape2d::GetPoint( const css::drawing::EnhancedCustomShapeParameterPair& rPair, const bool bScale, const bool bReplaceGeoSize ) const { Point aRetValue; @@ -1152,8 +1152,8 @@ bool EnhancedCustomShape2d::GetHandlePosition( const sal_uInt32 nIndex, Point& r { if ( aLogicRect.GetHeight() > aLogicRect.GetWidth() ) { - com::sun::star::drawing::EnhancedCustomShapeParameter aFirst = aHandle.aPosition.First; - com::sun::star::drawing::EnhancedCustomShapeParameter aSecond = aHandle.aPosition.Second; + css::drawing::EnhancedCustomShapeParameter aFirst = aHandle.aPosition.First; + css::drawing::EnhancedCustomShapeParameter aSecond = aHandle.aPosition.Second; aHandle.aPosition.First = aSecond; aHandle.aPosition.Second = aFirst; } @@ -1184,7 +1184,7 @@ bool EnhancedCustomShape2d::GetHandlePosition( const sal_uInt32 nIndex, Point& r return bRetValue; } -bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nIndex, const com::sun::star::awt::Point& rPosition ) +bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nIndex, const css::awt::Point& rPosition ) { bool bRetValue = false; if ( nIndex < GetHdlCount() ) @@ -1320,7 +1320,7 @@ bool EnhancedCustomShape2d::SetHandleControllerPosition( const sal_uInt32 nIndex // and writing them back into the GeometryItem SdrCustomShapeGeometryItem aGeometryItem( static_cast(pCustomShapeObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ))); - com::sun::star::beans::PropertyValue aPropVal; + css::beans::PropertyValue aPropVal; aPropVal.Name = "AdjustmentValues"; aPropVal.Value <<= seqAdjustmentValues; aGeometryItem.SetPropertyValue( aPropVal ); @@ -1534,7 +1534,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm && ( nCoordHeight == pDefCustomShape->nCoordHeight ) ) bIsDefaultViewBox = true; sal_Int32 j, nCount = pDefCustomShape->nVertices;//==3 - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqCoordinates1, seqCoordinates2; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> seqCoordinates1, seqCoordinates2; seqCoordinates1.realloc( nCount ); for ( j = 0; j < nCount; j++ ) @@ -1574,13 +1574,13 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm fWidth = nCoordWidth/2; fHeight = nCoordHeight/2; const Any* pViewBox = ((SdrCustomShapeGeometryItem&)rGeometryItem).GetPropertyValueByName( "ViewBox" ); - com::sun::star::awt::Rectangle aViewBox; + css::awt::Rectangle aViewBox; if ( pViewBox && (*pViewBox >>= aViewBox ) ) { aViewBox.Width = pDefCustomShape->nCoordWidth; aViewBox.Height = pDefCustomShape->nCoordHeight; } - com::sun::star::beans::PropertyValue aPropVal; + css::beans::PropertyValue aPropVal; aPropVal.Name = "ViewBox"; aPropVal.Value <<= aViewBox; rGeometryItem.SetPropertyValue( aPropVal ); diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 48bd4508e1ed..45b0cc58549a 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -65,7 +65,7 @@ namespace { void GetOrigin( const SdrCustomShapeGeometryItem& rItem, double& rOriginX, double& rOriginY ) { - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aOriginParaPair; + css::drawing::EnhancedCustomShapeParameterPair aOriginParaPair; const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Origin" ); if ( ! ( pAny && ( *pAny >>= aOriginParaPair ) && ( aOriginParaPair.First.Value >>= rOriginX ) && ( aOriginParaPair.Second.Value >>= rOriginY ) ) ) { @@ -76,7 +76,7 @@ void GetOrigin( const SdrCustomShapeGeometryItem& rItem, double& rOriginX, doubl void GetRotateAngle( const SdrCustomShapeGeometryItem& rItem, double& rAngleX, double& rAngleY ) { - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aRotateAngleParaPair; + css::drawing::EnhancedCustomShapeParameterPair aRotateAngleParaPair; const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "RotateAngle" ); if ( ! ( pAny && ( *pAny >>= aRotateAngleParaPair ) && ( aRotateAngleParaPair.First.Value >>= rAngleX ) && ( aRotateAngleParaPair.Second.Value >>= rAngleY ) ) ) { @@ -89,7 +89,7 @@ void GetRotateAngle( const SdrCustomShapeGeometryItem& rItem, double& rAngleX, d void GetSkew( const SdrCustomShapeGeometryItem& rItem, double& rSkewAmount, double& rSkewAngle ) { - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; + css::drawing::EnhancedCustomShapeParameterPair aSkewParaPair; const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Skew" ); if ( ! ( pAny && ( *pAny >>= aSkewParaPair ) && ( aSkewParaPair.First.Value >>= rSkewAmount ) && ( aSkewParaPair.Second.Value >>= rSkewAngle ) ) ) { @@ -101,7 +101,7 @@ void GetSkew( const SdrCustomShapeGeometryItem& rItem, double& rSkewAmount, doub void GetExtrusionDepth( const SdrCustomShapeGeometryItem& rItem, const double* pMap, double& rBackwardDepth, double& rForwardDepth ) { - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; + css::drawing::EnhancedCustomShapeParameterPair aDepthParaPair; double fDepth = 0, fFraction = 0; const Any* pAny = rItem.GetPropertyValueByName( "Extrusion", "Depth" ); if ( pAny && ( *pAny >>= aDepthParaPair ) && ( aDepthParaPair.First.Value >>= fDepth ) && ( aDepthParaPair.Second.Value >>= fFraction ) ) @@ -249,7 +249,7 @@ Point EnhancedCustomShape3d::Transformation2D::Transform2D( const basegfx::B3DPo bool EnhancedCustomShape3d::Transformation2D::IsParallel() const { - return eProjectionMode == com::sun::star::drawing::ProjectionMode_PARALLEL; + return eProjectionMode == css::drawing::ProjectionMode_PARALLEL; } SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, const SdrObject* pCustomShape ) diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx index 4cfc91312bd9..81c6558065e9 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.hxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx @@ -34,7 +34,7 @@ class EnhancedCustomShape3d class Transformation2D { Point aCenter; - com::sun::star::drawing::ProjectionMode eProjectionMode; + css::drawing::ProjectionMode eProjectionMode; // parallel projection double fSkewAngle; diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index d4bada5262b3..85cffda5fe17 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -426,7 +426,7 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape ) bool bSameLetterHeights = false; const SdrCustomShapeGeometryItem& rGeometryItem = static_cast(pCustomShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); - const com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( "TextPath", "SameLetterHeights" ); + const css::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( "TextPath", "SameLetterHeights" ); if ( pAny ) *pAny >>= bSameLetterHeights; diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx index c190913abcd2..5e0baeae7fc5 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx @@ -25,11 +25,11 @@ class SdrObject; class EnhancedCustomShapeFontWork { - static ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > mxBreakIterator; + static css::uno::Reference < css::i18n::XBreakIterator > mxBreakIterator; public: - static com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > GetBreakIterator(); + static css::uno::Reference < css::i18n::XBreakIterator > GetBreakIterator(); static SdrObject* CreateFontWork( const SdrObject* pShape2d, const SdrObject* pCustomShape ); }; diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 736727675278..7300ea5ed1a5 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -60,7 +60,7 @@ void EnhancedCustomShape::FillEquationParameter( const EnhancedCustomShapeParame switch( rSource.Type ) { - case com::sun::star::drawing::EnhancedCustomShapeParameterType::EQUATION : + case css::drawing::EnhancedCustomShapeParameterType::EQUATION : { if ( nValue & 0x40000000 ) { @@ -70,13 +70,13 @@ void EnhancedCustomShape::FillEquationParameter( const EnhancedCustomShapeParame nValue |= 0x400; } break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT : nValue += DFF_Prop_adjustValue; break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::BOTTOM : nValue = DFF_Prop_geoBottom; break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::RIGHT : nValue = DFF_Prop_geoRight; break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::TOP : nValue = DFF_Prop_geoTop; break; - case com::sun::star::drawing::EnhancedCustomShapeParameterType::LEFT : nValue = DFF_Prop_geoLeft; break; + case css::drawing::EnhancedCustomShapeParameterType::ADJUSTMENT : nValue += DFF_Prop_adjustValue; break; + case css::drawing::EnhancedCustomShapeParameterType::BOTTOM : nValue = DFF_Prop_geoBottom; break; + case css::drawing::EnhancedCustomShapeParameterType::RIGHT : nValue = DFF_Prop_geoRight; break; + case css::drawing::EnhancedCustomShapeParameterType::TOP : nValue = DFF_Prop_geoTop; break; + case css::drawing::EnhancedCustomShapeParameterType::LEFT : nValue = DFF_Prop_geoLeft; break; } - if ( rSource.Type != com::sun::star::drawing::EnhancedCustomShapeParameterType::NORMAL ) + if ( rSource.Type != css::drawing::EnhancedCustomShapeParameterType::NORMAL ) rDest.nOperation |= ( 0x2000 << nDestPara ); rDest.nPara[ nDestPara ] = nValue; } diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index f4bf7350b0d6..d72b63a85adb 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -6204,10 +6204,10 @@ bool IsCustomShapeFilledByDefault( MSO_SPT eSpType ) } sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType ) { - sal_Int16 nGluePointType = com::sun::star::drawing::EnhancedCustomShapeGluePointType::SEGMENTS; + sal_Int16 nGluePointType = css::drawing::EnhancedCustomShapeGluePointType::SEGMENTS; const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType ); if ( pDefCustomShape && pDefCustomShape->nGluePoints ) - nGluePointType = com::sun::star::drawing::EnhancedCustomShapeGluePointType::CUSTOM; + nGluePointType = css::drawing::EnhancedCustomShapeGluePointType::CUSTOM; else { switch( eSpType ) @@ -6222,7 +6222,7 @@ sal_Int16 GetCustomShapeConnectionTypeDefault( MSO_SPT eSpType ) case mso_sptTextBox : case mso_sptVerticalScroll : case mso_sptHorizontalScroll : - nGluePointType = com::sun::star::drawing::EnhancedCustomShapeGluePointType::RECT; + nGluePointType = css::drawing::EnhancedCustomShapeGluePointType::RECT; default: break; } } diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx index 6085569de9ad..d3e66f06d8ce 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx @@ -23,7 +23,7 @@ -EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xCustomShape, sal_uInt32 nIndex ) : +EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( css::uno::Reference< css::drawing::XShape >& xCustomShape, sal_uInt32 nIndex ) : mnIndex ( nIndex ), mxCustomShape ( xCustomShape ) { @@ -50,35 +50,35 @@ void SAL_CALL EnhancedCustomShapeHandle::release() throw() } // XCustomShapeHandle -com::sun::star::awt::Point SAL_CALL EnhancedCustomShapeHandle::getPosition() - throw ( com::sun::star::uno::RuntimeException, std::exception ) +css::awt::Point SAL_CALL EnhancedCustomShapeHandle::getPosition() + throw ( css::uno::RuntimeException, std::exception ) { SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxCustomShape ) ); if ( !pSdrObjCustomShape ) - throw com::sun::star::uno::RuntimeException(); + throw css::uno::RuntimeException(); Point aPosition; EnhancedCustomShape2d aCustomShape2d( pSdrObjCustomShape ); if ( !aCustomShape2d.GetHandlePosition( mnIndex, aPosition ) ) - throw com::sun::star::uno::RuntimeException(); - return com::sun::star::awt::Point( aPosition.X(), aPosition.Y() ); + throw css::uno::RuntimeException(); + return css::awt::Point( aPosition.X(), aPosition.Y() ); } -void SAL_CALL EnhancedCustomShapeHandle::setControllerPosition( const com::sun::star::awt::Point& aPnt ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL EnhancedCustomShapeHandle::setControllerPosition( const css::awt::Point& aPnt ) + throw ( css::uno::RuntimeException, std::exception ) { SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxCustomShape ) ); if ( !pSdrObjCustomShape ) - throw com::sun::star::uno::RuntimeException(); + throw css::uno::RuntimeException(); EnhancedCustomShape2d aCustomShape2d( pSdrObjCustomShape ); if ( !aCustomShape2d.SetHandleControllerPosition( mnIndex, aPnt ) ) - throw com::sun::star::uno::RuntimeException(); + throw css::uno::RuntimeException(); } // XInitialization -void SAL_CALL EnhancedCustomShapeHandle::initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& /* aArguments */ ) - throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL EnhancedCustomShapeHandle::initialize( const css::uno::Sequence< css::uno::Any >& /* aArguments */ ) + throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { } diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx index 7e89e59fe3b6..ccf6c8b038ad 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx @@ -31,16 +31,16 @@ class EnhancedCustomShapeHandle : public cppu::WeakImplHelper < - com::sun::star::drawing::XCustomShapeHandle, - com::sun::star::lang::XInitialization + css::drawing::XCustomShapeHandle, + css::lang::XInitialization > { - sal_uInt32 mnIndex; - com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxCustomShape; + sal_uInt32 mnIndex; + css::uno::Reference< css::drawing::XShape > mxCustomShape; public: - EnhancedCustomShapeHandle( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xCustomShape, sal_uInt32 nIndex ); + EnhancedCustomShapeHandle( css::uno::Reference< css::drawing::XShape >& xCustomShape, sal_uInt32 nIndex ); virtual ~EnhancedCustomShapeHandle(); // XInterface @@ -48,14 +48,14 @@ public: virtual void SAL_CALL release() throw() override; // XCustomShapeHandle - virtual com::sun::star::awt::Point SAL_CALL getPosition() - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setControllerPosition( const com::sun::star::awt::Point& ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL getPosition() + throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setControllerPosition( const css::awt::Point& ) + throw ( css::uno::RuntimeException, std::exception ) override; // XInitialization - virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) - throw ( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) + throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 36f5ef434b98..d79fa3269f79 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -702,7 +702,7 @@ IMPL_LINK_NOARG_TYPED(SvxShowCharSet, VscrollHdl, ScrollBar*, void) { if( m_pAccessible ) { - ::com::sun::star::uno::Any aOldAny, aNewAny; + css::uno::Any aOldAny, aNewAny; int nLast = LastInView(); for ( ; nLast != nSelectedIndex; ++nLast) { @@ -738,7 +738,7 @@ void SvxShowCharSet::ReleaseAccessible() m_xAccessible = NULL; } -::com::sun::star::uno::Reference< XAccessible > SvxShowCharSet::CreateAccessible() +css::uno::Reference< XAccessible > SvxShowCharSet::CreateAccessible() { OSL_ENSURE(!m_pAccessible,"Accessible already created!"); m_pAccessible = new svx::SvxShowCharSetVirtualAcc(this); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 9248301600e0..2d78701bedb3 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -734,7 +734,7 @@ Reference< XAccessible > SvxRectCtl::CreateAccessible() return Reference< XAccessible >(); } -RECT_POINT SvxRectCtl::GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& r ) const +RECT_POINT SvxRectCtl::GetApproxRPFromPixPt( const css::awt::Point& r ) const { return GetRPFromPoint( GetApproxLogPtFromPixPt( Point( r.X, r.Y ) ) ); } @@ -753,7 +753,7 @@ void SvxRectCtl::SetCS(CTL_STYLE eNew) // Control for editing bitmaps -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SvxPixelCtl::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > SvxPixelCtl::CreateAccessible() { if(!m_xAccess.is()) { diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 272005bc12d5..43735b05e332 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -750,7 +750,7 @@ IMPL_LINK_TYPED( GraphCtrl, UpdateHdl, Idle*, pTimer, void ) } -::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GraphCtrl::CreateAccessible() +css::uno::Reference< css::accessibility::XAccessible > GraphCtrl::CreateAccessible() { if( mpAccContext == NULL ) { @@ -760,7 +760,7 @@ IMPL_LINK_TYPED( GraphCtrl, UpdateHdl, Idle*, pTimer, void ) if( pParent ) { - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAccParent( pParent->GetAccessible() ); + css::uno::Reference< css::accessibility::XAccessible > xAccParent( pParent->GetAccessible() ); // Disable accessibility if no model/view data available if( pView && diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index e0ba29e1fe7c..e4bdfee0fb52 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -454,7 +454,7 @@ IMPL_LINK_TYPED( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void ) void SvxIMapDlg::DoOpen() { ::sfx2::FileDialogHelper aDlg( - com::sun::star::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); + css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); ImageMap aLoadIMap; const OUString aFilter( IMAP_ALL_FILTER ); @@ -493,7 +493,7 @@ void SvxIMapDlg::DoOpen() bool SvxIMapDlg::DoSave() { ::sfx2::FileDialogHelper aDlg( - com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); + css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); const OUString aBinFilter( IMAP_BINARY_FILTER ); const OUString aCERNFilter( IMAP_CERN_FILTER ); diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 31c706ca2386..5e8afcc56d18 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -96,7 +96,7 @@ class IMapWindow : public GraphCtrl, public DropTargetHelper Link aInfoLink; SfxItemPool* pIMapPool; SfxItemInfo* pItemInfo; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > + css::uno::Reference< css::frame::XFrame > mxDocumentFrame; DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool ); @@ -127,7 +127,7 @@ protected: public: - IMapWindow( vcl::Window* pParent, WinBits nBits, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame ); + IMapWindow( vcl::Window* pParent, WinBits nBits, const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame ); virtual ~IMapWindow(); virtual void dispose() override; diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 27d0b536f187..1d9c1bd00fbb 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -237,7 +237,7 @@ void SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags nLangList, } } - ::com::sun::star::uno::Sequence< sal_uInt16 > xKnown; + css::uno::Sequence< sal_uInt16 > xKnown; const sal_uInt16* pKnown; sal_uInt32 nCount; if ( nLangList & SvxLanguageListFlags::ONLY_KNOWN ) @@ -299,7 +299,7 @@ void SvxLanguageBoxBase::SetLanguageList( SvxLanguageListFlags nLangList, sal_Int32 SvxLanguageBoxBase::InsertLanguage( const LanguageType nLangType, sal_Int32 nPos ) { - return ImplInsertLanguage( nLangType, nPos, ::com::sun::star::i18n::ScriptType::WEAK ); + return ImplInsertLanguage( nLangType, nPos, css::i18n::ScriptType::WEAK ); } @@ -366,7 +366,7 @@ sal_Int32 SvxLanguageBoxBase::InsertDefaultLanguage( sal_Int16 nType, sal_Int32 sal_Int32 SvxLanguageBoxBase::InsertSystemLanguage( sal_Int32 nPos ) { - return ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, nPos, ::com::sun::star::i18n::ScriptType::WEAK ); + return ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, nPos, css::i18n::ScriptType::WEAK ); } diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 6d2e2bdf297a..a7b381ad2a12 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -40,7 +40,7 @@ bool SvxLongLRSpaceItem::operator==( const SfxPoolItem& rCmp) const mlRight == static_cast(rCmp).mlRight; } -bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxLongLRSpaceItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -50,7 +50,7 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 { case 0: { - ::com::sun::star::frame::status::LeftRightMargin aLeftRightMargin; + css::frame::status::LeftRightMargin aLeftRightMargin; aLeftRightMargin.Left = bConvert ? convertTwipToMm100( mlLeft ) : mlLeft; aLeftRightMargin.Right = bConvert ? convertTwipToMm100( mlRight ) : mlRight; rVal <<= aLeftRightMargin; @@ -75,7 +75,7 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 return true; } -bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxLongLRSpaceItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -83,7 +83,7 @@ bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u sal_Int32 nVal = 0; if ( nMemberId == 0 ) { - ::com::sun::star::frame::status::LeftRightMargin aLeftRightMargin; + css::frame::status::LeftRightMargin aLeftRightMargin; if ( rVal >>= aLeftRightMargin ) { mlLeft = bConvert ? convertMm100ToTwip(aLeftRightMargin.Left) : aLeftRightMargin.Left; @@ -169,7 +169,7 @@ bool SvxLongULSpaceItem::operator==( const SfxPoolItem& rCmp) const mlRight == static_cast(rCmp).mlRight; } -bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxLongULSpaceItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -179,7 +179,7 @@ bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 { case 0: { - ::com::sun::star::frame::status::UpperLowerMargin aUpperLowerMargin; + css::frame::status::UpperLowerMargin aUpperLowerMargin; aUpperLowerMargin.Upper = bConvert ? convertTwipToMm100( mlLeft ) : mlLeft; aUpperLowerMargin.Lower = bConvert ? convertTwipToMm100( mlRight ) : mlRight; rVal <<= aUpperLowerMargin; @@ -202,7 +202,7 @@ bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 return true; } -bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxLongULSpaceItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -210,7 +210,7 @@ bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u sal_Int32 nVal = 0; if ( nMemberId == 0 ) { - ::com::sun::star::frame::status::UpperLowerMargin aUpperLowerMargin; + css::frame::status::UpperLowerMargin aUpperLowerMargin; if ( rVal >>= aUpperLowerMargin ) { mlLeft = bConvert ? convertMm100ToTwip( aUpperLowerMargin.Upper ) : aUpperLowerMargin.Upper; @@ -297,7 +297,7 @@ bool SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const lHeight == static_cast(rCmp).lHeight; } -bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxPagePosSizeItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -306,7 +306,7 @@ bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 { case 0 : { - com::sun::star::awt::Rectangle aPagePosSize; + css::awt::Rectangle aPagePosSize; aPagePosSize.X = aPos.X(); aPagePosSize.Y = aPos.Y(); aPagePosSize.Width = lWidth; @@ -327,14 +327,14 @@ bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 return true; } -bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxPagePosSizeItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; sal_Int32 nVal = 0; if ( nMemberId == 0 ) { - com::sun::star::awt::Rectangle aPagePosSize; + css::awt::Rectangle aPagePosSize; if ( rVal >>= aPagePosSize ) { aPos.X() = aPagePosSize.X; @@ -499,7 +499,7 @@ bool SvxColumnItem::CalcOrtho() const return true; } -bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxColumnItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -529,7 +529,7 @@ bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe return true; } -bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxColumnItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; sal_Int32 nVal = 0; @@ -728,7 +728,7 @@ SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) : bLimits (rCopy.bLimits) {} -bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxObjectItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch (nMemberId) @@ -756,7 +756,7 @@ bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe return true; } -bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxObjectItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; bool bRet = false; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 910cd7f4064c..fefca16e7fa9 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2247,14 +2247,13 @@ void SvxSearchDialog::SaveToModule_Impl() rBindings.GetDispatcher()->Execute( SID_SEARCH_ITEM, SfxCallMode::SLOT, ppArgs ); } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > +css::uno::Reference< css::awt::XWindowPeer > SvxSearchDialog::GetComponentInterface( bool bCreate ) { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer - (Window::GetComponentInterface(false)); + css::uno::Reference< css::awt::XWindowPeer > xPeer( Window::GetComponentInterface(false) ); if ( !xPeer.is() && bCreate ) { - ::com::sun::star::awt::XWindowPeer* mxPeer = new VCLXSvxFindReplaceDialog(this); + css::awt::XWindowPeer* mxPeer = new VCLXSvxFindReplaceDialog(this); SetComponentInterface(mxPeer); return mxPeer; } diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 156a09dcd9f2..cd4ed8da86f6 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -201,7 +201,7 @@ SdrAttrObj* E3dExtrudeObj::GetBreakObj() SdrPathObj* pPathObj = new SdrPathObj(OBJ_PLIN, aPoly); SfxItemSet aSet(GetObjectItemSet()); - aSet.Put(XLineStyleItem(com::sun::star::drawing::LineStyle_SOLID)); + aSet.Put(XLineStyleItem(css::drawing::LineStyle_SOLID)); pPathObj->SetMergedItemSet(aSet); return pPathObj; diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 9d2c60c57260..884b5f5f8d2d 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -186,7 +186,7 @@ SdrAttrObj* E3dLatheObj::GetBreakObj() SfxItemSet aSet(GetObjectItemSet()); // Enable lines to guarantee that the object becomes visible - aSet.Put(XLineStyleItem(com::sun::star::drawing::LineStyle_SOLID)); + aSet.Put(XLineStyleItem(css::drawing::LineStyle_SOLID)); pPathObj->SetMergedItemSet(aSet); diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 6cd62af4d7a0..adac47020fe4 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -140,7 +140,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, bool /*bOnly3DAttr*/) co aSet.Put(aDefaultSet); // ... but no lines for 3D - aSet.Put(XLineStyleItem (com::sun::star::drawing::LineStyle_NONE)); + aSet.Put(XLineStyleItem (css::drawing::LineStyle_NONE)); // new defaults for distance and focal length aSet.Put(makeSvx3DDistanceItem(100)); diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 03fc375304ae..707cf7a5f8f3 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -188,10 +188,10 @@ void FmGridHeader::RequestHelp( const HelpEvent& rHEvt ) aItemRect.Bottom() = aPt.Y(); sal_uInt16 nPos = GetModelColumnPos(nItemId); - Reference< ::com::sun::star::container::XIndexContainer > xColumns(static_cast(GetParent())->GetPeer()->getColumns()); + Reference< css::container::XIndexContainer > xColumns(static_cast(GetParent())->GetPeer()->getColumns()); try { - Reference< ::com::sun::star::beans::XPropertySet > xColumn(xColumns->getByIndex(nPos),UNO_QUERY); + Reference< css::beans::XPropertySet > xColumn(xColumns->getByIndex(nPos),UNO_QUERY); OUString aHelpText; xColumn->getPropertyValue(FM_PROP_HELPTEXT) >>= aHelpText; if ( aHelpText.isEmpty() ) @@ -637,17 +637,16 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe { bool bDesignMode = static_cast(GetParent())->IsDesignMode(); - Reference< ::com::sun::star::container::XIndexContainer > xCols(static_cast(GetParent())->GetPeer()->getColumns()); + Reference< css::container::XIndexContainer > xCols(static_cast(GetParent())->GetPeer()->getColumns()); // Aufbau des Insert Menues // mark the column if nColId != HEADERBAR_ITEM_NOTFOUND if(nColId > 0) { sal_uInt16 nPos2 = GetModelColumnPos(nColId); - Reference< ::com::sun::star::container::XIndexContainer > xColumns(static_cast(GetParent())->GetPeer()->getColumns()); - Reference< ::com::sun::star::beans::XPropertySet> xColumn( - xColumns->getByIndex(nPos2), css::uno::UNO_QUERY); - Reference< ::com::sun::star::view::XSelectionSupplier > xSelSupplier(xColumns, UNO_QUERY); + Reference< css::container::XIndexContainer > xColumns(static_cast(GetParent())->GetPeer()->getColumns()); + Reference< css::beans::XPropertySet> xColumn( xColumns->getByIndex(nPos2), css::uno::UNO_QUERY); + Reference< css::view::XSelectionSupplier > xSelSupplier(xColumns, UNO_QUERY); if (xSelSupplier.is()) xSelSupplier->select(makeAny(xColumn)); } @@ -676,21 +675,20 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe if (pMenu && xCols.is() && nColId) { - Reference< ::com::sun::star::beans::XPropertySet > xSet( - xCols->getByIndex(nPos), css::uno::UNO_QUERY); + Reference< css::beans::XPropertySet > xSet( xCols->getByIndex(nPos), css::uno::UNO_QUERY); sal_Int16 nClassId; xSet->getPropertyValue(FM_PROP_CLASSID) >>= nClassId; - Reference< ::com::sun::star::io::XPersistObject > xServiceQuestion(xSet, UNO_QUERY); + Reference< css::io::XPersistObject > xServiceQuestion(xSet, UNO_QUERY); sal_Int32 nColType = xServiceQuestion.is() ? getColumnTypeByModelName(xServiceQuestion->getServiceName()) : 0; if (nColType == TYPE_TEXTFIELD) { // edit fields and formatted fields have the same service name, thus getColumnTypeByModelName returns TYPE_TEXTFIELD - // in both cases. And as columns don't have an ::com::sun::star::lang::XServiceInfo interface, we have to distinguish both + // in both cases. And as columns don't have an css::lang::XServiceInfo interface, we have to distinguish both // types via the existence of special properties - Reference< ::com::sun::star::beans::XPropertySet > xProps(xSet, UNO_QUERY); + Reference< css::beans::XPropertySet > xProps(xSet, UNO_QUERY); if (xProps.is()) { - Reference< ::com::sun::star::beans::XPropertySetInfo > xPropsInfo = xProps->getPropertySetInfo(); + Reference< css::beans::XPropertySetInfo > xPropsInfo = xProps->getPropertySetInfo(); if (xPropsInfo.is() && xPropsInfo->hasPropertyByName(FM_PROP_FORMATSSUPPLIER)) nColType = TYPE_FORMATTEDFIELD; } @@ -721,7 +719,7 @@ void FmGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rMe if (xCols.is()) { // check for hidden cols - Reference< ::com::sun::star::beans::XPropertySet > xCurCol; + Reference< css::beans::XPropertySet > xCurCol; Any aHidden,aName; for (sal_Int32 i=0; igetCount(); ++i) { @@ -780,7 +778,7 @@ enum InspectorAction { eOpenInspector, eCloseInspector, eUpdateInspector, eNone void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult) { - Reference< ::com::sun::star::container::XIndexContainer > xCols(static_cast(GetParent())->GetPeer()->getColumns()); + Reference< css::container::XIndexContainer > xCols(static_cast(GetParent())->GetPeer()->getColumns()); sal_uInt16 nPos = GetModelColumnPos(nColId); // remove and delete the menu we inserted in PreExecuteColumnContextMenu @@ -856,8 +854,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe break; case SID_FM_HIDECOL: { - Reference< ::com::sun::star::beans::XPropertySet > xCurCol( - xCols->getByIndex(nPos), css::uno::UNO_QUERY); + Reference< css::beans::XPropertySet > xCurCol( xCols->getByIndex(nPos), css::uno::UNO_QUERY); xCurCol->setPropertyValue(FM_PROP_HIDDEN, makeAny(true)); } break; @@ -877,7 +874,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe case SID_FM_SHOWALLCOLS: { // just iterate through all the cols ... - Reference< ::com::sun::star::beans::XPropertySet > xCurCol; + Reference< css::beans::XPropertySet > xCurCol; for (sal_Int32 i=0; igetCount(); ++i) { xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY); @@ -891,7 +888,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe if (nExecutionResult>0 && nExecutionResult<=16) { // it was a "show column/" command (there are at most 16 such items) // search the nExecutionResult'th hidden col - Reference< ::com::sun::star::beans::XPropertySet > xCurCol; + Reference< css::beans::XPropertySet > xCurCol; for (sal_uInt16 i=0; igetCount() && nExecutionResult; ++i) { xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY); @@ -1006,7 +1003,7 @@ void FmGridHeader::Command(const CommandEvent& rEvt) } FmGridControl::FmGridControl( - const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, + const Reference< css::uno::XComponentContext >& _rxContext, vcl::Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) @@ -1045,8 +1042,8 @@ void FmGridControl::Command(const CommandEvent& _rEvt) DbGridControl::Command( _rEvt ); } -// ::com::sun::star::beans::XPropertyChangeListener -void FmGridControl::propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) +// css::beans::XPropertyChangeListener +void FmGridControl::propertyChange(const css::beans::PropertyChangeEvent& evt) { if (evt.PropertyName == FM_PROP_ROWCOUNT) { @@ -1087,12 +1084,12 @@ void FmGridControl::SetDesignMode(bool bMode) } else { - Reference< ::com::sun::star::container::XIndexContainer > xColumns(GetPeer()->getColumns()); - Reference< ::com::sun::star::view::XSelectionSupplier > xSelSupplier(xColumns, UNO_QUERY); + Reference< css::container::XIndexContainer > xColumns(GetPeer()->getColumns()); + Reference< css::view::XSelectionSupplier > xSelSupplier(xColumns, UNO_QUERY); if (xSelSupplier.is()) { Any aSelection = xSelSupplier->getSelection(); - Reference< ::com::sun::star::beans::XPropertySet > xColumn; + Reference< css::beans::XPropertySet > xColumn; if (aSelection.getValueType().getTypeClass() == TypeClass_INTERFACE) xColumn.set(aSelection, css::uno::UNO_QUERY); Reference< XInterface > xCurrent; @@ -1130,23 +1127,23 @@ void FmGridControl::DeleteSelectedRows() return; // try to confirm the delete - Reference< ::com::sun::star::frame::XDispatchProvider > xDispatcher = static_cast(GetPeer()); + Reference< css::frame::XDispatchProvider > xDispatcher = static_cast(GetPeer()); if (xDispatcher.is()) { - ::com::sun::star::util::URL aUrl; + css::util::URL aUrl; aUrl.Complete = FMURL_CONFIRM_DELETION; - Reference< ::com::sun::star::util::XURLTransformer > xTransformer( - ::com::sun::star::util::URLTransformer::create(::comphelper::getProcessComponentContext()) ); + Reference< css::util::XURLTransformer > xTransformer( + css::util::URLTransformer::create(::comphelper::getProcessComponentContext()) ); xTransformer->parseStrict( aUrl ); - Reference< ::com::sun::star::frame::XDispatch > xDispatch = xDispatcher->queryDispatch(aUrl, OUString(), 0); - Reference< ::com::sun::star::form::XConfirmDeleteListener > xConfirm(xDispatch, UNO_QUERY); + Reference< css::frame::XDispatch > xDispatch = xDispatcher->queryDispatch(aUrl, OUString(), 0); + Reference< css::form::XConfirmDeleteListener > xConfirm(xDispatch, UNO_QUERY); if (xConfirm.is()) { - ::com::sun::star::sdb::RowChangeEvent aEvent; + css::sdb::RowChangeEvent aEvent; aEvent.Source = Reference< XInterface >(*getDataSource()); aEvent.Rows = nSelectedRows; - aEvent.Action = ::com::sun::star::sdb::RowChangeAction::DELETE; + aEvent.Action = css::sdb::RowChangeAction::DELETE; if (!xConfirm->confirmDelete(aEvent)) return; } @@ -1180,7 +1177,7 @@ void FmGridControl::DeleteSelectedRows() } else { - Reference< ::com::sun::star::sdbcx::XDeleteRows > xDeleteThem(Reference< XInterface >(*getDataSource()), UNO_QUERY); + Reference< css::sdbcx::XDeleteRows > xDeleteThem(Reference< XInterface >(*getDataSource()), UNO_QUERY); // collect the bookmarks of the selected rows Sequence < Any> aBookmarks = getSelectionBookmarks(); @@ -1279,7 +1276,7 @@ void FmGridControl::DeleteSelectedRows() } else { - Reference< ::com::sun::star::beans::XPropertySet > xSet(Reference< XInterface >(*m_pDataCursor), UNO_QUERY); + Reference< css::beans::XPropertySet > xSet(Reference< XInterface >(*m_pDataCursor), UNO_QUERY); sal_Int32 nRecordCount(0); xSet->getPropertyValue(FM_PROP_ROWCOUNT) >>= nRecordCount; @@ -1383,7 +1380,7 @@ void FmGridControl::DeleteSelectedRows() } // XCurrentRecordListener -void FmGridControl::positioned(const ::com::sun::star::lang::EventObject& /*rEvent*/) +void FmGridControl::positioned(const css::lang::EventObject& /*rEvent*/) { SAL_INFO("svx.fmcomp", "FmGridControl::positioned"); // position on the data source (force it to be done in the main thread) @@ -1392,7 +1389,7 @@ void FmGridControl::positioned(const ::com::sun::star::lang::EventObject& /*rEve bool FmGridControl::commit() { - // Commit nur ausfuehren, wenn nicht bereits ein Update vom ::com::sun::star::form::component::GridControl ausgefuehrt + // Commit nur ausfuehren, wenn nicht bereits ein Update vom css::form::component::GridControl ausgefuehrt // wird if (!IsUpdating()) { @@ -1405,7 +1402,7 @@ bool FmGridControl::commit() return true; } -void FmGridControl::inserted(const ::com::sun::star::lang::EventObject& /*rEvent*/) +void FmGridControl::inserted(const css::lang::EventObject& /*rEvent*/) { const DbGridRowRef& xRow = GetCurrentRow(); if (!xRow.Is()) @@ -1483,7 +1480,7 @@ void FmGridControl::ColumnResized(sal_uInt16 nId) // Wert ans model uebergeben DbGridColumn* pCol = DbGridControl::GetColumns().at( GetModelColumnPos(nId) ); - Reference< ::com::sun::star::beans::XPropertySet > xColModel(pCol->getModel()); + Reference< css::beans::XPropertySet > xColModel(pCol->getModel()); if (xColModel.is()) { Any aWidth; @@ -1518,14 +1515,14 @@ void FmGridControl::ColumnMoved(sal_uInt16 nId) m_bInColumnMove = true; DbGridControl::ColumnMoved(nId); - Reference< ::com::sun::star::container::XIndexContainer > xColumns(GetPeer()->getColumns()); + Reference< css::container::XIndexContainer > xColumns(GetPeer()->getColumns()); if (xColumns.is()) { // suchen der Spalte und verschieben im Model // ColumnPos holen DbGridColumn* pCol = DbGridControl::GetColumns().at( GetModelColumnPos(nId) ); - Reference< ::com::sun::star::beans::XPropertySet > xCol; + Reference< css::beans::XPropertySet > xCol; // Einfuegen muss sich an den Column Positionen orientieren sal_Int32 i; @@ -1540,7 +1537,7 @@ void FmGridControl::ColumnMoved(sal_uInt16 nId) } } - DBG_ASSERT(i < xColumns->getCount(), "Falscher ::com::sun::star::sdbcx::Index"); + DBG_ASSERT(i < xColumns->getCount(), "Falscher css::sdbcx::Index"); xColumns->removeByIndex(i); Any aElement; aElement <<= xCol; @@ -1554,7 +1551,7 @@ void FmGridControl::ColumnMoved(sal_uInt16 nId) m_bInColumnMove = false; } -void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::container::XIndexContainer >& xColumns) +void FmGridControl::InitColumnsByModels(const Reference< css::container::XIndexContainer >& xColumns) { // Spalten wieder neu setzen // wenn es nur eine HandleColumn gibt, dann nicht @@ -1574,7 +1571,7 @@ void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::conta Any aWidth; for (i = 0; i < xColumns->getCount(); ++i) { - Reference< ::com::sun::star::beans::XPropertySet > xCol( + Reference< css::beans::XPropertySet > xCol( xColumns->getByIndex(i), css::uno::UNO_QUERY); OUString aName( @@ -1597,8 +1594,7 @@ void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::conta Any aHidden; for (i = 0; i < xColumns->getCount(); ++i) { - Reference< ::com::sun::star::beans::XPropertySet > xCol( - xColumns->getByIndex(i), css::uno::UNO_QUERY); + Reference< css::beans::XPropertySet > xCol( xColumns->getByIndex(i), css::uno::UNO_QUERY); aHidden = xCol->getPropertyValue(FM_PROP_HIDDEN); if (::comphelper::getBOOL(aHidden)) HideColumn(GetColumnIdFromModelPos((sal_uInt16)i)); @@ -1679,7 +1675,7 @@ void FmGridControl::InitColumnByField( _pColumn->CreateControl( nFieldPos, xField, nTypeId ); } -void FmGridControl::InitColumnsByFields(const Reference< ::com::sun::star::container::XIndexAccess >& _rxFields) +void FmGridControl::InitColumnsByFields(const Reference< css::container::XIndexAccess >& _rxFields) { if ( !_rxFields.is() ) return; @@ -1724,10 +1720,10 @@ bool FmGridControl::isColumnSelected(sal_uInt16 /*nId*/,DbGridColumn* _pColumn) OSL_ENSURE(_pColumn,"Column can not be null!"); bool bSelected = false; // if the column which is shown here is selected ... - Reference< ::com::sun::star::view::XSelectionSupplier > xSelSupplier(GetPeer()->getColumns(), UNO_QUERY); + Reference< css::view::XSelectionSupplier > xSelSupplier(GetPeer()->getColumns(), UNO_QUERY); if ( xSelSupplier.is() ) { - Reference< ::com::sun::star::beans::XPropertySet > xColumn; + Reference< css::beans::XPropertySet > xColumn; xSelSupplier->getSelection() >>= xColumn; bSelected = (xColumn.get() == _pColumn->getModel().get()); } @@ -2030,7 +2026,7 @@ void FmGridControl::KeyInput( const KeyEvent& rKEvt ) case KEY_DELETE: if ( GetSelectColumnCount() && GetPeer() && m_nCurrentSelectedColumn >= 0 ) { - Reference< ::com::sun::star::container::XIndexContainer > xCols(GetPeer()->getColumns()); + Reference< css::container::XIndexContainer > xCols(GetPeer()->getColumns()); if ( xCols.is() ) { try diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 861b5959d07f..3e5bf2895630 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -79,9 +79,9 @@ using ::com::sun::star::awt::XVclWindowPeer; -::com::sun::star::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont ) +css::awt::FontDescriptor ImplCreateFontDescriptor( const vcl::Font& rFont ) { - ::com::sun::star::awt::FontDescriptor aFD; + css::awt::FontDescriptor aFD; aFD.Name = rFont.GetName(); aFD.StyleName = rFont.GetStyleName(); aFD.Height = (sal_Int16)rFont.GetSize().Height(); @@ -102,7 +102,7 @@ using ::com::sun::star::awt::XVclWindowPeer; } -vcl::Font ImplCreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr ) +vcl::Font ImplCreateFont( const css::awt::FontDescriptor& rDescr ) { vcl::Font aFont; aFont.SetName( rDescr.Name ); @@ -133,7 +133,7 @@ Any SAL_CALL FmXModifyMultiplexer::queryInterface(const Type& _rType) throw (Run { Any aReturn; aReturn = ::cppu::queryInterface(_rType, - static_cast< ::com::sun::star::util::XModifyListener*>(this), + static_cast< css::util::XModifyListener*>(this), static_cast< XEventListener*>(this) ); @@ -416,7 +416,7 @@ OUString FmXGridControl::GetComponentServiceName() } -sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< ::com::sun::star::awt::XControlModel >& rModel) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< css::awt::XControlModel >& rModel) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -458,7 +458,7 @@ FmXGridPeer* FmXGridControl::imp_CreatePeer(vcl::Window* pParent) } -void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt::XToolkit >& /*rToolkit*/, const Reference< ::com::sun::star::awt::XWindowPeer >& rParentPeer) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::createPeer(const Reference< css::awt::XToolkit >& /*rToolkit*/, const Reference< css::awt::XWindowPeer >& rParentPeer) throw( RuntimeException, std::exception ) { if ( !mxModel.is() ) throw DisposedException( OUString(), *this ); @@ -506,7 +506,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt: DBG_ASSERT(getPeer().is(), "FmXGridControl::createPeer : something went wrong ... no top level peer !"); pPeer = FmXGridPeer::getImplementation(getPeer()); - setPosSize( maComponentInfos.nX, maComponentInfos.nY, maComponentInfos.nWidth, maComponentInfos.nHeight, ::com::sun::star::awt::PosSize::POSSIZE ); + setPosSize( maComponentInfos.nX, maComponentInfos.nY, maComponentInfos.nWidth, maComponentInfos.nHeight, css::awt::PosSize::POSSIZE ); Reference< XIndexContainer > xColumns(getModel(), UNO_QUERY); if (xColumns.is()) @@ -559,7 +559,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt: Reference< XRowSet > xForm(xComp->getParent(), UNO_QUERY); // is the form alive? // we can see that if the form contains columns - Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xColumnsSupplier(xForm, UNO_QUERY); + Reference< css::sdbcx::XColumnsSupplier > xColumnsSupplier(xForm, UNO_QUERY); if (xColumnsSupplier.is()) { if (Reference< XIndexAccess > (xColumnsSupplier->getColumns(),UNO_QUERY)->getCount()) @@ -575,7 +575,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt: { try { - aOldCursorBookmark = Reference< ::com::sun::star::sdbcx::XRowLocate > (xForm, UNO_QUERY)->getBookmark(); + aOldCursorBookmark = Reference< css::sdbcx::XRowLocate > (xForm, UNO_QUERY)->getBookmark(); } catch( const Exception& e ) { @@ -596,7 +596,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt: if (aOldCursorBookmark.hasValue()) { // we have a valid bookmark, so we have to restore the cursor's position Reference< XFormComponent > xComp(getModel(), UNO_QUERY); - Reference< ::com::sun::star::sdbcx::XRowLocate > xLocate(xComp->getParent(), UNO_QUERY); + Reference< css::sdbcx::XRowLocate > xLocate(xComp->getParent(), UNO_QUERY); xLocate->moveToBookmark(aOldCursorBookmark); } } @@ -606,7 +606,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt: (void)e; } - Reference< ::com::sun::star::awt::XView > xPeerView(getPeer(), UNO_QUERY); + Reference< css::awt::XView > xPeerView(getPeer(), UNO_QUERY); xPeerView->setZoom( maComponentInfos.nZoomX, maComponentInfos.nZoomY ); xPeerView->setGraphics( mxGraphics ); } @@ -615,12 +615,12 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt: } -void FmXGridControl::addModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException, std::exception ) +void FmXGridControl::addModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception ) { m_aModifyListeners.addInterface( l ); if( getPeer().is() && m_aModifyListeners.getLength() == 1 ) { - Reference< ::com::sun::star::util::XModifyBroadcaster > xGrid(getPeer(), UNO_QUERY); + Reference< css::util::XModifyBroadcaster > xGrid(getPeer(), UNO_QUERY); xGrid->addModifyListener( &m_aModifyListeners); } } @@ -690,11 +690,11 @@ Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const T } -void SAL_CALL FmXGridControl::removeModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::removeModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception ) { if( getPeer().is() && m_aModifyListeners.getLength() == 1 ) { - Reference< ::com::sun::star::util::XModifyBroadcaster > xGrid(getPeer(), UNO_QUERY); + Reference< css::util::XModifyBroadcaster > xGrid(getPeer(), UNO_QUERY); xGrid->removeModifyListener( &m_aModifyListeners); } m_aModifyListeners.removeInterface( l ); @@ -712,7 +712,7 @@ void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeExc void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeException, std::exception ) { - ::com::sun::star::util::ModeChangeEvent aModeChangeEvent; + css::util::ModeChangeEvent aModeChangeEvent; // --- --- { @@ -817,37 +817,37 @@ void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContaine } -Reference< ::com::sun::star::frame::XDispatch > SAL_CALL FmXGridControl::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception ) +Reference< css::frame::XDispatch > SAL_CALL FmXGridControl::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::frame::XDispatchProvider > xPeerProvider(getPeer(), UNO_QUERY); + Reference< css::frame::XDispatchProvider > xPeerProvider(getPeer(), UNO_QUERY); if (xPeerProvider.is()) return xPeerProvider->queryDispatch(aURL, aTargetFrameName, nSearchFlags); else - return Reference< ::com::sun::star::frame::XDispatch > (); + return Reference< css::frame::XDispatch > (); } -Sequence< Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL FmXGridControl::queryDispatches(const Sequence< ::com::sun::star::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException, std::exception ) +Sequence< Reference< css::frame::XDispatch > > SAL_CALL FmXGridControl::queryDispatches(const Sequence< css::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::frame::XDispatchProvider > xPeerProvider(getPeer(), UNO_QUERY); + Reference< css::frame::XDispatchProvider > xPeerProvider(getPeer(), UNO_QUERY); if (xPeerProvider.is()) return xPeerProvider->queryDispatches(aDescripts); else - return Sequence< Reference< ::com::sun::star::frame::XDispatch > >(); + return Sequence< Reference< css::frame::XDispatch > >(); } -void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::frame::XDispatchProviderInterception > xPeerInterception(getPeer(), UNO_QUERY); + Reference< css::frame::XDispatchProviderInterception > xPeerInterception(getPeer(), UNO_QUERY); if (xPeerInterception.is()) xPeerInterception->registerDispatchProviderInterceptor(_xInterceptor); } -void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) +void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::frame::XDispatchProviderInterception > xPeerInterception(getPeer(), UNO_QUERY); + Reference< css::frame::XDispatchProviderInterception > xPeerInterception(getPeer(), UNO_QUERY); if (xPeerInterception.is()) xPeerInterception->releaseDispatchProviderInterceptor(_xInterceptor); } @@ -910,7 +910,7 @@ sal_Bool SAL_CALL FmXGridControl::hasElements() throw( RuntimeException, std::ex Type SAL_CALL FmXGridControl::getElementType( ) throw(RuntimeException, std::exception) { - return cppu::UnoType::get(); + return cppu::UnoType::get(); } // XEnumerationAccess @@ -942,11 +942,11 @@ Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoun return xPeer->getByIndex(_nIndex); } -// ::com::sun::star::util::XModeSelector +// css::util::XModeSelector void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException, std::exception ) { - Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); + Reference< css::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); if (!xPeer.is()) throw NoSupportException(); @@ -956,21 +956,21 @@ void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportExce OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); + Reference< css::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); return xPeer.is() ? xPeer->getMode() : OUString(); } css::uno::Sequence SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); + Reference< css::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); return xPeer.is() ? xPeer->getSupportedModes() : css::uno::Sequence(); } sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); + Reference< css::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); return xPeer.is() && xPeer->supportsMode(Mode); } @@ -1158,7 +1158,7 @@ using namespace ::com::sun::star::util; { if ( m_pDispatchers[i] == e.Source ) { - m_pDispatchers[i]->removeStatusListener( static_cast< ::com::sun::star::frame::XStatusListener* >( this ), *pSupportedURLs ); + m_pDispatchers[i]->removeStatusListener( static_cast< css::frame::XStatusListener* >( this ), *pSupportedURLs ); m_pDispatchers[i] = NULL; m_pStateCache[i] = false; bKnownSender = true; @@ -1171,13 +1171,13 @@ using namespace ::com::sun::star::util; } -void FmXGridPeer::addModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException, std::exception ) +void FmXGridPeer::addModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception ) { m_aModifyListeners.addInterface( l ); } -void FmXGridPeer::removeModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException, std::exception ) +void FmXGridPeer::removeModifyListener(const Reference< css::util::XModifyListener >& l) throw( RuntimeException, std::exception ) { m_aModifyListeners.removeInterface( l ); } @@ -1239,7 +1239,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType bool bRequestedAsAny = (xType.getTypeClass() == TypeClass_ANY); DbGridColumn* pCol; - Reference< ::com::sun::star::sdb::XColumn > xFieldContent; + Reference< css::sdb::XColumn > xFieldContent; Reference< XPropertySet > xCurrentColumn; for (sal_Int32 i=0; i SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType pCol = aColumns[ nModelPos ]; const DbGridRowRef xRow = pGrid->GetSeekRow(); - xFieldContent = (xRow.Is() && xRow->HasField(pCol->GetFieldPos())) ? xRow->GetField(pCol->GetFieldPos()).getColumn() : Reference< ::com::sun::star::sdb::XColumn > (); + xFieldContent = (xRow.Is() && xRow->HasField(pCol->GetFieldPos())) ? xRow->GetField(pCol->GetFieldPos()).getColumn() : Reference< css::sdb::XColumn > (); if (!xFieldContent.is()) // can't supply anything without a field content // FS - 07.12.99 - 54391 @@ -1308,7 +1308,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type Any* pReturnArray = aReturnSequence.getArray(); bool bRequestedAsAny = (xType.getTypeClass() == TypeClass_ANY); - Reference< ::com::sun::star::sdb::XColumn > xFieldContent; + Reference< css::sdb::XColumn > xFieldContent; for (sal_Int32 i=0; i < nColumnCount; ++i) { sal_uInt16 nModelPos = pGrid->GetModelColumnPos(pGrid->GetColumnIdFromViewPos((sal_uInt16)i)); @@ -1903,7 +1903,7 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) t pGrid->SetControlFont( vcl::Font() ); else { - ::com::sun::star::awt::FontDescriptor aFont; + css::awt::FontDescriptor aFont; if (Value >>= aFont) { vcl::Font aNewVclFont; @@ -2119,7 +2119,7 @@ void FmXGridPeer::removeContainerListener(const Reference< XContainerListener >& m_aContainerListeners.removeInterface( l ); } -// ::com::sun::star::data::XDatabaseCursorSupplier +// css::data::XDatabaseCursorSupplier void FmXGridPeer::startCursorListening() { @@ -2252,7 +2252,7 @@ void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeExcepti VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); if (pGrid) { - Reference< ::com::sun::star::view::XSelectionSupplier > xSelSupplier(evt.Source, UNO_QUERY); + Reference< css::view::XSelectionSupplier > xSelSupplier(evt.Source, UNO_QUERY); Any aSelection = xSelSupplier->getSelection(); DBG_ASSERT(aSelection.getValueType().getTypeClass() == TypeClass_INTERFACE, "FmXGridPeer::selectionChanged : invalid selection !"); Reference< XPropertySet > xSelection; @@ -2303,7 +2303,7 @@ sal_Bool FmXGridPeer::hasElements() throw( RuntimeException, std::exception ) Type SAL_CALL FmXGridPeer::getElementType( ) throw(RuntimeException, std::exception) { - return cppu::UnoType::get(); + return cppu::UnoType::get(); } // XEnumerationAccess @@ -2342,13 +2342,13 @@ Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, return aElement; DbGridColumn* pCol = pGrid->GetColumns().at( nPos ); - Reference< ::com::sun::star::awt::XControl > xControl(pCol->GetCell()); + Reference< css::awt::XControl > xControl(pCol->GetCell()); aElement <<= xControl; return aElement; } -// ::com::sun::star::util::XModeSelector +// css::util::XModeSelector void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException, std::exception ) { @@ -2409,7 +2409,7 @@ void FmXGridPeer::columnVisible(DbGridColumn* pColumn) VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); sal_Int32 _nIndex = pGrid->GetModelColumnPos(pColumn->GetId()); - Reference< ::com::sun::star::awt::XControl > xControl(pColumn->GetCell()); + Reference< css::awt::XControl > xControl(pColumn->GetCell()); ContainerEvent aEvt; aEvt.Source = static_cast(this); aEvt.Accessor <<= _nIndex; @@ -2424,7 +2424,7 @@ void FmXGridPeer::columnHidden(DbGridColumn* pColumn) VclPtr< FmGridControl > pGrid = GetAs< FmGridControl >(); sal_Int32 _nIndex = pGrid->GetModelColumnPos(pColumn->GetId()); - Reference< ::com::sun::star::awt::XControl > xControl(pColumn->GetCell()); + Reference< css::awt::XControl > xControl(pColumn->GetCell()); ContainerEvent aEvt; aEvt.Source = static_cast(this); aEvt.Accessor <<= _nIndex; @@ -2446,9 +2446,9 @@ void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException, std: } -Reference< ::com::sun::star::frame::XDispatch > FmXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception ) +Reference< css::frame::XDispatch > FmXGridPeer::queryDispatch(const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::frame::XDispatch > xResult; + Reference< css::frame::XDispatch > xResult; // first ask our interceptor chain if (m_xFirstDispatchInterceptor.is() && !m_bInterceptingDispatch) @@ -2465,23 +2465,23 @@ Reference< ::com::sun::star::frame::XDispatch > FmXGridPeer::queryDispatch(cons } -Sequence< Reference< ::com::sun::star::frame::XDispatch > > FmXGridPeer::queryDispatches(const Sequence< ::com::sun::star::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException, std::exception ) +Sequence< Reference< css::frame::XDispatch > > FmXGridPeer::queryDispatches(const Sequence< css::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException, std::exception ) { if (m_xFirstDispatchInterceptor.is()) return m_xFirstDispatchInterceptor->queryDispatches(aDescripts); // then ask ourself : we don't have any dispatches - return Sequence< Reference< ::com::sun::star::frame::XDispatch > >(); + return Sequence< Reference< css::frame::XDispatch > >(); } -void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) +void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) { if (_xInterceptor.is()) { if (m_xFirstDispatchInterceptor.is()) { - Reference< ::com::sun::star::frame::XDispatchProvider > xFirstProvider(m_xFirstDispatchInterceptor, UNO_QUERY); + Reference< css::frame::XDispatchProvider > xFirstProvider(m_xFirstDispatchInterceptor, UNO_QUERY); // there is already an interceptor; the new one will become its master _xInterceptor->setSlaveDispatchProvider(xFirstProvider); m_xFirstDispatchInterceptor->setMasterDispatchProvider(xFirstProvider); @@ -2489,12 +2489,12 @@ void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< ::com::su else { // it is the first interceptor; set ourself as slave - _xInterceptor->setSlaveDispatchProvider(static_cast(this)); + _xInterceptor->setSlaveDispatchProvider(static_cast(this)); } // we are the master of the chain's first interceptor m_xFirstDispatchInterceptor = _xInterceptor; - m_xFirstDispatchInterceptor->setMasterDispatchProvider(static_cast(this)); + m_xFirstDispatchInterceptor->setMasterDispatchProvider(static_cast(this)); // we have a new interceptor and we're alive ? if (!isDesignMode()) @@ -2504,16 +2504,16 @@ void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< ::com::su } -void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) +void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< css::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException, std::exception ) { if (!_xInterceptor.is()) return; - Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > xChainWalk(m_xFirstDispatchInterceptor); + Reference< css::frame::XDispatchProviderInterceptor > xChainWalk(m_xFirstDispatchInterceptor); if (m_xFirstDispatchInterceptor == _xInterceptor) { // our chain will have a new first element - Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > xSlave(m_xFirstDispatchInterceptor->getSlaveDispatchProvider(), UNO_QUERY); + Reference< css::frame::XDispatchProviderInterceptor > xSlave(m_xFirstDispatchInterceptor->getSlaveDispatchProvider(), UNO_QUERY); m_xFirstDispatchInterceptor = xSlave; } // do this before removing the interceptor from the chain as we won't know it's slave afterwards) @@ -2521,31 +2521,31 @@ void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< ::com::sun while (xChainWalk.is()) { // walk along the chain of interceptors and look for the interceptor that has to be removed - Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > xSlave(xChainWalk->getSlaveDispatchProvider(), UNO_QUERY); + Reference< css::frame::XDispatchProviderInterceptor > xSlave(xChainWalk->getSlaveDispatchProvider(), UNO_QUERY); if (xChainWalk == _xInterceptor) { // old master may be an interceptor too - Reference< ::com::sun::star::frame::XDispatchProviderInterceptor > xMaster(xChainWalk->getMasterDispatchProvider(), UNO_QUERY); + Reference< css::frame::XDispatchProviderInterceptor > xMaster(xChainWalk->getMasterDispatchProvider(), UNO_QUERY); // unchain the interceptor that has to be removed - xChainWalk->setSlaveDispatchProvider(Reference< ::com::sun::star::frame::XDispatchProvider > ()); - xChainWalk->setMasterDispatchProvider(Reference< ::com::sun::star::frame::XDispatchProvider > ()); + xChainWalk->setSlaveDispatchProvider(Reference< css::frame::XDispatchProvider > ()); + xChainWalk->setMasterDispatchProvider(Reference< css::frame::XDispatchProvider > ()); // reconnect the chain if (xMaster.is()) { if (xSlave.is()) - xMaster->setSlaveDispatchProvider(Reference< ::com::sun::star::frame::XDispatchProvider >::query(xSlave)); + xMaster->setSlaveDispatchProvider(Reference< css::frame::XDispatchProvider >::query(xSlave)); else // it's the first interceptor of the chain, set ourself as slave - xMaster->setSlaveDispatchProvider(static_cast(this)); + xMaster->setSlaveDispatchProvider(static_cast(this)); } else { // the chain's first element was removed, set ourself as new master of the second one if (xSlave.is()) - xSlave->setMasterDispatchProvider(static_cast(this)); + xSlave->setMasterDispatchProvider(static_cast(this)); } } @@ -2558,13 +2558,13 @@ void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< ::com::sun } -void FmXGridPeer::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( RuntimeException, std::exception ) +void FmXGridPeer::statusChanged(const css::frame::FeatureStateEvent& Event) throw( RuntimeException, std::exception ) { DBG_ASSERT(m_pStateCache, "FmXGridPeer::statusChanged : invalid call !"); DBG_ASSERT(m_pDispatchers, "FmXGridPeer::statusChanged : invalid call !"); - Sequence< ::com::sun::star::util::URL>& aUrls = getSupportedURLs(); - const ::com::sun::star::util::URL* pUrls = aUrls.getConstArray(); + Sequence< css::util::URL>& aUrls = getSupportedURLs(); + const css::util::URL* pUrls = aUrls.getConstArray(); Sequence aSlots = getSupportedGridSlots(); const sal_uInt16* pSlots = aSlots.getConstArray(); @@ -2672,9 +2672,9 @@ Sequence& FmXGridPeer::getSupportedGridSlots() } -Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs() +Sequence< css::util::URL>& FmXGridPeer::getSupportedURLs() { - static Sequence< ::com::sun::star::util::URL> aSupported; + static Sequence< css::util::URL> aSupported; if (aSupported.getLength() == 0) { static const char* sSupported[] = { @@ -2686,14 +2686,14 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs() FMURL_RECORD_UNDO }; aSupported.realloc(sizeof(sSupported)/sizeof(sSupported[0])); - ::com::sun::star::util::URL* pSupported = aSupported.getArray(); + css::util::URL* pSupported = aSupported.getArray(); sal_uInt16 i; for ( i = 0; i < aSupported.getLength(); ++i, ++pSupported) pSupported->Complete = OUString::createFromAscii(sSupported[i]); - // let an ::com::sun::star::util::URL-transformer normalize the URLs - Reference< ::com::sun::star::util::XURLTransformer > xTransformer( + // let an css::util::URL-transformer normalize the URLs + Reference< css::util::XURLTransformer > xTransformer( util::URLTransformer::create(::comphelper::getProcessComponentContext()) ); pSupported = aSupported.getArray(); for (i=0; i& aSupportedURLs = getSupportedURLs(); - const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray(); - Reference< ::com::sun::star::frame::XDispatch > xNewDispatch; + const Sequence< css::util::URL>& aSupportedURLs = getSupportedURLs(); + const css::util::URL* pSupportedURLs = aSupportedURLs.getConstArray(); + Reference< css::frame::XDispatch > xNewDispatch; for (sal_Int32 i=0; iremoveStatusListener(static_cast(this), *pSupportedURLs); + m_pDispatchers[i]->removeStatusListener(static_cast(this), *pSupportedURLs); m_pDispatchers[i] = xNewDispatch; if (m_pDispatchers[i].is()) - m_pDispatchers[i]->addStatusListener(static_cast(this), *pSupportedURLs); + m_pDispatchers[i]->addStatusListener(static_cast(this), *pSupportedURLs); } if (m_pDispatchers[i].is()) ++nDispatchersGot; @@ -2750,21 +2750,21 @@ void FmXGridPeer::ConnectToDispatcher() return; } - const Sequence< ::com::sun::star::util::URL>& aSupportedURLs = getSupportedURLs(); + const Sequence< css::util::URL>& aSupportedURLs = getSupportedURLs(); // _before_ adding the status listeners (as the add should result in a statusChanged-call) ! m_pStateCache = new bool[aSupportedURLs.getLength()]; - m_pDispatchers = new Reference< ::com::sun::star::frame::XDispatch > [aSupportedURLs.getLength()]; + m_pDispatchers = new Reference< css::frame::XDispatch > [aSupportedURLs.getLength()]; sal_uInt16 nDispatchersGot = 0; - const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray(); + const css::util::URL* pSupportedURLs = aSupportedURLs.getConstArray(); for (sal_Int32 i=0; iaddStatusListener(static_cast(this), *pSupportedURLs); + m_pDispatchers[i]->addStatusListener(static_cast(this), *pSupportedURLs); ++nDispatchersGot; } } @@ -2785,12 +2785,12 @@ void FmXGridPeer::DisConnectFromDispatcher() return; // we're not connected - const Sequence< ::com::sun::star::util::URL>& aSupportedURLs = getSupportedURLs(); - const ::com::sun::star::util::URL* pSupportedURLs = aSupportedURLs.getConstArray(); + const Sequence< css::util::URL>& aSupportedURLs = getSupportedURLs(); + const css::util::URL* pSupportedURLs = aSupportedURLs.getConstArray(); for (sal_Int32 i=0; iremoveStatusListener(static_cast(this), *pSupportedURLs); + m_pDispatchers[i]->removeStatusListener(static_cast(this), *pSupportedURLs); } delete[] m_pStateCache; @@ -2828,8 +2828,8 @@ IMPL_LINK_TYPED(FmXGridPeer, OnExecuteGridSlot, sal_uInt16, nSlot, bool) if (!m_pDispatchers) return false; // not handled - Sequence< ::com::sun::star::util::URL>& aUrls = getSupportedURLs(); - const ::com::sun::star::util::URL* pUrls = aUrls.getConstArray(); + Sequence< css::util::URL>& aUrls = getSupportedURLs(); + const css::util::URL* pUrls = aUrls.getConstArray(); Sequence aSlots = getSupportedGridSlots(); const sal_uInt16* pSlots = aSlots.getConstArray(); diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 369d16d03857..21b5fbae06f1 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -137,7 +137,7 @@ namespace CellControllerRef DbGridColumn::s_xEmptyController; -void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::sun::star::beans::XPropertySet >& xField, sal_Int32 nTypeId) +void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< css::beans::XPropertySet >& xField, sal_Int32 nTypeId) { Clear(); @@ -170,11 +170,11 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s case DataType::DOUBLE: case DataType::NUMERIC: case DataType::DECIMAL: - m_nAlign = ::com::sun::star::awt::TextAlign::RIGHT; + m_nAlign = css::awt::TextAlign::RIGHT; m_bNumeric = true; break; default: - m_nAlign = ::com::sun::star::awt::TextAlign::LEFT; + m_nAlign = css::awt::TextAlign::LEFT; break; } } @@ -282,7 +282,7 @@ bool DbGridColumn::Commit() FmXDataCell* pDataCell = dynamic_cast( m_pCell ); if (bResult && pDataCell) { - Reference< ::com::sun::star::form::XBoundComponent > xComp(m_xModel, UNO_QUERY); + Reference< css::form::XBoundComponent > xComp(m_xModel, UNO_QUERY); if (xComp.is()) bResult = xComp->commit(); } @@ -298,7 +298,7 @@ DbGridColumn::~DbGridColumn() } -void DbGridColumn::setModel(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xModel) +void DbGridColumn::setModel(css::uno::Reference< css::beans::XPropertySet > _xModel) { if ( m_pCell ) impl_toggleScriptManager_nothrow( false ); @@ -354,19 +354,19 @@ sal_Int16 DbGridColumn::SetAlignment(sal_Int16 _nAlign) case DataType::DATE: case DataType::TIME: case DataType::TIMESTAMP: - _nAlign = ::com::sun::star::awt::TextAlign::RIGHT; + _nAlign = css::awt::TextAlign::RIGHT; break; case DataType::BIT: case DataType::BOOLEAN: - _nAlign = ::com::sun::star::awt::TextAlign::CENTER; + _nAlign = css::awt::TextAlign::CENTER; break; default: - _nAlign = ::com::sun::star::awt::TextAlign::LEFT; + _nAlign = css::awt::TextAlign::LEFT; break; } } else - _nAlign = ::com::sun::star::awt::TextAlign::LEFT; + _nAlign = css::awt::TextAlign::LEFT; } m_nAlign = _nAlign; @@ -424,7 +424,7 @@ OUString DbGridColumn::GetCellText(const DbGridRow* pRow, const Reference< XNumb } -OUString DbGridColumn::GetCellText(const Reference< ::com::sun::star::sdb::XColumn >& xField, const Reference< XNumberFormatter >& xFormatter) const +OUString DbGridColumn::GetCellText(const Reference< css::sdb::XColumn >& xField, const Reference< XNumberFormatter >& xFormatter) const { OUString aText; if (xField.is()) @@ -439,9 +439,9 @@ OUString DbGridColumn::GetCellText(const Reference< ::com::sun::star::sdb::XColu } -Reference< ::com::sun::star::sdb::XColumn > DbGridColumn::GetCurrentFieldValue() const +Reference< css::sdb::XColumn > DbGridColumn::GetCurrentFieldValue() const { - Reference< ::com::sun::star::sdb::XColumn > xField; + Reference< css::sdb::XColumn > xField; const DbGridRowRef xRow = m_rParent.GetCurrentRow(); if (xRow.Is() && xRow->HasField(m_nFieldPos)) { @@ -478,10 +478,10 @@ void DbGridColumn::Paint(OutputDevice& rDev, switch (GetAlignment()) { - case ::com::sun::star::awt::TextAlign::RIGHT: + case css::awt::TextAlign::RIGHT: nStyle |= DrawTextFlags::Right; break; - case ::com::sun::star::awt::TextAlign::CENTER: + case css::awt::TextAlign::CENTER: nStyle |= DrawTextFlags::Center; break; default: @@ -558,7 +558,7 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn, bool /*_bText*/ ) if ( xColModelProps.is() ) { // if our model's format key changes we want to propagate the new value to our windows - m_pModelChangeBroadcaster = new ::comphelper::OPropertyChangeMultiplexer(this, Reference< ::com::sun::star::beans::XPropertySet > (_rColumn.getModel(), UNO_QUERY)); + m_pModelChangeBroadcaster = new ::comphelper::OPropertyChangeMultiplexer(this, Reference< css::beans::XPropertySet > (_rColumn.getModel(), UNO_QUERY)); m_pModelChangeBroadcaster->acquire(); // be listener for some common properties @@ -957,10 +957,10 @@ void DbCellControl::AlignControl(sal_Int16 nAlignment) WinBits nAlignmentBit = 0; switch (nAlignment) { - case ::com::sun::star::awt::TextAlign::RIGHT: + case css::awt::TextAlign::RIGHT: nAlignmentBit = WB_RIGHT; break; - case ::com::sun::star::awt::TextAlign::CENTER: + case css::awt::TextAlign::CENTER: nAlignmentBit = WB_CENTER; break; default: @@ -1007,7 +1007,7 @@ void DbCellControl::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRe } -double DbCellControl::GetValue(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) const +double DbCellControl::GetValue(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) const { double fValue = 0; if (m_rColumn.IsNumeric()) @@ -1174,14 +1174,14 @@ void DbTextField::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect OUString DbTextField::GetFormatText(const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/) { - const com::sun::star::uno::Reference xPS(_rxField, UNO_QUERY); + const css::uno::Reference xPS(_rxField, UNO_QUERY); FormattedColumnValue fmter( xFormatter, xPS ); return fmter.getFormattedValue(); } -void DbTextField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) +void DbTextField::UpdateFromField(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) { m_pEdit->SetText( GetFormatText( _rxField, xFormatter ) ); m_pEdit->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) ); @@ -1236,7 +1236,7 @@ void DbTextField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) DbFormattedField::DbFormattedField(DbGridColumn& _rColumn) :DbLimitedLengthField(_rColumn) - ,m_nKeyType(::com::sun::star::util::NumberFormat::UNDEFINED) + ,m_nKeyType(css::util::NumberFormat::UNDEFINED) { // if our model's format key changes we want to propagate the new value to our windows @@ -1253,16 +1253,16 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x { sal_Int16 nAlignment = m_rColumn.SetAlignmentFromModel(-1); - Reference< ::com::sun::star::beans::XPropertySet > xUnoModel = m_rColumn.getModel(); + Reference< css::beans::XPropertySet > xUnoModel = m_rColumn.getModel(); switch (nAlignment) { - case ::com::sun::star::awt::TextAlign::RIGHT: + case css::awt::TextAlign::RIGHT: m_pWindow = VclPtr::Create( &rParent, WB_RIGHT ); m_pPainter = VclPtr::Create( &rParent, WB_RIGHT ); break; - case ::com::sun::star::awt::TextAlign::CENTER: + case css::awt::TextAlign::CENTER: m_pWindow = VclPtr::Create( &rParent, WB_CENTER ); m_pPainter = VclPtr::Create( &rParent, WB_CENTER ); break; @@ -1287,7 +1287,7 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x // machen (das FormattedField unterstuetzt das sowieso nicht, nur abgeleitete Klassen) // von dem Uno-Model den Formatter besorgen - // (Ich koennte theoretisch auch ueber den ::com::sun::star::util::NumberFormatter gehen, den mir der Cursor bestimmt + // (Ich koennte theoretisch auch ueber den css::util::NumberFormatter gehen, den mir der Cursor bestimmt // liefern wuerde. Das Problem dabei ist, dass ich mich eigentlich nicht darauf verlassen // kann, dass die beiden Formatter die selben sind, sauber ist das Ganze, wenn ich ueber das // UNO-Model gehe.) @@ -1322,7 +1322,7 @@ void DbFormattedField::Init( vcl::Window& rParent, const Reference< XRowSet >& x } } - // nein ? vielleicht die ::com::sun::star::form::component::Form hinter dem Cursor ? + // nein ? vielleicht die css::form::component::Form hinter dem Cursor ? if (!m_xSupplier.is()) { Reference< XRowSet > xCursorForm(xCursor, UNO_QUERY); @@ -1485,7 +1485,7 @@ void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent ) th } -OUString DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** ppColor) +OUString DbFormattedField::GetFormatText(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** ppColor) { // defaultmaessig keine Farb-Angabe if (ppColor != NULL) @@ -1513,7 +1513,7 @@ OUString DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb: else { // Hier kann ich nicht mit einem double arbeiten, da das Feld mir keines liefern kann. - // Also einfach den Text vom ::com::sun::star::util::NumberFormatter in die richtige ::com::sun::star::form::component::Form brinden lassen. + // Also einfach den Text vom css::util::NumberFormatter in die richtige css::form::component::Form brinden lassen. aText = _rxField->getString(); if (_rxField->wasNull()) return aText; @@ -1533,7 +1533,7 @@ OUString DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb: } -void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) +void DbFormattedField::UpdateFromField(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) { try { @@ -1558,7 +1558,7 @@ void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::X else { // Hier kann ich nicht mit einem double arbeiten, da das Feld mir keines liefern kann. - // Also einfach den Text vom ::com::sun::star::util::NumberFormatter in die richtige ::com::sun::star::form::component::Form brinden lassen. + // Also einfach den Text vom css::util::NumberFormatter in die richtige css::form::component::Form brinden lassen. OUString sText( _rxField->getString()); pFormattedWindow->SetTextFormatted( sText ); @@ -1675,7 +1675,7 @@ CellControllerRef DbCheckBox::CreateController() const return new CheckBoxCellController(static_cast(m_pWindow.get())); } -static void lcl_setCheckBoxState( const Reference< ::com::sun::star::sdb::XColumn >& _rxField, +static void lcl_setCheckBoxState( const Reference< css::sdb::XColumn >& _rxField, CheckBoxControl* _pCheckBoxControl ) { TriState eState = TRISTATE_INDET; @@ -1696,14 +1696,14 @@ static void lcl_setCheckBoxState( const Reference< ::com::sun::star::sdb::XCol } -void DbCheckBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) +void DbCheckBox::UpdateFromField(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) { lcl_setCheckBoxState( _rxField, static_cast(m_pWindow.get()) ); } void DbCheckBox::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, - const Reference< ::com::sun::star::sdb::XColumn >& _rxField, + const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) { lcl_setCheckBoxState( _rxField, static_cast(m_pPainter.get()) ); @@ -1796,7 +1796,7 @@ OUString DbPatternField::impl_formatText( const OUString& _rText ) } -OUString DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) +OUString DbPatternField::GetFormatText(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { bool bIsForPaint = _rxField != m_rColumn.GetField(); ::std::unique_ptr< FormattedColumnValue >& rpFormatter = bIsForPaint ? m_pPaintFormatter : m_pValueFormatter; @@ -1916,7 +1916,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe // dem Field und dem Painter einen Formatter spendieren // zuerst testen, ob ich von dem Service hinter einer Connection bekommen kann - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier; + Reference< css::util::XNumberFormatsSupplier > xSupplier; Reference< XRowSet > xForm; if ( m_rColumn.GetParent().getDataSource() ) xForm = Reference< XRowSet >( Reference< XInterface >(*m_rColumn.GetParent().getDataSource()), UNO_QUERY ); @@ -1979,13 +1979,13 @@ namespace } -OUString DbNumericField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/) +OUString DbNumericField::GetFormatText(const Reference< css::sdb::XColumn >& _rxField, const Reference< css::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/) { return lcl_setFormattedNumeric_nothrow(dynamic_cast(*m_pPainter), *this, _rxField, _rxFormatter); } -void DbNumericField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter) +void DbNumericField::UpdateFromField(const Reference< css::sdb::XColumn >& _rxField, const Reference< css::util::XNumberFormatter >& _rxFormatter) { lcl_setFormattedNumeric_nothrow(dynamic_cast(*m_pWindow), *this, _rxField, _rxFormatter); } @@ -2080,7 +2080,7 @@ VclPtr DbCurrencyField::createField( vcl::Window* _pParent, WinBits _ } -double DbCurrencyField::GetCurrency(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) const +double DbCurrencyField::GetCurrency(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) const { double fValue = GetValue(_rxField, xFormatter); if (m_nScale) @@ -2120,13 +2120,13 @@ namespace } -OUString DbCurrencyField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/) +OUString DbCurrencyField::GetFormatText(const Reference< css::sdb::XColumn >& _rxField, const Reference< css::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/) { return lcl_setFormattedCurrency_nothrow( dynamic_cast< LongCurrencyField& >( *m_pPainter ), *this, _rxField, _rxFormatter ); } -void DbCurrencyField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter) +void DbCurrencyField::UpdateFromField(const Reference< css::sdb::XColumn >& _rxField, const Reference< css::util::XNumberFormatter >& _rxFormatter) { lcl_setFormattedCurrency_nothrow( dynamic_cast< LongCurrencyField& >( *m_pWindow ), *this, _rxField, _rxFormatter ); } @@ -2243,7 +2243,7 @@ namespace { try { - ::com::sun::star::util::Date aValue = _rxField->getDate(); + css::util::Date aValue = _rxField->getDate(); if ( _rxField->wasNull() ) _rField.SetText( sDate ); else @@ -2261,13 +2261,13 @@ namespace } } -OUString DbDateField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) +OUString DbDateField::GetFormatText(const Reference< css::sdb::XColumn >& _rxField, const Reference< css::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { return lcl_setFormattedDate_nothrow(dynamic_cast(*m_pPainter.get()), _rxField); } -void DbDateField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) +void DbDateField::UpdateFromField(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) { lcl_setFormattedDate_nothrow(dynamic_cast(*m_pWindow.get()), _rxField); } @@ -2299,7 +2299,7 @@ bool DbDateField::commitControl() } DbTimeField::DbTimeField( DbGridColumn& _rColumn ) - :DbSpinField( _rColumn, ::com::sun::star::awt::TextAlign::LEFT ) + :DbSpinField( _rColumn, css::awt::TextAlign::LEFT ) { doPropertyListening( FM_PROP_TIMEFORMAT ); doPropertyListening( FM_PROP_TIMEMIN ); @@ -2351,7 +2351,7 @@ namespace { try { - ::com::sun::star::util::Time aValue = _rxField->getTime(); + css::util::Time aValue = _rxField->getTime(); if ( _rxField->wasNull() ) _rField.SetText( sTime ); else @@ -2369,13 +2369,13 @@ namespace } } -OUString DbTimeField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) +OUString DbTimeField::GetFormatText(const Reference< css::sdb::XColumn >& _rxField, const Reference< css::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { return lcl_setFormattedTime_nothrow( *static_cast< TimeField* >( m_pPainter.get() ), _rxField ); } -void DbTimeField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) +void DbTimeField::UpdateFromField(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/) { lcl_setFormattedTime_nothrow( *static_cast< TimeField* >( m_pWindow.get() ), _rxField ); } @@ -2462,7 +2462,7 @@ void DbComboBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >& void DbComboBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor ) { - m_rColumn.SetAlignmentFromModel(::com::sun::star::awt::TextAlign::LEFT); + m_rColumn.SetAlignmentFromModel(css::awt::TextAlign::LEFT); m_pWindow = VclPtr::Create( &rParent ); @@ -2489,16 +2489,16 @@ CellControllerRef DbComboBox::CreateController() const } -OUString DbComboBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/) +OUString DbComboBox::GetFormatText(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/) { - const com::sun::star::uno::Reference xPS(_rxField, UNO_QUERY); + const css::uno::Reference xPS(_rxField, UNO_QUERY); ::dbtools::FormattedColumnValue fmter( xFormatter, xPS ); return fmter.getFormattedValue(); } -void DbComboBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) +void DbComboBox::UpdateFromField(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) { m_pWindow->SetText(GetFormatText(_rxField, xFormatter)); } @@ -2535,7 +2535,7 @@ DbListBox::DbListBox(DbGridColumn& _rColumn) } -void DbListBox::_propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw( RuntimeException ) +void DbListBox::_propertyChanged( const css::beans::PropertyChangeEvent& _rEvent ) throw( RuntimeException ) { if ( _rEvent.PropertyName == FM_PROP_STRINGITEMLIST ) { @@ -2577,7 +2577,7 @@ void DbListBox::SetList(const Any& rItems) void DbListBox::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor) { - m_rColumn.SetAlignment(::com::sun::star::awt::TextAlign::LEFT); + m_rColumn.SetAlignment(css::awt::TextAlign::LEFT); m_pWindow = VclPtr::Create( &rParent ); @@ -2608,7 +2608,7 @@ CellControllerRef DbListBox::CreateController() const } -OUString DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) +OUString DbListBox::GetFormatText(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/) { OUString sText; if ( _rxField.is() ) @@ -2634,7 +2634,7 @@ OUString DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColum } -void DbListBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) +void DbListBox::UpdateFromField(const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) { OUString sFormattedText( GetFormatText( _rxField, xFormatter ) ); if (!sFormattedText.isEmpty()) @@ -2681,7 +2681,7 @@ bool DbListBox::commitControl() DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbGridColumn& _rColumn) :DbCellControl(_rColumn) ,OSQLParserClient(rxContext) - ,m_nControlClass(::com::sun::star::form::FormComponentType::TEXTFIELD) + ,m_nControlClass(css::form::FormComponentType::TEXTFIELD) ,m_bFilterList(false) ,m_bFilterListFilled(false) ,m_bBound(false) @@ -2693,7 +2693,7 @@ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbG DbFilterField::~DbFilterField() { - if (m_nControlClass == ::com::sun::star::form::FormComponentType::CHECKBOX) + if (m_nControlClass == css::form::FormComponentType::CHECKBOX) static_cast(m_pWindow.get())->SetClickHdl( Link,void>() ); } @@ -2743,11 +2743,11 @@ void DbFilterField::SetList(const Any& rItems, bool bComboBox) } -void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< ::com::sun::star::beans::XPropertySet >& xModel) +void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< css::beans::XPropertySet >& xModel) { switch (m_nControlClass) { - case ::com::sun::star::form::FormComponentType::CHECKBOX: + case css::form::FormComponentType::CHECKBOX: m_pWindow = VclPtr::Create(pParent); m_pWindow->SetPaintTransparent( true ); static_cast(m_pWindow.get())->SetClickHdl( LINK( this, DbFilterField, OnClick ) ); @@ -2756,15 +2756,15 @@ void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< ::com:: m_pPainter->SetPaintTransparent( true ); m_pPainter->SetBackground(); break; - case ::com::sun::star::form::FormComponentType::LISTBOX: + case css::form::FormComponentType::LISTBOX: { m_pWindow = VclPtr::Create(pParent); sal_Int16 nLines = ::comphelper::getINT16(xModel->getPropertyValue(FM_PROP_LINECOUNT)); Any aItems = xModel->getPropertyValue(FM_PROP_STRINGITEMLIST); - SetList(aItems, m_nControlClass == ::com::sun::star::form::FormComponentType::COMBOBOX); + SetList(aItems, m_nControlClass == css::form::FormComponentType::COMBOBOX); static_cast(m_pWindow.get())->SetDropDownLineCount(nLines); } break; - case ::com::sun::star::form::FormComponentType::COMBOBOX: + case css::form::FormComponentType::COMBOBOX: { m_pWindow = VclPtr::Create(pParent); @@ -2779,7 +2779,7 @@ void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< ::com:: { sal_Int16 nLines = ::comphelper::getINT16(xModel->getPropertyValue(FM_PROP_LINECOUNT)); Any aItems = xModel->getPropertyValue(FM_PROP_STRINGITEMLIST); - SetList(aItems, m_nControlClass == ::com::sun::star::form::FormComponentType::COMBOBOX); + SetList(aItems, m_nControlClass == css::form::FormComponentType::COMBOBOX); static_cast(m_pWindow.get())->SetDropDownLineCount(nLines); } else @@ -2802,14 +2802,14 @@ void DbFilterField::CreateControl(vcl::Window* pParent, const Reference< ::com:: void DbFilterField::Init( vcl::Window& rParent, const Reference< XRowSet >& xCursor ) { - Reference< ::com::sun::star::beans::XPropertySet > xModel(m_rColumn.getModel()); - m_rColumn.SetAlignment(::com::sun::star::awt::TextAlign::LEFT); + Reference< css::beans::XPropertySet > xModel(m_rColumn.getModel()); + m_rColumn.SetAlignment(css::awt::TextAlign::LEFT); if (xModel.is()) { m_bFilterList = ::comphelper::hasProperty(FM_PROP_FILTERPROPOSAL, xModel) && ::comphelper::getBOOL(xModel->getPropertyValue(FM_PROP_FILTERPROPOSAL)); if (m_bFilterList) - m_nControlClass = ::com::sun::star::form::FormComponentType::COMBOBOX; + m_nControlClass = css::form::FormComponentType::COMBOBOX; else { sal_Int16 nClassId = ::comphelper::getINT16(xModel->getPropertyValue(FM_PROP_CLASSID)); @@ -2844,13 +2844,13 @@ CellControllerRef DbFilterField::CreateController() const CellControllerRef xController; switch (m_nControlClass) { - case ::com::sun::star::form::FormComponentType::CHECKBOX: + case css::form::FormComponentType::CHECKBOX: xController = new CheckBoxCellController(static_cast(m_pWindow.get())); break; - case ::com::sun::star::form::FormComponentType::LISTBOX: + case css::form::FormComponentType::LISTBOX: xController = new ListBoxCellController(static_cast(m_pWindow.get())); break; - case ::com::sun::star::form::FormComponentType::COMBOBOX: + case css::form::FormComponentType::COMBOBOX: xController = new ComboBoxCellController(static_cast(m_pWindow.get())); break; default: @@ -2879,9 +2879,9 @@ bool DbFilterField::commitControl() OUString aText(m_aText); switch (m_nControlClass) { - case ::com::sun::star::form::FormComponentType::CHECKBOX: + case css::form::FormComponentType::CHECKBOX: return true; - case ::com::sun::star::form::FormComponentType::LISTBOX: + case css::form::FormComponentType::LISTBOX: aText.clear(); if (static_cast(m_pWindow.get())->GetSelectEntryCount()) { @@ -2914,7 +2914,7 @@ bool DbFilterField::commitControl() { OUString aPreparedText; - ::com::sun::star::lang::Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); + css::lang::Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); Reference< XRowSet > xDataSourceRowSet( Reference< XInterface >(*m_rColumn.GetParent().getDataSource()), UNO_QUERY); @@ -2956,7 +2956,7 @@ void DbFilterField::SetText(const OUString& rText) m_aText = rText; switch (m_nControlClass) { - case ::com::sun::star::form::FormComponentType::CHECKBOX: + case css::form::FormComponentType::CHECKBOX: { TriState eState; if (rText == "1") @@ -2969,7 +2969,7 @@ void DbFilterField::SetText(const OUString& rText) static_cast(m_pWindow.get())->GetBox().SetState(eState); static_cast(m_pPainter.get())->GetBox().SetState(eState); } break; - case ::com::sun::star::form::FormComponentType::LISTBOX: + case css::form::FormComponentType::LISTBOX: { Sequence aPosSeq = ::comphelper::findValue(m_aValueList, m_aText, true); if (aPosSeq.getLength()) @@ -2992,7 +2992,7 @@ void DbFilterField::Update() if (m_bFilterList && !m_bFilterListFilled) { m_bFilterListFilled = true; - Reference< ::com::sun::star::beans::XPropertySet > xField = m_rColumn.GetField(); + Reference< css::beans::XPropertySet > xField = m_rColumn.GetField(); if (!xField.is()) return; @@ -3000,9 +3000,9 @@ void DbFilterField::Update() xField->getPropertyValue(FM_PROP_NAME) >>= aName; // the columnmodel - Reference< ::com::sun::star::container::XChild > xModelAsChild(m_rColumn.getModel(), UNO_QUERY); + Reference< css::container::XChild > xModelAsChild(m_rColumn.getModel(), UNO_QUERY); // the grid model - xModelAsChild = Reference< ::com::sun::star::container::XChild > (xModelAsChild->getParent(),UNO_QUERY); + xModelAsChild = Reference< css::container::XChild > (xModelAsChild->getParent(),UNO_QUERY); Reference< XRowSet > xForm(xModelAsChild->getParent(), UNO_QUERY); if (!xForm.is()) return; @@ -3017,12 +3017,12 @@ void DbFilterField::Update() // search the field Reference< XColumnsSupplier > xSupCol(xSupTab,UNO_QUERY); - Reference< ::com::sun::star::container::XNameAccess > xFieldNames = xSupCol->getColumns(); + Reference< css::container::XNameAccess > xFieldNames = xSupCol->getColumns(); if (!xFieldNames->hasByName(aName)) return; - Reference< ::com::sun::star::container::XNameAccess > xTablesNames = xSupTab->getTables(); - Reference< ::com::sun::star::beans::XPropertySet > xComposerFieldAsSet(xFieldNames->getByName(aName),UNO_QUERY); + Reference< css::container::XNameAccess > xTablesNames = xSupTab->getTables(); + Reference< css::beans::XPropertySet > xComposerFieldAsSet(xFieldNames->getByName(aName),UNO_QUERY); if (xComposerFieldAsSet.is() && ::comphelper::hasProperty(FM_PROP_TABLENAME, xComposerFieldAsSet) && ::comphelper::hasProperty(FM_PROP_FIELDSOURCE, xComposerFieldAsSet)) @@ -3041,7 +3041,7 @@ void DbFilterField::Update() // Access to the connection Reference< XStatement > xStatement; Reference< XResultSet > xListCursor; - Reference< ::com::sun::star::sdb::XColumn > xDataField; + Reference< css::sdb::XColumn > xDataField; try { @@ -3062,13 +3062,13 @@ void DbFilterField::Update() aStatement.append(composeTableNameForSelect(xConnection, xTableNameAccess)); xStatement = xConnection->createStatement(); - Reference< ::com::sun::star::beans::XPropertySet > xStatementProps(xStatement, UNO_QUERY); + Reference< css::beans::XPropertySet > xStatementProps(xStatement, UNO_QUERY); xStatementProps->setPropertyValue(FM_PROP_ESCAPE_PROCESSING, makeAny(true)); xListCursor = xStatement->executeQuery(aStatement.makeStringAndClear()); - Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(xListCursor, UNO_QUERY); - Reference< ::com::sun::star::container::XIndexAccess > xFields(xSupplyCols->getColumns(), UNO_QUERY); + Reference< css::sdbcx::XColumnsSupplier > xSupplyCols(xListCursor, UNO_QUERY); + Reference< css::container::XIndexAccess > xFields(xSupplyCols->getColumns(), UNO_QUERY); xDataField.set(xFields->getByIndex(0), css::uno::UNO_QUERY); if (!xDataField.is()) return; @@ -3083,7 +3083,7 @@ void DbFilterField::Update() ::std::vector< OUString > aStringList; aStringList.reserve(16); OUString aStr; - com::sun::star::util::Date aNullDate = m_rColumn.GetParent().getNullDate(); + css::util::Date aNullDate = m_rColumn.GetParent().getNullDate(); sal_Int32 nFormatKey = m_rColumn.GetKey(); Reference< XNumberFormatter > xFormatter = m_rColumn.GetParent().getNumberFormatter(); sal_Int16 nKeyType = ::comphelper::getNumberFormatType(xFormatter->getNumberFormatsSupplier()->getNumberFormats(), nFormatKey); @@ -3233,7 +3233,7 @@ void FmXGridCell::disposing() } -Any SAL_CALL FmXGridCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXGridCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) { Any aReturn = OComponentHelper::queryAggregation( _rType ); @@ -3246,7 +3246,7 @@ Any SAL_CALL FmXGridCell::queryAggregation( const ::com::sun::star::uno::Type& _ return aReturn; } -// ::com::sun::star::awt::XControl +// css::awt::XControl Reference< XInterface > FmXGridCell::getContext() throw( RuntimeException, std::exception ) { @@ -3254,13 +3254,13 @@ Reference< XInterface > FmXGridCell::getContext() throw( RuntimeException, std: } -Reference< ::com::sun::star::awt::XControlModel > FmXGridCell::getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +Reference< css::awt::XControlModel > FmXGridCell::getModel() throw( css::uno::RuntimeException, std::exception ) { checkDisposed(OComponentHelper::rBHelper.bDisposed); - return Reference< ::com::sun::star::awt::XControlModel > (m_pColumn->getModel(), UNO_QUERY); + return Reference< css::awt::XControlModel > (m_pColumn->getModel(), UNO_QUERY); } -// ::com::sun::star::form::XBoundControl +// css::form::XBoundControl sal_Bool FmXGridCell::getLock() throw( RuntimeException, std::exception ) { @@ -3519,7 +3519,7 @@ void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& TYPEINIT1(FmXDataCell, FmXGridCell); void FmXDataCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, - const Reference< ::com::sun::star::sdb::XColumn >& _rxField, + const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) { m_pCellControl->PaintFieldToCell( rDev, rRect, _rxField, xFormatter ); @@ -3528,7 +3528,7 @@ void FmXDataCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, void FmXDataCell::UpdateFromColumn() { - Reference< ::com::sun::star::sdb::XColumn > xField(m_pColumn->GetCurrentFieldValue()); + Reference< css::sdb::XColumn > xField(m_pColumn->GetCurrentFieldValue()); if (xField.is()) m_pCellControl->UpdateFromField(xField, m_pColumn->GetParent().getNumberFormatter()); } @@ -3544,7 +3544,7 @@ FmXTextCell::FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl ) void FmXTextCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, - const Reference< ::com::sun::star::sdb::XColumn >& _rxField, + const Reference< css::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) { if ( !m_bFastPaint ) @@ -3559,10 +3559,10 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev, switch (m_pColumn->GetAlignment()) { - case ::com::sun::star::awt::TextAlign::RIGHT: + case css::awt::TextAlign::RIGHT: nStyle |= DrawTextFlags::Right; break; - case ::com::sun::star::awt::TextAlign::CENTER: + case css::awt::TextAlign::CENTER: nStyle |= DrawTextFlags::Center; break; default: @@ -3621,7 +3621,7 @@ FmXEditCell::~FmXEditCell() void FmXEditCell::disposing() { - ::com::sun::star::lang::EventObject aEvt(*this); + css::lang::EventObject aEvt(*this); m_aTextListeners.disposeAndClear(aEvt); m_aChangeListeners.disposeAndClear(aEvt); @@ -3634,7 +3634,7 @@ void FmXEditCell::disposing() } -Any SAL_CALL FmXEditCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXEditCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) { Any aReturn = FmXTextCell::queryAggregation( _rType ); @@ -3645,7 +3645,7 @@ Any SAL_CALL FmXEditCell::queryAggregation( const ::com::sun::star::uno::Type& _ } -Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXEditCell::getTypes( ) throw(RuntimeException, std::exception) +Sequence< css::uno::Type > SAL_CALL FmXEditCell::getTypes( ) throw(RuntimeException, std::exception) { return ::comphelper::concatSequences( FmXTextCell::getTypes(), @@ -3656,15 +3656,15 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXEditCell::getTypes( ) throw IMPLEMENT_GET_IMPLEMENTATION_ID( FmXEditCell ) -// ::com::sun::star::awt::XTextComponent +// css::awt::XTextComponent -void SAL_CALL FmXEditCell::addTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXEditCell::addTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception ) { m_aTextListeners.addInterface( l ); } -void SAL_CALL FmXEditCell::removeTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXEditCell::removeTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception ) { m_aTextListeners.removeInterface( l ); } @@ -3679,13 +3679,13 @@ void SAL_CALL FmXEditCell::setText( const OUString& aText ) throw( RuntimeExcept m_pEditImplementation->SetText( aText ); // In JAVA wird auch ein textChanged ausgeloest, in VCL nicht. - // ::com::sun::star::awt::Toolkit soll JAVA-komform sein... + // css::awt::Toolkit soll JAVA-komform sein... onTextChanged(); } } -void SAL_CALL FmXEditCell::insertText(const ::com::sun::star::awt::Selection& rSel, const OUString& aText) throw(RuntimeException, std::exception) +void SAL_CALL FmXEditCell::insertText(const css::awt::Selection& rSel, const OUString& aText) throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3712,7 +3712,7 @@ OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException, std::exception } else { - Reference< ::com::sun::star::sdb::XColumn > xField(m_pColumn->GetCurrentFieldValue()); + Reference< css::sdb::XColumn > xField(m_pColumn->GetCurrentFieldValue()); if (xField.is()) aText = GetText(xField, m_pColumn->GetParent().getNumberFormatter()); } @@ -3735,7 +3735,7 @@ OUString SAL_CALL FmXEditCell::getSelectedText() throw( RuntimeException, std::e } -void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXEditCell::setSelection( const css::awt::Selection& aSelection ) throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3744,7 +3744,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& } -::com::sun::star::awt::Selection SAL_CALL FmXEditCell::getSelection() throw( RuntimeException, std::exception ) +css::awt::Selection SAL_CALL FmXEditCell::getSelection() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3752,7 +3752,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& if ( m_pEditImplementation ) aSel = m_pEditImplementation->GetSelection(); - return ::com::sun::star::awt::Selection(aSel.Min(), aSel.Max()); + return css::awt::Selection(aSel.Min(), aSel.Max()); } @@ -3804,7 +3804,7 @@ void SAL_CALL FmXEditCell::removeChangeListener( const Reference< form::XChangeL void FmXEditCell::onTextChanged() { - ::com::sun::star::awt::TextEvent aEvent; + css::awt::TextEvent aEvent; aEvent.Source = *this; m_aTextListeners.notifyEach( &awt::XTextListener::textChanged, aEvent ); } @@ -3867,7 +3867,7 @@ FmXCheckBoxCell::~FmXCheckBoxCell() void FmXCheckBoxCell::disposing() { - ::com::sun::star::lang::EventObject aEvt(*this); + css::lang::EventObject aEvt(*this); m_aItemListeners.disposeAndClear(aEvt); m_aActionListeners.disposeAndClear(aEvt); @@ -3878,7 +3878,7 @@ void FmXCheckBoxCell::disposing() } -Any SAL_CALL FmXCheckBoxCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXCheckBoxCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) { Any aReturn = FmXDataCell::queryAggregation( _rType ); @@ -3889,7 +3889,7 @@ Any SAL_CALL FmXCheckBoxCell::queryAggregation( const ::com::sun::star::uno::Typ } -Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes( ) throw(RuntimeException, std::exception) +Sequence< css::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes( ) throw(RuntimeException, std::exception) { return ::comphelper::concatSequences( FmXDataCell::getTypes(), @@ -3901,13 +3901,13 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes( ) t IMPLEMENT_GET_IMPLEMENTATION_ID( FmXCheckBoxCell ) -void SAL_CALL FmXCheckBoxCell::addItemListener( const Reference< ::com::sun::star::awt::XItemListener >& l ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXCheckBoxCell::addItemListener( const Reference< css::awt::XItemListener >& l ) throw( RuntimeException, std::exception ) { m_aItemListeners.addInterface( l ); } -void SAL_CALL FmXCheckBoxCell::removeItemListener( const Reference< ::com::sun::star::awt::XItemListener >& l ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXCheckBoxCell::removeItemListener( const Reference< css::awt::XItemListener >& l ) throw( RuntimeException, std::exception ) { m_aItemListeners.removeInterface( l ); } @@ -4043,7 +4043,7 @@ FmXListBoxCell::~FmXListBoxCell() void FmXListBoxCell::disposing() { - ::com::sun::star::lang::EventObject aEvt(*this); + css::lang::EventObject aEvt(*this); m_aItemListeners.disposeAndClear(aEvt); m_aActionListeners.disposeAndClear(aEvt); @@ -4055,7 +4055,7 @@ void FmXListBoxCell::disposing() } -Any SAL_CALL FmXListBoxCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXListBoxCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) { Any aReturn = FmXTextCell::queryAggregation(_rType); @@ -4066,7 +4066,7 @@ Any SAL_CALL FmXListBoxCell::queryAggregation( const ::com::sun::star::uno::Type } -Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXListBoxCell::getTypes( ) throw(RuntimeException, std::exception) +Sequence< css::uno::Type > SAL_CALL FmXListBoxCell::getTypes( ) throw(RuntimeException, std::exception) { return ::comphelper::concatSequences( FmXTextCell::getTypes(), @@ -4078,25 +4078,25 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXListBoxCell::getTypes( ) th IMPLEMENT_GET_IMPLEMENTATION_ID( FmXListBoxCell ) -void SAL_CALL FmXListBoxCell::addItemListener(const Reference< ::com::sun::star::awt::XItemListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::addItemListener(const Reference< css::awt::XItemListener >& l) throw( RuntimeException, std::exception ) { m_aItemListeners.addInterface( l ); } -void SAL_CALL FmXListBoxCell::removeItemListener(const Reference< ::com::sun::star::awt::XItemListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::removeItemListener(const Reference< css::awt::XItemListener >& l) throw( RuntimeException, std::exception ) { m_aItemListeners.removeInterface( l ); } -void SAL_CALL FmXListBoxCell::addActionListener(const Reference< ::com::sun::star::awt::XActionListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::addActionListener(const Reference< css::awt::XActionListener >& l) throw( RuntimeException, std::exception ) { m_aActionListeners.addInterface( l ); } -void SAL_CALL FmXListBoxCell::removeActionListener(const Reference< ::com::sun::star::awt::XActionListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXListBoxCell::removeActionListener(const Reference< css::awt::XActionListener >& l) throw( RuntimeException, std::exception ) { m_aActionListeners.removeInterface( l ); } @@ -4322,7 +4322,7 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Wind { OnDoubleClick( *m_pBox ); - ::com::sun::star::awt::ItemEvent aEvent; + css::awt::ItemEvent aEvent; aEvent.Source = *this; aEvent.Highlighted = 0; @@ -4345,12 +4345,12 @@ IMPL_LINK_NOARG_TYPED(FmXListBoxCell, OnDoubleClick, ListBox&, void) { ::cppu::OInterfaceIteratorHelper aIt( m_aActionListeners ); - ::com::sun::star::awt::ActionEvent aEvent; + css::awt::ActionEvent aEvent; aEvent.Source = *this; aEvent.ActionCommand = m_pBox->GetSelectEntry(); while( aIt.hasMoreElements() ) - static_cast< ::com::sun::star::awt::XActionListener *>(aIt.next())->actionPerformed( aEvent ); + static_cast< css::awt::XActionListener *>(aIt.next())->actionPerformed( aEvent ); } } @@ -4376,7 +4376,7 @@ FmXComboBoxCell::~FmXComboBoxCell() void FmXComboBoxCell::disposing() { - ::com::sun::star::lang::EventObject aEvt(*this); + css::lang::EventObject aEvt(*this); m_aItemListeners.disposeAndClear(aEvt); m_aActionListeners.disposeAndClear(aEvt); @@ -4384,7 +4384,7 @@ void FmXComboBoxCell::disposing() } -Any SAL_CALL FmXComboBoxCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXComboBoxCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) { Any aReturn = FmXTextCell::queryAggregation(_rType); @@ -4599,7 +4599,7 @@ void FmXFilterCell::PaintCell( OutputDevice& rDev, const Rectangle& rRect ) void FmXFilterCell::disposing() { - ::com::sun::star::lang::EventObject aEvt(*this); + css::lang::EventObject aEvt(*this); m_aTextListeners.disposeAndClear(aEvt); static_cast(m_pCellControl)->SetCommitHdl(Link()); @@ -4608,7 +4608,7 @@ void FmXFilterCell::disposing() } -Any SAL_CALL FmXFilterCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL FmXFilterCell::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) { Any aReturn = FmXGridCell::queryAggregation(_rType); @@ -4619,7 +4619,7 @@ Any SAL_CALL FmXFilterCell::queryAggregation( const ::com::sun::star::uno::Type& } -Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXFilterCell::getTypes( ) throw(RuntimeException, std::exception) +Sequence< css::uno::Type > SAL_CALL FmXFilterCell::getTypes( ) throw(RuntimeException, std::exception) { return ::comphelper::concatSequences( FmXGridCell::getTypes(), @@ -4630,15 +4630,15 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXFilterCell::getTypes( ) thr IMPLEMENT_GET_IMPLEMENTATION_ID( FmXFilterCell ) -// ::com::sun::star::awt::XTextComponent +// css::awt::XTextComponent -void SAL_CALL FmXFilterCell::addTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFilterCell::addTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception ) { m_aTextListeners.addInterface( l ); } -void SAL_CALL FmXFilterCell::removeTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFilterCell::removeTextListener(const Reference< css::awt::XTextListener >& l) throw( RuntimeException, std::exception ) { m_aTextListeners.removeInterface( l ); } @@ -4651,7 +4651,7 @@ void SAL_CALL FmXFilterCell::setText( const OUString& aText ) throw( RuntimeExce } -void SAL_CALL FmXFilterCell::insertText( const ::com::sun::star::awt::Selection& /*rSel*/, const OUString& /*aText*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFilterCell::insertText( const css::awt::Selection& /*rSel*/, const OUString& /*aText*/ ) throw( RuntimeException, std::exception ) { } @@ -4669,14 +4669,14 @@ OUString SAL_CALL FmXFilterCell::getSelectedText() throw( RuntimeException, std: } -void SAL_CALL FmXFilterCell::setSelection( const ::com::sun::star::awt::Selection& /*aSelection*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL FmXFilterCell::setSelection( const css::awt::Selection& /*aSelection*/ ) throw( RuntimeException, std::exception ) { } -::com::sun::star::awt::Selection SAL_CALL FmXFilterCell::getSelection() throw( RuntimeException, std::exception ) +css::awt::Selection SAL_CALL FmXFilterCell::getSelection() throw( RuntimeException, std::exception ) { - return ::com::sun::star::awt::Selection(); + return css::awt::Selection(); } @@ -4705,10 +4705,10 @@ void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ ) throw( RuntimeE IMPL_LINK_NOARG_TYPED(FmXFilterCell, OnCommit, DbFilterField&, void) { ::cppu::OInterfaceIteratorHelper aIt( m_aTextListeners ); - ::com::sun::star::awt::TextEvent aEvt; + css::awt::TextEvent aEvt; aEvt.Source = *this; while( aIt.hasMoreElements() ) - static_cast< ::com::sun::star::awt::XTextListener *>(aIt.next())->textChanged( aEvt ); + static_cast< css::awt::XTextListener *>(aIt.next())->textChanged( aEvt ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index f2f99b1138fe..bff76717db97 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -97,10 +97,10 @@ public: private: // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& /*i_aEvt*/) throw ( RuntimeException, std::exception ) override + virtual void SAL_CALL disposing(const css::lang::EventObject& /*i_aEvt*/) throw ( RuntimeException, std::exception ) override { } - virtual void SAL_CALL rowsChanged(const ::com::sun::star::sdb::RowsChangeEvent& i_aEvt) throw ( RuntimeException, std::exception ) override + virtual void SAL_CALL rowsChanged(const css::sdb::RowsChangeEvent& i_aEvt) throw ( RuntimeException, std::exception ) override { if ( i_aEvt.Action == RowChangeAction::UPDATE ) { @@ -1412,11 +1412,11 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt // get a new formatter and data cursor m_xFormatter = NULL; - Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = getNumberFormats(getConnection(_xCursor), true); + Reference< css::util::XNumberFormatsSupplier > xSupplier = getNumberFormats(getConnection(_xCursor), true); if (xSupplier.is()) { - m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter >( - ::com::sun::star::util::NumberFormatter::create(m_xContext), + m_xFormatter = Reference< css::util::XNumberFormatter >( + css::util::NumberFormatter::create(m_xContext), UNO_QUERY); m_xFormatter->attachNumberFormatsSupplier(xSupplier); @@ -3643,8 +3643,8 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; if ( pColumn ) { - Reference< ::com::sun::star::awt::XControl> xInt(pColumn->GetCell()); - Reference< ::com::sun::star::awt::XCheckBox> xBox(xInt,UNO_QUERY); + Reference< css::awt::XControl> xInt(pColumn->GetCell()); + Reference< css::awt::XCheckBox> xBox(xInt,UNO_QUERY); if ( xBox.is() ) { TriState eValue = TRISTATE_FALSE; diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 99995c5a76a6..310ed7d18053 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -46,7 +46,7 @@ OSystemParseContext::~OSystemParseContext() } -::com::sun::star::lang::Locale OSystemParseContext::getPreferredLocale( ) const +css::lang::Locale OSystemParseContext::getPreferredLocale( ) const { return SvtSysLocale().GetLanguageTag().getLocale(); } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index fda30fdbdb41..d7bcdbd754f9 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -444,11 +444,11 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection ) SetText( sTitle ); - Reference< ::com::sun::star::awt::XLayoutConstrains > xLayoutConstrains( m_xBrowserController, UNO_QUERY ); + Reference< css::awt::XLayoutConstrains > xLayoutConstrains( m_xBrowserController, UNO_QUERY ); if( xLayoutConstrains.is() ) { ::Size aConstrainedSize; - ::com::sun::star::awt::Size aMinSize = xLayoutConstrains->getMinimumSize(); + css::awt::Size aMinSize = xLayoutConstrains->getMinimumSize(); sal_Int32 nLeft(0), nTop(0), nRight(0), nBottom(0); GetBorder( nLeft, nTop, nRight, nBottom ); diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index 8cbe36f4872e..649d320badd3 100644 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx @@ -404,7 +404,7 @@ namespace svxform else { // and also the new font - setUnderline( xPeer, UnderlineDescriptor( com::sun::star::awt::FontUnderline::WAVE, m_nInvalidColor ) ); + setUnderline( xPeer, UnderlineDescriptor( css::awt::FontUnderline::WAVE, m_nInvalidColor ) ); } } diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index 56668dada57a..dd5a845a5362 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -38,12 +38,12 @@ SvxFmDrawPage::~SvxFmDrawPage() throw () { } -::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(css::uno::RuntimeException, std::exception) { return css::uno::Sequence(); } -Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException, std::exception) +Any SAL_CALL SvxFmDrawPage::queryAggregation( const css::uno::Type& _rType ) throw(RuntimeException, std::exception) { Any aRet = ::cppu::queryInterface ( _rType , static_cast< XFormsSupplier2* >( this ) @@ -55,17 +55,17 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type& return aRet; } -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL SvxFmDrawPage::getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes( ) throw(css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > aTypes(SvxDrawPage::getTypes()); + css::uno::Sequence< css::uno::Type > aTypes(SvxDrawPage::getTypes()); aTypes.realloc(aTypes.getLength() + 1); - ::com::sun::star::uno::Type* pTypes = aTypes.getArray(); + css::uno::Type* pTypes = aTypes.getArray(); - pTypes[aTypes.getLength()-1] = cppu::UnoType::get(); + pTypes[aTypes.getLength()-1] = cppu::UnoType::get(); return aTypes; } -SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xDescr ) +SdrObject *SvxFmDrawPage::_CreateSdrObject( const css::uno::Reference< css::drawing::XShape > & xDescr ) throw (css::uno::RuntimeException, std::exception) { OUString aShapeType( xDescr->getShapeType() ); @@ -79,12 +79,12 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } -::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const +css::uno::Reference< css::drawing::XShape > SvxFmDrawPage::_CreateShape( SdrObject *pObj ) const throw (css::uno::RuntimeException, std::exception) { if( FmFormInventor == pObj->GetObjInventor() ) { - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape = static_cast(new SvxShapeControl( pObj )); + css::uno::Reference< css::drawing::XShape > xShape = static_cast(new SvxShapeControl( pObj )); return xShape; } else @@ -92,9 +92,9 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } // XFormsSupplier -::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +css::uno::Reference< css::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms() throw( css::uno::RuntimeException, std::exception ) { - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xForms; + css::uno::Reference< css::container::XNameContainer > xForms; FmFormPage *pFmPage = dynamic_cast( GetSdrPage() ); if( pFmPage ) @@ -104,7 +104,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } // XFormsSupplier2 -sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( css::uno::RuntimeException, std::exception ) { bool bHas = false; FmFormPage* pFormPage = dynamic_cast( GetSdrPage() ); @@ -113,8 +113,8 @@ sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( ::com::sun::star::uno::Runtim return bHas; } -// ::com::sun::star::lang::XServiceInfo -::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +// css::lang::XServiceInfo +css::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) { return SvxDrawPage::getSupportedServiceNames(); } diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index d9b0911b2a0f..af817752bd7c 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -205,7 +205,7 @@ namespace svxform } - void OControlTransferData::addHiddenControlsFormat(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& seqInterfaces) + void OControlTransferData::addHiddenControlsFormat(const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& seqInterfaces) { m_aHiddenControlModels = seqInterfaces; } @@ -220,7 +220,7 @@ namespace svxform return; m_aControlPaths.realloc(nEntryCount); - ::com::sun::star::uno::Sequence* pAllPaths = m_aControlPaths.getArray(); + css::uno::Sequence* pAllPaths = m_aControlPaths.getArray(); for ( ListBoxEntrySet::const_iterator loop = m_aSelectedEntries.begin(); loop != m_aSelectedEntries.end(); ++loop, ++pAllPaths @@ -239,7 +239,7 @@ namespace svxform // pLoop == NULL heisst, dass ich am oberen Ende angelangt bin, dann sollte das Ganze abbrechen, was nur bei pRoot == NULL der Fall sein wird } - // dann koennen wir ihn in die ::com::sun::star::uno::Sequence uebertragen + // dann koennen wir ihn in die css::uno::Sequence uebertragen Sequence& rCurrentPath = *pAllPaths; sal_Int32 nDepth = aCurrentPath.size(); @@ -258,7 +258,7 @@ namespace svxform m_aSelectedEntries.swap( aEmpty ); sal_Int32 nControls = m_aControlPaths.getLength(); - const ::com::sun::star::uno::Sequence* pPaths = m_aControlPaths.getConstArray(); + const css::uno::Sequence* pPaths = m_aControlPaths.getConstArray(); for (sal_Int32 i=0; i& _rxIFace ) +void FmEntryData::newObject( const css::uno::Reference< css::uno::XInterface >& _rxIFace ) { // do not just copy, normalize it m_xNormalizedIFace = Reference< XInterface >( _rxIFace, UNO_QUERY ); diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 603a98820837..2cc0e156ec30 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -407,10 +407,10 @@ namespace { OUString lcl_getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement) { - Reference< ::com::sun::star::form::XFormComponent> xChild(_xElement, UNO_QUERY); - Reference< ::com::sun::star::container::XIndexAccess> xParent; + Reference< css::form::XFormComponent> xChild(_xElement, UNO_QUERY); + Reference< css::container::XIndexAccess> xParent; if (xChild.is()) - xParent = Reference< ::com::sun::star::container::XIndexAccess>(xChild->getParent(), UNO_QUERY); + xParent = Reference< css::container::XIndexAccess>(xChild->getParent(), UNO_QUERY); // while the current content is a form OUString sReturn; @@ -433,7 +433,7 @@ namespace // travel up xChild.set(xParent, css::uno::UNO_QUERY); if (xChild.is()) - xParent = Reference< ::com::sun::star::container::XIndexAccess>(xChild->getParent(), UNO_QUERY); + xParent = Reference< css::container::XIndexAccess>(xChild->getParent(), UNO_QUERY); } _rTopLevelElement = xParent; @@ -619,7 +619,7 @@ const FmFormObj* FmFormObj::GetFormObject( const SdrObject* _pSdrObject ) } -void FmFormObj::SetUnoControlModel( const Reference< com::sun::star::awt::XControlModel >& _rxModel ) +void FmFormObj::SetUnoControlModel( const Reference< css::awt::XControlModel >& _rxModel ) { SdrUnoObj::SetUnoControlModel( _rxModel ); diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index f83c8ec74e1d..4f8e5e363dd3 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -60,7 +60,7 @@ FmFormObjFactory::FmFormObjFactory() SdrObjFactory::InsertMakeObjectHdl(LINK(this, FmFormObjFactory, MakeObject)); - // Konfigurations-::com::sun::star::frame::Controller und NavigationBar registrieren + // Konfigurations-css::frame::Controller und NavigationBar registrieren SvxFmTbxCtlAbsRec::RegisterControl( SID_FM_RECORD_ABSOLUTE ); SvxFmTbxCtlRecText::RegisterControl( SID_FM_RECORD_TEXT ); SvxFmTbxCtlRecFromText::RegisterControl( SID_FM_RECORD_FROM_TEXT ); @@ -90,7 +90,7 @@ FmFormObjFactory::~FmFormObjFactory() { } -// ::com::sun::star::form::Form-Objekte erzeugen +// css::form::Form-Objekte erzeugen namespace { void lcl_initProperty( FmFormObj* _pObject, const OUString& _rPropName, const Any& _rValue ) diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index cc32c6dad91a..f0721b4e2687 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -109,7 +109,7 @@ void FmFormPage::SetModel(SdrModel* pNewModel) xForms->setParent( pObjShell->GetModel() ); } } - catch( ::com::sun::star::uno::Exception const& ) + catch( css::uno::Exception const& ) { OSL_FAIL( "UNO Exception caught resetting model for m_pImpl (FmFormPageImpl) in FmFormPage::SetModel" ); } @@ -177,7 +177,7 @@ bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView, return false; OUString aHelpText; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xSet( pFormObject->GetUnoControlModel(), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::beans::XPropertySet > xSet( pFormObject->GetUnoControlModel(), css::uno::UNO_QUERY ); if (xSet.is()) { if (::comphelper::hasProperty(FM_PROP_HELPTEXT, xSet)) diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 2a2aa6b98a37..7ab848e63058 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -356,7 +356,7 @@ bool FmFormPageImpl::validateCurForm() } -void FmFormPageImpl::setCurForm(Reference< ::com::sun::star::form::XForm > xForm) +void FmFormPageImpl::setCurForm(Reference< css::form::XForm > xForm) { xCurrentForm = xForm; } @@ -446,7 +446,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm() } -Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy( +Reference< css::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy( const Reference< XFormComponent > & rContent, const Reference< XDataSource > & rDatabase, const OUString& rDBTitle, const OUString& rCursorSource, sal_Int32 nCommandType ) { @@ -466,17 +466,17 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo // erst in der aktuellen form suchen xForm = findFormForDataSource( xCurrentForm, rDatabase, rCursorSource, nCommandType ); - Reference< ::com::sun::star::container::XIndexAccess > xFormsByIndex( getForms(), UNO_QUERY ); + Reference< css::container::XIndexAccess > xFormsByIndex( getForms(), UNO_QUERY ); DBG_ASSERT(xFormsByIndex.is(), "FmFormPageImpl::findPlaceInFormComponentHierarchy : no index access for my forms collection !"); sal_Int32 nCount = xFormsByIndex->getCount(); for (sal_Int32 i = 0; !xForm.is() && i < nCount; i++) { - Reference< ::com::sun::star::form::XForm > xToSearch; + Reference< css::form::XForm > xToSearch; xFormsByIndex->getByIndex(i) >>= xToSearch; xForm = findFormForDataSource( xToSearch, rDatabase, rCursorSource, nCommandType ); } - // wenn keine ::com::sun::star::form gefunden, dann eine neue erzeugen + // wenn keine css::form gefunden, dann eine neue erzeugen if (!xForm.is()) { SdrModel* pModel = m_rPage.GetModel(); @@ -491,9 +491,9 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo pModel->BegUndo(aUndoStr); } - xForm = Reference< ::com::sun::star::form::XForm >(::comphelper::getProcessServiceFactory()->createInstance(FM_SUN_COMPONENT_FORM), UNO_QUERY); + xForm = Reference< css::form::XForm >(::comphelper::getProcessServiceFactory()->createInstance(FM_SUN_COMPONENT_FORM), UNO_QUERY); // a form should always have the command type table as default - Reference< ::com::sun::star::beans::XPropertySet > xFormProps(xForm, UNO_QUERY); + Reference< css::beans::XPropertySet > xFormProps(xForm, UNO_QUERY); try { xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE, makeAny(sal_Int32(CommandType::TABLE))); } catch(Exception&) { } @@ -501,7 +501,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo xFormProps->setPropertyValue(FM_PROP_DATASOURCE,makeAny(rDBTitle)); else { - Reference< ::com::sun::star::beans::XPropertySet > xDatabaseProps(rDatabase, UNO_QUERY); + Reference< css::beans::XPropertySet > xDatabaseProps(rDatabase, UNO_QUERY); Any aDatabaseUrl = xDatabaseProps->getPropertyValue(FM_PROP_URL); xFormProps->setPropertyValue(FM_PROP_URL, aDatabaseUrl); } @@ -509,7 +509,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo xFormProps->setPropertyValue(FM_PROP_COMMAND,makeAny(rCursorSource)); xFormProps->setPropertyValue(FM_PROP_COMMANDTYPE, makeAny(nCommandType)); - Reference< ::com::sun::star::container::XNameAccess > xNamedSet( getForms(), UNO_QUERY ); + Reference< css::container::XNameAccess > xNamedSet( getForms(), UNO_QUERY ); const bool bTableOrQuery = ( CommandType::TABLE == nCommandType ) || ( CommandType::QUERY == nCommandType ); OUString sName = FormControlFactory::getUniqueName( xNamedSet, @@ -519,7 +519,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo if( bUndo ) { - Reference< ::com::sun::star::container::XIndexContainer > xContainer( getForms(), UNO_QUERY ); + Reference< css::container::XIndexContainer > xContainer( getForms(), UNO_QUERY ); pModel->AddUndo(new FmUndoContainerAction(*static_cast(pModel), FmUndoContainerAction::Inserted, xContainer, @@ -612,7 +612,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource( sal_Int32 nCount = xComponents->getCount(); for (sal_Int32 i = 0; !xResultForm.is() && i < nCount; ++i) { - Reference< ::com::sun::star::form::XForm > xSearchForm; + Reference< css::form::XForm > xSearchForm; xComponents->getByIndex(i) >>= xSearchForm; // continue searching in the sub form if (xSearchForm.is()) @@ -635,11 +635,11 @@ OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xForm } #endif OUString sName; - Reference< ::com::sun::star::beans::XPropertySet > xSet(xFormComponent, UNO_QUERY); + Reference< css::beans::XPropertySet > xSet(xFormComponent, UNO_QUERY); if (xSet.is()) { sName = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_NAME ) ); - Reference< ::com::sun::star::container::XNameAccess > xNameAcc(xControls, UNO_QUERY); + Reference< css::container::XNameAccess > xNameAcc(xControls, UNO_QUERY); if (sName.isEmpty() || xNameAcc->hasByName(sName)) { @@ -651,7 +651,7 @@ OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xForm Reference< XNameAccess >( xControls, UNO_QUERY ), xSet ); // bei Radiobuttons, die einen Namen haben, diesen nicht ueberschreiben! - if (sName.isEmpty() || nClassId != ::com::sun::star::form::FormComponentType::RADIOBUTTON) + if (sName.isEmpty() || nClassId != css::form::FormComponentType::RADIOBUTTON) { xSet->setPropertyValue(FM_PROP_NAME, makeAny(sDefaultName)); } diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 99bcb04f61ba..629a94667b50 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -902,7 +902,7 @@ void FmFormShell::GetState(SfxItemSet &rSet) bool bLayerLocked = false; if (m_pFormView) { - // Ist der ::com::sun::star::drawing::Layer gelocked, so m???ssen die Slots disabled werden. #36897 + // Ist der css::drawing::Layer gelocked, so m???ssen die Slots disabled werden. #36897 SdrPageView* pPV = m_pFormView->GetSdrPageView(); if (pPV != NULL) bLayerLocked = pPV->IsLayerLocked(m_pFormView->GetActiveLayer()); @@ -1111,7 +1111,7 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich) case SID_FM_SEARCH: { - Reference< ::com::sun::star::beans::XPropertySet > xNavSet(GetImpl()->getActiveForm(), UNO_QUERY); + Reference< css::beans::XPropertySet > xNavSet(GetImpl()->getActiveForm(), UNO_QUERY); sal_Int32 nCount = ::comphelper::getINT32(xNavSet->getPropertyValue(FM_PROP_ROWCOUNT)); bEnable = nCount != 0; } break; diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index cf5d5a3231ea..cf32940c3d9e 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -478,7 +478,7 @@ namespace // check if the control has one of the interfaces we can use for searching // *_pCurrentText will be filled with the current text of the control (as used when searching this control) -bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxControl, +bool IsSearchableControl( const css::uno::Reference< css::uno::XInterface>& _rxControl, OUString* _pCurrentText ) { if ( !_rxControl.is() ) @@ -770,7 +770,7 @@ void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( Runtime if (xFormController.is()) xFormController->removeActivateListener(static_cast(this)); - Reference< ::com::sun::star::lang::XComponent> xComp(m_xExternalViewController, UNO_QUERY); + Reference< css::lang::XComponent> xComp(m_xExternalViewController, UNO_QUERY); if (xComp.is()) xComp->removeEventListener(static_cast(static_cast(this))); @@ -783,7 +783,7 @@ void SAL_CALL FmXFormShell::disposing(const lang::EventObject& e) throw( Runtime } -void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) { if ( impl_checkDisposed() ) return; @@ -1139,14 +1139,14 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent lang::Locale aNewLanguage = Application::GetSettings().GetUILanguageTag().getLocale(); TransferFormComponentProperties(xOldSet, xNewSet, aNewLanguage); - Sequence< ::com::sun::star::script::ScriptEventDescriptor> aOldScripts; + Sequence< css::script::ScriptEventDescriptor> aOldScripts; Reference< XChild> xChild(xOldModel, UNO_QUERY); if (xChild.is()) { Reference< XIndexAccess> xParent(xChild->getParent(), UNO_QUERY); // remember old script events - Reference< ::com::sun::star::script::XEventAttacherManager> xEvManager(xChild->getParent(), UNO_QUERY); + Reference< css::script::XEventAttacherManager> xEvManager(xChild->getParent(), UNO_QUERY); if (xParent.is() && xEvManager.is()) { sal_Int32 nIndex = getElementPos(xParent, xOldModel); @@ -1171,7 +1171,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent else { OSL_FAIL("FmXFormShell::executeControlConversionSlot: could not replace the model !"); - Reference< ::com::sun::star::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); + Reference< css::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); if (xNewComponent.is()) xNewComponent->dispose(); return false; @@ -1180,7 +1180,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent catch(Exception&) { OSL_FAIL("FmXFormShell::executeControlConversionSlot: could not replace the model !"); - Reference< ::com::sun::star::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); + Reference< css::lang::XComponent> xNewComponent(xNewModel, UNO_QUERY); if (xNewComponent.is()) xNewComponent->dispose(); return false; @@ -1710,8 +1710,8 @@ void FmXFormShell::CloseExternalFormViewer() if (!m_xExternalViewController.is()) return; - Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame( m_xExternalViewController->getFrame()); - Reference< ::com::sun::star::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); + Reference< css::frame::XFrame> xExternalViewFrame( m_xExternalViewController->getFrame()); + Reference< css::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); if (!xCommLink.is()) return; @@ -2514,7 +2514,7 @@ IMPL_LINK_TYPED(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscCon // XContainerListener -void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { if ( impl_checkDisposed() ) return; @@ -2529,7 +2529,7 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun:: } -void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { if ( impl_checkDisposed() ) return; @@ -2542,7 +2542,7 @@ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun:: } -void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { if ( impl_checkDisposed() ) return; @@ -2608,7 +2608,7 @@ void FmXFormShell::impl_AddElement_nothrow(const Reference< XInterface>& Element xCont->addContainerListener(this); } - const Reference< ::com::sun::star::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY); + const Reference< css::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY); if (xSelSupplier.is()) xSelSupplier->addSelectionChangeListener(this); } @@ -2623,7 +2623,7 @@ void FmXFormShell::RemoveElement(const Reference< XInterface>& Element) void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Element) { - const Reference< ::com::sun::star::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY); + const Reference< css::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY); if (xSelSupplier.is()) xSelSupplier->removeSelectionChangeListener(this); @@ -2650,7 +2650,7 @@ void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Elem } -void FmXFormShell::selectionChanged(const lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) +void FmXFormShell::selectionChanged(const lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) { if ( impl_checkDisposed() ) return; @@ -3128,9 +3128,9 @@ void FmXFormShell::CreateExternalView() // the frame the external view is displayed in bool bAlreadyExistent = m_xExternalViewController.is(); - Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame; + Reference< css::frame::XFrame> xExternalViewFrame; OUString sFrameName("_beamer"); - sal_Int32 nSearchFlags = ::com::sun::star::frame::FrameSearchFlag::CHILDREN | ::com::sun::star::frame::FrameSearchFlag::CREATE; + sal_Int32 nSearchFlags = css::frame::FrameSearchFlag::CHILDREN | css::frame::FrameSearchFlag::CREATE; Reference< runtime::XFormController > xCurrentNavController( getNavController()); // the creation of the "partwindow" may cause a deactivate of the document which will result in our nav controller to be set to NULL @@ -3169,8 +3169,8 @@ void FmXFormShell::CreateExternalView() URL aWantToDispatch; aWantToDispatch.Complete = FMURL_COMPONENT_FORMGRIDVIEW; - Reference< ::com::sun::star::frame::XDispatchProvider> xProv(m_xAttachedFrame, UNO_QUERY); - Reference< ::com::sun::star::frame::XDispatch> xDisp; + Reference< css::frame::XDispatchProvider> xProv(m_xAttachedFrame, UNO_QUERY); + Reference< css::frame::XDispatch> xDisp; if (xProv.is()) xDisp = xProv->queryDispatch(aWantToDispatch, sFrameName, nSearchFlags); if (xDisp.is()) @@ -3179,11 +3179,11 @@ void FmXFormShell::CreateExternalView() } // with this the component should be loaded, now search the frame where it resides in - xExternalViewFrame = m_xAttachedFrame->findFrame(sFrameName, ::com::sun::star::frame::FrameSearchFlag::CHILDREN); + xExternalViewFrame = m_xAttachedFrame->findFrame(sFrameName, css::frame::FrameSearchFlag::CHILDREN); if (xExternalViewFrame.is()) { m_xExternalViewController = xExternalViewFrame->getController(); - Reference< ::com::sun::star::lang::XComponent> xComp(m_xExternalViewController, UNO_QUERY); + Reference< css::lang::XComponent> xComp(m_xExternalViewController, UNO_QUERY); if (xComp.is()) xComp->addEventListener(static_cast(static_cast(this))); } @@ -3191,7 +3191,7 @@ void FmXFormShell::CreateExternalView() else { xExternalViewFrame = m_xExternalViewController->getFrame(); - Reference< ::com::sun::star::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); + Reference< css::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); // if we display the active form we interpret the slot as "remove it" Reference< XForm> xCurrentModel(xCurrentNavController->getModel(), UNO_QUERY); @@ -3213,7 +3213,7 @@ void FmXFormShell::CreateExternalView() URL aClearURL; aClearURL.Complete = FMURL_GRIDVIEW_CLEARVIEW; - Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, OUString(), 0)); + Reference< css::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, OUString(), 0)); if (xClear.is()) xClear->dispatch(aClearURL, Sequence< PropertyValue>()); } @@ -3222,7 +3222,7 @@ void FmXFormShell::CreateExternalView() // instance for which this "external view" was triggered // get the dispatch interface of the frame so we can communicate (interceptable) with the controller - Reference< ::com::sun::star::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); + Reference< css::frame::XDispatchProvider> xCommLink(xExternalViewFrame, UNO_QUERY); if (m_xExternalViewController.is()) { @@ -3230,10 +3230,10 @@ void FmXFormShell::CreateExternalView() // collect the dispatchers we will need URL aAddColumnURL; aAddColumnURL.Complete = FMURL_GRIDVIEW_ADDCOLUMN; - Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, OUString(), 0)); + Reference< css::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, OUString(), 0)); URL aAttachURL; aAttachURL.Complete = FMURL_GRIDVIEW_ATTACHTOFORM; - Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, OUString(), 0)); + Reference< css::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, OUString(), 0)); if (xAddColumnDispatch.is() && xAttachDispatch.is()) { @@ -3539,7 +3539,7 @@ void FmXFormShell::implAdjustConfigCache() } -void FmXFormShell::Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) +void FmXFormShell::Notify( const css::uno::Sequence< OUString >& _rPropertyNames) { if ( impl_checkDisposed() ) return; diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 5361cf735a32..aae9551b4262 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -88,10 +88,10 @@ void FmSearchThread::onTerminated() // SMART_UNO_IMPLEMENTATION(FmRecordCountListener, UsrObject); -FmRecordCountListener::FmRecordCountListener(const Reference< ::com::sun::star::sdbc::XResultSet > & dbcCursor) +FmRecordCountListener::FmRecordCountListener(const Reference< css::sdbc::XResultSet > & dbcCursor) { - m_xListening = Reference< ::com::sun::star::beans::XPropertySet > (dbcCursor, UNO_QUERY); + m_xListening = Reference< css::beans::XPropertySet > (dbcCursor, UNO_QUERY); if (!m_xListening.is()) return; @@ -102,7 +102,7 @@ FmRecordCountListener::FmRecordCountListener(const Reference< ::com::sun::star:: return; } - m_xListening->addPropertyChangeListener(FM_PROP_ROWCOUNT, static_cast(this)); + m_xListening->addPropertyChangeListener(FM_PROP_ROWCOUNT, static_cast(this)); } @@ -127,12 +127,12 @@ FmRecordCountListener::~FmRecordCountListener() void FmRecordCountListener::DisConnect() { if(m_xListening.is()) - m_xListening->removePropertyChangeListener(FM_PROP_ROWCOUNT, static_cast(this)); + m_xListening->removePropertyChangeListener(FM_PROP_ROWCOUNT, static_cast(this)); m_xListening = NULL; } -void SAL_CALL FmRecordCountListener::disposing(const ::com::sun::star::lang::EventObject& /*Source*/) throw( RuntimeException, std::exception ) +void SAL_CALL FmRecordCountListener::disposing(const css::lang::EventObject& /*Source*/) throw( RuntimeException, std::exception ) { DBG_ASSERT(m_xListening.is(), "FmRecordCountListener::disposing should never have been called without a propset !"); DisConnect(); @@ -150,7 +150,7 @@ void FmRecordCountListener::NotifyCurrentCount() } -void FmRecordCountListener::propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& /*evt*/) throw(::com::sun::star::uno::RuntimeException, std::exception) +void FmRecordCountListener::propertyChange(const css::beans::PropertyChangeEvent& /*evt*/) throw(css::uno::RuntimeException, std::exception) { NotifyCurrentCount(); } @@ -158,7 +158,7 @@ void FmRecordCountListener::propertyChange(const ::com::sun::star::beans::Prope // FmSearchEngine - local classes -SimpleTextWrapper::SimpleTextWrapper(const Reference< ::com::sun::star::awt::XTextComponent > & _xText) +SimpleTextWrapper::SimpleTextWrapper(const Reference< css::awt::XTextComponent > & _xText) :ControlTextWrapper(_xText.get()) ,m_xText(_xText) { @@ -172,7 +172,7 @@ OUString SimpleTextWrapper::getCurrentText() const } -ListBoxWrapper::ListBoxWrapper(const Reference< ::com::sun::star::awt::XListBox > & _xBox) +ListBoxWrapper::ListBoxWrapper(const Reference< css::awt::XListBox > & _xBox) :ControlTextWrapper(_xBox.get()) ,m_xBox(_xBox) { @@ -186,7 +186,7 @@ OUString ListBoxWrapper::getCurrentText() const } -CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckBox > & _xBox) +CheckBoxWrapper::CheckBoxWrapper(const Reference< css::awt::XCheckBox > & _xBox) :ControlTextWrapper(_xBox.get()) ,m_xBox(_xBox) { @@ -233,7 +233,7 @@ bool FmSearchEngine::MoveCursor() else m_xSearchCursor.previous(); } - catch(::com::sun::star::sdbc::SQLException const& e) + catch(css::sdbc::SQLException const& e) { #if OSL_DEBUG_LEVEL > 0 OStringBuffer sDebugMessage("FmSearchEngine::MoveCursor : catched a DatabaseException ("); @@ -295,7 +295,7 @@ bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, } -void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star::container::XIndexAccess > & xAllFields, sal_Int32 nField) +void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< css::container::XIndexAccess > & xAllFields, sal_Int32 nField) { DBG_ASSERT( xAllFields.is() && ( nField >= 0 ) && ( nField < xAllFields->getCount() ), "FmSearchEngine::BuildAndInsertFieldInfo: invalid field descriptor!" ); @@ -306,19 +306,19 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star:: // von dem weiss ich jetzt, dass es den DatabaseRecord-Service unterstuetzt (hoffe ich) // fuer den FormatKey und den Typ brauche ich das PropertySet - Reference< ::com::sun::star::beans::XPropertySet > xProperties(xCurrentField, UNO_QUERY); + Reference< css::beans::XPropertySet > xProperties(xCurrentField, UNO_QUERY); // die FieldInfo dazu aufbauen FieldInfo fiCurrent; - fiCurrent.xContents = Reference< ::com::sun::star::sdb::XColumn > (xCurrentField, UNO_QUERY); + fiCurrent.xContents = Reference< css::sdb::XColumn > (xCurrentField, UNO_QUERY); fiCurrent.nFormatKey = ::comphelper::getINT32(xProperties->getPropertyValue(FM_PROP_FORMATKEY)); fiCurrent.bDoubleHandling = false; if (m_xFormatSupplier.is()) { - Reference< ::com::sun::star::util::XNumberFormats > xNumberFormats(m_xFormatSupplier->getNumberFormats()); + Reference< css::util::XNumberFormats > xNumberFormats(m_xFormatSupplier->getNumberFormats()); - sal_Int16 nFormatType = ::comphelper::getNumberFormatType(xNumberFormats, fiCurrent.nFormatKey) & ~((sal_Int16)::com::sun::star::util::NumberFormat::DEFINED); - fiCurrent.bDoubleHandling = (nFormatType != ::com::sun::star::util::NumberFormat::TEXT); + sal_Int16 nFormatType = ::comphelper::getNumberFormatType(xNumberFormats, fiCurrent.nFormatKey) & ~((sal_Int16)css::util::NumberFormat::DEFINED); + fiCurrent.bDoubleHandling = (nFormatType != css::util::NumberFormat::TEXT); } // und merken @@ -383,7 +383,7 @@ OUString FmSearchEngine::FormatField(sal_Int32 nWhich) if (m_nCurrentFieldIndex != -1) { DBG_ASSERT((nWhich == 0) || (nWhich == m_nCurrentFieldIndex), "FmSearchEngine::FormatField : Parameter nWhich ist ungueltig"); - // ich bin im single-field-modus, da ist auch die richtige Feld-Nummer erlaubt, obwohl dann der richtige ::com::sun::star::sdbcx::Index + // ich bin im single-field-modus, da ist auch die richtige Feld-Nummer erlaubt, obwohl dann der richtige css::sdbcx::Index // fuer meinen Array-Zugriff natuerlich 0 ist nWhich = 0; } @@ -693,8 +693,8 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext, ,m_nTransliterationFlags(0) { - m_xFormatter = Reference< ::com::sun::star::util::XNumberFormatter >( - ::com::sun::star::util::NumberFormatter::create( ::comphelper::getProcessComponentContext() ), + m_xFormatter = Reference< css::util::XNumberFormatter >( + css::util::NumberFormatter::create( ::comphelper::getProcessComponentContext() ), UNO_QUERY_THROW); m_xFormatter->attachNumberFormatsSupplier(m_xFormatSupplier); @@ -795,21 +795,21 @@ void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields) xCurrent = arrFields.at(i); DBG_ASSERT(xCurrent.is(), "FmSearchEngine::fillControlTexts : invalid field interface !"); // check which type of control this is - Reference< ::com::sun::star::awt::XTextComponent > xAsText(xCurrent, UNO_QUERY); + Reference< css::awt::XTextComponent > xAsText(xCurrent, UNO_QUERY); if (xAsText.is()) { m_aControlTexts.insert(m_aControlTexts.end(), new SimpleTextWrapper(xAsText)); continue; } - Reference< ::com::sun::star::awt::XListBox > xAsListBox(xCurrent, UNO_QUERY); + Reference< css::awt::XListBox > xAsListBox(xCurrent, UNO_QUERY); if (xAsListBox.is()) { m_aControlTexts.insert(m_aControlTexts.end(), new ListBoxWrapper(xAsListBox)); continue; } - Reference< ::com::sun::star::awt::XCheckBox > xAsCheckBox(xCurrent, UNO_QUERY); + Reference< css::awt::XCheckBox > xAsCheckBox(xCurrent, UNO_QUERY); DBG_ASSERT(xAsCheckBox.is(), "FmSearchEngine::fillControlTexts : invalid field interface (no supported type) !"); // we don't have any more options ... m_aControlTexts.insert(m_aControlTexts.end(), new CheckBoxWrapper(xAsCheckBox)); @@ -854,14 +854,14 @@ void FmSearchEngine::Init(const OUString& sVisibleFields) // now that we have this information, we need a collator which is able to case (in)sentively compare strings m_aStringCompare.loadDefaultCollator( SvtSysLocale().GetLanguageTag().getLocale(), - bCaseSensitiveIdentifiers ? 0 : ::com::sun::star::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ); + bCaseSensitiveIdentifiers ? 0 : css::i18n::CollatorOptions::CollatorOptions_IGNORE_CASE ); try { // der Cursor kann mir einen Record (als PropertySet) liefern, dieser unterstuetzt den DatabaseRecord-Service - Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); + Reference< css::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::Init : invalid cursor (no columns supplier) !"); - Reference< ::com::sun::star::container::XNameAccess > xAllFieldNames = xSupplyCols->getColumns(); + Reference< css::container::XNameAccess > xAllFieldNames = xSupplyCols->getColumns(); Sequence< OUString > seqFieldNames = xAllFieldNames->getElementNames(); OUString* pFieldNames = seqFieldNames.getArray(); @@ -1132,7 +1132,7 @@ void FmSearchEngine::CancelSearch() } -bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields, +bool FmSearchEngine::SwitchToContext(const Reference< css::sdbc::XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields, sal_Int32 nFieldIndex) { DBG_ASSERT(!m_bSearchingCurrently, "FmSearchEngine::SwitchToContext : please do not call while I'm searching !"); @@ -1242,7 +1242,7 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, bool bForce) { if (!bForce && (nFieldIndex == m_nCurrentFieldIndex)) return; - // (da ich keinen Wechsel des Iterators von aussen zulasse, heisst selber ::com::sun::star::sdbcx::Index auch immer selbe Spalte, also habe ich nix zu tun) + // (da ich keinen Wechsel des Iterators von aussen zulasse, heisst selber css::sdbcx::Index auch immer selbe Spalte, also habe ich nix zu tun) DBG_ASSERT((nFieldIndex == -1) || ((nFieldIndex >= 0) && @@ -1252,21 +1252,21 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, bool bForce) m_arrUsedFields.clear(); if (nFieldIndex == -1) { - Reference< ::com::sun::star::container::XIndexAccess > xFields; + Reference< css::container::XIndexAccess > xFields; for (size_t i=0; i xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); + Reference< css::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::RebuildUsedFields : invalid cursor (no columns supplier) !"); - xFields = Reference< ::com::sun::star::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); + xFields = Reference< css::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); BuildAndInsertFieldInfo(xFields, m_arrFieldMapping[i]); } } else { - Reference< ::com::sun::star::container::XIndexAccess > xFields; - Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); + Reference< css::container::XIndexAccess > xFields; + Reference< css::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::RebuildUsedFields : invalid cursor (no columns supplier) !"); - xFields = Reference< ::com::sun::star::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); + xFields = Reference< css::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); BuildAndInsertFieldInfo(xFields, m_arrFieldMapping[static_cast< size_t >(nFieldIndex)]); } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index e8530ebf01cb..280d0ac3ba83 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -311,7 +311,7 @@ namespace svx } - void SAL_CALL FmMouseListenerAdapter::mousePressed( const awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mousePressed( const awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // is this a request for a context menu? @@ -323,19 +323,19 @@ namespace svx } - void SAL_CALL FmMouseListenerAdapter::mouseReleased( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mouseReleased( const awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception) { // not interested in } - void SAL_CALL FmMouseListenerAdapter::mouseEntered( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mouseEntered( const awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception) { // not interested in } - void SAL_CALL FmMouseListenerAdapter::mouseExited( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) + void SAL_CALL FmMouseListenerAdapter::mouseExited( const awt::MouseEvent& /*e*/ ) throw (css::uno::RuntimeException, std::exception) { // not interested in } @@ -1323,7 +1323,7 @@ namespace svx } - void FmTextControlShell::focusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ) + void FmTextControlShell::focusGained( const css::awt::FocusEvent& _rEvent ) { Reference< XControl > xControl( _rEvent.Source, UNO_QUERY ); @@ -1339,7 +1339,7 @@ namespace svx } - void FmTextControlShell::focusLost( const ::com::sun::star::awt::FocusEvent& _rEvent ) + void FmTextControlShell::focusLost( const css::awt::FocusEvent& _rEvent ) { Reference< XControl > xControl( _rEvent.Source, UNO_QUERY ); diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 5cef4a75c094..646e39e045a4 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -142,25 +142,25 @@ void displayException(const Any& _rExcept, vcl::Window* _pParent) } -void displayException(const ::com::sun::star::sdbc::SQLException& _rExcept, vcl::Window* _pParent) +void displayException(const css::sdbc::SQLException& _rExcept, vcl::Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -void displayException(const ::com::sun::star::sdb::SQLContext& _rExcept, vcl::Window* _pParent) +void displayException(const css::sdb::SQLContext& _rExcept, vcl::Window* _pParent) { displayException(makeAny(_rExcept), _pParent); } -void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, vcl::Window* _pParent) +void displayException(const css::sdb::SQLErrorEvent& _rEvent, vcl::Window* _pParent) { displayException(_rEvent.Reason, _pParent); } -sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement) +sal_Int32 getElementPos(const Reference< css::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement) { sal_Int32 nIndex = -1; if (!xCont.is()) @@ -194,14 +194,14 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce } -OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel) +OUString getLabelName(const Reference< css::beans::XPropertySet>& xControlModel) { if (!xControlModel.is()) return OUString(); if (::comphelper::hasProperty(FM_PROP_CONTROLLABEL, xControlModel)) { - Reference< ::com::sun::star::beans::XPropertySet> xLabelSet; + Reference< css::beans::XPropertySet> xLabelSet; xControlModel->getPropertyValue(FM_PROP_CONTROLLABEL) >>= xLabelSet; if (xLabelSet.is() && ::comphelper::hasProperty(FM_PROP_LABEL, xLabelSet)) { @@ -217,26 +217,26 @@ OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& x // = CursorWrapper -CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, bool bUseCloned) +CursorWrapper::CursorWrapper(const Reference< css::sdbc::XRowSet>& _rxCursor, bool bUseCloned) { - ImplConstruct(Reference< ::com::sun::star::sdbc::XResultSet>(_rxCursor, UNO_QUERY), bUseCloned); + ImplConstruct(Reference< css::sdbc::XResultSet>(_rxCursor, UNO_QUERY), bUseCloned); } -CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, bool bUseCloned) +CursorWrapper::CursorWrapper(const Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned) { ImplConstruct(_rxCursor, bUseCloned); } -void CursorWrapper::ImplConstruct(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, bool bUseCloned) +void CursorWrapper::ImplConstruct(const Reference< css::sdbc::XResultSet>& _rxCursor, bool bUseCloned) { if (bUseCloned) { - Reference< ::com::sun::star::sdb::XResultSetAccess> xAccess(_rxCursor, UNO_QUERY); + Reference< css::sdb::XResultSetAccess> xAccess(_rxCursor, UNO_QUERY); try { - m_xMoveOperations = xAccess.is() ? xAccess->createResultSet() : Reference< ::com::sun::star::sdbc::XResultSet>(); + m_xMoveOperations = xAccess.is() ? xAccess->createResultSet() : Reference< css::sdbc::XResultSet>(); } catch(Exception&) { @@ -260,11 +260,11 @@ void CursorWrapper::ImplConstruct(const Reference< ::com::sun::star::sdbc::XResu } -const CursorWrapper& CursorWrapper::operator=(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor) +const CursorWrapper& CursorWrapper::operator=(const Reference< css::sdbc::XRowSet>& _rxCursor) { - m_xMoveOperations = Reference< ::com::sun::star::sdbc::XResultSet>(_rxCursor, UNO_QUERY); - m_xBookmarkOperations = Reference< ::com::sun::star::sdbcx::XRowLocate>(_rxCursor, UNO_QUERY); - m_xColumnsSupplier = Reference< ::com::sun::star::sdbcx::XColumnsSupplier>(_rxCursor, UNO_QUERY); + m_xMoveOperations = Reference< css::sdbc::XResultSet>(_rxCursor, UNO_QUERY); + m_xBookmarkOperations = Reference< css::sdbcx::XRowLocate>(_rxCursor, UNO_QUERY); + m_xColumnsSupplier = Reference< css::sdbcx::XColumnsSupplier>(_rxCursor, UNO_QUERY); if (!m_xMoveOperations.is() || !m_xBookmarkOperations.is() || !m_xColumnsSupplier.is()) { // all or nothing !! m_xMoveOperations = NULL; @@ -300,7 +300,7 @@ void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter) -FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< ::com::sun::star::lang::XComponent>& _rxObject, sal_Int16 _nId) +FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< css::lang::XComponent>& _rxObject, sal_Int16 _nId) :m_xObject(_rxObject) ,m_pListener(_pListener) ,m_nId(_nId) @@ -316,11 +316,11 @@ FmXDisposeMultiplexer::~FmXDisposeMultiplexer() { } -// ::com::sun::star::lang::XEventListener +// css::lang::XEventListener -void FmXDisposeMultiplexer::disposing(const ::com::sun::star::lang::EventObject& _Source) throw( RuntimeException, std::exception ) +void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& _Source) throw( RuntimeException, std::exception ) { - Reference< ::com::sun::star::lang::XEventListener> xPreventDelete(this); + Reference< css::lang::XEventListener> xPreventDelete(this); if (m_pListener) { @@ -336,7 +336,7 @@ void FmXDisposeMultiplexer::dispose() { if (m_xObject.is()) { - Reference< ::com::sun::star::lang::XEventListener> xPreventDelete(this); + Reference< css::lang::XEventListener> xPreventDelete(this); m_xObject->removeEventListener(this); m_xObject = NULL; @@ -348,11 +348,11 @@ void FmXDisposeMultiplexer::dispose() -sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject) +sal_Int16 getControlTypeByObject(const Reference< css::lang::XServiceInfo>& _rxObject) { // ask for the persistent service name - Reference< ::com::sun::star::io::XPersistObject> xPersistence(_rxObject, UNO_QUERY); - DBG_ASSERT(xPersistence.is(), "::getControlTypeByObject : argument shold be an ::com::sun::star::io::XPersistObject !"); + Reference< css::io::XPersistObject> xPersistence(_rxObject, UNO_QUERY); + DBG_ASSERT(xPersistence.is(), "::getControlTypeByObject : argument shold be an css::io::XPersistObject !"); if (!xPersistence.is()) return OBJ_FM_CONTROL; @@ -425,10 +425,10 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi bool isRowSetAlive(const Reference< XInterface >& _rxRowSet) { bool bIsAlive = false; - Reference< ::com::sun::star::sdbcx::XColumnsSupplier> xSupplyCols(_rxRowSet, UNO_QUERY); - Reference< ::com::sun::star::container::XIndexAccess> xCols; + Reference< css::sdbcx::XColumnsSupplier> xSupplyCols(_rxRowSet, UNO_QUERY); + Reference< css::container::XIndexAccess> xCols; if (xSupplyCols.is()) - xCols = Reference< ::com::sun::star::container::XIndexAccess>(xSupplyCols->getColumns(), UNO_QUERY); + xCols = Reference< css::container::XIndexAccess>(xSupplyCols->getColumns(), UNO_QUERY); if (xCols.is() && (xCols->getCount() > 0)) bIsAlive = true; diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 88ebcc3fa4b4..b4bc5688af17 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -97,7 +97,7 @@ public: } } - virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw( com::sun::star::reflection::InvocationTargetException, RuntimeException, std::exception) override + virtual Any SAL_CALL approveFiring(const ScriptEvent& evt) throw( css::reflection::InvocationTargetException, RuntimeException, std::exception) override { attemptListenerCreation(); if ( m_vbaListener.is() ) @@ -530,7 +530,7 @@ void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( Runtime // XPropertyChangeListener -void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -725,7 +725,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) // XContainerListener -void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -749,7 +749,7 @@ void FmXUndoEnvironment::implSetModified() } -void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -766,7 +766,7 @@ void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thr } -void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1217,7 +1217,7 @@ FmUndoModelReplaceAction::~FmUndoModelReplaceAction() -void FmUndoModelReplaceAction::DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced ) +void FmUndoModelReplaceAction::DisposeElement( const css::uno::Reference< css::awt::XControlModel>& xReplaced ) { Reference< XComponent > xComp(xReplaced, UNO_QUERY); if (xComp.is()) diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 62a6d77c7a61..0422871d55d1 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -434,7 +434,7 @@ SdrObject* FmFormView::CreateFieldControl(const OUString& rFieldDesc) const } -void FmFormView::InsertControlContainer(const Reference< ::com::sun::star::awt::XControlContainer > & xCC) +void FmFormView::InsertControlContainer(const Reference< css::awt::XControlContainer > & xCC) { if( !IsDesignMode() ) { @@ -456,7 +456,7 @@ void FmFormView::InsertControlContainer(const Reference< ::com::sun::star::awt:: } -void FmFormView::RemoveControlContainer(const Reference< ::com::sun::star::awt::XControlContainer > & xCC) +void FmFormView::RemoveControlContainer(const Reference< css::awt::XControlContainer > & xCC) { if( !IsDesignMode() ) { @@ -532,7 +532,7 @@ bool FmFormView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource) { - Reference< ::com::sun::star::awt::XControl> xControl(pImpl->m_xWindow,UNO_QUERY); + Reference< css::awt::XControl> xControl(pImpl->m_xWindow,UNO_QUERY); bool bRet = !xControl.is() || !_xSource.is() || _xSource != xControl->getModel(); if ( bRet ) UnmarkAll(); diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 28c8e47e61ff..4226e170b130 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -97,8 +97,8 @@ using namespace ::connectivity; using namespace ::dbtools; -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - FormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB ) +css::uno::Reference< css::uno::XInterface > SAL_CALL + FormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB ) throw (css::uno::Exception) { return *( new ::svxform::FormController( comphelper::getComponentContext(_rxORB) ) ); @@ -903,7 +903,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X } -::sal_Int32 SAL_CALL FormController::getFilterComponents() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::sal_Int32 SAL_CALL FormController::getFilterComponents() throw( css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -912,7 +912,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X } -::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms() throw( css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2770,7 +2770,7 @@ void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm } } -// com::sun::star::sdbc::XRowSetListener +// css::sdbc::XRowSetListener void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeException, std::exception ) { diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 3960dab6505e..e90784df970d 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -199,8 +199,8 @@ namespace svxform } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - LegacyFormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB ) +css::uno::Reference< css::uno::XInterface > SAL_CALL + LegacyFormController_NewInstance_Impl( const css::uno::Reference< css::lang::XMultiServiceFactory > & _rxORB ) throw (css::uno::Exception) { return ::svxform::LegacyFormController::Create( _rxORB ); diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index e6e8b3f72bed..139cfb2f4491 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -162,7 +162,7 @@ namespace svxform } - void OFormComponentObserver::Remove( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) + void OFormComponentObserver::Remove( const css::uno::Reference< css::uno::XInterface >& _rxElement ) { if (IsLocked() || !m_pNavModel) return; diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index db8bfcbcce0b..0b028a42f456 100644 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx @@ -35,11 +35,11 @@ namespace svxform //= DataColumn - a class wrapping an object implementing a sdb::DataColumn service - DataColumn::DataColumn(const Reference< ::com::sun::star::beans::XPropertySet>& _rxIFace) + DataColumn::DataColumn(const Reference< css::beans::XPropertySet>& _rxIFace) { m_xPropertySet = _rxIFace; - m_xColumn = Reference< ::com::sun::star::sdb::XColumn>(_rxIFace, UNO_QUERY); - m_xColumnUpdate = Reference< ::com::sun::star::sdb::XColumnUpdate>(_rxIFace, UNO_QUERY); + m_xColumn = Reference< css::sdb::XColumn>(_rxIFace, UNO_QUERY); + m_xColumnUpdate = Reference< css::sdb::XColumnUpdate>(_rxIFace, UNO_QUERY); if (!m_xPropertySet.is() || !m_xColumn.is()) { diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index 6f2ced18f938..3d6e58b62235 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -40,8 +40,8 @@ namespace svxform std::shared_ptr< ::connectivity::OSQLParseNode > OSQLParserClient::predicateTree( OUString& _rErrorMessage, const OUString& _rStatement, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField + const css::uno::Reference< css::util::XNumberFormatter >& _rxFormatter, + const css::uno::Reference< css::beans::XPropertySet >& _rxField ) const { return std::shared_ptr< OSQLParseNode >(m_pParser->predicateTree(_rErrorMessage, _rStatement, _rxFormatter, _rxField)); diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index cc3f76b7ed0c..700e0a617536 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -278,9 +278,9 @@ bool FmFieldWin::Close() } -void FmFieldWin::_propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +void FmFieldWin::_propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) { - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > xForm(evt.Source, ::com::sun::star::uno::UNO_QUERY); + css::uno::Reference< css::form::XForm > xForm(evt.Source, css::uno::UNO_QUERY); UpdateContent(xForm); } @@ -315,7 +315,7 @@ void FmFieldWin::UpdateContent(FmFormShell* pShell) } -void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xForm) +void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & xForm) { try { @@ -401,7 +401,7 @@ void FmFieldWin::Resize() - // adapt size of ::com::sun::star::form::ListBox + // adapt size of css::form::ListBox Point aLBPos( LISTBOX_BORDER, LISTBOX_BORDER ); Size aLBSize( aOutputSize ); aLBSize.Width() -= (2*LISTBOX_BORDER); diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 3feb54844336..7a6bfd2498dc 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -344,10 +344,10 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO { aSdgCnt.getPropertyValue( s_sTitle ) >>= aTitle; } - catch( const ::com::sun::star::uno::RuntimeException& ) + catch( const css::uno::RuntimeException& ) { } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } @@ -372,10 +372,10 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO { aSdvCnt.getPropertyValue( s_sTitle ) >>= aTitle; } - catch( const ::com::sun::star::uno::RuntimeException& ) + catch( const css::uno::RuntimeException& ) { } - catch( const ::com::sun::star::uno::Exception& ) + catch( const css::uno::Exception& ) { } diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index 3992a6986509..c04f0dba0e0e 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -200,7 +200,7 @@ void GalApp::Init() // For backwards compatibility, in case some code still uses plain // createInstance w/o args directly to obtain an instance: - com::sun::star::ucb::UniversalContentBroker::create(xComponentContext); + css::ucb::UniversalContentBroker::create(xComponentContext); } catch (const uno::Exception &e) { fprintf( stderr, "Bootstrap exception '%s'\n", rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index d7f0eacfd833..aff5046e2510 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -49,11 +49,11 @@ namespace a11y { class AccFrameSelector : public ::cppu::WeakImplHelper< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::lang::XServiceInfo + css::accessibility::XAccessible, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleEventBroadcaster, + css::lang::XServiceInfo >, public Resource { @@ -63,43 +63,43 @@ public: virtual ~AccFrameSelector(); //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::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::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) 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::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::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::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) 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::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 void SAL_CALL grabFocus( ) 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 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 void SAL_CALL grabFocus( ) 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; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAccessibleEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException, std::exception) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; void Invalidate(); void NotifyFocusListeners(bool bGetFocus); - void NotifyAccessibleEvent( const sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Any& _rNewValue ); + void NotifyAccessibleEvent( const sal_Int16 _nEventId, const css::uno::Any& _rOldValue, const css::uno::Any& _rNewValue ); protected: DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); @@ -107,7 +107,7 @@ protected: void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); private: - void IsValid() throw (::com::sun::star::uno::RuntimeException); + void IsValid() throw (css::uno::RuntimeException); void RemoveFrameSelEventListener(); VclPtr mpFrameSel; diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 51ca9aaf8609..cb59c82d18b8 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -68,13 +68,13 @@ class SdrView; */ typedef ::cppu::WeakAggComponentImplHelper7< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::accessibility::XAccessibleSelection, - ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XServiceName > + css::accessibility::XAccessible, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleEventBroadcaster, + css::accessibility::XAccessibleSelection, + css::lang::XServiceInfo, + css::lang::XServiceName > SvxGraphCtrlAccessibleContext_Base; class SvxGraphCtrlAccessibleContext: @@ -86,7 +86,7 @@ public: // internal SvxGraphCtrlAccessibleContext( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference< css::accessibility::XAccessible>& rxParent, GraphCtrl& rRepresentation, const OUString* pName = NULL, const OUString* pDescription = NULL ); @@ -98,61 +98,61 @@ protected: public: // XAccessible /// Return the XAccessibleContext. - 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; // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) 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& rPoint ) 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 void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) 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 void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + 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 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, 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::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() 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::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) override; -// virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {} -// virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {} + 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 nIndex) throw (css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, 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::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() 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::lang::Locale SAL_CALL getLocale() throw (css::uno::RuntimeException, css::accessibility::IllegalAccessibleComponentStateException, std::exception) override; +// virtual void SAL_CALL addPropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::uno::RuntimeException) {} +// virtual void SAL_CALL removePropertyChangeListener( const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::uno::RuntimeException) {} // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& xListener) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; // XServiceName - virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() throw (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 nSelectedChildIndex ) 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 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; // IAccessibleViewforwarder virtual Rectangle GetVisibleArea() const override; @@ -160,7 +160,7 @@ public: virtual Size LogicToPixel (const Size& rSize) const override; protected: - void checkChildIndexOnSelection( long nIndexOfChild ) throw (::com::sun::star::lang::IndexOutOfBoundsException ); + void checkChildIndexOnSelection( long nIndexOfChild ) throw (css::lang::IndexOutOfBoundsException ); public: @@ -180,27 +180,26 @@ protected: When the object is already disposed then a DisposedException is thrown. */ - Rectangle GetBoundingBoxOnScreen() throw (::com::sun::star::uno::RuntimeException); + Rectangle GetBoundingBoxOnScreen() throw (css::uno::RuntimeException); /// Return the object's current bounding box relative to the parent object. - Rectangle GetBoundingBox() throw (::com::sun::star::uno::RuntimeException); + Rectangle GetBoundingBox() throw (css::uno::RuntimeException); virtual void SAL_CALL disposing() override; private: SdrObject* getSdrObject( sal_Int32 nIndex ) - throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException ); + throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException ); - void CommitChange (sal_Int16 aEventId, const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue); - void FireEvent (const ::com::sun::star::accessibility::AccessibleEventObject& aEvent); + void CommitChange (sal_Int16 aEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue); + void FireEvent (const css::accessibility::AccessibleEventObject& aEvent); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessible( const SdrObject* pObj ); + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessible( const SdrObject* pObj ); accessibility::AccessibleShapeTreeInfo maTreeInfo; /// Reference to the parent object. - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> mxParent; + css::uno::Reference mxParent; /** Description of this object. This is not a constant because it can be set from the outside. diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 8dec907bed77..330002007863 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -31,7 +31,7 @@ class SvxShowCharSet; namespace svx { - typedef ::cppu::ImplHelper1 < ::com::sun::star::accessibility::XAccessible + typedef ::cppu::ImplHelper1 < css::accessibility::XAccessible > OAccessibleHelper_Base_2; class SvxShowCharSetAcc; @@ -43,13 +43,13 @@ namespace svx { VclPtr mpParent; // the vcl control SvxShowCharSetAcc* m_pTable; // the table, which holds the characters shown by the vcl control - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAcc; // the ref to the table + css::uno::Reference< css::accessibility::XAccessible > m_xAcc; // the ref to the table protected: virtual ~SvxShowCharSetVirtualAcc(); virtual void SAL_CALL disposing() override; - virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; public: SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ); @@ -58,29 +58,29 @@ namespace svx DECLARE_XTYPEPROVIDER( ) // XAccessibleComponent - virtual void SAL_CALL grabFocus( ) 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 void SAL_CALL grabFocus( ) 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; //OAccessibleContextHelper // XAccessibleContext - still waiting to be overwritten - 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_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::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) 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 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_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::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) 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 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return this; } - 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 css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override { return this; } + 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; // call the fireEvent method from the table when it exists. void SAL_CALL fireEvent( const sal_Int16 _nEventId, - const ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rNewValue + const css::uno::Any& _rOldValue, + const css::uno::Any& _rNewValue ); // simple access methods @@ -103,19 +103,19 @@ namespace svx Rectangle maRect; SvxShowCharSetItemAcc* m_pItem; SvxShowCharSetAcc* m_pParent; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAcc; + css::uno::Reference< css::accessibility::XAccessible > m_xAcc; SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos ); ~SvxShowCharSetItem(); - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible(); + css::uno::Reference< css::accessibility::XAccessible > GetAccessible(); void ClearAccessible(); }; - typedef ::cppu::ImplHelper2 < ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleTable + typedef ::cppu::ImplHelper2 < css::accessibility::XAccessible, + css::accessibility::XAccessibleTable > OAccessibleHelper_Base; // - SvxShowCharSetAcc - @@ -126,7 +126,7 @@ namespace svx class SvxShowCharSetAcc : public ::comphelper::OAccessibleSelectionHelper, public OAccessibleHelper_Base { - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > > m_aChildren; + ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > m_aChildren; SvxShowCharSetVirtualAcc* m_pParent; // the virtual parent protected: virtual void SAL_CALL disposing() override; @@ -137,50 +137,50 @@ namespace svx DECLARE_XTYPEPROVIDER( ) // XAccessibleComponent - virtual void SAL_CALL grabFocus( ) 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 void SAL_CALL grabFocus( ) 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; //OAccessibleContextHelper // XAccessibleContext - still waiting to be overwritten - 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_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::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) 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::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return this; } - 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 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_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::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) 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::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override { return this; } + 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; // 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; inline void SAL_CALL fireEvent( const sal_Int16 _nEventId, - const ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rNewValue + const css::uno::Any& _rOldValue, + const css::uno::Any& _rNewValue ) { NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue); @@ -193,7 +193,7 @@ namespace svx // return if the specified child is visible => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual bool implIsSelected( sal_Int32 nAccessibleChildIndex ) - throw (::com::sun::star::uno::RuntimeException) override; + throw (css::uno::RuntimeException) override; // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) virtual void @@ -204,14 +204,14 @@ namespace svx // OCommonAccessibleComponent /// implements the calculation of the bounding rectangle - still waiting to be overwritten - virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; }; // - SvxShowCharSetItemAcc - - typedef ::cppu::ImplHelper2 < ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleAction + typedef ::cppu::ImplHelper2 < css::accessibility::XAccessible, + css::accessibility::XAccessibleAction > OAccessibleHelper_Base_3; /** The child implementation of the table. @@ -226,7 +226,7 @@ namespace svx // OCommonAccessibleComponent /// implements the calculation of the bounding rectangle - still waiting to be overwritten - virtual ::com::sun::star::awt::Rectangle implGetBounds( ) throw (::com::sun::star::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; public: // XInterface @@ -238,36 +238,36 @@ namespace svx void ParentDestroyed(); // XAccessibleComponent - virtual void SAL_CALL grabFocus( ) 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 void SAL_CALL grabFocus( ) 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; //OAccessibleContextHelper // XAccessibleContext - still waiting to be overwritten - 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_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::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) 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 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_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::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) 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 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return this; } + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override { return this; } - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return mpParent->m_pParent->getForeground(); } - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override { return mpParent->m_pParent->getBackground(); } + virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override { return mpParent->m_pParent->getForeground(); } + virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override { return mpParent->m_pParent->getBackground(); } // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; inline void SAL_CALL fireEvent( const sal_Int16 _nEventId, - const ::com::sun::star::uno::Any& _rOldValue, - const ::com::sun::star::uno::Any& _rNewValue + const css::uno::Any& _rOldValue, + const css::uno::Any& _rNewValue ) { NotifyAccessibleEvent(_nEventId,_rOldValue,_rNewValue); diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx index 1d28d9ac8a78..7c61b7b39959 100644 --- a/svx/source/inc/datalistener.hxx +++ b/svx/source/inc/datalistener.hxx @@ -33,9 +33,9 @@ namespace svxform class DataNavigatorWindow; typedef cppu::WeakImplHelper< - com::sun::star::container::XContainerListener, - com::sun::star::frame::XFrameActionListener, - com::sun::star::xml::dom::events::XEventListener > DataListener_t; + css::container::XContainerListener, + css::frame::XFrameActionListener, + css::xml::dom::events::XEventListener > DataListener_t; class DataListener : public DataListener_t { @@ -50,18 +50,18 @@ namespace svxform public: // XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; // XFrameActionListener - virtual void SAL_CALL frameAction( const ::com::sun::star::frame::FrameActionEvent& Action ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& Action ) throw (css::uno::RuntimeException, std::exception) override; // xml::dom::events::XEventListener - virtual void SAL_CALL handleEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::events::XEvent >& evt ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL handleEvent( const css::uno::Reference< css::xml::dom::events::XEvent >& evt ) throw (css::uno::RuntimeException, std::exception) override; // lang::XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 7761ad679433..d00a9676587e 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -96,25 +96,25 @@ public: // Item representing the forms and subforms class FmFormItem : public FmParentData { - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xController; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterController > m_xFilterController; + css::uno::Reference< css::form::runtime::XFormController > m_xController; + css::uno::Reference< css::form::runtime::XFilterController > m_xFilterController; public: TYPEINFO_OVERRIDE(); FmFormItem( FmParentData* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & _xController, + const css::uno::Reference< css::form::runtime::XFormController > & _xController, const OUString& _rText) :FmParentData( _pParent, _rText ) ,m_xController( _xController ) - ,m_xFilterController( _xController, ::com::sun::star::uno::UNO_QUERY_THROW ) + ,m_xFilterController( _xController, css::uno::UNO_QUERY_THROW ) { } - inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& + inline const css::uno::Reference< css::form::runtime::XFormController >& GetController() { return m_xController; } - inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterController >& + inline const css::uno::Reference< css::form::runtime::XFilterController >& GetFilterController() { return m_xFilterController; } virtual Image GetImage() const override; @@ -160,8 +160,8 @@ class FmFilterModel : public FmParentData { friend class FmFilterAdapter; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > m_xControllers; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xController; + css::uno::Reference< css::container::XIndexAccess > m_xControllers; + css::uno::Reference< css::form::runtime::XFormController > m_xController; FmFilterAdapter* m_pAdapter; FmFilterItems* m_pCurrentItems; @@ -170,7 +170,7 @@ public: FmFilterModel(); virtual ~FmFilterModel(); - void Update(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xCurrent); + void Update(const css::uno::Reference< css::container::XIndexAccess > & xControllers, const css::uno::Reference< css::form::runtime::XFormController > & xCurrent); void Clear(); bool ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const; void Append(FmFilterItems* pItems, FmFilterItem* pFilterItem); @@ -180,8 +180,8 @@ public: FmFilterItems* GetCurrentItems() const {return m_pCurrentItems;} void SetCurrentItems(FmFilterItems* pCurrent); - const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & GetCurrentController() const {return m_xController;} - void SetCurrentController(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xController); + const css::uno::Reference< css::form::runtime::XFormController > & GetCurrentController() const {return m_xController;} + void SetCurrentController(const css::uno::Reference< css::form::runtime::XFormController > & xController); void Remove(FmFilterData* pFilterItem); static void AppendFilterItems( FmFormItem& _rItem ); @@ -190,9 +190,9 @@ public: protected: void Insert(const ::std::vector::iterator& rPos, FmFilterData* pFilterItem); void Remove( const ::std::vector::iterator& rPos ); - FmFormItem* Find(const ::std::vector& rItems, const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xController) const; - FmFormItem* Find(const ::std::vector& rItems, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm) const; - void Update(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, FmParentData* pParent); + FmFormItem* Find(const ::std::vector& rItems, const css::uno::Reference< css::form::runtime::XFormController > & xController) const; + FmFormItem* Find(const ::std::vector& rItems, const css::uno::Reference< css::form::XForm >& xForm) const; + void Update(const css::uno::Reference< css::container::XIndexAccess > & xControllers, FmParentData* pParent); }; @@ -255,8 +255,8 @@ public: virtual void dispose() override; void UpdateContent( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > & xControllers, - const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xCurrent + const css::uno::Reference< css::container::XIndexAccess > & xControllers, + const css::uno::Reference< css::form::runtime::XFormController > & xCurrent ); const FmFilterModel* GetFilterModel() const {return m_pModel;} diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index f0991bdd8c24..39514f64f443 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -42,24 +42,24 @@ class FmFormShell; class FmPropBrw : public SfxFloatingWindow, public SfxControllerItem { - bool m_bInitialStateChange; + bool m_bInitialStateChange; bool m_bInStateChange; - OUString m_sLastActivePage; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > - m_xInspectorContext; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > + OUString m_sLastActivePage; + css::uno::Reference< css::uno::XComponentContext > + m_xInspectorContext; + css::uno::Reference< css::uno::XComponentContext > m_xORB; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 > + css::uno::Reference< css::frame::XFrame2 > m_xMeAsFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > m_xLastKnownDocument; - ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorModel > + css::uno::Reference< css::inspection::XObjectInspectorModel > m_xInspectorModel; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > + css::uno::Reference< css::frame::XController > m_xBrowserController; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > + css::uno::Reference< css::awt::XWindow > m_xBrowserComponentWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > + css::uno::Reference< css::awt::XWindow > m_xFrameContainerWindow; protected: @@ -76,7 +76,7 @@ protected: public: FmPropBrw( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xORB, + const css::uno::Reference< css::uno::XComponentContext >& _xORB, SfxBindings* pBindings, SfxChildWindow* pMgr, vcl::Window* pParent, diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 26dd6626485d..c5d54713924b 100644 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx @@ -50,7 +50,7 @@ namespace svxform sal_Int32 nBorderColor; BorderDescriptor() - :nBorderType( ::com::sun::star::awt::VisualEffect::FLAT ) + :nBorderType( css::awt::VisualEffect::FLAT ) ,nBorderColor( 0x00000000 ) { } @@ -62,7 +62,7 @@ namespace svxform sal_Int32 nUnderlineColor; UnderlineDescriptor() - :nUnderlineType( ::com::sun::star::awt::FontUnderline::NONE ) + :nUnderlineType( css::awt::FontUnderline::NONE ) ,nUnderlineColor( 0x00000000 ) { } @@ -76,11 +76,11 @@ namespace svxform struct ControlData : public BorderDescriptor, UnderlineDescriptor { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > xControl; + css::uno::Reference< css::awt::XControl > xControl; OUString sOriginalHelpText; ControlData() : BorderDescriptor() { } - ControlData( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ) + ControlData( const css::uno::Reference< css::awt::XControl >& _rxControl ) :xControl( _rxControl ) { } @@ -130,14 +130,14 @@ namespace svxform ~ControlBorderManager(); public: - void focusGained( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl ); - void focusLost( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl ); - void mouseEntered( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl ); - void mouseExited( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl ); + void focusGained( const css::uno::Reference< css::uno::XInterface >& _rxControl ); + void focusLost( const css::uno::Reference< css::uno::XInterface >& _rxControl ); + void mouseEntered( const css::uno::Reference< css::uno::XInterface >& _rxControl ); + void mouseExited( const css::uno::Reference< css::uno::XInterface >& _rxControl ); void validityChanged( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl, - const ::com::sun::star::uno::Reference< ::com::sun::star::form::validation::XValidatableFormComponent >& _rxValidatable + const css::uno::Reference< css::awt::XControl >& _rxControl, + const css::uno::Reference< css::form::validation::XValidatableFormComponent >& _rxValidatable ); /// enables dynamic border color for the controls @@ -165,7 +165,7 @@ namespace svxform the control's status data, as a reference to our respective member */ void controlStatusGained( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl, + const css::uno::Reference< css::uno::XInterface >& _rxControl, ControlData& _rControlData ); @@ -175,17 +175,17 @@ namespace svxform @param _rControlData the control's status data, as a reference to our respective member */ - void controlStatusLost( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxControl, ControlData& _rControlData ); + void controlStatusLost( const css::uno::Reference< css::uno::XInterface >& _rxControl, ControlData& _rControlData ); /** determines whether the border of a given peer can be colored @param _rxPeer the peer to examine. Must not be */ - bool canColorBorder( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _rxPeer ); + bool canColorBorder( const css::uno::Reference< css::awt::XVclWindowPeer >& _rxPeer ); /** determines the status of the given control */ - ControlStatus getControlStatus( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); + ControlStatus getControlStatus( const css::uno::Reference< css::awt::XControl >& _rxControl ); /** retrieves the color associated with a given ControlStatus @param _eStatus @@ -203,8 +203,8 @@ namespace svxform the color/type to use when the control has the status CONTROL_STATUS_NONE */ void updateBorderStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XVclWindowPeer >& _rxPeer, + const css::uno::Reference< css::awt::XControl >& _rxControl, + const css::uno::Reference< css::awt::XVclWindowPeer >& _rxPeer, const BorderDescriptor& _rFallback ); @@ -217,7 +217,7 @@ namespace svxform the control to examine. Must not be , and have a non- peer */ void determineOriginalBorderStyle( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl, + const css::uno::Reference< css::awt::XControl >& _rxControl, BorderDescriptor& _rData ) const; }; diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx index 3f4c5fc60fd6..90027568066a 100644 --- a/svx/source/inc/fmcontrollayout.hxx +++ b/svx/source/inc/fmcontrollayout.hxx @@ -34,7 +34,7 @@ namespace svxform /** initializes the layout of a newly created form control (model) */ void initializeControlLayout( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, DocumentType _eDocType ); @@ -55,8 +55,8 @@ namespace svxform @param _rxModel a form component. */ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - getDefaultDocumentTextStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); + css::uno::Reference< css::beans::XPropertySet > + getDefaultDocumentTextStyle( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ); } diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx index b41349eb3963..05a2a76e4db8 100644 --- a/svx/source/inc/fmdocumentclassification.hxx +++ b/svx/source/inc/fmdocumentclassification.hxx @@ -46,11 +46,11 @@ namespace svxform /** classifies a document model */ static DocumentType classifyDocument( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocumentModel + const css::uno::Reference< css::frame::XModel >& _rxDocumentModel ); static DocumentType classifyHostDocument( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxFormComponent + const css::uno::Reference< css::uno::XInterface >& _rxFormComponent ); static DocumentType getDocumentTypeForModuleIdentifier( diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index 1386769fca04..8440b999767d 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -76,7 +76,7 @@ namespace svxform protected: // XClipboardOwner - virtual void SAL_CALL lostOwnership( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& _rxClipboard, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxTrans ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& _rxClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& _rxTrans ) throw(css::uno::RuntimeException, std::exception) override; // TransferableHelper virtual void DragFinished( sal_Int8 nDropAction ) override; @@ -131,10 +131,10 @@ namespace svxform ListBoxEntrySet m_aSelectedEntries; css::uno::Sequence< css::uno::Sequence< sal_uInt32 > > m_aControlPaths; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > m_aHiddenControlModels; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms > + css::uno::Reference< css::form::XForms > m_xFormsRoot; // the root of the forms collection where the entries we represent reside // this uniquely identifies the page and the document @@ -149,7 +149,7 @@ namespace svxform // ctor to construct the data from an arbitrary Transferable (usually clipboard data) OControlTransferData( - const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxTransferable + const css::uno::Reference< css::datatransfer::XTransferable >& _rxTransferable ); inline const DataFlavorExVector& GetDataFlavorExVector() const; @@ -168,7 +168,7 @@ namespace svxform size_t onEntryRemoved( SvTreeListEntry* _pEntry ); void setFormsRoot( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms >& _rxFormsRoot + const css::uno::Reference< css::form::XForms >& _rxFormsRoot ) { m_xFormsRoot = _rxFormsRoot; } void buildPathFormat(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot); @@ -179,16 +179,16 @@ namespace svxform void buildListFromPath(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot); // der umgekehrte Weg : wirft alles aus m_aSelectedEntries weg und baut es mittels m_aControlPaths neu auf - void addHiddenControlsFormat(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >& seqInterfaces); + void addHiddenControlsFormat(const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& seqInterfaces); // fuegt ein SVX_FML_HIDDEN_CONTROLS-Format hinzu und merk sich dafuer die uebergebenen Interfaces // (es erfolgt KEINE Ueberpruefung, ob dadurch auch tatsaechlich nur hidden Controls bezeichnet werden, dass muss der // Aufrufer sicherstellen) const ListBoxEntrySet& selected() const { return m_aSelectedEntries; } - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > + css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > hiddenControls() const { return m_aHiddenControlModels; } - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms > + css::uno::Reference< css::form::XForms > getFormsRoot() const { return m_xFormsRoot; } }; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 74f1092d67bf..79c53143fe79 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -137,24 +137,24 @@ class FmEntryDataList; class FmEntryData { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xNormalizedIFace; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xProperties; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild > m_xChild; + css::uno::Reference< css::uno::XInterface > m_xNormalizedIFace; + css::uno::Reference< css::beans::XPropertySet > m_xProperties; + css::uno::Reference< css::container::XChild > m_xChild; protected: Image m_aNormalImage; - OUString aText; + OUString aText; FmEntryDataList* pChildList; FmEntryData* pParent; protected: - void newObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIFace ); + void newObject( const css::uno::Reference< css::uno::XInterface >& _rxIFace ); public: TYPEINFO(); - FmEntryData( FmEntryData* pParentData, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rIFace ); + FmEntryData( FmEntryData* pParentData, const css::uno::Reference< css::uno::XInterface >& _rIFace ); FmEntryData( const FmEntryData& rEntryData ); virtual ~FmEntryData(); @@ -173,17 +173,17 @@ public: // note that the interface returned is normalized, i.e. querying the given XInterface of the object // for XInterface must return the interface itself. - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& GetElement() const + const css::uno::Reference< css::uno::XInterface >& GetElement() const { return m_xNormalizedIFace; } - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& GetPropertySet() const + const css::uno::Reference< css::beans::XPropertySet >& GetPropertySet() const { return m_xProperties; } - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XChild >& GetChildIFace() const + const css::uno::Reference< css::container::XChild >& GetChildIFace() const { return m_xChild; } @@ -236,14 +236,14 @@ public: class FmFormData : public FmEntryData { - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > m_xForm; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; + css::uno::Reference< css::form::XForm > m_xForm; + css::uno::Reference< css::container::XContainer > m_xContainer; public: TYPEINFO_OVERRIDE(); FmFormData( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, + const css::uno::Reference< css::form::XForm >& _rxForm, const ImageList& _rNormalImages, FmFormData* _pParent = NULL ); @@ -251,8 +251,8 @@ public: FmFormData( const FmFormData& rFormData ); virtual ~FmFormData(); - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& GetFormIface() const { return m_xForm; } - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& GetContainer() const { return m_xContainer; } + const css::uno::Reference< css::form::XForm >& GetFormIface() const { return m_xForm; } + const css::uno::Reference< css::container::XContainer >& GetContainer() const { return m_xContainer; } virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ) override; virtual FmEntryData* Clone() override; @@ -262,7 +262,7 @@ public: class FmControlData : public FmEntryData { - ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > m_xFormComponent; + css::uno::Reference< css::form::XFormComponent > m_xFormComponent; Image GetImage(const ImageList& ilNavigatorImages) const; @@ -270,19 +270,19 @@ public: TYPEINFO_OVERRIDE(); FmControlData( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxComponent, + const css::uno::Reference< css::form::XFormComponent >& _rxComponent, const ImageList& _rNormalImages, FmFormData* _pParent ); FmControlData( const FmControlData& rControlData ); virtual ~FmControlData(); - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& GetFormComponent() const { return m_xFormComponent; } + const css::uno::Reference< css::form::XFormComponent >& GetFormComponent() const { return m_xFormComponent; } virtual bool IsEqualWithoutChildren( FmEntryData* pEntryData ) override; virtual FmEntryData* Clone() override; void ModelReplaced( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxNew, + const css::uno::Reference< css::form::XFormComponent >& _rxNew, const ImageList& _rNormalImages ); }; @@ -297,8 +297,8 @@ namespace svxform class NavigatorTreeModel; class OFormComponentObserver - :public ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::container::XContainerListener + :public ::cppu::WeakImplHelper < css::beans::XPropertyChangeListener + , css::container::XContainerListener > { ::svxform::NavigatorTreeModel* m_pNavModel; @@ -309,16 +309,16 @@ namespace svxform OFormComponentObserver( ::svxform::NavigatorTreeModel* pModel ); // XEventListenerListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::beans::XPropertyChangeListener + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XContainerListener + // css::container::XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; void Lock() { m_nLocks++; } void UnLock() { m_nLocks--; } @@ -326,8 +326,8 @@ namespace svxform bool CanUndo() const { return m_bCanUndo; } void ReleaseModel() { m_pNavModel = NULL; } protected: - void Insert(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xIface, sal_Int32 nIndex); - void Remove( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ); + void Insert(const css::uno::Reference< css::uno::XInterface >& xIface, sal_Int32 nIndex); + void Remove( const css::uno::Reference< css::uno::XInterface >& _rxElement ); }; class NavigatorTreeModel : public SfxBroadcaster @@ -344,17 +344,17 @@ namespace svxform ImageList m_aNormalImages; - void UpdateContent( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms >& xForms ); + void UpdateContent( const css::uno::Reference< css::form::XForms >& xForms ); - void InsertForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm, sal_uInt32 nRelPos); + void InsertForm(const css::uno::Reference< css::form::XForm >& xForm, sal_uInt32 nRelPos); void RemoveForm(FmFormData* pFormData); - void InsertFormComponent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xComp, sal_uInt32 nRelPos); + void InsertFormComponent(const css::uno::Reference< css::form::XFormComponent >& xComp, sal_uInt32 nRelPos); void RemoveFormComponent(FmControlData* pControlData); void InsertSdrObj(const SdrObject* pSdrObj); void RemoveSdrObj(const SdrObject* pSdrObj); - void ReplaceFormComponent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xOld, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xNew); + void ReplaceFormComponent(const css::uno::Reference< css::form::XFormComponent >& xOld, const css::uno::Reference< css::form::XFormComponent >& xNew); void BroadcastMarkedObjects(const SdrMarkList& mlMarked); // einen RequestSelectHint mit den aktuell markierten Objekten broadcasten @@ -379,14 +379,14 @@ namespace svxform void Clear(); void SetModified( bool bMod=true ); - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms > GetForms() const; + css::uno::Reference< css::form::XForms > GetForms() const; FmFormShell* GetFormShell() const { return m_pFormShell; } FmFormPage* GetFormPage() const { return m_pFormPage; } - FmEntryData* FindData( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElement, FmEntryDataList* pDataList, bool bRecurs=true ); + FmEntryData* FindData( const css::uno::Reference< css::uno::XInterface >& xElement, FmEntryDataList* pDataList, bool bRecurs=true ); FmEntryData* FindData( const OUString& rText, FmFormData* pParentData, bool bRecurs=true ); FmEntryDataList* GetRootList() const { return m_pRootList; } - static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData ); - SdrObject* Search(SdrObjListIter& rIter, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xComp); + static css::uno::Reference< css::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData ); + SdrObject* Search(SdrObjListIter& rIter, const css::uno::Reference< css::form::XFormComponent >& xComp); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; @@ -464,7 +464,7 @@ namespace svxform void SynchronizeMarkList(); // umgekehrte Richtung von SynchronizeMarkList : markiert in der View alle der aktuellen Selektion entsprechenden Controls - void CollectObjects(FmFormData* pFormData, bool bDeep, ::std::set< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >& _rObjects); + void CollectObjects(FmFormData* pFormData, bool bDeep, ::std::set< css::uno::Reference< css::form::XFormComponent > >& _rObjects); // im Select aktualisiere ich normalerweise die Marklist der zugehoerigen View, mit folgenden Funktionen // kann ich das Locking dieses Verhaltens steuern diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index afcc0499b2db..530697b3feeb 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx @@ -26,12 +26,12 @@ class FmInterfaceItem : public SfxPoolItem { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInterface; + css::uno::Reference< css::uno::XInterface > xInterface; public: TYPEINFO_OVERRIDE(); - FmInterfaceItem( const sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxInterface ) + FmInterfaceItem( const sal_uInt16 nId, const css::uno::Reference< css::uno::XInterface >& rxInterface ) :SfxPoolItem( nId ) ,xInterface( rxInterface ) {} @@ -45,7 +45,7 @@ public: virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const override; virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const override; - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetInterface() const { return xInterface; } + const css::uno::Reference< css::uno::XInterface > GetInterface() const { return xInterface; } }; inline FmInterfaceItem& FmInterfaceItem::operator=( const FmInterfaceItem &rCpy ) diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index cbf0c70184d4..577d027e6211 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -31,15 +31,15 @@ class SVX_DLLPUBLIC FmFormObj: public SdrUnoObj { FmFormObj( const FmFormObj& ) = delete; - ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > aEvts; // events des Objects - ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor> m_aEventsHistory; + css::uno::Sequence< css::script::ScriptEventDescriptor > aEvts; // events des Objects + css::uno::Sequence< css::script::ScriptEventDescriptor> m_aEventsHistory; // valid if and only if m_pEnvironmentHistory != NULL, this are the events which we're set when // m_pEnvironmentHistory was created // Informationen fuer die Controlumgebung // werden nur vorgehalten, wenn ein Object sich nicht in einer Objectliste befindet - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer> m_xParent; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms > m_xEnvironmentHistory; + css::uno::Reference< css::container::XIndexContainer> m_xParent; + css::uno::Reference< css::form::XForms > m_xEnvironmentHistory; sal_Int32 m_nPos; VclPtr m_pLastKnownRefDevice; @@ -52,17 +52,17 @@ public: TYPEINFO_VISIBILITY_OVERRIDE(SAL_DLLPRIVATE); - SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& + SAL_DLLPRIVATE const css::uno::Reference< css::container::XIndexContainer>& GetOriginalParent() const { return m_xParent; } - SAL_DLLPRIVATE const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& + SAL_DLLPRIVATE const css::uno::Sequence< css::script::ScriptEventDescriptor >& GetOriginalEvents() const { return aEvts; } SAL_DLLPRIVATE sal_Int32 GetOriginalIndex() const { return m_nPos; } SAL_DLLPRIVATE void SetObjEnv( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xForm, + const css::uno::Reference< css::container::XIndexContainer>& xForm, const sal_Int32 nIdx, - const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& rEvts ); + const css::uno::Sequence< css::script::ScriptEventDescriptor >& rEvts ); SAL_DLLPRIVATE void ClearObjEnv(); public: @@ -81,9 +81,9 @@ public: SAL_DLLPRIVATE virtual void clonedFrom(const FmFormObj* _pSource); - SAL_DLLPRIVATE static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> ensureModelEnv( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rSourceContainer, - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& _rTopLevelDestContainer); + SAL_DLLPRIVATE static css::uno::Reference< css::uno::XInterface> ensureModelEnv( + const css::uno::Reference< css::uno::XInterface>& _rSourceContainer, + const css::uno::Reference< css::form::XForms>& _rTopLevelDestContainer); /** returns the FmFormObj behind the given SdrObject @@ -94,7 +94,7 @@ public: SAL_DLLPRIVATE static FmFormObj* GetFormObject( SdrObject* _pSdrObject ); SAL_DLLPRIVATE static const FmFormObj* GetFormObject( const SdrObject* _pSdrObject ); - SAL_DLLPRIVATE virtual void SetUnoControlModel( const ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& _rxModel ) override; + SAL_DLLPRIVATE virtual void SetUnoControlModel( const css::uno::Reference< css::awt::XControlModel >& _rxModel ) override; protected: SAL_DLLPRIVATE virtual bool EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) override; diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index dccda1cd3f37..3b9263db24e8 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -48,10 +48,10 @@ class SdrObject; class SVX_DLLPRIVATE FmFormPageImpl { - ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >,SdrObject* > m_aComponentMap; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > xCurrentForm; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms > m_xForms; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XMap > m_aControlShapeMap; + ::std::map< css::uno::Reference< css::form::XFormComponent >,SdrObject* > m_aComponentMap; + css::uno::Reference< css::form::XForm > xCurrentForm; + css::uno::Reference< css::form::XForms > m_xForms; + css::uno::WeakReference< css::container::XMap > m_aControlShapeMap; FmFormPage& m_rPage; Link m_aFormsCreationHdl; @@ -66,8 +66,8 @@ public: void initFrom( FmFormPageImpl& i_foreignImpl ); // nur wichtig fuer den DesignMode - void setCurForm(::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> xForm); - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> getDefaultForm(); + void setCurForm(css::uno::Reference< css::form::XForm> xForm); + css::uno::Reference< css::form::XForm> getDefaultForm(); /** finds a place in the form component hierarchy where to insert the given component @@ -75,9 +75,9 @@ public: the caller might decide on a suitable place where in the returned container the insertion should happen). */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> findPlaceInFormComponentHierarchy( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& rContent, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& rDatabase = ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>(), + css::uno::Reference< css::form::XForm> findPlaceInFormComponentHierarchy( + const css::uno::Reference< css::form::XFormComponent>& rContent, + const css::uno::Reference< css::sdbc::XDataSource>& rDatabase = css::uno::Reference< css::sdbc::XDataSource>(), const OUString& rDBTitle = OUString(), const OUString& rCursorSource = OUString(), sal_Int32 nCommandType = 0 @@ -87,7 +87,7 @@ public: inline bool hasEverBeenActivated( ) const { return !m_bFirstActivation; } inline void setHasBeenActivated( ) { m_bFirstActivation = false; } - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& getForms( bool _bForceCreate = true ); + const css::uno::Reference< css::form::XForms>& getForms( bool _bForceCreate = true ); void SetFormsCreationHdl( const Link& _rFormsCreationHdl ) { m_aFormsCreationHdl = _rFormsCreationHdl; } @@ -103,15 +103,15 @@ protected: @param nCommandType the desired CommandType property value of the sought-after form */ - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> findFormForDataSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& rForm, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource>& rDatabase, + css::uno::Reference< css::form::XForm> findFormForDataSource( + const css::uno::Reference< css::form::XForm>& rForm, + const css::uno::Reference< css::sdbc::XDataSource>& rDatabase, const OUString& rCommand, sal_Int32 nCommandType ); public: - static OUString setUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& xFormComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& xControls); + static OUString setUniqueName(const css::uno::Reference< css::form::XFormComponent>& xFormComponent, const css::uno::Reference< css::form::XForm>& xControls); void formObjectInserted( const FmFormObj& _object ); void formObjectRemoved( const FmFormObj& _object ); @@ -119,7 +119,7 @@ public: /** returns an object mapping from control models to drawing shapes. */ - SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::container::XMap > getControlToShapeMap(); + SVX_DLLPUBLIC css::uno::Reference< css::container::XMap > getControlToShapeMap(); private: /** validates whether xCurrentForm is still valid and to be used @@ -137,7 +137,7 @@ private: */ bool validateCurForm(); - ::com::sun::star::uno::Reference< ::com::sun::star::container::XMap > + css::uno::Reference< css::container::XMap > impl_createControlShapeMap_nothrow(); private: diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx index cc875e407ec4..de9841d4f218 100644 --- a/svx/source/inc/fmscriptingenv.hxx +++ b/svx/source/inc/fmscriptingenv.hxx @@ -44,30 +44,30 @@ namespace svxform @param _rxManager the XEventAttacherManager to monitor. Must not be . - @throws ::com::sun::star::lang::IllegalArgumentException + @throws css::lang::IllegalArgumentException if _rxManager is - @throws ::com::sun::star::lang::DisposedException + @throws css::lang::DisposedException if the instance is already disposed - @throws ::com::sun::star::uno::RuntimeException + @throws css::uno::RuntimeException if attaching as script listener to the manager fails with a RuntimeException itself */ virtual void registerEventAttacherManager( - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager >& _rxManager ) = 0; + const css::uno::Reference< css::script::XEventAttacherManager >& _rxManager ) = 0; /** registers an XEventAttacherManager whose events should not be monitored and handled anymore @param _rxManager the XEventAttacherManager which was previously registered. Must not ne . - @throws ::com::sun::star::lang::IllegalArgumentException + @throws css::lang::IllegalArgumentException if _rxManager is - @throws ::com::sun::star::lang::DisposedException + @throws css::lang::DisposedException if the instance is already disposed - @throws ::com::sun::star::uno::RuntimeException + @throws css::uno::RuntimeException if removing as script listener from the manager fails with a RuntimeException itself */ virtual void revokeEventAttacherManager( - const ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager >& _rxManager ) = 0; + const css::uno::Reference< css::script::XEventAttacherManager >& _rxManager ) = 0; /** disposes the scripting environment instance */ diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 4f0b8772bed7..1002a12bb8a8 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -63,7 +63,7 @@ #include #include -typedef std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > > FmFormArray; +typedef std::vector< css::uno::Reference< css::form::XForm > > FmFormArray; // catch database exceptions if they occur #define DO_SAFE(statement) try { statement; } catch( const Exception& ) { OSL_FAIL("unhandled exception (I tried to move a cursor (or something like that).)"); } @@ -97,11 +97,11 @@ namespace o3tl class FmXBoundFormFieldIterator : public ::comphelper::IndexAccessIterator { public: - FmXBoundFormFieldIterator(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rStartingPoint) : ::comphelper::IndexAccessIterator(_rStartingPoint) { } + FmXBoundFormFieldIterator(const css::uno::Reference< css::uno::XInterface>& _rStartingPoint) : ::comphelper::IndexAccessIterator(_rStartingPoint) { } protected: - virtual bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rElement) override; - virtual bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rContainer) const override; + virtual bool ShouldHandleElement(const css::uno::Reference< css::uno::XInterface>& _rElement) override; + virtual bool ShouldStepInto(const css::uno::Reference< css::uno::XInterface>& _rContainer) const override; }; class FmFormPage; @@ -122,16 +122,16 @@ struct FmLoadAction class SfxViewFrame; -typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::view::XSelectionChangeListener - , ::com::sun::star::form::XFormControllerListener +typedef ::cppu::WeakComponentImplHelper< css::beans::XPropertyChangeListener + , css::container::XContainerListener + , css::view::XSelectionChangeListener + , css::form::XFormControllerListener > FmXFormShell_BD_BASE; class FmXFormShell_Base_Disambiguation : public FmXFormShell_BD_BASE { - using ::com::sun::star::beans::XPropertyChangeListener::disposing; + using css::beans::XPropertyChangeListener::disposing; protected: FmXFormShell_Base_Disambiguation( ::osl::Mutex& _rMutex ); virtual void SAL_CALL disposing() override; @@ -181,7 +181,7 @@ class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE ::osl::Mutex m_aInvalidationSafety; // secure the access to all our slot invalidation related members - ::com::sun::star::form::NavigationBarMode m_eNavigate; // Art der Navigation + css::form::NavigationBarMode m_eNavigate; // Art der Navigation // da ich beim Suchen fuer die Behandlung des "gefunden" ein SdrObject markieren will, besorge ich mir vor dem // Hochreissen des Suchen-Dialoges alle relevanten Objekte @@ -202,32 +202,32 @@ class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE // aktuelle Form, Controller // nur im alive mode verfuegbar - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xActiveController; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xNavigationController; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > m_xActiveForm; + css::uno::Reference< css::form::runtime::XFormController > m_xActiveController; + css::uno::Reference< css::form::runtime::XFormController > m_xNavigationController; + css::uno::Reference< css::form::XForm > m_xActiveForm; // Aktueller container einer Page // nur im designmode verfuegbar - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xForms; + css::uno::Reference< css::container::XIndexAccess> m_xForms; // the currently selected objects, as to be displayed in the property browser - InterfaceBag m_aCurrentSelection; + InterfaceBag m_aCurrentSelection; /// the currently selected form, or the form which all currently selected controls belong to, or - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > m_xCurrentForm; + css::uno::Reference< css::form::XForm > m_xCurrentForm; /// the last selection/marking of controls only. Necessary to implement the "Control properties" slot - InterfaceBag m_aLastKnownMarkedControls; + InterfaceBag m_aLastKnownMarkedControls; // und das ist ebenfalls fuer's 'gefunden' : Beim Finden in GridControls brauche ich die Spalte, bekomme aber // nur die Nummer des Feldes, die entspricht der Nummer der Spalte + , wobei der Offset von der Position // des GridControls im Formular abhaengt. Also hier eine Umrechnung. - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> m_xLastGridFound; + css::uno::Reference< css::awt::XControlModel> m_xLastGridFound; // the frame we live in - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame> m_xAttachedFrame; + css::uno::Reference< css::frame::XFrame> m_xAttachedFrame; // Administration of external form views (see the SID_FM_VIEW_AS_GRID-slot) - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xExternalViewController; // the controller for the external form view - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xExtViewTriggerController; // the nav controller at the time the external display was triggered - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xExternalDisplayedForm; // the form which the external view is based on + css::uno::Reference< css::frame::XController > m_xExternalViewController; // the controller for the external form view + css::uno::Reference< css::form::runtime::XFormController > m_xExtViewTriggerController; // the nav controller at the time the external display was triggered + css::uno::Reference< css::sdbc::XResultSet > m_xExternalDisplayedForm; // the form which the external view is based on mutable ::svxform::DocumentType m_eDocumentType; /// the type of document we're living in @@ -235,7 +235,7 @@ class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE bool m_bHadPropertyBrowserInDesignMode : 1; bool m_bTrackProperties : 1; - // soll ich (bzw. der Owner diese Impl-Klasse) mich um die Aktualisierung des ::com::sun::star::beans::Property-Browsers kuemmern ? + // soll ich (bzw. der Owner diese Impl-Klasse) mich um die Aktualisierung des css::beans::Property-Browsers kuemmern ? bool m_bUseWizards : 1; @@ -250,9 +250,9 @@ class SVX_DLLPUBLIC FmXFormShell : public FmXFormShell_BASE public: // attribute access - SAL_DLLPRIVATE inline const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& + SAL_DLLPRIVATE inline const css::uno::Reference< css::frame::XFrame >& getHostFrame() const { return m_xAttachedFrame; } - SAL_DLLPRIVATE inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& + SAL_DLLPRIVATE inline const css::uno::Reference< css::sdbc::XResultSet >& getExternallyDisplayedForm() const { return m_xExternalDisplayedForm; } SAL_DLLPRIVATE inline bool @@ -267,22 +267,22 @@ protected: SAL_DLLPRIVATE virtual ~FmXFormShell(); // EventListener - SAL_DLLPRIVATE virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; -// ::com::sun::star::container::XContainerListener - SAL_DLLPRIVATE virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - SAL_DLLPRIVATE virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - SAL_DLLPRIVATE virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; +// css::container::XContainerListener + SAL_DLLPRIVATE virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; // XSelectionChangeListener - SAL_DLLPRIVATE virtual void SAL_CALL selectionChanged(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; -// ::com::sun::star::beans::XPropertyChangeListener - SAL_DLLPRIVATE virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; +// css::beans::XPropertyChangeListener + SAL_DLLPRIVATE virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override; -// ::com::sun::star::form::XFormControllerListener - SAL_DLLPRIVATE virtual void SAL_CALL formActivated(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - SAL_DLLPRIVATE virtual void SAL_CALL formDeactivated(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; +// css::form::XFormControllerListener + SAL_DLLPRIVATE virtual void SAL_CALL formActivated(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + SAL_DLLPRIVATE virtual void SAL_CALL formDeactivated(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; // OComponentHelper SAL_DLLPRIVATE virtual void SAL_CALL disposing() override; @@ -299,12 +299,12 @@ public: SAL_DLLPRIVATE virtual void invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures ) override; SAL_DLLPRIVATE void ExecuteTabOrderDialog( // execute SID_FM_TAB_DIALOG - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >& _rxForForm + const css::uno::Reference< css::awt::XTabControllerModel >& _rxForForm ); // stuff - SAL_DLLPRIVATE void AddElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); - SAL_DLLPRIVATE void RemoveElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); + SAL_DLLPRIVATE void AddElement(const css::uno::Reference< css::uno::XInterface>& Element); + SAL_DLLPRIVATE void RemoveElement(const css::uno::Reference< css::uno::XInterface>& Element); /** updates m_xForms, to be either , if we're in alive mode, or our current page's forms collection, if in design mode @@ -325,21 +325,21 @@ protected: // form handling /// load or unload the forms on a page SAL_DLLPRIVATE void loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour = FORMS_LOAD | FORMS_SYNC ); - SAL_DLLPRIVATE void smartControlReset( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxModels ); + SAL_DLLPRIVATE void smartControlReset( const css::uno::Reference< css::container::XIndexAccess >& _rxModels ); SAL_DLLPRIVATE void startListening(); SAL_DLLPRIVATE void stopListening(); - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > + SAL_DLLPRIVATE css::uno::Reference< css::awt::XControl > impl_getControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& i_rxModel, + const css::uno::Reference< css::awt::XControlModel>& i_rxModel, const FmFormObj& i_rKnownFormObj ); // sammelt in strNames die Namen aller Formulare SAL_DLLPRIVATE static void impl_collectFormSearchContexts_nothrow( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxStartingPoint, + const css::uno::Reference< css::uno::XInterface>& _rxStartingPoint, const OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames ); @@ -351,11 +351,11 @@ protected: public: // methode fuer nicht designmode (alive mode) - SAL_DLLPRIVATE void setActiveController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& _xController, bool _bNoSaveOldContent = false ); - SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveController() const {return m_xActiveController;} - SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getActiveInternalController() const { return m_xActiveController == m_xExternalViewController ? m_xExtViewTriggerController : m_xActiveController; } - SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& getActiveForm() const {return m_xActiveForm;} - SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController>& getNavController() const {return m_xNavigationController;} + SAL_DLLPRIVATE void setActiveController( const css::uno::Reference< css::form::runtime::XFormController>& _xController, bool _bNoSaveOldContent = false ); + SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getActiveController() const {return m_xActiveController;} + SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getActiveInternalController() const { return m_xActiveController == m_xExternalViewController ? m_xExtViewTriggerController : m_xActiveController; } + SAL_DLLPRIVATE const css::uno::Reference< css::form::XForm>& getActiveForm() const {return m_xActiveForm;} + SAL_DLLPRIVATE const css::uno::Reference< css::form::runtime::XFormController>& getNavController() const {return m_xNavigationController;} SAL_DLLPRIVATE inline const svx::ControllerFeatures& getActiveControllerFeatures() const { return m_aActiveControllerFeatures; } @@ -383,7 +383,7 @@ public: SAL_DLLPRIVATE bool setCurrentSelectionFromMark(const SdrMarkList& rMarkList); /// returns the currently selected form, or the form which all currently selected controls belong to, or - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > + SAL_DLLPRIVATE css::uno::Reference< css::form::XForm > getCurrentForm() const { return m_xCurrentForm; } SAL_DLLPRIVATE void forgetCurrentForm(); /// returns whether the last known marking contained only controls @@ -391,7 +391,7 @@ public: /// determines whether the current selection consists of exactly the given object SAL_DLLPRIVATE bool isSolelySelected( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject + const css::uno::Reference< css::uno::XInterface >& _rxObject ); /// handles a MouseButtonDown event of the FmFormView @@ -427,7 +427,7 @@ public: /// enables or disables all conversion slots in a menu, according to the current selection SAL_DLLPRIVATE void checkControlConversionSlotsForCurrentSelection( Menu& rMenu ); /// executes a control conversion slot for a given object - SAL_DLLPRIVATE bool executeControlConversionSlot( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxObject, sal_uInt16 _nSlotId ); + SAL_DLLPRIVATE bool executeControlConversionSlot( const css::uno::Reference< css::form::XFormComponent >& _rxObject, sal_uInt16 _nSlotId ); /** executes a control conversion slot for the current selection @precond canConvertCurrentSelectionToControl( _nSlotId ) must return */ @@ -454,9 +454,9 @@ public: SAL_DLLPRIVATE inline bool IsSelectionUpdatePending(); SAL_DLLPRIVATE void ForceUpdateSelection(bool bLockInvalidation); - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> getContextDocument() const; - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm> getInternalForm(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& _xForm) const; - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> getInternalForm(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xForm) const; + SAL_DLLPRIVATE css::uno::Reference< css::frame::XModel> getContextDocument() const; + SAL_DLLPRIVATE css::uno::Reference< css::form::XForm> getInternalForm(const css::uno::Reference< css::form::XForm>& _xForm) const; + SAL_DLLPRIVATE css::uno::Reference< css::sdbc::XResultSet> getInternalForm(const css::uno::Reference< css::sdbc::XResultSet>& _xForm) const; // if the form belongs to the controller (extern) displaying a grid, the according internal form will // be displayed, _xForm else @@ -486,10 +486,10 @@ private: // closes the task-local beamer displaying a grid view for a form // ConfigItem related stuff - SAL_DLLPRIVATE virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames) override; + SAL_DLLPRIVATE virtual void Notify( const css::uno::Sequence< OUString >& _rPropertyNames) override; SAL_DLLPRIVATE void implAdjustConfigCache(); - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + SAL_DLLPRIVATE css::uno::Reference< css::awt::XControlContainer > getControlContainerForView(); /** finds and sets a default for m_xCurrentForm, if it is currently NULL @@ -499,7 +499,7 @@ private: /** sets m_xCurrentForm to the provided form, and updates everything which depends on the current form */ - SAL_DLLPRIVATE void impl_updateCurrentForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxNewCurForm ); + SAL_DLLPRIVATE void impl_updateCurrentForm( const css::uno::Reference< css::form::XForm >& _rxNewCurForm ); /** adds or removes ourself as XEventListener at m_xActiveController */ @@ -507,11 +507,11 @@ private: /** add an element */ - SAL_DLLPRIVATE void impl_AddElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); + SAL_DLLPRIVATE void impl_AddElement_nothrow(const css::uno::Reference< css::uno::XInterface>& Element); /** remove an element */ - SAL_DLLPRIVATE void impl_RemoveElement_nothrow(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); + SAL_DLLPRIVATE void impl_RemoveElement_nothrow(const css::uno::Reference< css::uno::XInterface>& Element); SAL_DLLPRIVATE virtual void ImplCommit() override; @@ -527,7 +527,7 @@ public: /** determines whether the current form slot is currently enabled */ - SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, ::com::sun::star::form::runtime::FeatureState* _pCompleteState = NULL ); + SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, css::form::runtime::FeatureState* _pCompleteState = NULL ); protected: DECL_DLLPRIVATE_LINK_TYPED( OnLoadForms, void*, void ); @@ -541,10 +541,10 @@ inline bool FmXFormShell::IsSelectionUpdatePending() // = ein Iterator, der ausgehend von einem Interface ein Objekt sucht, dessen -// = ::com::sun::star::beans::Property-Set eine ControlSource- sowie eine BoundField-Eigenschaft hat, +// = css::beans::Property-Set eine ControlSource- sowie eine BoundField-Eigenschaft hat, // = wobei letztere einen Wert ungleich NULL haben muss. // = Wenn das Interface selber diese Bedingung nicht erfuellt, wird getestet, -// = ob es ein Container ist (also ueber eine ::com::sun::star::container::XIndexAccess verfuegt), dann +// = ob es ein Container ist (also ueber eine css::container::XIndexAccess verfuegt), dann // = wird dort abgestiegen und fuer jedes Element des Containers das selbe // = versucht (wiederum eventuell mit Abstieg). // = Wenn irgendein Objekt dabei die geforderte Eigenschaft hat, entfaellt @@ -554,16 +554,16 @@ inline bool FmXFormShell::IsSelectionUpdatePending() class SearchableControlIterator : public ::comphelper::IndexAccessIterator { OUString m_sCurrentValue; - // der aktuelle Wert der ControlSource-::com::sun::star::beans::Property + // der aktuelle Wert der ControlSource-css::beans::Property public: OUString getCurrentValue() const { return m_sCurrentValue; } public: - SearchableControlIterator(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xStartingPoint); + SearchableControlIterator(css::uno::Reference< css::uno::XInterface> xStartingPoint); - virtual bool ShouldHandleElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& rElement) override; - virtual bool ShouldStepInto(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xContainer) const override; + virtual bool ShouldHandleElement(const css::uno::Reference< css::uno::XInterface>& rElement) override; + virtual bool ShouldStepInto(const css::uno::Reference< css::uno::XInterface>& xContainer) const override; virtual void Invalidate() override { IndexAccessIterator::Invalidate(); m_sCurrentValue.clear(); } }; diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx index 31426f83f275..d5b6daba0b29 100644 --- a/svx/source/inc/fmtextcontrolfeature.hxx +++ b/svx/source/inc/fmtextcontrolfeature.hxx @@ -31,16 +31,16 @@ namespace svx { - typedef ::cppu::WeakImplHelper < ::com::sun::star::frame::XStatusListener + typedef ::cppu::WeakImplHelper < css::frame::XStatusListener > FmTextControlFeature_Base; class FmTextControlFeature : public FmTextControlFeature_Base { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > + css::uno::Reference< css::frame::XDispatch > m_xDispatcher; - ::com::sun::star::util::URL m_aFeatureURL; - ::com::sun::star::uno::Any m_aFeatureState; + css::util::URL m_aFeatureURL; + css::uno::Any m_aFeatureState; SfxSlotId m_nSlotId; ISlotInvalidator* m_pInvalidator; bool m_bFeatureEnabled; @@ -53,15 +53,15 @@ namespace svx the URL which the instance should be responsible for */ FmTextControlFeature( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _rxDispatcher, - const ::com::sun::star::util::URL& _rFeatureURL, + const css::uno::Reference< css::frame::XDispatch >& _rxDispatcher, + const css::util::URL& _rFeatureURL, SfxSlotId _nId, ISlotInvalidator* _pInvalidator ); /// determines whether the feature we're responsible for is currently enabled inline bool isFeatureEnabled( ) const { return m_bFeatureEnabled; } - inline const ::com::sun::star::uno::Any& getFeatureState( ) const { return m_aFeatureState; } + inline const css::uno::Any& getFeatureState( ) const { return m_aFeatureState; } /** dispatches the feature URL to the dispatcher */ @@ -69,7 +69,7 @@ namespace svx /** dispatches the feature URL to the dispatcher, with passing the given arguments */ - void dispatch( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgs ) const; + void dispatch( const css::uno::Sequence< css::beans::PropertyValue >& _rArgs ) const; /// releases any resources associated with this instance void dispose(); @@ -79,8 +79,8 @@ namespace svx protected: // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& State ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; }; diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index 62bfa1f8ee6d..0d3b9b2344d4 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -54,8 +54,8 @@ namespace svx class IFocusObserver { public: - virtual void focusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ) = 0; - virtual void focusLost( const ::com::sun::star::awt::FocusEvent& _rEvent ) = 0; + virtual void focusGained( const css::awt::FocusEvent& _rEvent ) = 0; + virtual void focusLost( const css::awt::FocusEvent& _rEvent ) = 0; protected: ~IFocusObserver() {} @@ -67,7 +67,7 @@ namespace svx class IContextRequestObserver { public: - virtual void contextMenuRequested( const ::com::sun::star::awt::MouseEvent& _rEvent ) = 0; + virtual void contextMenuRequested( const css::awt::MouseEvent& _rEvent ) = 0; protected: ~IContextRequestObserver() {} @@ -78,39 +78,39 @@ namespace svx ,public IContextRequestObserver { private: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > m_xActiveControl; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > m_xActiveTextComponent; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xActiveController; + css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer; + css::uno::Reference< css::awt::XControl > m_xActiveControl; + css::uno::Reference< css::awt::XTextComponent > m_xActiveTextComponent; + css::uno::Reference< css::form::runtime::XFormController > m_xActiveController; #ifndef DONT_REMEMBER_LAST_CONTROL // without this define, m_xActiveControl remembers the *last* active control, even // if it, in the meantime, already lost the focus - bool m_bActiveControl; + bool m_bActiveControl; // so we need an additional boolean flag telling whether the active control // is really focused #endif - bool m_bActiveControlIsReadOnly; - bool m_bActiveControlIsRichText; + bool m_bActiveControlIsReadOnly; + bool m_bActiveControlIsRichText; // listening at all controls of the active controller for focus changes typedef rtl::Reference FocusListenerAdapter; - typedef ::std::vector< FocusListenerAdapter > FocusListenerAdapters; - FocusListenerAdapters m_aControlObservers; + typedef ::std::vector< FocusListenerAdapter > FocusListenerAdapters; + FocusListenerAdapters m_aControlObservers; typedef rtl::Reference MouseListenerAdapter; - MouseListenerAdapter m_aContextMenuObserver; + MouseListenerAdapter m_aContextMenuObserver; // translating between "slots" of the framework and "features" of the active control typedef rtl::Reference ControlFeature; typedef ::std::map< SfxSlotId, ControlFeature, ::std::less< SfxSlotId > > ControlFeatures; - ControlFeatures m_aControlFeatures; + ControlFeatures m_aControlFeatures; - SfxViewFrame* m_pViewFrame; + SfxViewFrame* m_pViewFrame; // invalidating slots - SfxBindings& m_rBindings; - Link m_aControlActivationHandler; - AutoTimer m_aClipboardInvalidation; - bool m_bNeedClipboardInvalidation; + SfxBindings& m_rBindings; + Link m_aControlActivationHandler; + AutoTimer m_aClipboardInvalidation; + bool m_bNeedClipboardInvalidation; public: FmTextControlShell( SfxViewFrame* _pFrame ); @@ -127,10 +127,10 @@ namespace svx /** to be called when a form in our document has been activated */ - void formActivated( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController ); + void formActivated( const css::uno::Reference< css::form::runtime::XFormController >& _rxController ); /** to be called when a form in our document has been deactivated */ - void formDeactivated( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController ); + void formDeactivated( const css::uno::Reference< css::form::runtime::XFormController >& _rxController ); /** notifies the instance that the design mode has changed */ @@ -138,11 +138,11 @@ namespace svx protected: // IFocusObserver - virtual void focusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ) override; - virtual void focusLost( const ::com::sun::star::awt::FocusEvent& _rEvent ) override; + virtual void focusGained( const css::awt::FocusEvent& _rEvent ) override; + virtual void focusLost( const css::awt::FocusEvent& _rEvent ) override; // IContextRequestObserver - virtual void contextMenuRequested( const ::com::sun::star::awt::MouseEvent& _rEvent ) override; + virtual void contextMenuRequested( const css::awt::MouseEvent& _rEvent ) override; // ISlotInvalidator virtual void Invalidate( SfxSlotId _nSlot ) override; @@ -158,14 +158,14 @@ namespace svx FmTextControlFeature* implGetFeatureDispatcher( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& _rxProvider, + const css::uno::Reference< css::frame::XDispatchProvider >& _rxProvider, SfxApplication* _pApplication, SfxSlotId _nSlot ); // fills the given structure with dispatchers for the given slots, for the given control void fillFeatureDispatchers( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl, + const css::uno::Reference< css::awt::XControl >& _rxControl, SfxSlotId* _pZeroTerminatedSlots, ControlFeatures& _rDispatchers ); @@ -178,7 +178,7 @@ namespace svx ); /// to be called when a control has been activated - void controlActivated( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); + void controlActivated( const css::uno::Reference< css::awt::XControl >& _rxControl ); /// to be called when the currently active control has been deactivated void controlDeactivated( ); @@ -188,7 +188,7 @@ namespace svx @precond we don't have an active controller currently */ - void startControllerListening( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController ); + void startControllerListening( const css::uno::Reference< css::form::runtime::XFormController >& _rxController ); /** stops listening at the active controller @precond we have an active controller currently @@ -197,7 +197,7 @@ namespace svx /** parses the given URL's Complete member, by calling XURLTransformer::parseString */ - void impl_parseURL_nothrow( ::com::sun::star::util::URL& _rURL ); + void impl_parseURL_nothrow( css::util::URL& _rURL ); DECL_LINK_TYPED( OnInvalidateClipboard, Timer*, void ); }; diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index 6b6371a4f1cb..a8bad59640c7 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -47,13 +47,13 @@ class SdrObject; class FmUndoPropertyAction: public SdrUndoAction { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xObj; - OUString aPropertyName; - ::com::sun::star::uno::Any aNewValue; - ::com::sun::star::uno::Any aOldValue; + css::uno::Reference< css::beans::XPropertySet> xObj; + OUString aPropertyName; + css::uno::Any aNewValue; + css::uno::Any aOldValue; public: - FmUndoPropertyAction(FmFormModel& rMod, const ::com::sun::star::beans::PropertyChangeEvent& evt); + FmUndoPropertyAction(FmFormModel& rMod, const css::beans::PropertyChangeEvent& evt); virtual void Undo() override; virtual void Redo() override; @@ -64,14 +64,14 @@ public: class FmUndoContainerAction: public SdrUndoAction { - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > + css::uno::Reference< css::container::XIndexContainer > m_xContainer; // container which the action applies to - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > m_xElement; // object not owned by the action - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + css::uno::Reference< css::uno::XInterface > m_xOwnElement; // object owned by the action sal_Int32 m_nIndex; // index of the object within it's container - ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor > + css::uno::Sequence< css::script::ScriptEventDescriptor > m_aEvents; // events of the object public: @@ -87,15 +87,15 @@ private: public: FmUndoContainerAction(FmFormModel& rMod, Action _eAction, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& xCont, - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElem, + const css::uno::Reference< css::container::XIndexContainer >& xCont, + const css::uno::Reference< css::uno::XInterface >& xElem, sal_Int32 nIdx = -1); virtual ~FmUndoContainerAction(); virtual void Undo() override; virtual void Redo() override; - static void DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElem ); + static void DisposeElement( const css::uno::Reference< css::uno::XInterface >& xElem ); protected: void implReInsert( ); @@ -104,11 +104,11 @@ protected: class FmUndoModelReplaceAction : public SdrUndoAction { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> m_xReplaced; + css::uno::Reference< css::awt::XControlModel> m_xReplaced; SdrUnoObj* m_pObject; public: - FmUndoModelReplaceAction(FmFormModel& rMod, SdrUnoObj* pObject, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced); + FmUndoModelReplaceAction(FmFormModel& rMod, SdrUnoObj* pObject, const css::uno::Reference< css::awt::XControlModel>& xReplaced); virtual ~FmUndoModelReplaceAction(); virtual void Undo() override; @@ -116,14 +116,14 @@ public: virtual OUString GetComment() const override; - static void DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced ); + static void DisposeElement( const css::uno::Reference< css::awt::XControlModel>& xReplaced ); }; class SVX_DLLPRIVATE FmXUndoEnvironment - : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::util::XModifyListener + : public ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener + , css::container::XContainerListener + , css::util::XModifyListener > , public SfxListener // public ::cppu::OWeakObject @@ -143,8 +143,8 @@ public: // UNO Anbindung // SMART_UNO_DECLARATION(FmXUndoEnvironment, ::cppu::OWeakObject); - // virtual sal_Bool queryInterface(UsrUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>&); - // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass>> getIdlClasses(); + // virtual sal_Bool queryInterface(UsrUik, css::uno::Reference< css::uno::XInterface>&); + // virtual css::uno::Sequence< css::uno::Reference< css::reflection::XIdlClass>> getIdlClasses(); void Lock() { osl_atomic_increment( &m_Locks ); } void UnLock() { osl_atomic_decrement( &m_Locks ); } @@ -154,8 +154,8 @@ public: struct Accessor { friend class FmFormModel; private: Accessor() { } }; // addition and removal of form collections - void AddForms( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& rForms ); - void RemoveForms( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& rForms ); + void AddForms( const css::uno::Reference< css::container::XNameContainer>& rForms ); + void RemoveForms( const css::uno::Reference< css::container::XNameContainer>& rForms ); // readonly-ness void SetReadOnly( bool bRead, const Accessor& ) { bReadOnly = bRead; } @@ -163,18 +163,18 @@ public: protected: // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw( css::uno::RuntimeException, std::exception ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException, std::exception) override; // XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; void ModeChanged(); void dispose(); @@ -182,15 +182,15 @@ protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; private: - void AddElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); - void RemoveElement(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); - void TogglePropertyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Element); + void AddElement(const css::uno::Reference< css::uno::XInterface>& Element); + void RemoveElement(const css::uno::Reference< css::uno::XInterface>& Element); + void TogglePropertyListening(const css::uno::Reference< css::uno::XInterface>& Element); void implSetModified(); - void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& _rxContainer, bool _bStartListening ); - void switchListening( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxObject, bool _bStartListening ); - ::com::sun::star::uno::Reference< com::sun::star::script::XScriptListener > m_vbaListener; + void switchListening( const css::uno::Reference< css::container::XIndexContainer >& _rxContainer, bool _bStartListening ); + void switchListening( const css::uno::Reference< css::uno::XInterface >& _rxObject, bool _bStartListening ); + css::uno::Reference< css::script::XScriptListener > m_vbaListener; public: // Methoden zur Zuordnung von Controls zu Forms, // werden von der Seite und der UndoUmgebung genutzt diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 41733586d539..c1ad869cc57b 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -81,17 +81,17 @@ namespace svx { // FormViewPageWindowAdapter -typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XIndexAccess - , ::com::sun::star::form::runtime::XFormControllerContext +typedef ::cppu::WeakImplHelper < css::container::XIndexAccess + , css::form::runtime::XFormControllerContext > FormViewPageWindowAdapter_Base; class FormViewPageWindowAdapter : public FormViewPageWindowAdapter_Base { friend class FmXFormView; - ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > > m_aControllerList; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xControlContainer; - css::uno::Reference m_xContext; + ::std::vector< css::uno::Reference< css::form::runtime::XFormController > > m_aControllerList; + css::uno::Reference< css::awt::XControlContainer > m_xControlContainer; + css::uno::Reference m_xContext; FmXFormView* m_pViewImpl; VclPtr m_pWindow; @@ -104,44 +104,44 @@ public: //const SdrPageViewWinRec*, FmXFormView* pView); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 _Index) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _Index) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XFormControllerContext - virtual void SAL_CALL makeVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _Control ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL makeVisible( const css::uno::Reference< css::awt::XControl >& _Control ) throw (css::uno::RuntimeException, std::exception) override; - const ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > >& GetList() {return m_aControllerList;} + const ::std::vector< css::uno::Reference< css::form::runtime::XFormController > >& GetList() {return m_aControllerList;} protected: - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > getController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm ) const; + css::uno::Reference< css::form::runtime::XFormController > getController( const css::uno::Reference< css::form::XForm >& xForm ) const; void setController( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& xForm, - const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxParentController ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getControlContainer() const { return m_xControlContainer; } - void updateTabOrder( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm ); + const css::uno::Reference< css::form::XForm >& xForm, + const css::uno::Reference< css::form::runtime::XFormController >& _rxParentController ); + css::uno::Reference< css::awt::XControlContainer > getControlContainer() const { return m_xControlContainer; } + void updateTabOrder( const css::uno::Reference< css::form::XForm >& _rxForm ); void dispose(); vcl::Window* getWindow() const {return m_pWindow;} }; typedef ::rtl::Reference< FormViewPageWindowAdapter > PFormViewPageWindowAdapter; typedef ::std::vector< PFormViewPageWindowAdapter > PageWindowAdapterList; -typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > - , ::comphelper::OInterfaceCompare< ::com::sun::star::form::XForm > +typedef ::std::set < css::uno::Reference< css::form::XForm > + , ::comphelper::OInterfaceCompare< css::form::XForm > > SetOfForms; -typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > +typedef ::std::map < css::uno::Reference< css::awt::XControlContainer > , SetOfForms - , ::comphelper::OInterfaceCompare< ::com::sun::star::awt::XControlContainer > + , ::comphelper::OInterfaceCompare< css::awt::XControlContainer > > MapControlContainerToSetOfForms; class SdrModel; class FmXFormView : public ::cppu::WeakImplHelper< - ::com::sun::star::form::XFormControllerListener, - ::com::sun::star::awt::XFocusListener, - ::com::sun::star::container::XContainerListener> + css::form::XFormControllerListener, + css::awt::XFocusListener, + css::container::XContainerListener> { friend class FmFormView; friend class FmFormShell; @@ -150,8 +150,8 @@ class FmXFormView : public ::cppu::WeakImplHelper< class ObjectRemoveListener; friend class ObjectRemoveListener; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> m_xWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xLastCreatedControlModel; + css::uno::Reference< css::awt::XWindow> m_xWindow; + css::uno::Reference< css::beans::XPropertySet > m_xLastCreatedControlModel; FmFormObj* m_pMarkedGrid; FmFormView* m_pView; @@ -160,7 +160,7 @@ class FmXFormView : public ::cppu::WeakImplHelper< ImplSVEvent * m_nAutoFocusEvent; // event for asynchronously setting the focus to a control ImplSVEvent * m_nControlWizardEvent; // event for asynchronously setting the focus to a control - ::com::sun::star::sdb::SQLErrorEvent + css::sdb::SQLErrorEvent m_aAsyncError; // error event which is to be displayed asyn. See m_nErrorMessageEvent. PageWindowAdapterList @@ -194,27 +194,27 @@ protected: public: // UNO Anbindung -// ::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; -// ::com::sun::star::container::XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::container::XContainerListener + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw(css::uno::RuntimeException, std::exception) override; -// ::com::sun::star::form::XFormControllerListener - virtual void SAL_CALL formActivated(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL formDeactivated(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XFormControllerListener + virtual void SAL_CALL formActivated(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL formDeactivated(const css::lang::EventObject& rEvent) throw(css::uno::RuntimeException, std::exception) override; // XFocusListener - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override; FmFormView* getView() const {return m_pView;} - PFormViewPageWindowAdapter findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ) const; + PFormViewPageWindowAdapter findWindow( const css::uno::Reference< css::awt::XControlContainer >& _rxCC ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > - getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; + css::uno::Reference< css::form::runtime::XFormController > + getFormController( const css::uno::Reference< css::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; // activation handling inline bool hasEverBeenActivated( ) const { return !m_bFirstActivation; } @@ -238,14 +238,12 @@ public: void breakCreateFormObject(); static bool - isFocusable( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& i_rControl - ); + isFocusable( const css::uno::Reference< css::awt::XControl >& i_rControl ); private: //void addWindow(const SdrPageViewWinRec*); void addWindow(const SdrPageWindow&); - void removeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ); + void removeWindow( const css::uno::Reference< css::awt::XControlContainer >& _rxCC ); void Activate(bool bSync = false); void Deactivate(bool bDeactivateController = true); @@ -256,8 +254,8 @@ private: OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, + const css::uno::Reference< css::beans::XPropertySet >& _rxField, + const css::uno::Reference< css::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, sal_uInt32 _nInventor, @@ -273,13 +271,13 @@ private: OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, + const css::uno::Reference< css::beans::XPropertySet >& _rxField, + const css::uno::Reference< css::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource >& _rxDataSource = NULL, + const css::uno::Reference< css::sdbc::XDataSource >& _rxDataSource = NULL, const OUString& _rDataSourceName = OUString(), const OUString& _rCommand = OUString(), const sal_Int32 _nCommandType = -1 @@ -288,7 +286,7 @@ private: void ObjectRemovedInAliveMode(const SdrObject* pObject); // asynchronously displays an error message. See also OnDelayedErrorMessage. - void displayAsyncErrorMessage( const ::com::sun::star::sdb::SQLErrorEvent& _rEvent ); + void displayAsyncErrorMessage( const css::sdb::SQLErrorEvent& _rEvent ); // cancels all pending async events void cancelEvents(); diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index 5b6dcf2228a1..aceb739699a6 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -65,35 +65,35 @@ namespace svxform */ sal_Int16 initializeControlModel( const DocumentType _eDocType, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, const Rectangle& _rControlBoundRect ); sal_Int16 initializeControlModel( const DocumentType _eDocType, const SdrUnoObj& _rObject ); - sal_Int16 initializeControlModel( const DocumentType _eDocType, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel ); + sal_Int16 initializeControlModel( const DocumentType _eDocType, const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel ); void initializeTextFieldLineEnds( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel + const css::uno::Reference< css::beans::XPropertySet >& _rxModel ); static void initializeFieldDependentProperties( - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDatabaseField, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats + const css::uno::Reference< css::beans::XPropertySet >& _rxDatabaseField, + const css::uno::Reference< css::beans::XPropertySet >& _rxControlModel, + const css::uno::Reference< css::util::XNumberFormats >& _rxNumberFormats ); static OUString getDefaultName( const sal_Int16 nClassId, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo >& _rxObject + const css::uno::Reference< css::lang::XServiceInfo >& _rxObject ); static OUString getDefaultUniqueName_ByComponentType( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject + const css::uno::Reference< css::container::XNameAccess >& _rxContainer, + const css::uno::Reference< css::beans::XPropertySet >& _rxObject ); static OUString getUniqueName( - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxContainer, + const css::uno::Reference< css::container::XNameAccess >& _rxContainer, const OUString& _rBaseName ); diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 6755150a980f..410a6d858cdc 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -79,48 +79,48 @@ #include -struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent> , bool> +struct FmXTextComponentLess : public ::std::binary_function< css::uno::Reference< css::awt::XTextComponent >, css::uno::Reference< css::awt::XTextComponent> , bool> { - bool operator() (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& x, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& y) const + bool operator() (const css::uno::Reference< css::awt::XTextComponent >& x, const css::uno::Reference< css::awt::XTextComponent >& y) const { return reinterpret_cast(x.get()) < reinterpret_cast(y.get()); } }; -typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, OUString, FmXTextComponentLess> FmFilterRow; +typedef ::std::map< css::uno::Reference< css::awt::XTextComponent >, OUString, FmXTextComponentLess> FmFilterRow; typedef ::std::vector< FmFilterRow > FmFilterRows; -typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > > FmFormControllers; +typedef ::std::vector< css::uno::Reference< css::form::runtime::XFormController > > FmFormControllers; namespace vcl { class Window; } namespace svxform { - typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > > FilterComponents; + typedef ::std::vector< css::uno::Reference< css::awt::XTextComponent > > FilterComponents; class ControlBorderManager; struct FmFieldInfo; - typedef cppu::WeakComponentImplHelper < ::com::sun::star::form::runtime::XFormController - , ::com::sun::star::form::runtime::XFilterController - , ::com::sun::star::awt::XFocusListener - , ::com::sun::star::form::XLoadListener - , ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::awt::XTextListener - , ::com::sun::star::awt::XItemListener - , ::com::sun::star::container::XContainerListener - , ::com::sun::star::util::XModifyListener - , ::com::sun::star::form::XConfirmDeleteListener - , ::com::sun::star::sdb::XSQLErrorListener - , ::com::sun::star::sdbc::XRowSetListener - , ::com::sun::star::sdb::XRowSetApproveListener - , ::com::sun::star::form::XDatabaseParameterListener - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::form::XResetListener - , ::com::sun::star::frame::XDispatch - , ::com::sun::star::awt::XMouseListener - , ::com::sun::star::form::validation::XFormComponentValidityListener - , ::com::sun::star::task::XInteractionHandler - , ::com::sun::star::form::XGridControlListener - , ::com::sun::star::form::runtime::XFeatureInvalidation + typedef cppu::WeakComponentImplHelper < css::form::runtime::XFormController + , css::form::runtime::XFilterController + , css::awt::XFocusListener + , css::form::XLoadListener + , css::beans::XPropertyChangeListener + , css::awt::XTextListener + , css::awt::XItemListener + , css::container::XContainerListener + , css::util::XModifyListener + , css::form::XConfirmDeleteListener + , css::sdb::XSQLErrorListener + , css::sdbc::XRowSetListener + , css::sdb::XRowSetApproveListener + , css::form::XDatabaseParameterListener + , css::lang::XServiceInfo + , css::form::XResetListener + , css::frame::XDispatch + , css::awt::XMouseListener + , css::form::validation::XFormComponentValidityListener + , css::task::XInteractionHandler + , css::form::XGridControlListener + , css::form::runtime::XFeatureInvalidation > FormController_BASE; class ColumnInfoCache; @@ -132,22 +132,22 @@ namespace svxform ,public ::svxform::OSQLParserClient { typedef ::std::map < sal_Int16, - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > + css::uno::Reference< css::frame::XDispatch > > DispatcherContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabController> m_xTabController; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> m_xActiveControl, m_xCurrentControl; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xModelAsIndex; - ::com::sun::star::uno::Reference< ::com::sun::star::script::XEventAttacherManager> m_xModelAsManager; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xComponentContext; + css::uno::Reference< css::uno::XAggregation> m_xAggregate; + css::uno::Reference< css::awt::XTabController> m_xTabController; + css::uno::Reference< css::awt::XControl> m_xActiveControl, m_xCurrentControl; + css::uno::Reference< css::container::XIndexAccess> m_xModelAsIndex; + css::uno::Reference< css::script::XEventAttacherManager> m_xModelAsManager; + css::uno::Reference< css::uno::XInterface> m_xParent; + css::uno::Reference< css::uno::XComponentContext> m_xComponentContext; // Composer used for checking filter conditions - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xComposer; - ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > m_xInteractionHandler; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormControllerContext > m_xFormControllerContext; + css::uno::Reference< css::sdb::XSingleSelectQueryComposer > m_xComposer; + css::uno::Reference< css::task::XInteractionHandler > m_xInteractionHandler; + css::uno::Reference< css::form::runtime::XFormControllerContext > m_xFormControllerContext; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> > m_aControls; + css::uno::Sequence< css::uno::Reference< css::awt::XControl> > m_aControls; ::cppu::OInterfaceContainerHelper m_aActivateListeners, m_aModifyListeners, @@ -167,12 +167,12 @@ namespace svxform ::svxform::ControlBorderManager* m_pControlBorderManager; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations > + css::uno::Reference< css::form::runtime::XFormOperations > m_xFormOperations; DispatcherContainer m_aFeatureDispatchers; ::std::set< sal_Int16 > m_aInvalidFeatures; // for asynchronous feature invalidation - OUString m_aMode; + OUString m_aMode; ::svxform::DelayedEvent m_aLoadEvent; ::svxform::DelayedEvent m_aToggleEvent; @@ -201,226 +201,226 @@ namespace svxform bool m_bSuspendFilterTextListening; // no bit field, passed around as reference // as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing - // the ::com::sun::star::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class + // the css::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class typedef std::vector Interceptors; Interceptors m_aControlDispatchInterceptors; public: - FormController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _rxORB ); + FormController( const css::uno::Reference< css::uno::XComponentContext > & _rxORB ); protected: virtual ~FormController(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& type) throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& _rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgs ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& _rURL, const css::uno::Sequence< css::beans::PropertyValue >& _rArgs ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxListener, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::container::XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL getParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setParent(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Parent) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XChild + virtual css::uno::Reference< css::uno::XInterface> SAL_CALL getParent() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setParent(const css::uno::Reference< css::uno::XInterface>& Parent) throw( css::lang::NoSupportException, 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; // OComponentHelper virtual void SAL_CALL disposing() override; // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any & rConvertedValue, ::com::sun::star::uno::Any & rOldValue, - sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw( ::com::sun::star::lang::IllegalArgumentException ) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, + sal_Int32 nHandle, const css::uno::Any& rValue ) + throw( css::lang::IllegalArgumentException ) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw( ::com::sun::star::uno::Exception, std::exception ) override; - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw( css::uno::Exception, std::exception ) override; + virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; using OPropertySetHelper::getFastPropertyValue; // XFilterController - virtual ::sal_Int32 SAL_CALL getFilterComponents() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getDisjunctiveTerms() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addFilterControllerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterControllerListener >& _Listener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeFilterControllerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterControllerListener >& _Listener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 _Component ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getPredicateExpressions() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendEmptyDisjunctiveTerm() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getActiveTerm() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getFilterComponents() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDisjunctiveTerms() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& _Listener ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeFilterControllerListener( const css::uno::Reference< css::form::runtime::XFilterControllerListener >& _Listener ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XControl > SAL_CALL getFilterComponent( ::sal_Int32 _Component ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL getPredicateExpressions() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL appendEmptyDisjunctiveTerm() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getActiveTerm() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XEnumerationAccess + virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::container::XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XContainerListener + virtual void SAL_CALL elementInserted(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL elementReplaced(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL elementRemoved(const css::container::ContainerEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; // XLoadListener - virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL loaded(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL unloaded(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL unloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL reloading(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL reloaded(const css::lang::EventObject& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // XModeSelector - virtual void SAL_CALL setMode(const OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getMode() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setMode(const OUString& Mode) throw( css::lang::NoSupportException, css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getMode() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw( css::uno::RuntimeException, std::exception ) override; - // ::com::sun::star::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::container::XIndexAccess + virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw( css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addModifyListener(const css::uno::Reference< css::util::XModifyListener>& l) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener>& l) throw( css::uno::RuntimeException, std::exception ) override; // XFocusListener - virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL focusGained(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL focusLost(const css::awt::FocusEvent& e) throw( css::uno::RuntimeException, std::exception ) override; // XMouseListener - virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; // XFormComponentValidityListener - virtual void SAL_CALL componentValidityChanged( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL componentValidityChanged( const css::lang::EventObject& _rSource ) throw (css::uno::RuntimeException, std::exception) override; // XInteractionHandler - virtual void SAL_CALL handle( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& Request ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& Request ) throw (css::uno::RuntimeException, std::exception) override; // XGridControlListener - virtual void SAL_CALL columnChanged( const ::com::sun::star::lang::EventObject& _event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL columnChanged( const css::lang::EventObject& _event ) throw (css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::beans::XPropertyChangeListener -> change of states - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::beans::XPropertyChangeListener -> change of states + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override; // XTextListener -> modify setzen - virtual void SAL_CALL textChanged(const ::com::sun::star::awt::TextEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL textChanged(const css::awt::TextEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; // XItemListener -> modify setzen - virtual void SAL_CALL itemStateChanged(const ::com::sun::star::awt::ItemEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL itemStateChanged(const css::awt::ItemEvent& rEvent) throw( css::uno::RuntimeException, std::exception ) override; // XModifyListener -> modify setzen - virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; // XFormController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> SAL_CALL getCurrentControl() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addChildController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _ChildController ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) override; + virtual css::uno::Reference< css::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XControl> SAL_CALL getCurrentControl() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeActivateListener(const css::uno::Reference< css::form::XFormControllerListener>& l) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addChildController( const css::uno::Reference< css::form::runtime::XFormController >& _ChildController ) throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setContext( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormControllerContext >& _context ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _interactionHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::form::runtime::XFormControllerContext > SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setContext( const css::uno::Reference< css::form::runtime::XFormControllerContext >& _context ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& _interactionHandler ) throw (css::uno::RuntimeException, std::exception) override; // XTabController - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> > SAL_CALL getControls() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl> > SAL_CALL getControls() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel>& Model) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel> SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setModel(const css::uno::Reference< css::awt::XTabControllerModel>& Model) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XTabControllerModel> SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL setContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer>& Container) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer> SAL_CALL getContainer() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setContainer(const css::uno::Reference< css::awt::XControlContainer>& Container) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlContainer> SAL_CALL getContainer() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL autoTabOrder() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL activateTabOrder() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL autoTabOrder() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL activateTabOrder() throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL activateFirst() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL activateLast() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL activateFirst() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL activateLast() throw( css::uno::RuntimeException, std::exception ) override; - // com::sun::star::sdbc::XRowSetListener - virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + // css::sdbc::XRowSetListener + virtual void SAL_CALL cursorMoved(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL rowChanged(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL rowSetChanged(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override; // XRowSetApproveListener - virtual sal_Bool SAL_CALL approveCursorMove(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL approveRowChange(const ::com::sun::star::sdb::RowChangeEvent& event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL approveRowSetChange(const ::com::sun::star::lang::EventObject& event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL approveCursorMove(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL approveRowChange(const css::sdb::RowChangeEvent& event) throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL approveRowSetChange(const css::lang::EventObject& event) throw( css::uno::RuntimeException, std::exception ) override; // XRowSetApproveBroadcaster - virtual void SAL_CALL addRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& listener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeRowSetApproveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XRowSetApproveListener>& listener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& listener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeRowSetApproveListener(const css::uno::Reference< css::sdb::XRowSetApproveListener>& listener) throw( css::uno::RuntimeException, std::exception ) override; // XSQLErrorBroadcaster - virtual void SAL_CALL errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL errorOccured(const css::sdb::SQLErrorEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // XSQLErrorListener - virtual void SAL_CALL addSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeSQLErrorListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLErrorListener>& _rListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeSQLErrorListener(const css::uno::Reference< css::sdb::XSQLErrorListener>& _rListener) throw( css::uno::RuntimeException, std::exception ) override; // XDatabaseParameterBroadcaster2 - virtual void SAL_CALL addDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeDatabaseParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeDatabaseParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; // XDatabaseParameterBroadcaster - virtual void SAL_CALL addParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeParameterListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XDatabaseParameterListener>& aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeParameterListener(const css::uno::Reference< css::form::XDatabaseParameterListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; // XDatabaseParameterListener - virtual sal_Bool SAL_CALL approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL approveParameter(const css::form::DatabaseParameterEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // XConfirmDeleteBroadcaster - virtual void SAL_CALL addConfirmDeleteListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XConfirmDeleteListener>& aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeConfirmDeleteListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XConfirmDeleteListener>& aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL addConfirmDeleteListener(const css::uno::Reference< css::form::XConfirmDeleteListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL removeConfirmDeleteListener(const css::uno::Reference< css::form::XConfirmDeleteListener>& aListener) throw( css::uno::RuntimeException, std::exception ) override; // XConfirmDeleteListener - virtual sal_Bool SAL_CALL confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL confirmDelete(const css::sdb::RowChangeEvent& aEvent) throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XResetListener - virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL resetted(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL approveReset(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL resetted(const css::lang::EventObject& rEvent) throw( css::uno::RuntimeException, std::exception ) override; // XFeatureInvalidation - virtual void SAL_CALL invalidateFeatures( const ::com::sun::star::uno::Sequence< ::sal_Int16 >& Features ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL invalidateAllFeatures( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL invalidateFeatures( const css::uno::Sequence< ::sal_Int16 >& Features ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL invalidateAllFeatures( ) throw (css::uno::RuntimeException, std::exception) override; // method for registration - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // comphelper::OPropertyArrayUsageHelper virtual void fillProperties( - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps + css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps, + css::uno::Sequence< css::beans::Property >& /* [out] */ _rAggregateProps ) const override; protected: // DispatchInterceptor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> + virtual css::uno::Reference< css::frame::XDispatch> interceptedQueryDispatch( - const ::com::sun::star::util::URL& aURL, + const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags - ) throw( ::com::sun::star::uno::RuntimeException ) override; + ) throw( css::uno::RuntimeException ) override; virtual ::osl::Mutex* getInterceptorMutex() override { return &m_aMutex; } @@ -440,7 +440,7 @@ namespace svxform /** ensures that we have an interaction handler, if possible If an interaction handler was provided at creation time (initialize), this - one will be used. Else, an attempt is made to create an InteractionHandler + one will be used. Else, an attempt is made to create an InteractionHandler is made. @return @@ -462,38 +462,38 @@ namespace svxform if and only if the control was successfully replaced */ bool replaceControl( - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxExistentControl, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxNewControl + const css::uno::Reference< css::awt::XControl >& _rxExistentControl, + const css::uno::Reference< css::awt::XControl >& _rxNewControl ); // we're listening at all bound controls for modifications - void startControlModifyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl); - void stopControlModifyListening(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl); + void startControlModifyListening(const css::uno::Reference< css::awt::XControl>& xControl); + void stopControlModifyListening(const css::uno::Reference< css::awt::XControl>& xControl); void setLocks(); - void setControlLock(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl); - void addToEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl); - void removeFromEventAttacher(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl); + void setControlLock(const css::uno::Reference< css::awt::XControl>& xControl); + void addToEventAttacher(const css::uno::Reference< css::awt::XControl>& xControl); + void removeFromEventAttacher(const css::uno::Reference< css::awt::XControl>& xControl); void toggleAutoFields(bool bAutoFields); - void unload() throw( ::com::sun::star::uno::RuntimeException ); + void unload() throw( css::uno::RuntimeException ); void removeBoundFieldListener(); - void startFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, bool _bPropertiesOnly ); - void stopFormListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxForm, bool _bPropertiesOnly ); + void startFormListening( const css::uno::Reference< css::beans::XPropertySet >& _rxForm, bool _bPropertiesOnly ); + void stopFormListening( const css::uno::Reference< css::beans::XPropertySet >& _rxForm, bool _bPropertiesOnly ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> findControl( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> >& rCtrls, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& rxCtrlModel, bool _bRemove, bool _bOverWrite ) const; + css::uno::Reference< css::awt::XControl> findControl( css::uno::Sequence< css::uno::Reference< css::awt::XControl> >& rCtrls, const css::uno::Reference< css::awt::XControlModel>& rxCtrlModel, bool _bRemove, bool _bOverWrite ) const; - void insertControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl); - void removeControl(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl); + void insertControl(const css::uno::Reference< css::awt::XControl>& xControl); + void removeControl(const css::uno::Reference< css::awt::XControl>& xControl); /// called when a new control is to be handled by the controller - void implControlInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& _rxControl, bool _bAddToEventAttacher ); + void implControlInserted( const css::uno::Reference< css::awt::XControl>& _rxControl, bool _bAddToEventAttacher ); /// called when a control is not to be handled by the controller anymore - void implControlRemoved( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& _rxControl, bool _bRemoveFromEventAttacher ); + void implControlRemoved( const css::uno::Reference< css::awt::XControl>& _rxControl, bool _bRemoveFromEventAttacher ); /** sets m_xCurrentControl, plus does administrative tasks depending on it */ - void implSetCurrentControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl ); + void implSetCurrentControl( const css::uno::Reference< css::awt::XControl >& _rxControl ); /** invalidates the FormFeatures which depend on the current control */ @@ -522,9 +522,9 @@ namespace svxform vcl::Window* getDialogParentWindow(); // returns the window which should be used as parent window for dialogs - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor> createInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _xInterception); + css::uno::Reference< css::frame::XDispatchProviderInterceptor> createInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterception>& _xInterception); // create a new interceptor, register it on the given object - void deleteInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _xInterception); + void deleteInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterception>& _xInterception); // if createInterceptor was called for the given object the according interceptor will be removed // from the objects interceptor chain and released @@ -547,20 +547,20 @@ namespace svxform */ bool checkFormComponentValidity( OUString& /* [out] */ _rFirstInvalidityExplanation, - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& /* [out] */ _rxFirstInvalidModel + css::uno::Reference< css::awt::XControlModel >& /* [out] */ _rxFirstInvalidModel ); /** locates the control which belongs to a given model */ - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > - locateControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxModel ); + css::uno::Reference< css::awt::XControl > + locateControl( const css::uno::Reference< css::awt::XControlModel >& _rxModel ); // set the text for all filters void impl_setTextOnAllFilter_throw(); // in filter mode we do not listen for changes bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();} - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> isInList(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& xPeer) const; + css::uno::Reference< css::awt::XControl> isInList(const css::uno::Reference< css::awt::XWindowPeer>& xPeer) const; DECL_LINK_TYPED( OnActivateTabOrder, Idle*, void ); DECL_LINK_TYPED( OnInvalidateFeatures, Timer*, void ); diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index 4732a40b528f..f6b9b519e845 100644 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx @@ -86,7 +86,7 @@ namespace svx IControllerFeatureInvalidation* _pInvalidationCallback ); - /** constructs the instance from a XFormController instance + /** constructs the instance from a XFormController instance @param _rxController The form controller which the helper should be responsible for. Must not @@ -96,7 +96,7 @@ namespace svx the callback for invalidating feature states */ ControllerFeatures( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController, + const css::uno::Reference< css::form::runtime::XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback ); @@ -109,7 +109,7 @@ namespace svx /** assign to a controller */ void assign( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController + const css::uno::Reference< css::form::runtime::XFormController >& _rxController ); /// clears the instance so that it cannot be used afterwards @@ -125,8 +125,8 @@ namespace svx //= FormControllerHelper - typedef ::cppu::WeakImplHelper < ::com::sun::star::form::runtime::XFeatureInvalidation - , ::com::sun::star::sdb::XSQLErrorListener + typedef ::cppu::WeakImplHelper < css::form::runtime::XFeatureInvalidation + , css::sdb::XSQLErrorListener > FormControllerHelper_Base; /** is a helper class which manages form controller functionality (such as moveNext etc.). @@ -139,13 +139,13 @@ namespace svx { protected: IControllerFeatureInvalidation* m_pInvalidationCallback; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations > + css::uno::Reference< css::form::runtime::XFormOperations > m_xFormOperations; - ::com::sun::star::uno::Any m_aOperationError; + css::uno::Any m_aOperationError; public: - /** constructs the helper from a XFormController instance + /** constructs the helper from a XFormController instance @param _rxController The form controller which the helper should be responsible for. Must not @@ -154,20 +154,20 @@ namespace svx the callback for invalidating feature states */ FormControllerHelper( - const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _rxController, + const css::uno::Reference< css::form::runtime::XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback ); // forwards to the XFormOperations implementation - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > + css::uno::Reference< css::sdbc::XRowSet > getCursor() const; void getState( sal_Int32 _nSlotId, - ::com::sun::star::form::runtime::FeatureState& _out_rState + css::form::runtime::FeatureState& _out_rState ) const; bool isEnabled( sal_Int32 _nSlotId ) const; void execute( sal_Int32 _nSlotId ) const; - void execute( sal_Int32 _nSlotId, const OUString& _rParamName, const ::com::sun::star::uno::Any& _rParamValue ) const; + void execute( sal_Int32 _nSlotId, const OUString& _rParamName, const css::uno::Any& _rParamValue ) const; bool commitCurrentRecord() const; bool commitCurrentControl( ) const; bool isInsertionRow() const; @@ -186,14 +186,14 @@ namespace svx virtual ~FormControllerHelper(); // XFeatureInvalidation - virtual void SAL_CALL invalidateFeatures( const ::com::sun::star::uno::Sequence< ::sal_Int16 >& Features ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL invalidateAllFeatures() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL invalidateFeatures( const css::uno::Sequence< ::sal_Int16 >& Features ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL invalidateAllFeatures() throw (css::uno::RuntimeException, std::exception) override; // XSQLErrorListener - virtual void SAL_CALL errorOccured( const ::com::sun::star::sdb::SQLErrorEvent& _Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL errorOccured( const css::sdb::SQLErrorEvent& _Event ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; private: enum FormOperation { EXECUTE, EXECUTE_ARGS, COMMIT_CONTROL, COMMIT_RECORD }; @@ -201,11 +201,11 @@ namespace svx bool impl_operateForm_nothrow( const FormOperation _eWhat, const sal_Int16 _nFeature, /* ignore for COMMIT_* */ - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rArguments /* ignore except for EXECUTE_ARGS */ + const css::uno::Sequence< css::beans::NamedValue >& _rArguments /* ignore except for EXECUTE_ARGS */ ) const; bool impl_operateForm_nothrow( const FormOperation _eWhat ) const { - return impl_operateForm_nothrow( _eWhat, 0, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >() ); + return impl_operateForm_nothrow( _eWhat, 0, css::uno::Sequence< css::beans::NamedValue >() ); } private: diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index af6125ccd2ee..44d6dfa5811f 100644 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx @@ -33,8 +33,8 @@ namespace svxform class DispatchInterceptor { public: - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> interceptedQueryDispatch( - const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ) = 0; + virtual css::uno::Reference< css::frame::XDispatch> interceptedQueryDispatch( + const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( css::uno::RuntimeException ) = 0; virtual ::osl::Mutex* getInterceptorMutex() = 0; @@ -47,8 +47,8 @@ namespace svxform //= - typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::frame::XDispatchProviderInterceptor - , ::com::sun::star::lang::XEventListener + typedef ::cppu::WeakComponentImplHelper< css::frame::XDispatchProviderInterceptor + , css::lang::XEventListener > DispatchInterceptionMultiplexer_BASE; class DispatchInterceptionMultiplexer : public DispatchInterceptionMultiplexer_BASE @@ -57,43 +57,43 @@ namespace svxform ::osl::Mutex* m_pMutex; // the component which's dispatches we're intercepting - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProviderInterception > + css::uno::WeakReference< css::frame::XDispatchProviderInterception > m_xIntercepted; - bool m_bListening; + bool m_bListening; // the real interceptor DispatchInterceptor* m_pMaster; // chaining - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xSlaveDispatcher; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xMasterDispatcher; + css::uno::Reference< css::frame::XDispatchProvider> m_xSlaveDispatcher; + css::uno::Reference< css::frame::XDispatchProvider> m_xMasterDispatcher; virtual ~DispatchInterceptionMultiplexer(); public: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception> getIntercepted() const { return m_xIntercepted; } + css::uno::Reference< css::frame::XDispatchProviderInterception> getIntercepted() const { return m_xIntercepted; } public: DispatchInterceptionMultiplexer( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _rToIntercept, + const css::uno::Reference< css::frame::XDispatchProviderInterception>& _rToIntercept, DispatchInterceptor* _pMaster ); // UNO DECLARE_UNO3_DEFAULTS(DispatchInterceptionMultiplexer, DispatchInterceptionMultiplexer_BASE) - // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::frame::XDispatchProvider + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw(css::uno::RuntimeException, std::exception) override; - // ::com::sun::star::frame::XDispatchProviderInterceptor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + // css::frame::XDispatchProviderInterceptor + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSlaveDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewDispatchProvider ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMasterDispatchProvider( const css::uno::Reference< css::frame::XDispatchProvider >& xNewSupplier ) 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; // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx index 219b66c94754..b6885b934583 100644 --- a/svx/source/inc/formfeaturedispatcher.hxx +++ b/svx/source/inc/formfeaturedispatcher.hxx @@ -31,7 +31,7 @@ namespace svx { - typedef ::cppu::WeakImplHelper < ::com::sun::star::frame::XDispatch + typedef ::cppu::WeakImplHelper < css::frame::XDispatch > OSingleFeatureDispatcher_Base; class OSingleFeatureDispatcher : public OSingleFeatureDispatcher_Base @@ -39,13 +39,13 @@ namespace svx private: ::osl::Mutex& m_rMutex; ::cppu::OInterfaceContainerHelper m_aStatusListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations > + css::uno::Reference< css::form::runtime::XFormOperations > m_xFormOperations; - const ::com::sun::star::util::URL m_aFeatureURL; - ::com::sun::star::uno::Any m_aLastKnownState; + const css::util::URL m_aFeatureURL; + css::uno::Any m_aLastKnownState; const sal_Int16 m_nFormFeature; - bool m_bLastKnownEnabled; - bool m_bDisposed; + bool m_bLastKnownEnabled; + bool m_bDisposed; public: /** constructs the dispatcher @@ -64,9 +64,9 @@ namespace svx @see dispose */ OSingleFeatureDispatcher( - const ::com::sun::star::util::URL& _rFeatureURL, + const css::util::URL& _rFeatureURL, const sal_Int16 _nFormFeature, - const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations >& _rxFormOperations, + const css::uno::Reference< css::form::runtime::XFormOperations >& _rxFormOperations, ::osl::Mutex& _rMutex ); @@ -76,9 +76,9 @@ namespace svx protected: // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& _rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArguments ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxControl, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispatch( const css::util::URL& _rURL, const css::uno::Sequence< css::beans::PropertyValue >& _rArguments ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& _rxControl, const css::util::URL& _rURL ) throw (css::uno::RuntimeException, std::exception) override; protected: /** notifies our current state to one or all listeners @@ -92,7 +92,7 @@ namespace svx for actually doing the notification(s) */ void notifyStatus( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, + const css::uno::Reference< css::frame::XStatusListener >& _rxListener, ::osl::ClearableMutexGuard& _rFreeForNotification ); @@ -100,7 +100,7 @@ namespace svx /** checks whether our instance is alive If the instance already received a dispose call, then a - DisposedException is thrown. + DisposedException is thrown. @precond our Mutex is locked - else calling the method would not make sense, since @@ -114,7 +114,7 @@ namespace svx @precond our mutex is locked */ - void getUnoState( ::com::sun::star::frame::FeatureStateEvent& /* [out] */ _rState ) const; + void getUnoState( css::frame::FeatureStateEvent& /* [out] */ _rState ) const; }; diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index 0db4a8baa11c..075e4e0d6cf3 100644 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -29,8 +29,7 @@ namespace svxform class FormToolboxes { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > - m_xLayouter; + css::uno::Reference< css::frame::XLayoutManager > m_xLayouter; public: /** constructs an instance @@ -38,7 +37,7 @@ namespace svxform the frame to analyze */ SVX_DLLPUBLIC FormToolboxes( - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame + const css::uno::Reference< css::frame::XFrame >& _rxFrame ); public: diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index ce301131705e..2cc5c0fe92ab 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -66,8 +66,8 @@ class DbGridColumn { friend class DbGridControl; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xModel; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xField; // Verbindung zum Datenbankfeld + css::uno::Reference< css::beans::XPropertySet > m_xModel; + css::uno::Reference< css::beans::XPropertySet > m_xField; // Verbindung zum Datenbankfeld ::svt::CellControllerRef m_xController; // Struktur zum Verwalten der Controls fuer eine Spalte // diese wird von der DbBrowseBox auf die jeweiligen Zellen // einer Spalte positioniert @@ -105,7 +105,7 @@ public: ,m_nTypeId(0) ,m_nId(_nId) ,m_nFieldPos(-1) - ,m_nAlign(::com::sun::star::awt::TextAlign::LEFT) + ,m_nAlign(css::awt::TextAlign::LEFT) ,m_bReadOnly(false) ,m_bAutoValue(false) ,m_bInSave(false) @@ -119,8 +119,8 @@ public: ~DbGridColumn(); - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& getModel() const { return m_xModel; } - void setModel(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xModel); + const css::uno::Reference< css::beans::XPropertySet >& getModel() const { return m_xModel; } + void setModel(css::uno::Reference< css::beans::XPropertySet > _xModel); sal_uInt16 GetId() const {return m_nId;} @@ -132,46 +132,46 @@ public: bool IsHidden() const {return m_bHidden;} sal_Int32 GetKey() const {return m_nFormatKey;} const ::svt::CellControllerRef& GetController() const {return m_bLocked ? s_xEmptyController : m_xController;} - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& GetField() const {return m_xField;} + const css::uno::Reference< css::beans::XPropertySet >& GetField() const {return m_xField;} DbGridControl& GetParent() const {return m_rParent;} FmXGridCell* GetCell() const {return m_pCell;} - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn > GetCurrentFieldValue() const; + css::uno::Reference< css::sdb::XColumn > GetCurrentFieldValue() const; // Zeichnen eines Feldes an einer Position, ist ein View gesetzt // uebernimmt dieser das Zeichnen, z.B. fuer CheckBoxen void Paint(OutputDevice& rDev, const Rectangle& rRect, const DbGridRow* pRow, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); + const css::uno::Reference< css::util::XNumberFormatter >& xFormatter); // Inititialierung im alive mode // Ist kein ColumnController gesetzt, wird eine DefaultInitialisierung // vorgenommen - void CreateControl(sal_Int32 _nFieldPos, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xField, sal_Int32 nTypeId); + void CreateControl(sal_Int32 _nFieldPos, const css::uno::Reference< css::beans::XPropertySet >& xField, sal_Int32 nTypeId); void UpdateControl() { - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xField(m_xField); + css::uno::Reference< css::beans::XPropertySet > xField(m_xField); CreateControl(m_nFieldPos, xField, m_nTypeId); } // Editieren einer Zelle - void UpdateFromField(const DbGridRow* pRow, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); + void UpdateFromField(const DbGridRow* pRow, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter); bool Commit(); // freigeben aller Daten, die fuer den AliveMode noetig sind void Clear(); - OUString GetCellText(const DbGridRow* pRow, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const; - OUString GetCellText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& xField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const; + OUString GetCellText(const DbGridRow* pRow, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) const; + OUString GetCellText(const css::uno::Reference< css::sdb::XColumn >& xField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) const; void SetReadOnly(bool bRead){m_bReadOnly = bRead;} void SetObject(sal_Int16 nPos) {m_bObject = m_bReadOnly = true; m_nFieldPos = nPos;} void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ); - // Properties, die auf den ::com::sun::star::frame::Controller durchschlagen koennen + // Properties, die auf den css::frame::Controller durchschlagen koennen sal_Int16 SetAlignment(sal_Int16 _nAlign); // if _nAlign is -1, the alignment is calculated from the type of the field we are bound to // the value really set is returned @@ -208,7 +208,7 @@ private: bool m_bAlignedController : 1; bool m_bAccessingValueProperty : 1; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > + css::uno::Reference< css::sdbc::XRowSet > m_xCursor; protected: @@ -218,7 +218,7 @@ protected: protected: // attribute access - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& getCursor() const { return m_xCursor; } + const css::uno::Reference< css::sdbc::XRowSet >& getCursor() const { return m_xCursor; } // control transparency inline bool isTransparent( ) const { return m_bTransparent; } @@ -254,7 +254,7 @@ protected: // called whenever a property which affects field settings in general is called // you should overwrite this method for every property you add yourself as listener to // with doPropertyListening - virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); + virtual void implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ); // called by _propertyChanged if a property which denotes the column value has changed void implValuePropertyChanged( ); @@ -280,26 +280,26 @@ public: void SetTextLineColor(const Color& _rColor); // Initialisieren bevor ein Control angezeigt wird - virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); + virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ); virtual ::svt::CellControllerRef CreateController() const = 0; // Schreiben des Wertes in das Model bool Commit(); // Formatting the field data to output text - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) = 0; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) = 0; virtual void Update(){} // Refresh the control by the field data - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) = 0; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) = 0; // Painten eines Zellinhalts im vorgegeben Rechteck - virtual void PaintFieldToCell( OutputDevice& rDev, const Rectangle& rRect, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); + virtual void PaintFieldToCell( OutputDevice& rDev, const Rectangle& rRect, const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter); virtual void PaintCell( OutputDevice& _rDev, const Rectangle& _rRect ); void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ); - double GetValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const; + double GetValue(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) const; protected: void invalidatedController(); @@ -321,20 +321,20 @@ protected: @see commitControl */ - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) = 0; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) = 0; protected: // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override; private: void implDoPropertyListening( const OUString& _rPropertyName, bool _bWarnIfNotExistent = true ); /// updates the "readonly" setting on m_pWindow, according to the respective property value in the given model - void implAdjustReadOnly( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel,bool i_bReadOnly ); + void implAdjustReadOnly( const css::uno::Reference< css::beans::XPropertySet >& _rxModel,bool i_bReadOnly ); /// updates the "enabled" setting on m_pWindow, according to the respective property value in the given model - void implAdjustEnabled( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); + void implAdjustEnabled( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ); }; @@ -371,7 +371,7 @@ protected: protected: // DbCellControl - virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) override; + virtual void implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; protected: void implSetMaxTextLen( sal_Int16 _nMaxLen ) @@ -398,18 +398,18 @@ public: ::svt::IEditImplementation* GetEditImplementation() { return m_pEdit; } bool IsSimpleEdit() const { return m_bIsSimpleEdit; } - virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) override; - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; virtual ::svt::CellControllerRef CreateController() const override; virtual void PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter ) override; + const css::uno::Reference< css::sdb::XColumn >& _rxField, + const css::uno::Reference< css::util::XNumberFormatter >& _rxFormatter ) override; protected: // DbCellControl virtual bool commitControl( ) override; - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) override; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; // DbLimitedLengthField virtual void implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen ) override; }; @@ -418,7 +418,7 @@ protected: class DbFormattedField : public DbLimitedLengthField { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xSupplier; + css::uno::Reference< css::util::XNumberFormatsSupplier > m_xSupplier; sal_Int16 m_nKeyType; @@ -428,18 +428,18 @@ public: virtual ~DbFormattedField(); - virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) override; - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; virtual ::svt::CellControllerRef CreateController() const override; protected: // DbCellControl virtual bool commitControl( ) override; - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) override; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override; }; @@ -449,18 +449,18 @@ public: TYPEINFO_OVERRIDE(); DbCheckBox(DbGridColumn& _rColumn); - virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) override; - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; virtual ::svt::CellControllerRef CreateController() const override; virtual void PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + const css::uno::Reference< css::sdb::XColumn >& _rxField, + const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; protected: // DbCellControl virtual bool commitControl( ) override; - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) override; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; }; @@ -471,50 +471,50 @@ public: TYPEINFO_OVERRIDE(); DbComboBox(DbGridColumn& _rColumn); - virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) override; - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; virtual ::svt::CellControllerRef CreateController() const override; - void SetList(const ::com::sun::star::uno::Any& rItems); + void SetList(const css::uno::Any& rItems); protected: // DbCellControl virtual bool commitControl( ) override; - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) override; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; - virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) override; + virtual void implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override; }; class DbListBox :public DbCellControl { bool m_bBound : 1; - ::com::sun::star::uno::Sequence< OUString > m_aValueList; + css::uno::Sequence< OUString > m_aValueList; public: TYPEINFO_OVERRIDE(); DbListBox(DbGridColumn& _rColumn); - virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) override; - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; virtual ::svt::CellControllerRef CreateController() const override; - void SetList(const ::com::sun::star::uno::Any& rItems); + void SetList(const css::uno::Any& rItems); protected: // DbCellControl virtual bool commitControl( ) override; - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) override; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; - virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) override; + virtual void implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; // OPropertyChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw(css::uno::RuntimeException) override; }; @@ -523,17 +523,17 @@ class DbPatternField : public DbCellControl public: TYPEINFO_OVERRIDE(); DbPatternField( DbGridColumn& _rColumn, const css::uno::Reference& _rContext ); - virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) override; - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; virtual ::svt::CellControllerRef CreateController() const override; protected: /// DbCellControl virtual bool commitControl( ) override; - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) override; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; - virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) override; + virtual void implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; private: OUString impl_formatText(const OUString& _rText); @@ -554,17 +554,17 @@ public: TYPEINFO_OVERRIDE(); protected: - DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign = com::sun::star::awt::TextAlign::RIGHT ); + DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign = css::awt::TextAlign::RIGHT ); public: - virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& _rxCursor ) override; + virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& _rxCursor ) override; virtual ::svt::CellControllerRef CreateController() const override; protected: virtual VclPtr createField( vcl::Window* _pParent, WinBits _nFieldStyle, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel + const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) = 0; }; @@ -574,23 +574,23 @@ class DbDateField : public DbSpinField public: TYPEINFO_OVERRIDE(); DbDateField(DbGridColumn& _rColumn); - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; protected: // DbCellControl virtual bool commitControl( ) override; - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) override; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; // DbSpinField virtual VclPtr createField( vcl::Window* _pParent, WinBits _nFieldStyle, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel + const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; /// initializes everything which relates to the properties describing the numeric behaviour - virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) override; + virtual void implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; }; @@ -599,23 +599,23 @@ class DbTimeField : public DbSpinField public: TYPEINFO_OVERRIDE(); DbTimeField(DbGridColumn& _rColumn); - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; protected: // DbCellControl virtual bool commitControl( ) override; - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) override; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; // DbSpinField virtual VclPtr createField( vcl::Window* _pParent, WinBits _nFieldStyle, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel + const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; /// initializes everything which relates to the properties describing the numeric behaviour - virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) override; + virtual void implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; }; @@ -626,25 +626,25 @@ class DbCurrencyField : public DbSpinField public: TYPEINFO_OVERRIDE(); DbCurrencyField(DbGridColumn& _rColumn); - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; - double GetCurrency(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) const; + double GetCurrency(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) const; protected: // DbCellControl virtual bool commitControl( ) override; - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) override; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; // DbSpinField virtual VclPtr createField( vcl::Window* _pParent, WinBits _nFieldStyle, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel + const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; /// initializes everything which relates to the properties describing the numeric behaviour - virtual void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) override; + virtual void implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; }; @@ -653,23 +653,23 @@ class DbNumericField : public DbSpinField public: TYPEINFO_OVERRIDE(); DbNumericField(DbGridColumn& _rColumn); - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; protected: // DbCellControl virtual bool commitControl( ) override; - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) override; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; // DbSpinField virtual VclPtr createField( vcl::Window* _pParent, WinBits _nFieldStyle, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel + const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; /// initializes everything which relates to the properties describing the numeric behaviour - void implAdjustGenericFieldSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ) override; + void implAdjustGenericFieldSetting( const css::uno::Reference< css::beans::XPropertySet >& _rxModel ) override; }; @@ -687,15 +687,15 @@ class DbFilterField public: TYPEINFO_OVERRIDE(); - DbFilterField(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, DbGridColumn& _rColumn); + DbFilterField(const css::uno::Reference< css::uno::XComponentContext >& rxContext, DbGridColumn& _rColumn); virtual ~DbFilterField(); - virtual void Init( vcl::Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ) override; + virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; virtual ::svt::CellControllerRef CreateController() const override; virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect) override; virtual void Update() override; - virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; - virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL) override; + virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; const OUString& GetText() const {return m_aText;} void SetText(const OUString& rText); @@ -706,21 +706,21 @@ protected: // DbCellControl virtual bool commitControl( ) override; - virtual void updateFromModel( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _rxModel ) override; + virtual void updateFromModel( css::uno::Reference< css::beans::XPropertySet > _rxModel ) override; protected: - void SetList(const ::com::sun::star::uno::Any& rItems, bool bComboBox); - void CreateControl(vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xModel); + void SetList(const css::uno::Any& rItems, bool bComboBox); + void CreateControl(vcl::Window* pParent, const css::uno::Reference< css::beans::XPropertySet >& xModel); DECL_LINK_TYPED( OnClick, VclPtr, void ); }; // Base class providing the access to a grid cell -typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::XControl - , ::com::sun::star::form::XBoundControl +typedef ::cppu::ImplHelper2 < css::awt::XControl + , css::form::XBoundControl > FmXGridCell_Base; -typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XWindow +typedef ::cppu::ImplHelper1 < css::awt::XWindow > FmXGridCell_WindowBase; class FmXGridCell :public ::cppu::OComponentHelper ,public FmXGridCell_Base @@ -747,58 +747,58 @@ public: void init(); DECLARE_UNO3_AGG_DEFAULTS(FmXGridCell, OComponentHelper) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; void SetTextLineColor(); void SetTextLineColor(const Color& _rColor); // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; // OComponentHelper virtual void SAL_CALL disposing() override; -// ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override {OComponentHelper::dispose();} - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener)throw(::com::sun::star::uno::RuntimeException, std::exception) override { OComponentHelper::addEventListener(aListener);} - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener)throw(::com::sun::star::uno::RuntimeException, std::exception) override { OComponentHelper::removeEventListener(aListener);} +// css::lang::XComponent + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override {OComponentHelper::dispose();} + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener)throw(css::uno::RuntimeException, std::exception) override { OComponentHelper::addEventListener(aListener);} + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener)throw(css::uno::RuntimeException, std::exception) override { OComponentHelper::removeEventListener(aListener);} -// ::com::sun::star::awt::XControl - virtual void SAL_CALL setContext(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& /*Context*/) throw(::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& /*Toolkit*/, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& /*Parent*/) throw(::com::sun::star::uno::RuntimeException, std::exception) override {} +// css::awt::XControl + virtual void SAL_CALL setContext(const css::uno::Reference< css::uno::XInterface >& /*Context*/) throw(css::uno::RuntimeException, std::exception) override {} + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit >& /*Toolkit*/, const css::uno::Reference< css::awt::XWindowPeer >& /*Parent*/) throw(css::uno::RuntimeException, std::exception) override {} - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer() throw (::com::sun::star::uno::RuntimeException, std::exception) override {return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > ();} - virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& /*Model*/) throw (::com::sun::star::uno::RuntimeException, std::exception) override {return sal_False;} - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView() throw (::com::sun::star::uno::RuntimeException, std::exception) override {return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > ();} - virtual void SAL_CALL setDesignMode(sal_Bool /*bOn*/) throw (::com::sun::star::uno::RuntimeException, std::exception) override {} - virtual sal_Bool SAL_CALL isDesignMode() throw (::com::sun::star::uno::RuntimeException, std::exception) override {return sal_False;} - virtual sal_Bool SAL_CALL isTransparent() throw (::com::sun::star::uno::RuntimeException, std::exception) override {return sal_False;} + virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() throw (css::uno::RuntimeException, std::exception) override {return css::uno::Reference< css::awt::XWindowPeer > ();} + virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& /*Model*/) throw (css::uno::RuntimeException, std::exception) override {return sal_False;} + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override {return css::uno::Reference< css::awt::XView > ();} + virtual void SAL_CALL setDesignMode(sal_Bool /*bOn*/) throw (css::uno::RuntimeException, std::exception) override {} + virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) override {return sal_False;} + virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) override {return sal_False;} -// ::com::sun::star::form::XBoundControl - virtual sal_Bool SAL_CALL getLock() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLock(sal_Bool _bLock) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::form::XBoundControl + virtual sal_Bool SAL_CALL getLock() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLock(sal_Bool _bLock) throw(css::uno::RuntimeException, std::exception) override; // XWindow - virtual void SAL_CALL setPosSize( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosSize( ::sal_Int32 X, ::sal_Int32 Y, ::sal_Int32 Width, ::sal_Int32 Height, ::sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; bool Commit() {return m_pCellControl->Commit();} void ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _eInitWhat ) @@ -813,8 +813,8 @@ protected: virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ); // default implementations call our focus listeners, don't forget to call them if you override this - virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ); - virtual void onFocusLost( const ::com::sun::star::awt::FocusEvent& _rEvent ); + virtual void onFocusGained( const css::awt::FocusEvent& _rEvent ); + virtual void onFocusLost( const css::awt::FocusEvent& _rEvent ); private: DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void ); @@ -832,11 +832,11 @@ public: virtual void PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& xField, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); + const css::uno::Reference< css::sdb::XColumn >& xField, + const css::uno::Reference< css::util::XNumberFormatter >& xFormatter); - void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& xField, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) + void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& xField, + const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) { m_pCellControl->UpdateFromField(xField, xFormatter); } protected: @@ -868,18 +868,18 @@ public: virtual void PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& xField, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter) override; + const css::uno::Reference< css::sdb::XColumn >& xField, + const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; - OUString GetText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, - Color** ppColor = NULL) + OUString GetText(const css::uno::Reference< css::sdb::XColumn >& _rxField, + const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, + Color** ppColor = NULL) {return m_pCellControl->GetFormatText(_rxField, xFormatter, ppColor);} }; -typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::XTextComponent - , ::com::sun::star::form::XChangeBroadcaster +typedef ::cppu::ImplHelper2 < css::awt::XTextComponent + , css::form::XChangeBroadcaster > FmXEditCell_Base; class FmXEditCell : public FmXTextCell, public FmXEditCell_Base @@ -898,46 +898,46 @@ public: FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl ); DECLARE_UNO3_AGG_DEFAULTS(FmXEditCell, FmXTextCell) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; // OComponentHelper virtual void SAL_CALL disposing() override; -// ::com::sun::star::awt::XTextComponent - virtual void SAL_CALL addTextListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTextListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText(const OUString& aText) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertText(const ::com::sun::star::awt::Selection& Sel, const OUString& Text) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSelection(const ::com::sun::star::awt::Selection& aSelection) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Selection SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isEditable() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEditable(sal_Bool bEditable) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getMaxTextLen() throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::awt::XTextComponent + virtual void SAL_CALL addTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setText(const OUString& aText) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertText(const css::awt::Selection& Sel, const OUString& Text) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSelectedText() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSelection(const css::awt::Selection& aSelection) throw(css::uno::RuntimeException, std::exception) override; + virtual css::awt::Selection SAL_CALL getSelection() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isEditable() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEditable(sal_Bool bEditable) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getMaxTextLen() throw(css::uno::RuntimeException, std::exception) override; // XChangeBroadcaster - virtual void SAL_CALL addChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChangeListener( const css::uno::Reference< css::form::XChangeListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeChangeListener( const css::uno::Reference< css::form::XChangeListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; protected: virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; - virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ) override; - virtual void onFocusLost( const ::com::sun::star::awt::FocusEvent& _rEvent ) override; + virtual void onFocusGained( const css::awt::FocusEvent& _rEvent ) override; + virtual void onFocusLost( const css::awt::FocusEvent& _rEvent ) override; private: void onTextChanged(); }; -typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::XCheckBox - , ::com::sun::star::awt::XButton +typedef ::cppu::ImplHelper2 < css::awt::XCheckBox + , css::awt::XButton > FmXCheckBoxCell_Base; class FmXCheckBoxCell : public FmXDataCell, public FmXCheckBoxCell_Base @@ -955,26 +955,26 @@ public: // UNO DECLARE_UNO3_AGG_DEFAULTS(FmXCheckBoxCell, FmXDataCell) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; // OComponentHelper virtual void SAL_CALL disposing() override; -// ::com::sun::star::awt::XCheckBox - virtual void SAL_CALL addItemListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItemListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getState() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setState(sal_Int16 n) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLabel(const OUString& Label) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enableTriState(sal_Bool b) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::awt::XCheckBox + virtual void SAL_CALL addItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getState() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setState(sal_Int16 n) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLabel(const OUString& Label) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enableTriState(sal_Bool b) throw(css::uno::RuntimeException, std::exception) override; // XButton - virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - //virtual void SAL_CALL setLabel( const OUString& Label ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActionCommand( const OUString& Command ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& l ) throw (css::uno::RuntimeException, std::exception) override; + //virtual void SAL_CALL setLabel( const OUString& Label ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setActionCommand( const OUString& Command ) throw (css::uno::RuntimeException, std::exception) override; protected: virtual vcl::Window* getEventWindow() const override; @@ -982,7 +982,7 @@ protected: }; -typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XListBox +typedef ::cppu::ImplHelper1 < css::awt::XListBox > FmXListBoxCell_Base; class FmXListBoxCell :public FmXTextCell ,public FmXListBoxCell_Base @@ -998,36 +998,36 @@ public: FmXListBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl ); DECLARE_UNO3_AGG_DEFAULTS(FmXListBoxCell, FmXTextCell) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; // OComponentHelper virtual void SAL_CALL disposing() override; -// ::com::sun::star::awt::XListBox - virtual void SAL_CALL addItemListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItemListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItem(const OUString& aItem, sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItems(const ::com::sun::star::uno::Sequence< OUString >& aItems, sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItems(sal_Int16 nPos, sal_Int16 nCount) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getItemCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getItem(sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getSelectedItemPos() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedItem() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL selectItemPos(sal_Int16 nPos, sal_Bool bSelect) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL selectItemsPos(const ::com::sun::star::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL selectItem(const OUString& aItem, sal_Bool bSelect) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isMutipleMode() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL setMultipleMode(sal_Bool bMulti) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getDropDownLineCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL setDropDownLineCount(sal_Int16 nLines) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::awt::XListBox + virtual void SAL_CALL addItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeItemListener(const css::uno::Reference< css::awt::XItemListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionListener(const css::uno::Reference< css::awt::XActionListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeActionListener(const css::uno::Reference< css::awt::XActionListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addItem(const OUString& aItem, sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addItems(const css::uno::Sequence< OUString >& aItems, sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeItems(sal_Int16 nPos, sal_Int16 nCount) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getItemCount() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getItem(sal_Int16 nPos) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getItems() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getSelectedItemPos() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSelectedItemsPos() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSelectedItem() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedItems() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SAL_CALL selectItemPos(sal_Int16 nPos, sal_Bool bSelect) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SAL_CALL selectItemsPos(const css::uno::Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SAL_CALL selectItem(const OUString& aItem, sal_Bool bSelect) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isMutipleMode() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SAL_CALL setMultipleMode(sal_Bool bMulti) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getDropDownLineCount() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SAL_CALL setDropDownLineCount(sal_Int16 nLines) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(css::uno::RuntimeException, std::exception) override; protected: virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; @@ -1036,7 +1036,7 @@ protected: }; -typedef ::cppu::ImplHelper1 < ::com::sun::star::awt::XComboBox +typedef ::cppu::ImplHelper1 < css::awt::XComboBox > FmXComboBoxCell_Base; class FmXComboBoxCell :public FmXTextCell ,public FmXComboBoxCell_Base @@ -1053,34 +1053,34 @@ public: FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl ); DECLARE_UNO3_AGG_DEFAULTS(FmXListBoxCell, FmXTextCell) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; // OComponentHelper virtual void SAL_CALL disposing() override; // XComboBox - virtual void SAL_CALL addItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItem( const OUString& _Item, ::sal_Int16 _Pos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& _Items, ::sal_Int16 _Pos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getItem( ::sal_Int16 _Pos ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addItemListener( const css::uno::Reference< css::awt::XItemListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeItemListener( const css::uno::Reference< css::awt::XItemListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addItem( const OUString& _Item, ::sal_Int16 _Pos ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addItems( const css::uno::Sequence< OUString >& _Items, ::sal_Int16 _Pos ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getItem( ::sal_Int16 _Pos ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getItems( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (css::uno::RuntimeException, std::exception) override; protected: virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; }; -typedef ::cppu::ImplHelper2 < ::com::sun::star::awt::XTextComponent - , ::com::sun::star::lang::XUnoTunnel +typedef ::cppu::ImplHelper2 < css::awt::XTextComponent + , css::lang::XUnoTunnel > FmXFilterCell_Base; class FmXFilterCell :public FmXGridCell ,public FmXFilterCell_Base @@ -1094,15 +1094,15 @@ public: DECLARE_UNO3_AGG_DEFAULTS(FmXFilterCell, FmXGridCell) - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override; // helpers for XUnoTunnel - static const ::com::sun::star::uno::Sequence& getUnoTunnelId(); + static const css::uno::Sequence& getUnoTunnelId(); // painting the filter text void PaintCell(OutputDevice& rDev, const Rectangle& rRect); @@ -1111,19 +1111,19 @@ public: // OComponentHelper virtual void SAL_CALL disposing() override; -// ::com::sun::star::awt::XTextComponent - virtual void SAL_CALL addTextListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeTextListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText(const OUString& aText) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertText(const ::com::sun::star::awt::Selection& Sel, const OUString& Text) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSelection(const ::com::sun::star::awt::Selection& aSelection) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::awt::Selection SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isEditable() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEditable(sal_Bool bEditable) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getMaxTextLen() throw(::com::sun::star::uno::RuntimeException, std::exception) override; +// css::awt::XTextComponent + virtual void SAL_CALL addTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeTextListener(const css::uno::Reference< css::awt::XTextListener >& l) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setText(const OUString& aText) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertText(const css::awt::Selection& Sel, const OUString& Text) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSelectedText() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setSelection(const css::awt::Selection& aSelection) throw(css::uno::RuntimeException, std::exception) override; + virtual css::awt::Selection SAL_CALL getSelection() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isEditable() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setEditable(sal_Bool bEditable) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setMaxTextLen(sal_Int16 nLen) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getMaxTextLen() throw(css::uno::RuntimeException, std::exception) override; protected: DECL_LINK_TYPED( OnCommit, DbFilterField&, void ); diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index 4a4084b37e28..3ab1663ed2d9 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -36,23 +36,23 @@ namespace svxform class DataColumn { // interfaces needed for sddb::Column - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xPropertySet; + css::uno::Reference< css::beans::XPropertySet> m_xPropertySet; // interfaces needed for sdb::DataColumn - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn> m_xColumn; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate> m_xColumnUpdate; + css::uno::Reference< css::sdb::XColumn> m_xColumn; + css::uno::Reference< css::sdb::XColumnUpdate> m_xColumnUpdate; public: DataColumn() { }; - DataColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxIFace); + DataColumn(const css::uno::Reference< css::beans::XPropertySet>& _rxIFace); // if the object behind _rxIFace doesn't fully support the DataColumn service, // (which is checked via the supported interfaces) _all_ members will be set to // void !, even if the object has some of the needed interfaces. DataColumn* operator ->() { return this; } - operator ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> () const{ return m_xColumn.get(); } + operator css::uno::Reference< css::uno::XInterface> () const{ return m_xColumn.get(); } // 'conversions' - inline const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& getColumn() const + inline const css::uno::Reference< css::sdb::XColumn>& getColumn() const { return m_xColumn; } diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index f7cc610394be..0151f2cae9c3 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -42,19 +42,19 @@ namespace svxform class SVX_DLLPUBLIC OSQLParserClient : public ::svxform::OParseContextClient { private: - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; protected: mutable std::shared_ptr< ::connectivity::OSQLParser > m_pParser; OSQLParserClient( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext); + const css::uno::Reference< css::uno::XComponentContext >& rxContext); std::shared_ptr< ::connectivity::OSQLParseNode > predicateTree( OUString& _rErrorMessage, const OUString& _rStatement, - const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField + const css::uno::Reference< css::util::XNumberFormatter >& _rxFormatter, + const css::uno::Reference< css::beans::XPropertySet >& _rxField ) const; }; diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 848daf1cf609..35ab8e744e68 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -55,11 +55,11 @@ class SvxPixelCtl; typedef ::cppu::WeakAggComponentImplHelper5< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::lang::XServiceInfo > + css::accessibility::XAccessible, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleEventBroadcaster, + css::lang::XServiceInfo > SvxPixelCtlAccessibleChild_BASE; class SvxPixelCtlAccessibleChild : @@ -67,7 +67,7 @@ class SvxPixelCtlAccessibleChild : public SvxPixelCtlAccessibleChild_BASE { SvxPixelCtl& mrParentWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent; + css::uno::Reference< css::accessibility::XAccessible > mxParent; bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color Rectangle* mpBoundingBox; /// index of child in parent @@ -79,70 +79,70 @@ public: SvxPixelCtl& rWindow, bool bPixelColorOrBG, const Rectangle& rBounds, - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xParent, + const css::uno::Reference< css::accessibility::XAccessible >& xParent, long nIndexInParent ); virtual ~SvxPixelCtlAccessibleChild(); //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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; //Methods for XAccessibleEventBroadcaster sal_uInt32 mnClientId; virtual void SAL_CALL addAccessibleEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; + void CommitChange( const css::accessibility::AccessibleEventObject& rEvent ); //Solution: Add the event handling method - void FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew); + void FireAccessibleEvent (short nEventId, const css::uno::Any& rOld, const css::uno::Any& rNew); virtual void SAL_CALL disposing() override; - Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException ); - Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( css::uno::RuntimeException ); /// @returns true if it's disposed or in disposing inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException ); void CheckChild(); @@ -153,13 +153,12 @@ public: typedef ::cppu::WeakAggComponentImplHelper6< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::accessibility::XAccessibleSelection, -// ::com::sun::star::accessibility::XAccessibleTable, - ::com::sun::star::lang::XServiceInfo > + css::accessibility::XAccessible, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleEventBroadcaster, + css::accessibility::XAccessibleSelection, + css::lang::XServiceInfo > SvxPixelCtlAccessible_BASE; class SvxPixelCtlAccessible : @@ -172,65 +171,65 @@ public: SvxPixelCtlAccessible(SvxPixelCtl& rWindow); virtual ~SvxPixelCtlAccessible(); - void ensureIsAlive() const throw ( ::com::sun::star::lang::DisposedException ); + void ensureIsAlive() const throw ( css::lang::DisposedException ); //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; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - ::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; - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; //Methods for XAccessibleEventBroadcaster sal_uInt32 mnClientId; virtual void SAL_CALL addAccessibleEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; - void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; + void CommitChange( const css::accessibility::AccessibleEventObject& rEvent ); //Solution: Add the event handling method - void FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew); + void FireAccessibleEvent (short nEventId, const css::uno::Any& rOld, const css::uno::Any& rNew); virtual void SAL_CALL disposing() override; - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > CreateChild (long nIndex, Point mPoint); void LoseFocus(); @@ -239,7 +238,7 @@ public: inline bool IsAlive() const; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> m_xCurChild; + css::uno::Reference< css::accessibility::XAccessible> m_xCurChild; public: void NotifyChild(long nIndex, bool bSelect, bool bCheck); }; diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 9d20f10eac8c..e7a6ef1e7ed5 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -60,12 +60,12 @@ namespace vcl { class Window; } typedef ::cppu::WeakAggComponentImplHelper6< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::accessibility::XAccessibleSelection, - ::com::sun::star::lang::XServiceInfo > + css::accessibility::XAccessible, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleEventBroadcaster, + css::accessibility::XAccessibleSelection, + css::lang::XServiceInfo > SvxRectCtlAccessibleContext_Base; class SvxRectCtlAccessibleContext : public ::comphelper::OBaseMutex, public SvxRectCtlAccessibleContext_Base @@ -73,7 +73,7 @@ class SvxRectCtlAccessibleContext : public ::comphelper::OBaseMutex, public SvxR public: // internal SvxRectCtlAccessibleContext( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference< css::accessibility::XAccessible>& rxParent, SvxRectCtl& rRepresentation, const OUString* pName = NULL, const OUString* pDescription = NULL ); @@ -81,130 +81,130 @@ protected: virtual ~SvxRectCtlAccessibleContext(); public: // 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; // XAccessibleComponent virtual sal_Bool SAL_CALL - containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + containsPoint( const css::awt::Point& rPoint ) throw( css::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& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL - getBounds() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Rectangle SAL_CALL + getBounds() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Point SAL_CALL - getLocation() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL + getLocation() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Point SAL_CALL - getLocationOnScreen() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL + getLocationOnScreen() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Size SAL_CALL - getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL + getSize() throw( css::uno::RuntimeException, std::exception ) override; bool SAL_CALL - isVisible() throw( ::com::sun::star::uno::RuntimeException ); + isVisible() throw( css::uno::RuntimeException ); virtual void SAL_CALL - grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + grabFocus() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getForeground( ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL - getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getBackground( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleContext virtual sal_Int32 SAL_CALL - getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override; + throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, 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 css::uno::Reference< css::accessibility::XAccessible> SAL_CALL + getAccessibleParent() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getAccessibleIndexInParent() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL - getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getAccessibleRole() throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL - getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL - getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getAccessibleName() throw (css::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 css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL + getAccessibleRelationSet() throw( css::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 css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::lang::Locale SAL_CALL + virtual css::lang::Locale SAL_CALL getLocale() - throw( ::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) override; + throw( css::uno::RuntimeException, + css::accessibility::IllegalAccessibleComponentStateException, std::exception ) override; // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL - getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL - supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString> SAL_CALL + getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence SAL_CALL - getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence SAL_CALL + getImplementationId() throw( 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; + throw( css::lang::IndexOutOfBoundsException, css::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; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - clearAccessibleSelection() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + clearAccessibleSelection() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - selectAllAccessibleChildren() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + selectAllAccessibleChildren() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - getSelectedAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - 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 void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) override; + throw( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; protected: // internals - void checkChildIndex( long nIndexOfChild ) throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + void checkChildIndex( long nIndexOfChild ) throw( css::lang::IndexOutOfBoundsException ); - void checkChildIndexOnSelection( long nIndexOfChild ) throw( ::com::sun::star::lang::IndexOutOfBoundsException ); + void checkChildIndexOnSelection( long nIndexOfChild ) throw( css::lang::IndexOutOfBoundsException ); /** Selects a new child by index. @@ -231,13 +231,13 @@ public: protected: /// @Return the object's current bounding box relative to the desktop. - Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException ); /// @Return the object's current bounding box relative to the parent object. - Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( css::uno::RuntimeException ); /// Calls all Listener to tell they the change. - void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); + void CommitChange( const css::accessibility::AccessibleEventObject& rEvent ); virtual void SAL_CALL disposing() override; @@ -248,7 +248,7 @@ protected: inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException ); private: /** Description of this object. This is not a constant because it can @@ -261,7 +261,7 @@ private: OUString msName; /// Reference to the parent object. - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxParent; /// pointer to internal representation @@ -291,20 +291,20 @@ inline bool SvxRectCtlAccessibleContext::IsNotAlive() const } typedef ::cppu::WeakAggComponentImplHelper7< - ::com::sun::star::accessibility::XAccessible, - ::com::sun::star::accessibility::XAccessibleComponent, - ::com::sun::star::accessibility::XAccessibleContext, - ::com::sun::star::accessibility::XAccessibleEventBroadcaster, - ::com::sun::star::accessibility::XAccessibleValue, - ::com::sun::star::accessibility::XAccessibleAction, - ::com::sun::star::lang::XServiceInfo > + css::accessibility::XAccessible, + css::accessibility::XAccessibleComponent, + css::accessibility::XAccessibleContext, + css::accessibility::XAccessibleEventBroadcaster, + css::accessibility::XAccessibleValue, + css::accessibility::XAccessibleAction, + css::lang::XServiceInfo > SvxRectCtlChildAccessibleContext_Base; class SvxRectCtlChildAccessibleContext : public SvxRectCtlChildAccessibleContext_Base { public: SvxRectCtlChildAccessibleContext( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference< css::accessibility::XAccessible>& rxParent, const vcl::Window& rParentWindow, const OUString& rName, const OUString& rDescription, const Rectangle& rBoundingBox, @@ -313,111 +313,111 @@ protected: virtual ~SvxRectCtlChildAccessibleContext(); public: // 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; // XAccessibleComponent virtual sal_Bool SAL_CALL - containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + containsPoint( const css::awt::Point& rPoint ) throw( css::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& rPoint ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleAtPoint( const css::awt::Point& rPoint ) throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Rectangle SAL_CALL - getBounds() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Rectangle SAL_CALL + getBounds() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Point SAL_CALL - getLocation() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL + getLocation() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Point SAL_CALL - getLocationOnScreen() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL + getLocationOnScreen() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::awt::Size SAL_CALL - getSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL + getSize() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL - grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + grabFocus() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getForeground( ) throw (css::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL - getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + getBackground( ) throw (css::uno::RuntimeException, std::exception) override; // XAccessibleContext virtual sal_Int32 SAL_CALL - getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getAccessibleChildCount() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) override; + throw( css::uno::RuntimeException, css::lang::IndexOutOfBoundsException, 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 css::uno::Reference< css::accessibility::XAccessible > SAL_CALL + getAccessibleParent() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getAccessibleIndexInParent() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL - getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getAccessibleRole() throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL - getAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getAccessibleDescription() throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL - getAccessibleName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + getAccessibleName() throw( css::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 css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL + getAccessibleRelationSet() throw( css::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 css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL + getAccessibleStateSet() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::lang::Locale SAL_CALL + virtual css::lang::Locale SAL_CALL getLocale() - throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) override; + throw( css::uno::RuntimeException, css::accessibility::IllegalAccessibleComponentStateException, std::exception ) override; // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeAccessibleEventListener( - const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) + throw( css::uno::RuntimeException, std::exception ) override; // XAccessibleValue - virtual ::com::sun::star::uno::Any SAL_CALL - getCurrentValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + getCurrentValue() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL - setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + setCurrentValue( const css::uno::Any& aNumber ) throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Any SAL_CALL - getMaximumValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + getMaximumValue() throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Any SAL_CALL - getMinimumValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL + getMinimumValue() throw( css::uno::RuntimeException, std::exception ) override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) 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; + getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL - supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString> SAL_CALL + getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence SAL_CALL - getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence SAL_CALL + getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; // internal /// Sets the checked status @@ -425,11 +425,11 @@ public: void FireFocusEvent(); protected: - Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException ); - Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( css::uno::RuntimeException ); - void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); + void CommitChange( const css::accessibility::AccessibleEventObject& rEvent ); virtual void SAL_CALL disposing() override; @@ -440,7 +440,7 @@ protected: inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( css::lang::DisposedException ); /// Mutex guarding this object. ::osl::Mutex maMutex; @@ -459,7 +459,7 @@ private: OUString msName; /// Reference to the parent object. - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > mxParent; /// Bounding box diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index ec2beb76969b..c3711d9ea45f 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -97,7 +97,7 @@ public: const SfxPoolItem* pState) override; void UpdateContent(FmFormShell*); - void UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > &); + void UpdateContent(const css::uno::Reference< css::form::XForm > &); void FillInfo( SfxChildWinInfo& rInfo ) const override; const OUString& GetDatabaseName() const { return m_aDatabaseName; } @@ -109,7 +109,7 @@ public: protected: // FmXChangeListener - virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void _propertyChanged(const css::beans::PropertyChangeEvent& evt) throw( css::uno::RuntimeException, std::exception ) override; protected: inline SfxBindings& GetBindings() { return SfxControllerItem::GetBindings(); } diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx index a0571888b21d..26311cc3f4a8 100644 --- a/svx/source/inc/unogalthemeprovider.hxx +++ b/svx/source/inc/unogalthemeprovider.hxx @@ -29,9 +29,9 @@ class Gallery; namespace { -class GalleryThemeProvider : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XInitialization, - ::com::sun::star::gallery::XGalleryThemeProvider, - ::com::sun::star::lang::XServiceInfo > +class GalleryThemeProvider : public ::cppu::WeakImplHelper< css::lang::XInitialization, + css::gallery::XGalleryThemeProvider, + css::lang::XServiceInfo > { public: @@ -41,29 +41,29 @@ public: protected: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XGalleryThemeProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::gallery::XGalleryTheme > SAL_CALL insertNewByName( const OUString& ThemeName ) throw (::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& ThemeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::gallery::XGalleryTheme > SAL_CALL insertNewByName( const OUString& ThemeName ) throw (css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByName( const OUString& ThemeName ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; private: diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index b84187cc85cb..32ef594b3c6e 100644 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx @@ -36,30 +36,30 @@ namespace svxform { private: // - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > + css::uno::Reference< css::beans::XPropertySet > m_xBinding; - OUString m_sFacetName; - OUString m_sConditionValue; - ::com::sun::star::uno::Reference< ::com::sun::star::xforms::XModel > + OUString m_sFacetName; + OUString m_sConditionValue; + css::uno::Reference< css::xforms::XModel > m_xWorkModel; // public: - static ::com::sun::star::uno::Reference< com::sun::star::uno::XInterface > - SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); + static css::uno::Reference< css::uno::XInterface > + SAL_CALL Create( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); protected: - OAddConditionDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); + OAddConditionDialog( const css::uno::Reference< css::uno::XComponentContext >& _rxORB ); // XTypeProvider - virtual com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual com::sun::star::uno::Reference SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx index a16b7962f845..3755aa2288e1 100644 --- a/svx/source/inc/xmlxtexp.hxx +++ b/svx/source/inc/xmlxtexp.hxx @@ -35,19 +35,17 @@ class SvxXMLXTableExportComponent : public SvXMLExport { public: SvxXMLXTableExportComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext, + const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString& rFileName, - const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler, - const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > & xTable, - com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& xGrfResolver); + const css::uno::Reference< css::xml::sax::XDocumentHandler > & xHandler, + const css::uno::Reference< css::container::XNameContainer > & xTable, + css::uno::Reference< css::document::XGraphicObjectResolver >& xGrfResolver); virtual ~SvxXMLXTableExportComponent(); static bool save( const OUString& rURL, - const com::sun::star::uno::Reference< - ::com::sun::star::container::XNameContainer >& xTable, - const ::com::sun::star::uno::Reference < - ::com::sun::star::embed::XStorage > &xStorage, + const css::uno::Reference< css::container::XNameContainer >& xTable, + const css::uno::Reference< css::embed::XStorage > &xStorage, OUString *pOptName ) throw (css::uno::RuntimeException, std::exception); @@ -58,7 +56,7 @@ public: private: bool exportTable() throw(); - const com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > & mxTable; + const css::uno::Reference< css::container::XNameContainer > & mxTable; }; #endif diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx index b1b3fd9ef5de..3a8ce799fb99 100644 --- a/svx/source/inc/xmlxtimp.hxx +++ b/svx/source/inc/xmlxtimp.hxx @@ -34,23 +34,23 @@ class SvxXMLXTableImport : public SvXMLImport { public: SvxXMLXTableImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & rTable, - com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver >& rGrfResolver); + const css::uno::Reference< css::uno::XComponentContext >& rContext, + const css::uno::Reference< css::container::XNameContainer > & rTable, + css::uno::Reference< css::document::XGraphicObjectResolver >& rGrfResolver); virtual ~SvxXMLXTableImport() throw (); static bool load( const OUString &rPath, const OUString &rReferer, - const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > &xStorage, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& xTable, + const css::uno::Reference < css::embed::XStorage > &xStorage, + const css::uno::Reference< css::container::XNameContainer >& xTable, bool *bOptLoadedFromStorage ) throw(); protected: virtual SvXMLImportContext *CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; + const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList ) override; private: - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & mrTable; + const css::uno::Reference< css::container::XNameContainer > & mrTable; }; #endif diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 72c732e254f9..6e8f16f3e77b 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -28,12 +28,12 @@ using namespace ::com::sun::star; TYPEINIT1(SvxSmartTagItem, SfxPoolItem); SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, - const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence, - const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence, - const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, - const com::sun::star::uno::Reference rRange, - const com::sun::star::uno::Reference rController, - const com::sun::star::lang::Locale rLocale, + const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence, + const css::uno::Sequence < css::uno::Sequence< sal_Int32 > >& rActionIndicesSequence, + const css::uno::Sequence< css::uno::Reference< css::container::XStringKeyMap > >& rStringKeyMaps, + const css::uno::Reference rRange, + const css::uno::Reference rController, + const css::lang::Locale rLocale, const OUString& rApplicationName, const OUString& rRangeText ) : SfxPoolItem( nId ), diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 2a83482644a5..39f1a5563635 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -114,22 +114,22 @@ SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c -bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxChartTextOrderItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // the order of the two enums is not equal, so a mapping is required - ::com::sun::star::chart::ChartAxisArrangeOrderType eAO; + css::chart::ChartAxisArrangeOrderType eAO; SvxChartTextOrder eOrder( GetValue()); switch( eOrder ) { case CHTXTORDER_SIDEBYSIDE: - eAO = ::com::sun::star::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE; break; + eAO = css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE; break; case CHTXTORDER_UPDOWN: - eAO = ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_ODD; break; + eAO = css::chart::ChartAxisArrangeOrderType_STAGGER_ODD; break; case CHTXTORDER_DOWNUP: - eAO = ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_EVEN; break; + eAO = css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN; break; case CHTXTORDER_AUTO: - eAO = ::com::sun::star::chart::ChartAxisArrangeOrderType_AUTO; break; + eAO = css::chart::ChartAxisArrangeOrderType_AUTO; break; } rVal <<= eAO; @@ -139,10 +139,10 @@ bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uI -bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxChartTextOrderItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // the order of the two enums is not equal, so a mapping is required - ::com::sun::star::chart::ChartAxisArrangeOrderType eAO; + css::chart::ChartAxisArrangeOrderType eAO; SvxChartTextOrder eOrder; if(!(rVal >>= eAO)) @@ -151,18 +151,18 @@ bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sa sal_Int32 nAO = 0; if(!(rVal >>= nAO)) return false; - eAO = static_cast< ::com::sun::star::chart::ChartAxisArrangeOrderType >( nAO ); + eAO = static_cast< css::chart::ChartAxisArrangeOrderType >( nAO ); } switch( eAO ) { - case ::com::sun::star::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE: + case css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE: eOrder = CHTXTORDER_SIDEBYSIDE; break; - case ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_ODD: + case css::chart::ChartAxisArrangeOrderType_STAGGER_ODD: eOrder = CHTXTORDER_UPDOWN; break; - case ::com::sun::star::chart::ChartAxisArrangeOrderType_STAGGER_EVEN: + case css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN: eOrder = CHTXTORDER_DOWNUP; break; - case ::com::sun::star::chart::ChartAxisArrangeOrderType_AUTO: + case css::chart::ChartAxisArrangeOrderType_AUTO: eOrder = CHTXTORDER_AUTO; break; default: return false; diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index c16ba6f24490..9835dfae0215 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -58,11 +58,11 @@ SvxClipboardFormatItem::~SvxClipboardFormatItem() delete pImpl; } -bool SvxClipboardFormatItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool SvxClipboardFormatItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { sal_uInt16 nCount = Count(); - ::com::sun::star::frame::status::ClipboardFormats aClipFormats; + css::frame::status::ClipboardFormats aClipFormats; aClipFormats.Identifiers.realloc( nCount ); aClipFormats.Names.realloc( nCount ); @@ -76,9 +76,9 @@ bool SvxClipboardFormatItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uIn return true; } -bool SvxClipboardFormatItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool SvxClipboardFormatItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { - ::com::sun::star::frame::status::ClipboardFormats aClipFormats; + css::frame::status::ClipboardFormats aClipFormats; if ( rVal >>= aClipFormats ) { sal_uInt16 nCount = sal_uInt16( aClipFormats.Identifiers.getLength() ); diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 6c77b90998f0..b0ed1bbb3418 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -58,28 +58,28 @@ SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem( const uno::Sequence< bea } } -com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rPropName ) +css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rPropName ) { - com::sun::star::uno::Any* pRet = NULL; + css::uno::Any* pRet = NULL; PropertyHashMap::iterator aHashIter( aPropHashMap.find( rPropName ) ); if ( aHashIter != aPropHashMap.end() ) pRet = &aPropSeq[ (*aHashIter).second ].Value; return pRet; } -const com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rPropName ) const +const css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rPropName ) const { - const com::sun::star::uno::Any* pRet = NULL; + const css::uno::Any* pRet = NULL; PropertyHashMap::const_iterator aHashIter( aPropHashMap.find( rPropName ) ); if ( aHashIter != aPropHashMap.end() ) pRet = &aPropSeq[ (*aHashIter).second ].Value; return pRet; } -com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rSequenceName, const OUString& rPropName ) +css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rSequenceName, const OUString& rPropName ) { - com::sun::star::uno::Any* pRet = NULL; - com::sun::star::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); + css::uno::Any* pRet = NULL; + css::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); if ( pSeqAny ) { if ( pSeqAny->getValueType() == cppu::UnoType>::get() ) @@ -87,7 +87,7 @@ com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( co PropertyPairHashMap::iterator aHashIter( aPropPairHashMap.find( PropertyPair( rSequenceName, rPropName ) ) ); if ( aHashIter != aPropPairHashMap.end() ) { - ::com::sun::star::uno::Sequence < beans::PropertyValue > const & rSecSequence = + css::uno::Sequence < beans::PropertyValue > const & rSecSequence = *static_cast const *>(pSeqAny->getValue()); pRet = const_cast(&rSecSequence[ (*aHashIter).second ].Value); } @@ -96,10 +96,10 @@ com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( co return pRet; } -const com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rSequenceName, const OUString& rPropName ) const +const css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUString& rSequenceName, const OUString& rPropName ) const { - const com::sun::star::uno::Any* pRet = NULL; - const com::sun::star::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); + const css::uno::Any* pRet = NULL; + const css::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); if ( pSeqAny ) { if ( pSeqAny->getValueType() == cppu::UnoType>::get() ) @@ -107,7 +107,7 @@ const com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByNa PropertyPairHashMap::const_iterator aHashIter( aPropPairHashMap.find( PropertyPair( rSequenceName, rPropName ) ) ); if ( aHashIter != aPropPairHashMap.end() ) { - ::com::sun::star::uno::Sequence < beans::PropertyValue > const & rSecSequence = + css::uno::Sequence < beans::PropertyValue > const & rSecSequence = *static_cast const *>(pSeqAny->getValue()); pRet = &rSecSequence[ (*aHashIter).second ].Value; } @@ -116,15 +116,15 @@ const com::sun::star::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByNa return pRet; } -void SdrCustomShapeGeometryItem::SetPropertyValue( const com::sun::star::beans::PropertyValue& rPropVal ) +void SdrCustomShapeGeometryItem::SetPropertyValue( const css::beans::PropertyValue& rPropVal ) { - com::sun::star::uno::Any* pAny = GetPropertyValueByName( rPropVal.Name ); + css::uno::Any* pAny = GetPropertyValueByName( rPropVal.Name ); if ( pAny ) { // property is already available sal_Int32 i; if ( pAny->getValueType() == cppu::UnoType>::get() ) { // old property is a sequence->each entry has to be removed from the HashPairMap - ::com::sun::star::uno::Sequence < beans::PropertyValue > const & rSecSequence = + css::uno::Sequence < beans::PropertyValue > const & rSecSequence = *static_cast const *>(pAny->getValue()); for ( i = 0; i < rSecSequence.getLength(); i++ ) { @@ -136,7 +136,7 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const com::sun::star::beans:: *pAny = rPropVal.Value; if ( rPropVal.Value.getValueType() == cppu::UnoType>::get() ) { // the new property is a sequence->each entry has to be inserted into the HashPairMap - ::com::sun::star::uno::Sequence < beans::PropertyValue > const & rSecSequence = + css::uno::Sequence < beans::PropertyValue > const & rSecSequence = *static_cast const *>(pAny->getValue()); for ( i = 0; i < rSecSequence.getLength(); i++ ) { @@ -158,20 +158,20 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const com::sun::star::beans:: } } -void SdrCustomShapeGeometryItem::SetPropertyValue( const OUString& rSequenceName, const com::sun::star::beans::PropertyValue& rPropVal ) +void SdrCustomShapeGeometryItem::SetPropertyValue( const OUString& rSequenceName, const css::beans::PropertyValue& rPropVal ) { - com::sun::star::uno::Any* pAny = GetPropertyValueByName( rSequenceName, rPropVal.Name ); + css::uno::Any* pAny = GetPropertyValueByName( rSequenceName, rPropVal.Name ); if ( pAny ) // just replacing *pAny = rPropVal.Value; else { - com::sun::star::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); + css::uno::Any* pSeqAny = GetPropertyValueByName( rSequenceName ); if( pSeqAny == NULL ) { - ::com::sun::star::uno::Sequence < beans::PropertyValue > aSeq; + css::uno::Sequence < beans::PropertyValue > aSeq; beans::PropertyValue aValue; aValue.Name = rSequenceName; - aValue.Value = ::com::sun::star::uno::makeAny( aSeq ); + aValue.Value = css::uno::makeAny( aSeq ); assert(aPropSeq.end() == std::find_if(aPropSeq.begin(), aPropSeq.end(), [&rSequenceName](beans::PropertyValue const& rV) @@ -193,13 +193,13 @@ void SdrCustomShapeGeometryItem::SetPropertyValue( const OUString& rSequenceName PropertyPairHashMap::iterator aHashIter( aPropPairHashMap.find( PropertyPair( rSequenceName, rPropVal.Name ) ) ); if ( aHashIter != aPropPairHashMap.end() ) { - ::com::sun::star::uno::Sequence < beans::PropertyValue > const & rSecSequence = + css::uno::Sequence < beans::PropertyValue > const & rSecSequence = *static_cast const *>(pSeqAny->getValue()); const_cast &>(rSecSequence)[ (*aHashIter).second ].Value = rPropVal.Value; } else { - ::com::sun::star::uno::Sequence < beans::PropertyValue > const & rSecSequence = + css::uno::Sequence < beans::PropertyValue > const & rSecSequence = *static_cast const *>(pSeqAny->getValue()); sal_Int32 nCount = rSecSequence.getLength(); @@ -220,12 +220,12 @@ void SdrCustomShapeGeometryItem::ClearPropertyValue( const OUString& rPropName ) PropertyHashMap::iterator aHashIter( aPropHashMap.find( rPropName ) ); if ( aHashIter != aPropHashMap.end() ) { - com::sun::star::uno::Any* pSeqAny = &aPropSeq[ (*aHashIter).second ].Value; + css::uno::Any* pSeqAny = &aPropSeq[ (*aHashIter).second ].Value; if ( pSeqAny ) { if ( pSeqAny->getValueType() == cppu::UnoType>::get() ) { - ::com::sun::star::uno::Sequence < beans::PropertyValue > const & rSecSequence = + css::uno::Sequence < beans::PropertyValue > const & rSecSequence = *static_cast const *>(pSeqAny->getValue()); sal_Int32 i; diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index ba185ced9d5f..01313a3d2ed4 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -74,13 +74,13 @@ SfxPoolItem* SvxColorListItem::Clone( SfxItemPool * ) const // Should be a template class but ... #define QUERY_PUT_IMPL(svtype, xtype) \ -bool svtype::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const \ +bool svtype::QueryValue( css::uno::Any& rVal, sal_uInt8 ) const \ { \ rVal = uno::makeAny( uno::Reference< uno::XWeak >( p##xtype.get() ) ); \ return true; \ } \ \ -bool svtype::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) \ +bool svtype::PutValue( const css::uno::Any& rVal, sal_uInt8 ) \ { \ uno::Reference< uno::XWeak > xRef; \ if( rVal >>= xRef ) { \ diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index b1b5b39b4195..318a3b22176d 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -91,7 +91,7 @@ SvStream& SvxHyperlinkItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ rStrm.WriteUInt16( nCnt ); if( nCnt ) { - // 2. ::com::sun::star::script::JavaScript-Macros + // 2. css::script::JavaScript-Macros for ( SvxMacroTable::const_iterator it = pMacroTable->begin(); it != pMacroTable->end(); ++it) { @@ -285,7 +285,7 @@ void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl ) pMacroTable = new SvxMacroTableDtor ( rTbl ); } -bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxHyperlinkItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -313,7 +313,7 @@ bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMe return true; } -bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxHyperlinkItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; OUString aStr; diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index ae86e5fc3ae6..612d6c1cbe33 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -1152,7 +1152,7 @@ bool SvxNumberFormatShell::IsAdded_Impl( size_t nKey ) // Konvertierungs-Routinen: void SvxNumberFormatShell::PosToCategory_Impl(sal_uInt16 nPos, short& rCategory) const { - // Kategorie ::com::sun::star::form-Positionen abbilden (->Resource) + // Kategorie css::form-Positionen abbilden (->Resource) switch ( nPos ) { case CAT_USERDEFINED: rCategory = css::util::NumberFormat::DEFINED; break; @@ -1172,7 +1172,7 @@ void SvxNumberFormatShell::PosToCategory_Impl(sal_uInt16 nPos, short& rCategory) void SvxNumberFormatShell::CategoryToPos_Impl(short nCategory, sal_uInt16& rPos) const { - // Kategorie auf ::com::sun::star::form-Positionen abbilden (->Resource) + // Kategorie auf css::form-Positionen abbilden (->Resource) switch ( nCategory ) { case css::util::NumberFormat::DEFINED: rPos = CAT_USERDEFINED; break; diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 4e303a57802f..d073187cffe9 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -92,14 +92,14 @@ bool SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const mbBookMode == rItem.IsBookMode() ); } -bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxViewLayoutItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { case 0 : { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( VIEWLAYOUT_PARAMS ); + css::uno::Sequence< css::beans::PropertyValue > aSeq( VIEWLAYOUT_PARAMS ); aSeq[0].Name = VIEWLAYOUT_PARAM_COLUMNS; aSeq[0].Value <<= sal_Int32( GetValue() ); aSeq[1].Name = VIEWLAYOUT_PARAM_BOOKMODE; @@ -118,14 +118,14 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM return true; } -bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxViewLayoutItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { case 0 : { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq; + css::uno::Sequence< css::beans::PropertyValue > aSeq; if (( rVal >>= aSeq ) && ( aSeq.getLength() == VIEWLAYOUT_PARAMS )) { sal_Int32 nColumns( 0 ); diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 2c980e02d5b5..c6b1f22e8ef9 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -90,14 +90,14 @@ bool SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom ); } -bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool SvxZoomSliderItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { case 0 : { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOMSLIDER_PARAMS ); + css::uno::Sequence< css::beans::PropertyValue > aSeq( ZOOMSLIDER_PARAMS ); aSeq[0].Name = ZOOMSLIDER_PARAM_CURRENTZOOM; aSeq[0].Value <<= sal_Int32( GetValue() ); aSeq[1].Name = ZOOMSLIDER_PARAM_SNAPPINGPOINTS; @@ -138,18 +138,18 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nM return true; } -bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool SvxZoomSliderItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { case 0 : { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq; + css::uno::Sequence< css::beans::PropertyValue > aSeq; if (( rVal >>= aSeq ) && ( aSeq.getLength() == ZOOMSLIDER_PARAMS )) { sal_Int32 nCurrentZoom( 0 ); - com::sun::star::uno::Sequence < sal_Int32 > aValues; + css::uno::Sequence < sal_Int32 > aValues; bool bAllConverted( true ); sal_Int16 nConvertedCount( 0 ); @@ -207,7 +207,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt case MID_ZOOMSLIDER_SNAPPINGPOINTS: { - com::sun::star::uno::Sequence < sal_Int32 > aValues; + css::uno::Sequence < sal_Int32 > aValues; if ( rVal >>= aValues ) { maValues = aValues; diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index f4d7be6c2339..723986f62ab4 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -52,27 +52,27 @@ namespace { - basegfx::B2DLineJoin impGetB2DLineJoin(com::sun::star::drawing::LineJoint eLineJoint) + basegfx::B2DLineJoin impGetB2DLineJoin(css::drawing::LineJoint eLineJoint) { switch(eLineJoint) { - case com::sun::star::drawing::LineJoint_MIDDLE : + case css::drawing::LineJoint_MIDDLE : { return basegfx::B2DLineJoin::Middle; } - case com::sun::star::drawing::LineJoint_BEVEL : + case css::drawing::LineJoint_BEVEL : { return basegfx::B2DLineJoin::Bevel; } - case com::sun::star::drawing::LineJoint_MITER : + case css::drawing::LineJoint_MITER : { return basegfx::B2DLineJoin::Miter; } - case com::sun::star::drawing::LineJoint_ROUND : + case css::drawing::LineJoint_ROUND : { return basegfx::B2DLineJoin::Round; } - default : // com::sun::star::drawing::LineJoint_NONE + default : // css::drawing::LineJoint_NONE { return basegfx::B2DLineJoin::NONE; // XLINEJOINT_NONE } @@ -111,8 +111,8 @@ namespace } const sal_uInt32 nLineWidth = (static_cast(rSet.Get(XATTR_LINEWIDTH))).GetValue(); - const com::sun::star::drawing::LineJoint eLineJoint = (static_cast(rSet.Get(XATTR_LINEJOINT))).GetValue(); - const com::sun::star::drawing::LineCap eLineCap = (static_cast(rSet.Get(XATTR_LINECAP))).GetValue(); + const css::drawing::LineJoint eLineJoint = (static_cast(rSet.Get(XATTR_LINEJOINT))).GetValue(); + const css::drawing::LineCap eLineCap = (static_cast(rSet.Get(XATTR_LINECAP))).GetValue(); return drawinglayer::attribute::LineAttribute( aColorAttribute, @@ -123,11 +123,11 @@ namespace drawinglayer::attribute::StrokeAttribute impGetStrokeAttribute(const SfxItemSet& rSet) { - const com::sun::star::drawing::LineStyle eLineStyle = (static_cast(rSet.Get(XATTR_LINESTYLE))).GetValue(); + const css::drawing::LineStyle eLineStyle = (static_cast(rSet.Get(XATTR_LINESTYLE))).GetValue(); double fFullDotDashLen(0.0); ::std::vector< double > aDotDashArray; - if(com::sun::star::drawing::LineStyle_DASH == eLineStyle) + if(css::drawing::LineStyle_DASH == eLineStyle) { const XDash& rDash = (static_cast(rSet.Get(XATTR_LINEDASH))).GetDashValue(); diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 1e35fd3ff23c..6f62f8e670ca 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -99,7 +99,7 @@ void ObjectContactOfObjListPainter::ProcessDisplay(DisplayInfo& rDisplayInfo) aViewRange, GetXDrawPageForSdrPage(const_cast< SdrPage* >(mpProcessedPage)), 0.0, - com::sun::star::uno::Sequence()); + css::uno::Sequence()); updateViewInformation2D(aNewViewInformation2D); // collect primitive data in a sequence; this will already use the updated ViewInformation2D diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index 08aa36a5ac6e..7c32e153b4c3 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -195,7 +195,7 @@ void ViewContactOfE3dScene::createViewInformation3D(const basegfx::B3DRange& rCo basegfx::B3DHomMatrix aWorldToDevice(aWorldToCamera); const drawinglayer::attribute::SdrSceneAttribute& rSdrSceneAttribute = getSdrSceneAttribute(); - if(::com::sun::star::drawing::ProjectionMode_PERSPECTIVE == rSdrSceneAttribute.getProjectionMode()) + if(css::drawing::ProjectionMode_PERSPECTIVE == rSdrSceneAttribute.getProjectionMode()) { aWorldToDevice.frustum(-1.0, 1.0, -1.0, 1.0, fMinZ, fMaxZ); } @@ -210,7 +210,7 @@ void ViewContactOfE3dScene::createViewInformation3D(const basegfx::B3DRange& rCo aDeviceRange.transform(aWorldToDevice); // set projection - if(::com::sun::star::drawing::ProjectionMode_PERSPECTIVE == rSdrSceneAttribute.getProjectionMode()) + if(css::drawing::ProjectionMode_PERSPECTIVE == rSdrSceneAttribute.getProjectionMode()) { aProjection.frustum( aDeviceRange.getMinX(), aDeviceRange.getMaxX(), diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 6542edb71328..169b136f28bf 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -642,9 +642,9 @@ namespace sdr { namespace contact { virtual void SAL_CALL modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException, std::exception) override; // XContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (css::uno::RuntimeException, std::exception) override; private: /** retrieves the SdrPageView which our associated SdrPageViewWindow belongs to diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index f42c1c80efc3..4722122116ea 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -33,9 +33,9 @@ using namespace com::sun::star; namespace { -typedef cppu::WeakComponentImplHelper< ::com::sun::star::graphic::XPrimitiveFactory2D, css::lang::XServiceInfo > PrimitiveFactory2DImplBase; +typedef cppu::WeakComponentImplHelper< css::graphic::XPrimitiveFactory2D, css::lang::XServiceInfo > PrimitiveFactory2DImplBase; -// base class for C++ implementation of com::sun::star::graphic::XPrimitiveFactory2D +// base class for C++ implementation of css::graphic::XPrimitiveFactory2D class PrimitiveFactory2D : protected comphelper::OBaseMutex, public PrimitiveFactory2DImplBase @@ -44,8 +44,8 @@ public: PrimitiveFactory2D(): PrimitiveFactory2DImplBase(m_aMutex) {} // Methods from XPrimitiveFactory2D - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) throw (css::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 2ec29edf342f..e25d6346a02d 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -132,27 +132,27 @@ namespace drawinglayer } } - basegfx::B2DLineJoin LineJointToB2DLineJoin(com::sun::star::drawing::LineJoint eLineJoint) + basegfx::B2DLineJoin LineJointToB2DLineJoin(css::drawing::LineJoint eLineJoint) { switch(eLineJoint) { - case com::sun::star::drawing::LineJoint_MIDDLE : + case css::drawing::LineJoint_MIDDLE : { return basegfx::B2DLineJoin::Middle; } - case com::sun::star::drawing::LineJoint_BEVEL : + case css::drawing::LineJoint_BEVEL : { return basegfx::B2DLineJoin::Bevel; } - case com::sun::star::drawing::LineJoint_MITER : + case css::drawing::LineJoint_MITER : { return basegfx::B2DLineJoin::Miter; } - case com::sun::star::drawing::LineJoint_ROUND : + case css::drawing::LineJoint_ROUND : { return basegfx::B2DLineJoin::Round; } - default : // com::sun::star::drawing::LineJoint_NONE + default : // css::drawing::LineJoint_NONE { return basegfx::B2DLineJoin::NONE; } @@ -218,7 +218,7 @@ namespace drawinglayer { attribute::SdrLineAttribute createNewSdrLineAttribute(const SfxItemSet& rSet) { - const com::sun::star::drawing::LineStyle eStyle(static_cast(rSet.Get(XATTR_LINESTYLE)).GetValue()); + const css::drawing::LineStyle eStyle(static_cast(rSet.Get(XATTR_LINESTYLE)).GetValue()); if(drawing::LineStyle_NONE != eStyle) { @@ -233,8 +233,8 @@ namespace drawinglayer { const sal_uInt32 nWidth(static_cast(rSet.Get(XATTR_LINEWIDTH)).GetValue()); const Color aColor(static_cast(rSet.Get(XATTR_LINECOLOR)).GetColorValue()); - const com::sun::star::drawing::LineJoint eJoint(static_cast(rSet.Get(XATTR_LINEJOINT)).GetValue()); - const com::sun::star::drawing::LineCap eCap(static_cast(rSet.Get(XATTR_LINECAP)).GetValue()); + const css::drawing::LineJoint eJoint(static_cast(rSet.Get(XATTR_LINEJOINT)).GetValue()); + const css::drawing::LineCap eCap(static_cast(rSet.Get(XATTR_LINECAP)).GetValue()); ::std::vector< double > aDotDashArray; double fFullDotDashLen(0.0); @@ -885,12 +885,12 @@ namespace drawinglayer attribute::SdrSceneAttribute createNewSdrSceneAttribute(const SfxItemSet& rSet) { // get perspective - ::com::sun::star::drawing::ProjectionMode aProjectionMode(::com::sun::star::drawing::ProjectionMode_PARALLEL); + css::drawing::ProjectionMode aProjectionMode(css::drawing::ProjectionMode_PARALLEL); const sal_uInt16 nProjectionValue(static_cast(rSet.Get(SDRATTR_3DSCENE_PERSPECTIVE)).GetValue()); if(1L == nProjectionValue) { - aProjectionMode = ::com::sun::star::drawing::ProjectionMode_PERSPECTIVE; + aProjectionMode = css::drawing::ProjectionMode_PERSPECTIVE; } // get distance @@ -900,20 +900,20 @@ namespace drawinglayer const double fShadowSlant(F_PI180 * static_cast(rSet.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue()); // get shade mode - ::com::sun::star::drawing::ShadeMode aShadeMode(::com::sun::star::drawing::ShadeMode_FLAT); + css::drawing::ShadeMode aShadeMode(css::drawing::ShadeMode_FLAT); const sal_uInt16 nShadeValue(static_cast(rSet.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue()); if(1L == nShadeValue) { - aShadeMode = ::com::sun::star::drawing::ShadeMode_PHONG; + aShadeMode = css::drawing::ShadeMode_PHONG; } else if(2L == nShadeValue) { - aShadeMode = ::com::sun::star::drawing::ShadeMode_SMOOTH; + aShadeMode = css::drawing::ShadeMode_SMOOTH; } else if(3L == nShadeValue) { - aShadeMode = ::com::sun::star::drawing::ShadeMode_DRAFT; + aShadeMode = css::drawing::ShadeMode_DRAFT; } // get two sided lighting diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index 54b335b7a013..25ec9740305e 100644 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx @@ -37,45 +37,45 @@ namespace drawinglayer attribute::Sdr3DObjectAttribute* createNewSdr3DObjectAttribute(const SfxItemSet& rSet) { // get NormalsKind - ::com::sun::star::drawing::NormalsKind aNormalsKind(::com::sun::star::drawing::NormalsKind_SPECIFIC); + css::drawing::NormalsKind aNormalsKind(css::drawing::NormalsKind_SPECIFIC); const sal_uInt16 nNormalsValue(static_cast(rSet.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue()); if(1L == nNormalsValue) { - aNormalsKind = ::com::sun::star::drawing::NormalsKind_FLAT; + aNormalsKind = css::drawing::NormalsKind_FLAT; } else if(2L == nNormalsValue) { - aNormalsKind = ::com::sun::star::drawing::NormalsKind_SPHERE; + aNormalsKind = css::drawing::NormalsKind_SPHERE; } // get NoermalsInvert flag const bool bInvertNormals(static_cast(rSet.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue()); // get TextureProjectionX - ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionX(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC); + css::drawing::TextureProjectionMode aTextureProjectionX(css::drawing::TextureProjectionMode_OBJECTSPECIFIC); const sal_uInt16 nTextureValueX(static_cast(rSet.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue()); if(1L == nTextureValueX) { - aTextureProjectionX = ::com::sun::star::drawing::TextureProjectionMode_PARALLEL; + aTextureProjectionX = css::drawing::TextureProjectionMode_PARALLEL; } else if(2L == nTextureValueX) { - aTextureProjectionX = ::com::sun::star::drawing::TextureProjectionMode_SPHERE; + aTextureProjectionX = css::drawing::TextureProjectionMode_SPHERE; } // get TextureProjectionY - ::com::sun::star::drawing::TextureProjectionMode aTextureProjectionY(::com::sun::star::drawing::TextureProjectionMode_OBJECTSPECIFIC); + css::drawing::TextureProjectionMode aTextureProjectionY(css::drawing::TextureProjectionMode_OBJECTSPECIFIC); const sal_uInt16 nTextureValueY(static_cast(rSet.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue()); if(1L == nTextureValueY) { - aTextureProjectionY = ::com::sun::star::drawing::TextureProjectionMode_PARALLEL; + aTextureProjectionY = css::drawing::TextureProjectionMode_PARALLEL; } else if(2L == nTextureValueY) { - aTextureProjectionY = ::com::sun::star::drawing::TextureProjectionMode_SPHERE; + aTextureProjectionY = css::drawing::TextureProjectionMode_SPHERE; } // get DoubleSided flag @@ -89,30 +89,30 @@ namespace drawinglayer // get texture kind // TextureKind: 1 == Base3DTextureLuminance, 2 == Base3DTextureIntensity, 3 == Base3DTextureColor - ::com::sun::star::drawing::TextureKind2 aTextureKind(::com::sun::star::drawing::TextureKind2_LUMINANCE); + css::drawing::TextureKind2 aTextureKind(css::drawing::TextureKind2_LUMINANCE); const sal_uInt16 nTextureKind(static_cast(rSet.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue()); if(2 == nTextureKind) { - aTextureKind = ::com::sun::star::drawing::TextureKind2_INTENSITY; + aTextureKind = css::drawing::TextureKind2_INTENSITY; } else if(3 == nTextureKind) { - aTextureKind = ::com::sun::star::drawing::TextureKind2_COLOR; + aTextureKind = css::drawing::TextureKind2_COLOR; } // get texture mode // TextureMode: 1 == Base3DTextureReplace, 2 == Base3DTextureModulate, 3 == Base3DTextureBlend - ::com::sun::star::drawing::TextureMode aTextureMode(::com::sun::star::drawing::TextureMode_REPLACE); + css::drawing::TextureMode aTextureMode(css::drawing::TextureMode_REPLACE); const sal_uInt16 nTextureMode(static_cast(rSet.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue()); if(2 == nTextureMode) { - aTextureMode = ::com::sun::star::drawing::TextureMode_MODULATE; + aTextureMode = css::drawing::TextureMode_MODULATE; } else if(3 == nTextureMode) { - aTextureMode = ::com::sun::star::drawing::TextureMode_BLEND; + aTextureMode = css::drawing::TextureMode_BLEND; } // get object color diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index b408b7ec5990..2ae586339f6b 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -120,7 +120,7 @@ namespace sdr mpItemSet->Put(XLineStartWidthItem(200)); mpItemSet->Put(XLineEndItem(OUString(), basegfx::B2DPolyPolygon(aNewPolygon))); mpItemSet->Put(XLineEndWidthItem(200)); - mpItemSet->Put(XLineStyleItem(com::sun::star::drawing::LineStyle_SOLID)); + mpItemSet->Put(XLineStyleItem(css::drawing::LineStyle_SOLID)); } } // end of namespace properties } // end of namespace sdr diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 02a6dbf6d9d6..8f68d861da24 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -162,7 +162,7 @@ namespace sdr if(pNewItem && (SDRATTR_TEXTDIRECTION == nWhich)) { - bool bVertical(com::sun::star::text::WritingMode_TB_RL == static_cast(pNewItem)->GetValue()); + bool bVertical(css::text::WritingMode_TB_RL == static_cast(pNewItem)->GetValue()); rObj.SetVerticalWriting(bVertical); } diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx index 1f2b032b2dde..0e04605de235 100644 --- a/svx/source/sidebar/PanelLayout.cxx +++ b/svx/source/sidebar/PanelLayout.cxx @@ -18,7 +18,7 @@ using namespace sfx2::sidebar; -PanelLayout::PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const com::sun::star::uno::Reference &rFrame) +PanelLayout::PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference &rFrame) : Control(pParent) , m_bInClose(false) { diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 3b1e764f56fb..63bb7b3f820b 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -478,7 +478,7 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) // mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog SvtViewOptions aPageOpt(E_TABPAGE, "cui/ui/possizetabpage/PositionAndSize"); - aPageOpt.SetUserItem( USERITEM_NAME, ::com::sun::star::uno::makeAny( ::rtl::OUString::number( int(mpCbxScale->IsChecked()) ) ) ); + aPageOpt.SetUserItem( USERITEM_NAME, css::uno::makeAny( ::rtl::OUString::number( int(mpCbxScale->IsChecked()) ) ) ); } @@ -885,7 +885,7 @@ void PosSizePropertyPanel::NotifyItemUpdate( // mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog SvtViewOptions aPageOpt(E_TABPAGE, "cui/ui/possizetabpage/PositionAndSize"); OUString sUserData; - ::com::sun::star::uno::Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME ); + css::uno::Any aUserItem = aPageOpt.GetUserItem( USERITEM_NAME ); ::rtl::OUString aTemp; if ( aUserItem >>= aTemp ) sUserData = aTemp; diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index e903a8c38073..087824e6938b 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -156,7 +156,7 @@ void TextCharacterSpacingControl::Rearrange(bool bLBAvailable,bool bAvailable, l SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE ); if ( aWinOpt.Exists() ) { - ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt.GetUserData(); + css::uno::Sequence < css::beans::NamedValue > aSeq = aWinOpt.GetUserData(); ::rtl::OUString aTmp; if ( aSeq.getLength()) aSeq[0].Value >>= aTmp; diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index f4ba7045c059..ea2667dba8c4 100644 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -185,7 +185,7 @@ void SmartTagMgr::GetActionSequences( Sequence < OUString >& rSmartTagTypes, /** Returns the caption for a smart tag type. */ -OUString SmartTagMgr::GetSmartTagCaption( const OUString& rSmartTagType, const com::sun::star::lang::Locale& rLocale ) const +OUString SmartTagMgr::GetSmartTagCaption( const OUString& rSmartTagType, const css::lang::Locale& rLocale ) const { OUString aRet; @@ -232,7 +232,7 @@ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags, mxConfigurationSettings->setPropertyValue( "RecognizeSmartTags", aEnabled ); bCommit = true; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { } } @@ -254,7 +254,7 @@ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags, mxConfigurationSettings->setPropertyValue( "ExcludedSmartTagTypes", aNewTypes ); bCommit = true; } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { } } @@ -265,14 +265,14 @@ void SmartTagMgr::WriteConfiguration( const bool* pIsLabelTextWithSmartTags, { Reference< util::XChangesBatch >( mxConfigurationSettings, UNO_QUERY_THROW )->commitChanges(); } - catch ( ::com::sun::star::uno::Exception& ) + catch ( css::uno::Exception& ) { } } } } -// ::com::sun::star::util::XModifyListener +// css::util::XModifyListener void SmartTagMgr::modified( const lang::EventObject& ) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -284,7 +284,7 @@ void SmartTagMgr::modified( const lang::EventObject& ) throw( RuntimeException, LoadLibraries(); } -// ::com::sun::star::lang::XEventListener +// css::lang::XEventListener void SmartTagMgr::disposing( const lang::EventObject& rEvent ) throw( RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -311,7 +311,7 @@ void SmartTagMgr::disposing( const lang::EventObject& rEvent ) throw( RuntimeExc } } -// ::com::sun::star::util::XChangesListener +// css::util::XChangesListener void SmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 29fa8be887d4..32f449f44f43 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -324,10 +324,10 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) if (nSelect == PSZ_FUNC_NONE) nSelect = 0; - ::com::sun::star::uno::Any a; + css::uno::Any a; SfxUInt16Item aItem( SID_PSZ_FUNCTION, nSelect ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = "StatusBarFunc"; aItem.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 773d0f6d3224..586d628a49f8 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -118,11 +118,11 @@ bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt ) { mnState = nNewState; - ::com::sun::star::uno::Any a; + css::uno::Any a; SfxUInt16Item aState( GetSlotId(), mnState ); INetURLObject aObj( m_aCommandURL ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = aObj.GetURLPath(); aState.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 152a9619fd3d..c5948dd27230 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -124,11 +124,11 @@ void XmlSecStatusBarControl::Command( const CommandEvent& rCEvt ) PopupMenu aPopupMenu( ResId( RID_SVXMNU_XMLSECSTATBAR, DIALOG_MGR() ) ); if( aPopupMenu.Execute( &GetStatusBar(), rCEvt.GetMousePosPixel() ) ) { - ::com::sun::star::uno::Any a; + css::uno::Any a; SfxUInt16Item aState( GetSlotId(), 0 ); INetURLObject aObj( m_aCommandURL ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = aObj.GetURLPath(); aState.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index f1d8adbc9a95..a477eebac098 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -159,10 +159,10 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt ) case ZOOM_WHOLE_PAGE: aZoom.SetType( SvxZoomType::WHOLEPAGE ); break; } - ::com::sun::star::uno::Any a; + css::uno::Any a; INetURLObject aObj( m_aCommandURL ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = aObj.GetURLPath(); aZoom.QueryValue( a ); aArgs[0].Value = a; @@ -196,10 +196,10 @@ bool SvxZoomPageStatusBarControl::MouseButtonDown(const MouseEvent&) { SvxZoomItem aZoom( SvxZoomType::WHOLEPAGE, 0, GetId() ); - ::com::sun::star::uno::Any a; + css::uno::Any a; INetURLObject aObj( m_aCommandURL ); - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); + css::uno::Sequence< css::beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = aObj.GetURLPath(); aZoom.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index e1555b6a4a2a..3f9348167fed 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -210,7 +210,7 @@ void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eStat mxImpl->mnMaxZoom > mxImpl->mnSliderCenter, "Looks like the zoom slider item is corrupted" ); - const com::sun::star::uno::Sequence < sal_Int32 > rSnappingPoints = static_cast( pState )->GetSnappingPoints(); + const css::uno::Sequence < sal_Int32 > rSnappingPoints = static_cast( pState )->GetSnappingPoints(); mxImpl->maSnappingPointOffsets.clear(); mxImpl->maSnappingPointZooms.clear(); diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 9a26fc04f6c2..80813a275a4b 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -236,7 +236,7 @@ SdrItemPool::SdrItemPool( mppLocalPoolDefaults[SDRATTR_TRANSFORMREF1Y -SDRATTR_START]=new SdrTransformRef1YItem; mppLocalPoolDefaults[SDRATTR_TRANSFORMREF2X -SDRATTR_START]=new SdrTransformRef2XItem; mppLocalPoolDefaults[SDRATTR_TRANSFORMREF2Y -SDRATTR_START]=new SdrTransformRef2YItem; - mppLocalPoolDefaults[SDRATTR_TEXTDIRECTION -SDRATTR_START]=new SvxWritingModeItem(com::sun::star::text::WritingMode_LR_TB, SDRATTR_TEXTDIRECTION); + mppLocalPoolDefaults[SDRATTR_TEXTDIRECTION -SDRATTR_START]=new SvxWritingModeItem(css::text::WritingMode_LR_TB, SDRATTR_TEXTDIRECTION); mppLocalPoolDefaults[ SDRATTR_GRAFRED - SDRATTR_START] = new SdrGrafRedItem; mppLocalPoolDefaults[ SDRATTR_GRAFGREEN - SDRATTR_START] = new SdrGrafGreenItem; mppLocalPoolDefaults[ SDRATTR_GRAFBLUE - SDRATTR_START] = new SdrGrafBlueItem; diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 712dd85df9ec..bf38d8699531 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -1423,7 +1423,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const } else { - com::sun::star::geometry::AffineMatrix2D aAffineMatrix2D; + css::geometry::AffineMatrix2D aAffineMatrix2D; Point aPageOffset(0, 0); if(GetSdrPageView()) diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 353261ae17c8..b676dc210d08 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1932,7 +1932,7 @@ bool SdrObjEditView::EndMacroObj() /** fills the given any with a XTextCursor for the current text selection. Leaves the any untouched if there currently is no text selected */ -void SdrObjEditView::getTextSelection( ::com::sun::star::uno::Any& rSelection ) +void SdrObjEditView::getTextSelection( css::uno::Any& rSelection ) { if( IsTextEdit() ) { @@ -1943,7 +1943,7 @@ void SdrObjEditView::getTextSelection( ::com::sun::star::uno::Any& rSelection ) if( pObj ) { - ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xText( pObj->getUnoShape(), ::com::sun::star::uno::UNO_QUERY ); + css::uno::Reference< css::text::XText > xText( pObj->getUnoShape(), css::uno::UNO_QUERY ); if( xText.is() ) { SvxUnoTextBase* pRange = SvxUnoTextBase::getImplementation( xText ); @@ -2254,7 +2254,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar ESelection aSel( pOLV->GetSelection() ); if( !aSel.HasRange() ) - pOLV->SetSelection( rEditEngine.GetWord( aSel, com::sun::star::i18n::WordType::DICTIONARY_WORD ) ); + pOLV->SetSelection( rEditEngine.GetWord( aSel, css::i18n::WordType::DICTIONARY_WORD ) ); const bool bRemoveParaAttribs = !bNoParagraphFormats; pOLV->RemoveAttribsKeepLanguages( bRemoveParaAttribs ); diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 213ffb986b85..394cc3781829 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -89,7 +89,7 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport( maOldLineColor(), mnLineWidth(0), maLineJoin(basegfx::B2DLineJoin::NONE), - maLineCap(com::sun::star::drawing::LineCap_BUTT), + maLineCap(css::drawing::LineCap_BUTT), maDash(css::drawing::DashStyle_RECT, 0, 0, 0, 0, 0), mbMov(false), mbSize(false), @@ -356,19 +356,19 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr switch(maLineJoin) { default : // basegfx::B2DLineJoin::NONE - mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_NONE)); + mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_NONE)); break; case basegfx::B2DLineJoin::Middle: - mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_MIDDLE)); + mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_MIDDLE)); break; case basegfx::B2DLineJoin::Bevel: - mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_BEVEL)); + mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_BEVEL)); break; case basegfx::B2DLineJoin::Miter: - mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_MITER)); + mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_MITER)); break; case basegfx::B2DLineJoin::Round: - mpLineAttr->Put(XLineJointItem(com::sun::star::drawing::LineJoint_ROUND)); + mpLineAttr->Put(XLineJointItem(css::drawing::LineJoint_ROUND)); break; } diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index 7e253091dd60..f06003b3a252 100644 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -54,7 +54,7 @@ protected: Color maOldLineColor; sal_Int32 mnLineWidth; basegfx::B2DLineJoin maLineJoin; - com::sun::star::drawing::LineCap maLineCap; + css::drawing::LineCap maLineCap; XDash maDash; bool mbMov; diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 57a944fd3350..53bddf9c4e8a 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -53,9 +53,9 @@ void SetOfByte::operator|=(const SetOfByte& r2ndSet) /** initialize this set with a uno sequence of sal_Int8 */ -void SetOfByte::PutValue( const com::sun::star::uno::Any & rAny ) +void SetOfByte::PutValue( const css::uno::Any & rAny ) { - com::sun::star::uno::Sequence< sal_Int8 > aSeq; + css::uno::Sequence< sal_Int8 > aSeq; if( rAny >>= aSeq ) { sal_Int16 nCount = (sal_Int16)aSeq.getLength(); @@ -77,7 +77,7 @@ void SetOfByte::PutValue( const com::sun::star::uno::Any & rAny ) /** returns a uno sequence of sal_Int8 */ -void SetOfByte::QueryValue( com::sun::star::uno::Any & rAny ) const +void SetOfByte::QueryValue( css::uno::Any & rAny ) const { sal_Int16 nNumBytesSet = 0; sal_Int16 nIndex; @@ -90,7 +90,7 @@ void SetOfByte::QueryValue( com::sun::star::uno::Any & rAny ) const } } - com::sun::star::uno::Sequence< sal_Int8 > aSeq( nNumBytesSet ); + css::uno::Sequence< sal_Int8 > aSeq( nNumBytesSet ); for( nIndex = 0; nIndex < nNumBytesSet; nIndex++ ) { diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 2f938d5663bb..becf1d5f9e56 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1820,7 +1820,7 @@ uno::Reference< uno::XInterface > SdrModel::getUnoModel() return mxUnoModel; } -void SdrModel::setUnoModel( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xModel ) +void SdrModel::setUnoModel( css::uno::Reference< css::uno::XInterface > xModel ) { mxUnoModel = xModel; } @@ -1828,7 +1828,7 @@ void SdrModel::setUnoModel( ::com::sun::star::uno::Reference< ::com::sun::star:: uno::Reference< uno::XInterface > SdrModel::createUnoModel() { OSL_FAIL( "SdrModel::createUnoModel() - base implementation should not be called!" ); - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInt; + css::uno::Reference< css::uno::XInterface > xInt; return xInt; } @@ -2084,7 +2084,7 @@ namespace class theSdrModelUnoTunnelImplementationId : public rtl::Static< UnoTunnelIdInit, theSdrModelUnoTunnelImplementationId > {}; } -const ::com::sun::star::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImplementationId() +const css::uno::Sequence< sal_Int8 >& SdrModel::getUnoTunnelImplementationId() { return theSdrModelUnoTunnelImplementationId::get().getSeq(); } diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index b15e66bc1ada..456cd007c50e 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -278,7 +278,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS // is creating a paraobject, but paraobjects can not be created without model. So // we are preventing the crash by setting the writing mode always left to right, // this is not bad since our shadow geometry does not contain text. - aTempSet.Put( SvxWritingModeItem( com::sun::star::text::WritingMode_LR_TB, SDRATTR_TEXTDIRECTION ) ); + aTempSet.Put( SvxWritingModeItem( css::text::WritingMode_LR_TB, SDRATTR_TEXTDIRECTION ) ); // no shadow aTempSet.Put(makeSdrShadowItem(false)); @@ -502,7 +502,7 @@ bool SdrObjCustomShape::IsMirroredX() const bool bMirroredX = false; SdrCustomShapeGeometryItem aGeometryItem( static_cast(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ) ); const OUString sMirroredX( "MirroredX" ); - com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX ); + css::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredX ); if ( pAny ) *pAny >>= bMirroredX; return bMirroredX; @@ -512,7 +512,7 @@ bool SdrObjCustomShape::IsMirroredY() const bool bMirroredY = false; SdrCustomShapeGeometryItem aGeometryItem( static_cast(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ) ); const OUString sMirroredY( "MirroredY" ); - com::sun::star::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY ); + css::uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sMirroredY ); if ( pAny ) *pAny >>= bMirroredY; return bMirroredY; @@ -541,7 +541,7 @@ void SdrObjCustomShape::SetMirroredY( const bool bMirrorY ) bool SdrObjCustomShape::IsPostRotate() const { - const com::sun::star::uno::Any* pAny; + const css::uno::Any* pAny; bool bPostRotate = false; const SdrCustomShapeGeometryItem& rGeometryItem = static_cast(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); pAny = rGeometryItem.GetPropertyValueByName( "IsPostRotateAngle" ); @@ -552,7 +552,7 @@ bool SdrObjCustomShape::IsPostRotate() const double SdrObjCustomShape::GetExtraTextRotation( const bool bPreRotation ) const { - const com::sun::star::uno::Any* pAny; + const css::uno::Any* pAny; const SdrCustomShapeGeometryItem& rGeometryItem = static_cast(GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); const OUString sTextRotateAngle( "TextRotateAngle" ); const OUString sTextPreRotateAngle( "TextPreRotateAngle" ); @@ -585,7 +585,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const bool bBezierAl Reference< XCustomShapeEngine > xCustomShapeEngine( GetCustomShapeEngine() ); if ( xCustomShapeEngine.is() ) { - com::sun::star::drawing::PolyPolygonBezierCoords aBezierCoords = xCustomShapeEngine->getLineGeometry(); + css::drawing::PolyPolygonBezierCoords aBezierCoords = xCustomShapeEngine->getLineGeometry(); try { aRetval = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( aBezierCoords ); @@ -594,7 +594,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::GetLineGeometry( const bool bBezierAl aRetval = basegfx::tools::adaptiveSubdivideByAngle(aRetval); } } - catch ( const com::sun::star::lang::IllegalArgumentException & ) + catch ( const css::lang::IllegalArgumentException & ) { } } @@ -731,7 +731,7 @@ static sal_Int32 GetNumberOfProperties ( const SvxMSDffHandle* pData ) return nPropertiesNeeded; } -static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::star::beans::PropertyValues& rPropValues ) +static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, css::beans::PropertyValues& rPropValues ) { SvxMSDffHandleFlags nFlags = pData->nFlags; sal_Int32 n=0; @@ -739,7 +739,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s // POSITION { const OUString sPosition( "Position" ); - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aPosition; + css::drawing::EnhancedCustomShapeParameterPair aPosition; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.First, pData->nPositionX, true, true ); EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aPosition.Second, pData->nPositionY, true, false ); rPropValues[ n ].Name = sPosition; @@ -769,7 +769,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s if ( nFlags & SvxMSDffHandleFlags::POLAR ) { const OUString sPolar( "Polar" ); - ::com::sun::star::drawing::EnhancedCustomShapeParameterPair aCenter; + css::drawing::EnhancedCustomShapeParameterPair aCenter; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.First, pData->nCenterX, bool( nFlags & SvxMSDffHandleFlags::CENTER_X_IS_SPECIAL ), true ); EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aCenter.Second, pData->nCenterY, @@ -781,7 +781,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { const OUString sRadiusRangeMinimum( "RadiusRangeMinimum" ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; + css::drawing::EnhancedCustomShapeParameter aRadiusRangeMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMinimum, pData->nRangeXMin, bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL ), true ); rPropValues[ n ].Name = sRadiusRangeMinimum; @@ -790,7 +790,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { const OUString sRadiusRangeMaximum( "RadiusRangeMaximum" ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; + css::drawing::EnhancedCustomShapeParameter aRadiusRangeMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRadiusRangeMaximum, pData->nRangeXMax, bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL ), false ); rPropValues[ n ].Name = sRadiusRangeMaximum; @@ -803,7 +803,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s if ( pData->nRangeXMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { const OUString sRangeXMinimum( "RangeXMinimum" ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMinimum; + css::drawing::EnhancedCustomShapeParameter aRangeXMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMinimum, pData->nRangeXMin, bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MIN_IS_SPECIAL ), true ); rPropValues[ n ].Name = sRangeXMinimum; @@ -812,7 +812,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s if ( pData->nRangeXMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { const OUString sRangeXMaximum( "RangeXMaximum" ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeXMaximum; + css::drawing::EnhancedCustomShapeParameter aRangeXMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeXMaximum, pData->nRangeXMax, bool( nFlags & SvxMSDffHandleFlags::RANGE_X_MAX_IS_SPECIAL ), false ); rPropValues[ n ].Name = sRangeXMaximum; @@ -821,7 +821,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s if ( pData->nRangeYMin != DEFAULT_MINIMUM_SIGNED_COMPARE ) { const OUString sRangeYMinimum( "RangeYMinimum" ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMinimum; + css::drawing::EnhancedCustomShapeParameter aRangeYMinimum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMinimum, pData->nRangeYMin, bool( nFlags & SvxMSDffHandleFlags::RANGE_Y_MIN_IS_SPECIAL ), true ); rPropValues[ n ].Name = sRangeYMinimum; @@ -830,7 +830,7 @@ static void lcl_ShapePropertiesFromDFF( const SvxMSDffHandle* pData, com::sun::s if ( pData->nRangeYMax != DEFAULT_MAXIMUM_SIGNED_COMPARE ) { const OUString sRangeYMaximum( "RangeYMaximum" ); - ::com::sun::star::drawing::EnhancedCustomShapeParameter aRangeYMaximum; + css::drawing::EnhancedCustomShapeParameter aRangeYMaximum; EnhancedCustomShape2d::SetEnhancedCustomShapeHandleParameter( aRangeYMaximum, pData->nRangeYMax, bool( nFlags & SvxMSDffHandleFlags::RANGE_Y_MAX_IS_SPECIAL ), false ); rPropValues[ n ].Name = sRangeYMaximum; @@ -892,7 +892,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) if ( pDefCustomShape ) pDefData = pDefCustomShape->pDefData; - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > seqAdjustmentValues; + css::uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > seqAdjustmentValues; // AdjustmentValues @@ -912,17 +912,17 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) for ( i = nAdjustmentValues; i < nAdjustmentDefaults; i++ ) { seqAdjustmentValues[ i ].Value <<= pDefData[ i ]; - seqAdjustmentValues[ i ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; + seqAdjustmentValues[ i ].State = css::beans::PropertyState_DIRECT_VALUE; } } // check if there are defaulted adjustment values that should be filled the hard coded defaults (pDefValue) sal_Int32 nCount = nAdjustmentValues > nAdjustmentDefaults ? nAdjustmentDefaults : nAdjustmentValues; for ( i = 0; i < nCount; i++ ) { - if ( seqAdjustmentValues[ i ].State != com::sun::star::beans::PropertyState_DIRECT_VALUE ) + if ( seqAdjustmentValues[ i ].State != css::beans::PropertyState_DIRECT_VALUE ) { seqAdjustmentValues[ i ].Value <<= pDefData[ i ]; - seqAdjustmentValues[ i ].State = com::sun::star::beans::PropertyState_DIRECT_VALUE; + seqAdjustmentValues[ i ].State = css::beans::PropertyState_DIRECT_VALUE; } } } @@ -935,7 +935,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) const OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox ); - com::sun::star::awt::Rectangle aViewBox; + css::awt::Rectangle aViewBox; if ( !pViewBox || !(*pViewBox >>= aViewBox ) ) { if ( pDefCustomShape ) @@ -959,7 +959,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( !pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqCoordinates; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> seqCoordinates; sal_Int32 i, nCount = pDefCustomShape->nVertices; seqCoordinates.realloc( nCount ); @@ -978,7 +978,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( !pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqGluePoints; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> seqGluePoints; sal_Int32 i, nCount = pDefCustomShape->nGluePoints; seqGluePoints.realloc( nCount ); for ( i = 0; i < nCount; i++ ) @@ -996,7 +996,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( !pAny && pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > seqSegments; + css::uno::Sequence< css::drawing::EnhancedCustomShapeSegment > seqSegments; sal_Int32 i, nCount = pDefCustomShape->nElements; seqSegments.realloc( nCount ); @@ -1044,7 +1044,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( !pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > seqTextFrames; + css::uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > seqTextFrames; sal_Int32 i, nCount = pDefCustomShape->nTextRect; seqTextFrames.realloc( nCount ); @@ -1066,7 +1066,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations ); if ( !pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation ) { - com::sun::star::uno::Sequence< OUString > seqEquations; + css::uno::Sequence< OUString > seqEquations; sal_Int32 i, nCount = pDefCustomShape->nCalculation; seqEquations.realloc( nCount ); @@ -1083,7 +1083,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles ); if ( !pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles ) { - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > seqHandles; + css::uno::Sequence< css::beans::PropertyValues > seqHandles; sal_Int32 i, nCount = pDefCustomShape->nHandles; const SvxMSDffHandle* pData = pDefCustomShape->pHandles; @@ -1091,7 +1091,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType ) for ( i = 0; i < nCount; i++, pData++ ) { sal_Int32 nPropertiesNeeded; - com::sun::star::beans::PropertyValues& rPropValues = seqHandles[ i ]; + css::beans::PropertyValues& rPropValues = seqHandles[ i ]; nPropertiesNeeded = GetNumberOfProperties( pData ); rPropValues.realloc( nPropertiesNeeded ); lcl_ShapePropertiesFromDFF( pData, rPropValues ); @@ -1126,7 +1126,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons { const OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox ); - com::sun::star::awt::Rectangle aViewBox; + css::awt::Rectangle aViewBox; if ( pViewBox && ( *pViewBox >>= aViewBox ) ) { if ( ( aViewBox.Width == pDefCustomShape->nCoordWidth ) @@ -1142,7 +1142,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); if ( pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqCoordinates1, seqCoordinates2; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> seqCoordinates1, seqCoordinates2; if ( *pAny >>= seqCoordinates1 ) { sal_Int32 i, nCount = pDefCustomShape->nVertices; @@ -1167,7 +1167,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); if ( pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeParameterPair> seqGluePoints1, seqGluePoints2; + css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> seqGluePoints1, seqGluePoints2; if ( *pAny >>= seqGluePoints1 ) { sal_Int32 i, nCount = pDefCustomShape->nGluePoints; @@ -1193,7 +1193,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sSegments ); if ( pAny ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeSegment > seqSegments1, seqSegments2; + css::uno::Sequence< css::drawing::EnhancedCustomShapeSegment > seqSegments1, seqSegments2; if ( *pAny >>= seqSegments1 ) { if ( pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements ) @@ -1273,7 +1273,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations ); if ( pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation ) { - com::sun::star::uno::Sequence< OUString > seqEquations1, seqEquations2; + css::uno::Sequence< OUString > seqEquations1, seqEquations2; if ( *pAny >>= seqEquations1 ) { sal_Int32 i, nCount = pDefCustomShape->nCalculation; @@ -1298,7 +1298,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); if ( pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect ) { - com::sun::star::uno::Sequence< com::sun::star::drawing::EnhancedCustomShapeTextFrame > seqTextFrames1, seqTextFrames2; + css::uno::Sequence< css::drawing::EnhancedCustomShapeTextFrame > seqTextFrames1, seqTextFrames2; if ( *pAny >>= seqTextFrames1 ) { sal_Int32 i, nCount = pDefCustomShape->nTextRect; @@ -1326,7 +1326,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles ); if ( pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles ) { - com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValues > seqHandles1, seqHandles2; + css::uno::Sequence< css::beans::PropertyValues > seqHandles1, seqHandles2; if ( *pAny >>= seqHandles1 ) { sal_Int32 i, nCount = pDefCustomShape->nHandles; @@ -1335,7 +1335,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons for ( i = 0; i < nCount; i++, pData++ ) { sal_Int32 nPropertiesNeeded; - com::sun::star::beans::PropertyValues& rPropValues = seqHandles2[ i ]; + css::beans::PropertyValues& rPropValues = seqHandles2[ i ]; nPropertiesNeeded = GetNumberOfProperties( pData ); rPropValues.realloc( nPropertiesNeeded ); lcl_ShapePropertiesFromDFF( pData, rPropValues ); @@ -1606,12 +1606,12 @@ void SdrObjCustomShape::NbcResize( const Point& rRef, const Fraction& rxFact, co if ( aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_X ) { sal_Int32 nX = ( aIter->aPosition.X - aOld.Left() ) + maRect.Left(); - aIter->xInteraction->setControllerPosition( com::sun::star::awt::Point( nX, aIter->xInteraction->getPosition().Y ) ); + aIter->xInteraction->setControllerPosition( css::awt::Point( nX, aIter->xInteraction->getPosition().Y ) ); } if ( aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_Y ) { sal_Int32 nY = ( aIter->aPosition.Y - aOld.Top() ) + maRect.Top(); - aIter->xInteraction->setControllerPosition( com::sun::star::awt::Point( aIter->xInteraction->getPosition().X, nY ) ); + aIter->xInteraction->setControllerPosition( css::awt::Point( aIter->xInteraction->getPosition().X, nY ) ); } } catch ( const uno::RuntimeException& ) @@ -1918,7 +1918,7 @@ SdrHdl* SdrObjCustomShape::GetHdl( sal_uInt32 nHdlNum ) const { try { - com::sun::star::awt::Point aPosition( aInteractionHandles[ nCustomShapeHdlNum ].xInteraction->getPosition() ); + css::awt::Point aPosition( aInteractionHandles[ nCustomShapeHdlNum ].xInteraction->getPosition() ); pH = new SdrHdl( Point( aPosition.X, aPosition.Y ), HDL_CUSTOMSHAPE1 ); pH->SetPointNum( nCustomShapeHdlNum ); pH->SetObj( const_cast(this) ); @@ -2041,7 +2041,7 @@ void SdrObjCustomShape::DragResizeCustomShape( const Rectangle& rNewRect ) else nX += maRect.Left(); } - aIter->xInteraction->setControllerPosition( com::sun::star::awt::Point( nX, aIter->xInteraction->getPosition().Y ) ); + aIter->xInteraction->setControllerPosition( css::awt::Point( nX, aIter->xInteraction->getPosition().Y ) ); } if ( aIter->nMode & CustomShapeHandleModes::RESIZE_ABSOLUTE_Y ) { @@ -2062,7 +2062,7 @@ void SdrObjCustomShape::DragResizeCustomShape( const Rectangle& rNewRect ) else nY += maRect.Top(); } - aIter->xInteraction->setControllerPosition( com::sun::star::awt::Point( aIter->xInteraction->getPosition().X, nY ) ); + aIter->xInteraction->setControllerPosition( css::awt::Point( aIter->xInteraction->getPosition().X, nY ) ); } } catch ( const uno::RuntimeException& ) @@ -2083,7 +2083,7 @@ void SdrObjCustomShape::DragMoveCustomShapeHdl( const Point& rDestination, { try { - com::sun::star::awt::Point aPt( rDestination.X(), rDestination.Y() ); + css::awt::Point aPt( rDestination.X(), rDestination.Y() ); if ( aInteractionHandle.nMode & CustomShapeHandleModes::MOVE_SHAPE && bMoveCalloutRectangle ) { sal_Int32 nXDiff = aPt.X - aInteractionHandle.aPosition.X; diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 65c29ee0d108..c2ed3bad1ae0 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -802,7 +802,7 @@ void SdrObject::SetOrdNum(sal_uInt32 nNum) nOrdNum = nNum; } -void SdrObject::GetGrabBagItem(com::sun::star::uno::Any& rVal) const +void SdrObject::GetGrabBagItem(css::uno::Any& rVal) const { if (pGrabBagItem != NULL) pGrabBagItem->QueryValue(rVal); @@ -812,7 +812,7 @@ void SdrObject::GetGrabBagItem(com::sun::star::uno::Any& rVal) const } } -void SdrObject::SetGrabBagItem(const com::sun::star::uno::Any& rVal) +void SdrObject::SetGrabBagItem(const css::uno::Any& rVal) { if (pGrabBagItem == NULL) pGrabBagItem = new SfxGrabBagItem; @@ -2925,7 +2925,7 @@ SvxShape* SdrObject::getSvxShape() return mpSvxShape; } -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SdrObject::getUnoShape() +css::uno::Reference< css::uno::XInterface > SdrObject::getUnoShape() { // try weak reference first uno::Reference< uno::XInterface > xShape( getWeakUnoShape() ); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 4c4d74c72d69..fef7e7847e18 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -117,7 +117,7 @@ public: virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; + const OUString& rMimeType, const css::uno::Any & rValue ) override; void DataChanged( const Graphic& rGraphic ); bool Connect() { return 0 != GetRealObject(); } @@ -219,7 +219,7 @@ void SdrGraphicLink::RemoveGraphicUpdater() } ::sfx2::SvBaseLink::UpdateResult SdrGraphicLink::DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) + const OUString& rMimeType, const css::uno::Any & rValue ) { SdrModel* pModel = rGrafObj.GetModel(); sfx2::LinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0; @@ -1323,13 +1323,13 @@ IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* ) { Graphic aGraphic; - std::unique_ptr > pFilterData; + std::unique_ptr > pFilterData; if(mbInsidePaint && !GetViewContact().HasViewObjectContacts(true)) { - pFilterData.reset(new com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >( 3 )); + pFilterData.reset(new css::uno::Sequence< css::beans::PropertyValue >( 3 )); - const com::sun::star::awt::Size aPreviewSizeHint( 64, 64 ); + const css::awt::Size aPreviewSizeHint( 64, 64 ); const bool bAllowPartialStreamRead = true; // create instance also for previews in order to avoid that its corresponding // data is cleared in the graphic cache entry in case that the preview data equals the complete graphic data diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 485c473e8350..574a4f566926 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -135,9 +135,9 @@ public: private: Rectangle impl_getScaledRect_nothrow() const; // XStateChangeListener - virtual void SAL_CALL changingState( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stateChanged( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL changingState( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL stateChanged( const css::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; // document::XEventListener virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) override; @@ -155,7 +155,7 @@ private: virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; - virtual uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; + virtual uno::Reference< css::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) override; @@ -181,7 +181,7 @@ Rectangle SdrLightEmbeddedClient_Impl::impl_getScaledRect_nothrow() const return aLogicRect; } -void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const ::com::sun::star::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (css::embed::WrongStateException, css::uno::RuntimeException, std::exception) { } @@ -197,7 +197,7 @@ void SdrLightEmbeddedClient_Impl::Release() } -void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const ::com::sun::star::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const css::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -213,7 +213,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const ::com::sun::star: } -void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -410,7 +410,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI() xObject->changeState( embed::EmbedStates::RUNNING ); } } - catch (com::sun::star::uno::Exception& ) + catch (css::uno::Exception& ) {} } } @@ -430,7 +430,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI() uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; - com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager(getLayoutManager()); + css::uno::Reference< css::frame::XLayoutManager > xLayoutManager(getLayoutManager()); if ( xLayoutManager.is() ) { static const char aMenuBarURL[] = "private:resource/menubar/menubar"; @@ -440,11 +440,11 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI() } -uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbeddedClient_Impl::getLayoutManager() +uno::Reference< css::frame::XLayoutManager > SAL_CALL SdrLightEmbeddedClient_Impl::getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) { - uno::Reference< ::com::sun::star::frame::XLayoutManager > xMan; + uno::Reference< css::frame::XLayoutManager > xMan; SolarMutexGuard aGuard; uno::Reference < beans::XPropertySet > xFrame( lcl_getFrame_throw(mpObj)); try @@ -600,7 +600,7 @@ public: virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; + const OUString& rMimeType, const css::uno::Any & rValue ) override; bool Connect() { return GetRealObject() != NULL; } }; @@ -623,7 +623,7 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink() ::sfx2::SvBaseLink::UpdateResult SdrEmbedObjectLink::DataChanged( - const OUString& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue*/ ) + const OUString& /*rMimeType*/, const css::uno::Any & /*rValue*/ ) { if ( !pObj->UpdateLinkURL_Impl() ) { @@ -956,7 +956,7 @@ bool SdrOle2Obj::UpdateLinkURL_Impl() if ( nCurState != embed::EmbedStates::LOADED ) mpImpl->mxObjRef->changeState(nCurState); } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( OString(OString("SdrOle2Obj::UpdateLinkURL_Impl(), " @@ -998,7 +998,7 @@ void SdrOle2Obj::BreakFileLink_Impl() DisconnectFileLink_Impl(); mpImpl->maLinkURL.clear(); } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( OString(OString("SdrOle2Obj::BreakFileLink_Impl(), " @@ -1049,7 +1049,7 @@ void SdrOle2Obj::CheckFileLink_Impl() } } } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( OString(OString("SdrOle2Obj::CheckFileLink_Impl(), " @@ -1133,7 +1133,7 @@ void SdrOle2Obj::Connect_Impl() } } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( OString(OString("SdrOle2Obj::Connect_Impl(), " @@ -1220,7 +1220,7 @@ void SdrOle2Obj::RemoveListeners_Impl() } } } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( OString(OString("SdrOle2Obj::RemoveListeners_Impl(), " @@ -1302,7 +1302,7 @@ void SdrOle2Obj::Disconnect_Impl() GetSdrGlobalData().GetOLEObjCache().RemoveObj(this); } } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( OString(OString("SdrOle2Obj::Disconnect_Impl(), " @@ -1359,7 +1359,7 @@ SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHC pClone->SetModel(GetModel()); // gray outline - pClone->SetMergedItem(XLineStyleItem(com::sun::star::drawing::LineStyle_SOLID)); + pClone->SetMergedItem(XLineStyleItem(css::drawing::LineStyle_SOLID)); const svtools::ColorConfig aColorConfig; const svtools::ColorConfigValue aColor(aColorConfig.GetColorValue(svtools::OBJECTBOUNDARIES)); pClone->SetMergedItem(XLineColorItem(OUString(), aColor.nColor)); @@ -1437,7 +1437,7 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel) } DBG_ASSERT( !aTmp.isEmpty(), "Copying embedded object failed!" ); } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( OString(OString("SdrOle2Obj::SetModel(), " @@ -1507,7 +1507,7 @@ void SdrOle2Obj::SetPage(SdrPage* pNewPage) -void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rNewObjRef ) +void SdrOle2Obj::SetObjRef( const css::uno::Reference < css::embed::XEmbeddedObject >& rNewObjRef ) { DBG_ASSERT( !rNewObjRef.is() || !mpImpl->mxObjRef.GetObject().is(), "SetObjRef called on already initialized object!"); if( rNewObjRef == mpImpl->mxObjRef.GetObject() ) @@ -2008,7 +2008,7 @@ bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, s xObj->changeState( embed::EmbedStates::LOADED ); bResult = true; } - catch( ::com::sun::star::uno::Exception& ) + catch( css::uno::Exception& ) { OSL_FAIL( OString(OString("SdrOle2Obj::Unload=(), " @@ -2271,7 +2271,7 @@ Graphic SdrOle2Obj::GetEmptyOLEReplacementGraphic() -void SdrOle2Obj::SetWindow(const com::sun::star::uno::Reference < com::sun::star::awt::XWindow >& _xWindow) +void SdrOle2Obj::SetWindow(const css::uno::Reference < css::awt::XWindow >& _xWindow) { if ( mpImpl->mxObjRef.is() && mpImpl->pLightClient ) { diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 297313fc47b3..21663ee3a835 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1422,8 +1422,8 @@ void SdrTextObj::NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObjec if (pText && pText->GetOutlinerParaObject()) { SvxWritingModeItem aWritingMode(pText->GetOutlinerParaObject()->IsVertical() - ? com::sun::star::text::WritingMode_TB_RL - : com::sun::star::text::WritingMode_LR_TB, + ? css::text::WritingMode_TB_RL + : css::text::WritingMode_LR_TB, SDRATTR_TEXTDIRECTION); GetProperties().SetObjectItemDirect(aWritingMode); } diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index b6541474141b..5e2c38069548 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -343,7 +343,7 @@ namespace rInfo.mnTextLen, aDXArray, aFontAttribute, - rInfo.mpLocale ? *rInfo.mpLocale : ::com::sun::star::lang::Locale(), + rInfo.mpLocale ? *rInfo.mpLocale : css::lang::Locale(), aBFontColor, aTextFillColor, @@ -371,7 +371,7 @@ namespace rInfo.mnTextLen, aDXArray, aFontAttribute, - rInfo.mpLocale ? *rInfo.mpLocale : ::com::sun::star::lang::Locale(), + rInfo.mpLocale ? *rInfo.mpLocale : css::lang::Locale(), aBFontColor, rInfo.mbFilled, rInfo.mnWidthToFill, diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 226c07b7192c..a3b817106559 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -77,7 +77,7 @@ namespace sal_Int32 mnParagraph; SvxFont maFont; ::std::vector< double > maDblDXArray; // double DXArray, font size independent -> unit coordinate system - ::com::sun::star::lang::Locale maLocale; + css::lang::Locale maLocale; // bitfield bool mbRTL : 1; @@ -91,7 +91,7 @@ namespace mnParagraph(rInfo.mnPara), maFont(rInfo.mrFont), maDblDXArray(), - maLocale(rInfo.mpLocale ? *rInfo.mpLocale : ::com::sun::star::lang::Locale()), + maLocale(rInfo.mpLocale ? *rInfo.mpLocale : css::lang::Locale()), mbRTL(!rInfo.mrFont.IsVertical() && rInfo.IsRTL()) { if(mnTextLength && rInfo.mpDXArray) @@ -128,7 +128,7 @@ namespace const SvxFont& getFont() const { return maFont; } bool isRTL() const { return mbRTL; } const ::std::vector< double >& getDoubleDXArray() const { return maDblDXArray; } - const ::com::sun::star::lang::Locale& getLocale() const { return maLocale; } + const css::lang::Locale& getLocale() const { return maLocale; } sal_Int32 getPortionIndex(sal_Int32 nIndex, sal_Int32 nLength) const { @@ -211,7 +211,7 @@ namespace const drawinglayer::attribute::SdrFormTextAttribute maSdrFormTextAttribute; // FormText parameters std::vector< drawinglayer::primitive2d::BasePrimitive2D* >& mrDecomposition; // destination primitive list std::vector< drawinglayer::primitive2d::BasePrimitive2D* >& mrShadowDecomposition; // destination primitive list for shadow - Reference < com::sun::star::i18n::XBreakIterator > mxBreak; // break iterator + Reference < css::i18n::XBreakIterator > mxBreak; // break iterator static double getParagraphTextLength(const ::std::vector< const impPathTextPortion* >& rTextPortions) { @@ -232,7 +232,7 @@ namespace return fRetval; } - sal_Int32 getNextGlyphLen(const impPathTextPortion* pCandidate, sal_Int32 nPosition, const ::com::sun::star::lang::Locale& rFontLocale) + sal_Int32 getNextGlyphLen(const impPathTextPortion* pCandidate, sal_Int32 nPosition, const css::lang::Locale& rFontLocale) { sal_Int32 nNextGlyphLen(1); @@ -257,7 +257,7 @@ namespace { // prepare BreakIterator Reference < XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - mxBreak = com::sun::star::i18n::BreakIterator::create(xContext); + mxBreak = css::i18n::BreakIterator::create(xContext); } void HandlePair(const basegfx::B2DPolygon& rPolygonCandidate, const ::std::vector< const impPathTextPortion* >& rTextPortions) diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 27d3649f90b5..cf8777616325 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -48,7 +48,7 @@ public: virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) override; + const OUString& rMimeType, const css::uno::Any & rValue ) override; }; ImpSdrObjTextLink::~ImpSdrObjTextLink() @@ -69,7 +69,7 @@ void ImpSdrObjTextLink::Closed() ::sfx2::SvBaseLink::UpdateResult ImpSdrObjTextLink::DataChanged( - const OUString& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue */) + const OUString& /*rMimeType*/, const css::uno::Any & /*rValue */) { bool bForceReload = false; SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : 0; @@ -171,9 +171,9 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) INetURLObject aURL( pData->aFileName ); DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); - ::ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue("DateModified") ); - ::com::sun::star::util::DateTime aDateTime; + ::ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); + css::uno::Any aAny( aCnt.getPropertyValue("DateModified") ); + css::util::DateTime aDateTime; aAny >>= aDateTime; ::utl::typeConvert( aDateTime, aFileDT ); diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 8d625e0cf7a6..ed5326aad310 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -65,7 +65,7 @@ using namespace sdr::contact; #include -class SdrControlEventListenerImpl : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener > +class SdrControlEventListenerImpl : public ::cppu::WeakImplHelper< css::lang::XEventListener > { protected: SdrUnoObj* pObj; @@ -76,15 +76,15 @@ public: {} // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; void StopListening(const uno::Reference< lang::XComponent >& xComp); void StartListening(const uno::Reference< lang::XComponent >& xComp); }; // XEventListener -void SAL_CALL SdrControlEventListenerImpl::disposing( const ::com::sun::star::lang::EventObject& /*Source*/) - throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SdrControlEventListenerImpl::disposing( const css::lang::EventObject& /*Source*/) + throw(css::uno::RuntimeException, std::exception) { if (pObj) { diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index ed70e078aa1d..d1e240e6dc79 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1709,7 +1709,7 @@ uno::Reference< uno::XInterface > SdrPage::getUnoPage() uno::Reference< uno::XInterface > SdrPage::createUnoPage() { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInt = + css::uno::Reference< css::uno::XInterface > xInt = static_cast( new SvxFmDrawPage( this ) ); return xInt; } diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 003777192ade..0564bc8cd8c5 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -203,9 +203,9 @@ void SdrPageView::RemovePaintWindowFromPageView(SdrPaintWindow& rPaintWindow) } } -::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SdrPageView::GetControlContainer( const OutputDevice& _rDevice ) const +css::uno::Reference< css::awt::XControlContainer > SdrPageView::GetControlContainer( const OutputDevice& _rDevice ) const { - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > xReturn; + css::uno::Reference< css::awt::XControlContainer > xReturn; const SdrPageWindow* pCandidate = FindPatchedPageWindow( _rDevice ); if ( pCandidate ) diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index e4ddd18e20ed..158be7ddb02a 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::container; namespace accessibility { -AccessibleCell::AccessibleCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo ) +AccessibleCell::AccessibleCell( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo ) : AccessibleCellBase( rxParent, AccessibleRole::TABLE_CELL ) , maShapeTreeInfo( rShapeTreeInfo ) , mnIndexInParent( nIndex ) @@ -169,7 +169,7 @@ void SAL_CALL AccessibleCell::release( ) throw () /** The children of this cell come from the paragraphs of text. */ -sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ThrowIfDisposed (); @@ -231,17 +231,17 @@ Reference SAL_CALL AccessibleCell::getAccessibleStateSet() //Just when the parent table is not read-only,set states EDITABLE,RESIZABLE,MOVEABLE - ::com::sun::star::uno::Reference xTempAcc = getAccessibleParent(); + css::uno::Reference xTempAcc = getAccessibleParent(); if( xTempAcc.is() ) { - ::com::sun::star::uno::Reference + css::uno::Reference xTempAccContext = xTempAcc->getAccessibleContext(); if( xTempAccContext.is() ) { - ::com::sun::star::uno::Reference rState = + css::uno::Reference rState = xTempAccContext->getAccessibleStateSet(); if( rState.is() ) { - com::sun::star::uno::Sequence pStates = rState->getStates(); + css::uno::Sequence pStates = rState->getStates(); int count = pStates.getLength(); for( int iIndex = 0;iIndex < count;iIndex++ ) { @@ -269,7 +269,7 @@ Reference SAL_CALL AccessibleCell::getAccessibleStateSet() // XAccessibleComponent -sal_Bool SAL_CALL AccessibleCell::containsPoint( const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL AccessibleCell::containsPoint( const css::awt::Point& aPoint) throw (css::uno::RuntimeException, std::exception) { return AccessibleComponentBase::containsPoint( aPoint ); } @@ -282,7 +282,7 @@ sal_Bool SAL_CALL AccessibleCell::containsPoint( const ::com::sun::star::awt::Po the already instantiated children and only if no match is found instantiate the remaining ones. */ -Reference SAL_CALL AccessibleCell::getAccessibleAtPoint ( const ::com::sun::star::awt::Point& aPoint) throw(RuntimeException, std::exception) +Reference SAL_CALL AccessibleCell::getAccessibleAtPoint ( const css::awt::Point& aPoint) throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -313,13 +313,13 @@ Reference SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -::com::sun::star::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); ThrowIfDisposed (); - ::com::sun::star::awt::Rectangle aBoundingBox; + css::awt::Rectangle aBoundingBox; if( mxCell.is() ) { // Get the cell's bounding box in internal coordinates (in 100th of mm) @@ -360,27 +360,27 @@ Reference SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, std::exception) +css::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, std::exception) { ThrowIfDisposed (); - ::com::sun::star::awt::Rectangle aBoundingBox(getBounds()); - return ::com::sun::star::awt::Point(aBoundingBox.X, aBoundingBox.Y); + css::awt::Rectangle aBoundingBox(getBounds()); + return css::awt::Point(aBoundingBox.X, aBoundingBox.Y); } -::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeException, std::exception) +css::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeException, std::exception) { ThrowIfDisposed (); // Get relative position... - ::com::sun::star::awt::Point aLocation(getLocation ()); + css::awt::Point aLocation(getLocation ()); // ... and add absolute position of the parent. Reference xParentComponent( getAccessibleParent(), uno::UNO_QUERY); if(xParentComponent.is()) { - ::com::sun::star::awt::Point aParentLocation(xParentComponent->getLocationOnScreen()); + css::awt::Point aParentLocation(xParentComponent->getLocationOnScreen()); aLocation.X += aParentLocation.X; aLocation.Y += aParentLocation.Y; } @@ -403,21 +403,21 @@ awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::excep -void SAL_CALL AccessibleCell::addFocusListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL AccessibleCell::addFocusListener ( const css::uno::Reference< css::awt::XFocusListener >& xListener) throw (css::uno::RuntimeException) { AccessibleComponentBase::addFocusListener( xListener ); } -void SAL_CALL AccessibleCell::removeFocusListener (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL AccessibleCell::removeFocusListener (const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) { AccessibleComponentBase::removeFocusListener( xListener ); } -void SAL_CALL AccessibleCell::grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL AccessibleCell::grabFocus() throw (css::uno::RuntimeException, std::exception) { AccessibleComponentBase::grabFocus(); } @@ -448,7 +448,7 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground() throw (RuntimeException, std: // XAccessibleExtendedComponent -::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL AccessibleCell::getFont() throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Reference< css::awt::XFont > SAL_CALL AccessibleCell::getFont() throw (css::uno::RuntimeException, std::exception) { //todo return AccessibleComponentBase::getFont(); @@ -456,14 +456,14 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground() throw (RuntimeException, std: -OUString SAL_CALL AccessibleCell::getTitledBorderText() throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getTitledBorderText() throw (css::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getTitledBorderText(); } -OUString SAL_CALL AccessibleCell::getToolTipText() throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getToolTipText() throw (css::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getToolTipText(); } @@ -615,7 +615,7 @@ OUString AccessibleCell::getCellName( sal_Int32 nCol, sal_Int32 nRow ) return aBuf.makeStringAndClear(); } -OUString SAL_CALL AccessibleCell::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getAccessibleName() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); SolarMutexGuard aSolarGuard; @@ -646,7 +646,7 @@ void AccessibleCell::UpdateChildren() +If this is correct, we also don't need sdr::table::CellRef getCellRef(), UpdateChildren(), getCellName( sal_Int32 nCol, sal_Int32 nRow ) above + -OUString SAL_CALL AccessibleCell::getAccessibleName() throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL AccessibleCell::getAccessibleName() throw (css::uno::RuntimeException) { ThrowIfDisposed (); SolarMutexGuard aSolarGuard; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index dabfb03d96fa..8e51491572da 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -46,12 +46,12 @@ namespace accessibility class AccessibleShapeTreeInfo; -typedef ::cppu::ImplInheritanceHelper< AccessibleContextBase, ::com::sun::star::accessibility::XAccessibleExtendedComponent > AccessibleCellBase; +typedef ::cppu::ImplInheritanceHelper< AccessibleContextBase, css::accessibility::XAccessibleExtendedComponent > AccessibleCellBase; class AccessibleCell : boost::noncopyable, public AccessibleCellBase, public AccessibleComponentBase, public IAccessibleViewForwarderListener { public: - AccessibleCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo); + AccessibleCell( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo); virtual ~AccessibleCell(); void Init(); @@ -62,45 +62,45 @@ public: virtual bool ResetState (sal_Int16 aState) 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; // 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 nIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::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 sal_Int32 SAL_CALL getAccessibleIndexInParent() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName() 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 nIndex) throw(css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) override; sdr::table::CellRef getCellRef() { return mxCell;} void UpdateChildren(); static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); // 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 void SAL_CALL addFocusListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener) throw (::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL removeFocusListener (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) override; - virtual void SAL_CALL grabFocus() 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 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 void SAL_CALL addFocusListener ( const css::uno::Reference< css::awt::XFocusListener >& xListener) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL removeFocusListener (const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL grabFocus() 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; // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitledBorderText() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getToolTipText() throw (css::uno::RuntimeException, std::exception) override; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& rxListener) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // IAccessibleViewForwarderListener virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) override; diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 4c421855717e..0bea6de4c68c 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -108,8 +108,8 @@ void AccessibleTableShapeImpl::init( const Reference< XAccessible>& xAccessible, Reference< XModifyListener > xListener( this ); mxTable->addModifyListener( xListener ); //register the listener with table model - Reference< ::com::sun::star::view::XSelectionSupplier > xSelSupplier(xTable, UNO_QUERY); - Reference< ::com::sun::star::view::XSelectionChangeListener > xSelListener( xAccessible, UNO_QUERY ); + Reference< css::view::XSelectionSupplier > xSelSupplier(xTable, UNO_QUERY); + Reference< css::view::XSelectionChangeListener > xSelListener( xAccessible, UNO_QUERY ); if (xSelSupplier.is()) xSelSupplier->addSelectionChangeListener(xSelListener); mRowCount = mxTable->getRowCount(); @@ -1101,32 +1101,32 @@ Locale SAL_CALL AccessibleTableHeaderShape::getLocale() throw (IllegalAccessible } //XAccessibleComponent -sal_Bool SAL_CALL AccessibleTableHeaderShape::containsPoint ( const ::com::sun::star::awt::Point& aPoint ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL AccessibleTableHeaderShape::containsPoint ( const css::awt::Point& aPoint ) throw (RuntimeException, std::exception) { return mpTable->containsPoint( aPoint ); } -Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleAtPoint ( const ::com::sun::star::awt::Point& aPoint) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleAtPoint ( const css::awt::Point& aPoint) throw (RuntimeException, std::exception) { return mpTable->getAccessibleAtPoint( aPoint ); } -::com::sun::star::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds() throw (RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds() throw (RuntimeException, std::exception) { return mpTable->getBounds(); } -::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation() throw (RuntimeException, std::exception) +css::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation() throw (RuntimeException, std::exception) { return mpTable->getLocation(); } -::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen() throw (RuntimeException, std::exception) +css::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen() throw (RuntimeException, std::exception) { return mpTable->getLocationOnScreen(); } -::com::sun::star::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize() throw (RuntimeException, std::exception) +css::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize() throw (RuntimeException, std::exception) { return mpTable->getSize(); } diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index a95e6fb5a1a9..61418a29e1aa 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -73,15 +73,15 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet() static const SfxItemPropertyMapEntry aSvxCellPropertyMap[] = { FILL_PROPERTIES -// { "HasLevels", OWN_ATTR_HASLEVELS, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("Style"), OWN_ATTR_STYLE, cppu::UnoType< ::com::sun::star::style::XStyle >::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, cppu::UnoType::get(), 0, 0}, - { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, cppu::UnoType::get(), 0, 0}, \ - { OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, ::cppu::UnoType::get(), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, ::cppu::UnoType::get(), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::cppu::UnoType::get(), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::cppu::UnoType::get(), 0, SFX_METRIC_ITEM}, \ - { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, cppu::UnoType::get(), 0, 0},\ +// { "HasLevels", OWN_ATTR_HASLEVELS, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString("Style"), OWN_ATTR_STYLE, cppu::UnoType< css::style::XStyle >::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, cppu::UnoType::get(), 0, 0}, + { OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, cppu::UnoType::get(), 0, 0}, \ + { OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, cppu::UnoType::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, cppu::UnoType::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, cppu::UnoType::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, cppu::UnoType::get(), 0, SFX_METRIC_ITEM}, \ + { OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, cppu::UnoType::get(), 0, 0},\ { OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, cppu::UnoType::get(), 0, 0}, \ { OUString("TableBorder"), OWN_ATTR_TABLEBORDER, cppu::UnoType::get(), 0, 0 }, \ @@ -313,7 +313,7 @@ namespace sdr { if(pNewItem && (SDRATTR_TEXTDIRECTION == nWhich)) { - bool bVertical(com::sun::star::text::WritingMode_TB_RL == static_cast(pNewItem)->GetValue()); + bool bVertical(css::text::WritingMode_TB_RL == static_cast(pNewItem)->GetValue()); sdr::table::SdrTableObj& rObj = static_cast(GetSdrObject()); if( rObj.IsVerticalWriting() != bVertical ) @@ -882,16 +882,16 @@ Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId( ) throw (RuntimeExcept } // XLayoutConstrains -::com::sun::star::awt::Size SAL_CALL Cell::getMinimumSize() +css::awt::Size SAL_CALL Cell::getMinimumSize() throw (RuntimeException, std::exception) { - return ::com::sun::star::awt::Size( getMinimumWidth(), getMinimumHeight() ); + return css::awt::Size( getMinimumWidth(), getMinimumHeight() ); } -::com::sun::star::awt::Size SAL_CALL Cell::getPreferredSize() +css::awt::Size SAL_CALL Cell::getPreferredSize() throw (RuntimeException, std::exception) { @@ -900,7 +900,7 @@ Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId( ) throw (RuntimeExcept -::com::sun::star::awt::Size SAL_CALL Cell::calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw (RuntimeException, std::exception) +css::awt::Size SAL_CALL Cell::calcAdjustedSize( const css::awt::Size& aNewSize ) throw (RuntimeException, std::exception) { return aNewSize; } diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index bda662edf8a0..22f216cbcf4a 100644 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx @@ -50,9 +50,9 @@ namespace sdr { namespace table { class SVX_DLLPUBLIC Cell : public SdrText, public SvxUnoTextBase, - public ::com::sun::star::table::XMergeableCell, - public ::com::sun::star::awt::XLayoutConstrains, - public ::com::sun::star::lang::XEventListener, + public css::table::XMergeableCell, + public css::awt::XLayoutConstrains, + public css::lang::XEventListener, public ::cppu::OWeakObject { friend class CellUndo; @@ -104,84 +104,84 @@ public: SVX_DLLPRIVATE void copyFormatFrom( const CellRef& xSourceCell ); // XInterface - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& Type ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& Type ) throw (css::uno::RuntimeException, std::exception) override; SVX_DLLPRIVATE virtual void SAL_CALL acquire() throw () override; SVX_DLLPRIVATE virtual void SAL_CALL release() throw () override; // XTypeProvider - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Sequence< ::sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; // XLayoutConstrains - SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() - throw (::com::sun::star::uno::RuntimeException, + SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL getMinimumSize() + throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() - throw (::com::sun::star::uno::RuntimeException, + SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL getPreferredSize() + throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) throw (css::uno::RuntimeException, std::exception) override; // XMergeableCell - SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getRowSpan() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColumnSpan() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual sal_Bool SAL_CALL isMerged() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getRowSpan() throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColumnSpan() throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual sal_Bool SAL_CALL isMerged() throw (css::uno::RuntimeException, std::exception) override; // XCell - SVX_DLLPRIVATE virtual OUString SAL_CALL getFormula() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setFormula( const OUString& aFormula ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual double SAL_CALL getValue() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setValue( double nValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::table::CellContentType SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual sal_Int32 SAL_CALL getError() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::beans::XPropertySet - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual OUString SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL setFormula( const OUString& aFormula ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual double SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL setValue( double nValue ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::table::CellContentType SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual sal_Int32 SAL_CALL getError() throw (css::uno::RuntimeException, std::exception) override; + + // css::beans::XPropertySet + SVX_DLLPRIVATE virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XMultiPropertySet - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - - // ::com::sun::star::beans::XPropertyState - SVX_DLLPRIVATE virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + + // css::beans::XPropertyState + SVX_DLLPRIVATE virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XMultiPropertyStates SVX_DLLPRIVATE virtual void SAL_CALL setAllPropertiesToDefault() - throw (::com::sun::star::uno::RuntimeException, + throw (css::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XText - SVX_DLLPRIVATE virtual void SAL_CALL insertTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL removeTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& xContent ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL insertTextContent( const css::uno::Reference< css::text::XTextRange >& xRange, const css::uno::Reference< css::text::XTextContent >& xContent, sal_Bool bAbsorb ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL removeTextContent( const css::uno::Reference< css::text::XTextContent >& xContent ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; // XSimpleText - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& aTextPosition ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL insertString( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL insertControlCharacter( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, ::sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursor( ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Reference< css::text::XTextCursor > SAL_CALL createTextCursorByRange( const css::uno::Reference< css::text::XTextRange >& aTextPosition ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL insertString( const css::uno::Reference< css::text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL insertControlCharacter( const css::uno::Reference< css::text::XTextRange >& xRange, ::sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; // XTextRange - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual OUString SAL_CALL getString( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - SVX_DLLPRIVATE virtual void SAL_CALL setString( const OUString& aString ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Reference< css::text::XText > SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getStart( ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual css::uno::Reference< css::text::XTextRange > SAL_CALL getEnd( ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual OUString SAL_CALL getString( ) throw (css::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL setString( const OUString& aString ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - SVX_DLLPRIVATE virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + SVX_DLLPRIVATE virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; SVX_DLLPRIVATE virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject ) override; @@ -200,7 +200,7 @@ protected: SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet() override; SVX_DLLPRIVATE virtual void SetObjectItem(const SfxPoolItem& rItem) override; - SVX_DLLPRIVATE ::com::sun::star::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ); + SVX_DLLPRIVATE css::uno::Any GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ); private: SVX_DLLPRIVATE Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw(css::uno::RuntimeException); @@ -210,7 +210,7 @@ private: sdr::properties::TextProperties* mpProperties; - ::com::sun::star::table::CellContentType mnCellContentType; + css::table::CellContentType mnCellContentType; OUString msFormula; double mfValue; @@ -221,7 +221,7 @@ private: Rectangle maCellRect; - ::com::sun::star::uno::Reference< ::com::sun::star::table::XTable > mxTable; + css::uno::Reference< css::table::XTable > mxTable; }; diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx index b91084fed25b..d17d4173b6f3 100644 --- a/svx/source/table/cellcursor.hxx +++ b/svx/source/table/cellcursor.hxx @@ -31,7 +31,7 @@ namespace sdr { namespace table { struct CellPos; -typedef ::cppu::ImplInheritanceHelper< CellRange, ::com::sun::star::table::XCellCursor, ::com::sun::star::table::XMergeableCellRange > CellCursorBase; +typedef ::cppu::ImplInheritanceHelper< CellRange, css::table::XCellCursor, css::table::XMergeableCellRange > CellCursorBase; class CellCursor : public CellCursorBase { @@ -40,21 +40,21 @@ public: virtual ~CellCursor(); // XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override; // XCellCursor - virtual void SAL_CALL gotoStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoNext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoPrevious( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoStart( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoEnd( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoNext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoPrevious( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) throw (css::uno::RuntimeException, std::exception) override; // XMergeableCellRange - virtual void SAL_CALL merge( ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL split( ::sal_Int32 Columns, ::sal_Int32 Rows ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isMergeable( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL merge( ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL split( ::sal_Int32 Columns, ::sal_Int32 Rows ) throw (css::lang::NoSupportException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isMergeable( ) throw (css::uno::RuntimeException, std::exception) override; protected: bool GetMergedSelection( CellPos& rStart, CellPos& rEnd ); diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx index 120c79825072..455adc5678b7 100644 --- a/svx/source/table/cellrange.hxx +++ b/svx/source/table/cellrange.hxx @@ -29,7 +29,7 @@ namespace sdr { namespace table { -class CellRange : public ::cppu::WeakAggImplHelper1< ::com::sun::star::table::XCellRange >, public ICellRange +class CellRange : public ::cppu::WeakAggImplHelper1< css::table::XCellRange >, public ICellRange { public: CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ); @@ -40,12 +40,12 @@ public: virtual sal_Int32 getTop() override; virtual sal_Int32 getRight() override; virtual sal_Int32 getBottom() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTable > getTable() override; + virtual css::uno::Reference< css::table::XTable > getTable() override; // XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override; protected: TableModelRef mxTable; diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index 7286791156f3..2288201c2311 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -33,10 +33,10 @@ namespace sdr { namespace table { -typedef std::vector< ::com::sun::star::beans::Property > PropertyVector; +typedef std::vector< css::beans::Property > PropertyVector; typedef std::unordered_map< OUString, ::sal_uInt32, OUStringHash, std::equal_to< OUString > > PropertyMap; -class FastPropertySetInfo : public ::cppu::WeakAggImplHelper1< ::com::sun::star::beans::XPropertySetInfo > +class FastPropertySetInfo : public ::cppu::WeakAggImplHelper1< css::beans::XPropertySetInfo > { public: explicit FastPropertySetInfo( const PropertyVector& rProps ); @@ -44,13 +44,13 @@ public: void addProperties( const PropertyVector& rProps ); - const ::com::sun::star::beans::Property& getProperty( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException ); - const ::com::sun::star::beans::Property* hasProperty( const OUString& aName ); + const css::beans::Property& getProperty( const OUString& aName ) throw (css::beans::UnknownPropertyException ); + const css::beans::Property* hasProperty( const OUString& aName ); // XPropertySetInfo - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::Property > SAL_CALL getProperties( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) override; private: PropertyVector maProperties; @@ -59,32 +59,32 @@ private: -class FastPropertySet : public ::cppu::WeakAggImplHelper3< ::com::sun::star::beans::XPropertySet, ::com::sun::star::beans::XMultiPropertySet, ::com::sun::star::beans::XFastPropertySet > +class FastPropertySet : public ::cppu::WeakAggImplHelper3< css::beans::XPropertySet, css::beans::XMultiPropertySet, css::beans::XFastPropertySet > { public: explicit FastPropertySet( const rtl::Reference< FastPropertySetInfo >& xInfo ); virtual ~FastPropertySet(); // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XMultiPropertySet -// virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; +// virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override = 0; - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override = 0; + virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override = 0; + virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override = 0; private: rtl::Reference< FastPropertySetInfo > mxInfo; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 12e259de1d3d..3b6d0f239c1c 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -195,7 +195,7 @@ bool TableStyleSettings::operator==( const TableStyleSettings& rStyle ) const -class SdrTableObjImpl : public TableDesignUser, public ::cppu::WeakImplHelper< ::com::sun::star::util::XModifyListener > +class SdrTableObjImpl : public TableDesignUser, public ::cppu::WeakImplHelper< css::util::XModifyListener > { public: CellRef mxActiveCell; @@ -229,10 +229,10 @@ public: SdrTableObjImpl& operator=( const SdrTableObjImpl& rSource ); // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; void update(); @@ -281,7 +281,7 @@ void SdrTableObjImpl::init( SdrTableObj* pTable, sal_Int32 nColumns, sal_Int32 n mpTableObj = pTable; mxTable = new TableModel( pTable ); mxTable->init( nColumns, nRows ); - Reference< XModifyListener > xListener( static_cast< ::com::sun::star::util::XModifyListener* >(this) ); + Reference< XModifyListener > xListener( static_cast< css::util::XModifyListener* >(this) ); mxTable->addModifyListener( xListener ); mpLayouter = new TableLayouter( mxTable ); LayoutTable( mpTableObj->maRect, true, true ); @@ -304,7 +304,7 @@ SdrTableObjImpl& SdrTableObjImpl::operator=( const SdrTableObjImpl& rSource ) if( mxTable.is() ) { - Reference< XModifyListener > xListener( static_cast< ::com::sun::star::util::XModifyListener* >(this) ); + Reference< XModifyListener > xListener( static_cast< css::util::XModifyListener* >(this) ); mxTable->removeModifyListener( xListener ); mxTable->dispose(); mxTable.clear(); @@ -314,7 +314,7 @@ SdrTableObjImpl& SdrTableObjImpl::operator=( const SdrTableObjImpl& rSource ) mxTable = new TableModel( mpTableObj, rSource.mxTable ); mpLayouter = new TableLayouter( mxTable ); - Reference< XModifyListener > xListener( static_cast< ::com::sun::star::util::XModifyListener* >(this) ); + Reference< XModifyListener > xListener( static_cast< css::util::XModifyListener* >(this) ); mxTable->addModifyListener( xListener ); mxTableStyle = rSource.mxTableStyle; ApplyCellStyles(); @@ -479,7 +479,7 @@ void SdrTableObjImpl::dispose() if( mxTable.is() ) { - Reference< XModifyListener > xListener( static_cast< ::com::sun::star::util::XModifyListener* >(this) ); + Reference< XModifyListener > xListener( static_cast< css::util::XModifyListener* >(this) ); mxTable->removeModifyListener( xListener ); mxTable->dispose(); mxTable.clear(); @@ -570,7 +570,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset // XModifyListener -void SAL_CALL SdrTableObjImpl::modified( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SdrTableObjImpl::modified( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception) { update(); } @@ -612,7 +612,7 @@ void SdrTableObjImpl::connectTableStyle() Reference< XModifyBroadcaster > xBroadcaster( mxTableStyle, UNO_QUERY ); if( xBroadcaster.is() ) { - Reference< XModifyListener > xListener( static_cast< ::com::sun::star::util::XModifyListener* >(this) ); + Reference< XModifyListener > xListener( static_cast< css::util::XModifyListener* >(this) ); xBroadcaster->addModifyListener( xListener ); } } @@ -627,7 +627,7 @@ void SdrTableObjImpl::disconnectTableStyle() Reference< XModifyBroadcaster > xBroadcaster( mxTableStyle, UNO_QUERY ); if( xBroadcaster.is() ) { - Reference< XModifyListener > xListener( static_cast< ::com::sun::star::util::XModifyListener* >(this) ); + Reference< XModifyListener > xListener( static_cast< css::util::XModifyListener* >(this) ); xBroadcaster->removeModifyListener( xListener ); } } @@ -644,7 +644,7 @@ bool SdrTableObjImpl::isInUse() // XEventListener -void SAL_CALL SdrTableObjImpl::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SdrTableObjImpl::disposing( const css::lang::EventObject& /*Source*/ ) throw (css::uno::RuntimeException, std::exception) { mxActiveCell.clear(); mxTable.clear(); @@ -2047,7 +2047,7 @@ void SdrTableObj::ReformatText() bool SdrTableObj::IsVerticalWriting() const { const SvxWritingModeItem* pModeItem = dynamic_cast< const SvxWritingModeItem* >( &GetObjectItem( SDRATTR_TEXTDIRECTION ) ); - return pModeItem && pModeItem->GetValue() == com::sun::star::text::WritingMode_TB_RL; + return pModeItem && pModeItem->GetValue() == css::text::WritingMode_TB_RL; } @@ -2056,7 +2056,7 @@ void SdrTableObj::SetVerticalWriting(bool bVertical ) { if( bVertical != IsVerticalWriting() ) { - SvxWritingModeItem aModeItem( com::sun::star::text::WritingMode_LR_TB, SDRATTR_TEXTDIRECTION ); + SvxWritingModeItem aModeItem( css::text::WritingMode_LR_TB, SDRATTR_TEXTDIRECTION ); SetObjectItem( aModeItem ); } } diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index 9e558bdb9719..f94147da46b5 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -72,7 +72,7 @@ void TableColumn::dispose() -void TableColumn::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException) +void TableColumn::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) throw DisposedException(); @@ -144,7 +144,7 @@ void SAL_CALL TableColumn::setName( const OUString& aName ) throw (RuntimeExcept // XFastPropertySet -void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception) { bool bOk = false; bool bChange = false; diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index ab87cb160d13..2f9b3cc7cd5c 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -31,7 +31,7 @@ namespace sdr { namespace table { -typedef ::cppu::ImplInheritanceHelper< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableColumnBase; +typedef ::cppu::ImplInheritanceHelper< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableColumnBase; class TableColumn : public TableColumnBase { @@ -42,22 +42,22 @@ public: virtual ~TableColumn(); void dispose(); - void throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException); + void throwIfDisposed() const throw (css::uno::RuntimeException); TableColumn& operator=( const TableColumn& ); // XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; private: static rtl::Reference< FastPropertySetInfo > getStaticPropertySetInfo(); diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index 0b6863281357..10f0184dcfeb 100644 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx @@ -55,7 +55,7 @@ void TableColumns::dispose() -void TableColumns::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException) +void TableColumns::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) throw DisposedException(); diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx index 9c47425b497d..8c350e2e5876 100644 --- a/svx/source/table/tablecolumns.hxx +++ b/svx/source/table/tablecolumns.hxx @@ -29,26 +29,26 @@ namespace sdr { namespace table { -class TableColumns : public ::cppu::WeakAggImplHelper1< ::com::sun::star::table::XTableColumns > +class TableColumns : public ::cppu::WeakAggImplHelper1< css::table::XTableColumns > { public: explicit TableColumns( const TableModelRef& xTableModel ); virtual ~TableColumns(); void dispose(); - void throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException); + void throwIfDisposed() const throw (css::uno::RuntimeException); // XTableColumns - virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // Methods - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; private: TableModelRef mxTableModel; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index be4109b8828d..ac3ed92595fb 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -84,17 +84,17 @@ using namespace ::com::sun::star::style; namespace sdr { namespace table { -class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper< ::com::sun::star::util::XModifyListener > +class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper< css::util::XModifyListener > { public: explicit SvxTableControllerModifyListener( SvxTableController* pController ) : mpController( pController ) {} // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; SvxTableController* mpController; }; @@ -103,7 +103,7 @@ public: // XModifyListener -void SAL_CALL SvxTableControllerModifyListener::modified( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxTableControllerModifyListener::modified( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { if( mpController ) mpController->onTableModified(); @@ -113,7 +113,7 @@ void SAL_CALL SvxTableControllerModifyListener::modified( const ::com::sun::star // XEventListener -void SAL_CALL SvxTableControllerModifyListener::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxTableControllerModifyListener::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { mpController = 0; } @@ -246,7 +246,7 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, vcl::Window* pWindow } -// ::com::sun::star::awt::XMouseClickHandler: +// css::awt::XMouseClickHandler: bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, vcl::Window* pWindow ) diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 7a8824e66289..966f811c3756 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -94,7 +94,7 @@ public: virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasElements() throw(RuntimeException, std::exception) override; // XIndexAccess @@ -109,8 +109,8 @@ public: virtual void SAL_CALL removeModifyListener( const Reference< XModifyListener >& aListener ) throw (RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; void notifyModifyListener(); @@ -456,14 +456,14 @@ void TableDesignStyle::notifyModifyListener() // if we get a modify hint from a style, notify all registered XModifyListener -void SAL_CALL TableDesignStyle::modified( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL TableDesignStyle::modified( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { notifyModifyListener(); } -void SAL_CALL TableDesignStyle::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) { } diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index 2701c9bcefb8..32d59735e805 100644 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx @@ -44,13 +44,13 @@ public: virtual sal_Int32 getTop() = 0; virtual sal_Int32 getRight() = 0; virtual sal_Int32 getBottom() = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTable > getTable() = 0; + virtual css::uno::Reference< css::table::XTable > getTable() = 0; protected: ~ICellRange() {} }; -typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::table::XTable, ::com::sun::star::util::XBroadcaster > TableModelBase; +typedef ::cppu::WeakComponentImplHelper< css::table::XTable, css::util::XBroadcaster > TableModelBase; class TableModel : public ::comphelper::OBaseMutex, public TableModelBase, @@ -88,52 +88,52 @@ public: virtual sal_Int32 getTop() override; virtual sal_Int32 getRight() override; virtual sal_Int32 getBottom() override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTable > getTable() override; + virtual css::uno::Reference< css::table::XTable > getTable() override; // XTable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellCursor > SAL_CALL createCursor( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellCursor > SAL_CALL createCursorByRange( const ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange >& rRange ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getColumnCount() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellCursor > SAL_CALL createCursor( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellCursor > SAL_CALL createCursorByRange( const css::uno::Reference< css::table::XCellRange >& rRange ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getRowCount() throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getColumnCount() throw (css::uno::RuntimeException, std::exception) override; // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XModifiable - virtual sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setModified( sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; // XColumnRowRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableColumns > SAL_CALL getColumns() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XTableRows > SAL_CALL getRows() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XTableColumns > SAL_CALL getColumns() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XTableRows > SAL_CALL getRows() throw (css::uno::RuntimeException, std::exception) override; // XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( ::sal_Int32 nColumn, ::sal_Int32 nRow ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( ::sal_Int32 nLeft, ::sal_Int32 nTop, ::sal_Int32 nRight, ::sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( ::sal_Int32 nColumn, ::sal_Int32 nRow ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( ::sal_Int32 nLeft, ::sal_Int32 nTop, ::sal_Int32 nRight, ::sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XBroadcaster - virtual void SAL_CALL lockBroadcasts() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlockBroadcasts() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lockBroadcasts() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unlockBroadcasts() throw (css::uno::RuntimeException, std::exception) override; protected: void notifyModification(); @@ -160,8 +160,8 @@ private: */ virtual void SAL_CALL disposing() override; - TableRowRef getRow( sal_Int32 nRow ) const throw (::com::sun::star::lang::IndexOutOfBoundsException); - TableColumnRef getColumn( sal_Int32 nColumn ) const throw (::com::sun::star::lang::IndexOutOfBoundsException); + TableRowRef getRow( sal_Int32 nRow ) const throw (css::lang::IndexOutOfBoundsException); + TableColumnRef getColumn( sal_Int32 nColumn ) const throw (css::lang::IndexOutOfBoundsException); void updateRows(); void updateColumns(); @@ -184,14 +184,14 @@ class TableModelNotifyGuard { public: explicit TableModelNotifyGuard( TableModel* pModel ) - : mxBroadcaster( static_cast< ::com::sun::star::util::XBroadcaster* >( pModel ) ) + : mxBroadcaster( static_cast< css::util::XBroadcaster* >( pModel ) ) { if( mxBroadcaster.is() ) mxBroadcaster->lockBroadcasts(); } - explicit TableModelNotifyGuard( ::com::sun::star::uno::XInterface* pInterface ) - : mxBroadcaster( pInterface, ::com::sun::star::uno::UNO_QUERY ) + explicit TableModelNotifyGuard( css::uno::XInterface* pInterface ) + : mxBroadcaster( pInterface, css::uno::UNO_QUERY ) { if( mxBroadcaster.is() ) mxBroadcaster->lockBroadcasts(); @@ -204,7 +204,7 @@ public: } private: - com::sun::star::uno::Reference< ::com::sun::star::util::XBroadcaster > mxBroadcaster; + css::uno::Reference< css::util::XBroadcaster > mxBroadcaster; }; } } diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 195a895781e5..37b9430da6a2 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -85,7 +85,7 @@ void TableRow::dispose() -void TableRow::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException) +void TableRow::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) throw DisposedException(); @@ -210,7 +210,7 @@ void SAL_CALL TableRow::setName( const OUString& aName ) throw (RuntimeException // XFastPropertySet -void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, css::lang::WrappedTargetException, RuntimeException, std::exception) { bool bOk = false; bool bChange = false; diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index b4462d131418..9c3d8d723864 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -31,7 +31,7 @@ namespace sdr { namespace table { -typedef ::cppu::ImplInheritanceHelper< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableRowBase; +typedef ::cppu::ImplInheritanceHelper< FastPropertySet, css::table::XCellRange, css::container::XNamed > TableRowBase; class TableRow : public TableRowBase { @@ -42,7 +42,7 @@ public: virtual ~TableRow(); void dispose(); - void throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException); + void throwIfDisposed() const throw (css::uno::RuntimeException); TableRow& operator=( const TableRow& ); @@ -50,17 +50,17 @@ public: void removeColumns( sal_Int32 nIndex, sal_Int32 nCount ); // XCellRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCell > SAL_CALL getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::table::XCellRange > SAL_CALL getCellRangeByName( const OUString& aRange ) throw (css::uno::RuntimeException, std::exception) override; // XNamed - virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override; // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; private: static rtl::Reference< FastPropertySetInfo > getStaticPropertySetInfo(); diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx index bfaecd7d78d3..fdbd19c94ebb 100644 --- a/svx/source/table/tablerows.cxx +++ b/svx/source/table/tablerows.cxx @@ -56,7 +56,7 @@ void TableRows::dispose() -void TableRows::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException) +void TableRows::throwIfDisposed() const throw (css::uno::RuntimeException) { if( !mxTableModel.is() ) throw DisposedException(); diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx index f59e1e02b4fd..d9bb4fed942b 100644 --- a/svx/source/table/tablerows.hxx +++ b/svx/source/table/tablerows.hxx @@ -29,26 +29,26 @@ namespace sdr { namespace table { -class TableRows : public ::cppu::WeakAggImplHelper1< ::com::sun::star::table::XTableRows > +class TableRows : public ::cppu::WeakAggImplHelper1< css::table::XTableRows > { public: explicit TableRows( const TableModelRef& xTableModel ); virtual ~TableRows(); void dispose(); - void throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException); + void throwIfDisposed() const throw (css::uno::RuntimeException); // XTableRows - virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // Methods - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; private: TableModelRef mxTableModel; diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index ffb3082f7218..54796f603fdb 100644 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -59,12 +59,12 @@ private: sdr::properties::TextProperties* mpProperties; OutlinerParaObject* mpOutlinerParaObject; - ::com::sun::star::table::CellContentType mnCellContentType; + css::table::CellContentType mnCellContentType; - OUString msFormula; + OUString msFormula; double mfValue; ::sal_Int32 mnError; - bool mbMerged; + bool mbMerged; ::sal_Int32 mnRowSpan; ::sal_Int32 mnColSpan; @@ -253,7 +253,7 @@ private: struct Data { TableStyleSettings maSettings; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > mxTableStyle; + css::uno::Reference< css::container::XIndexAccess > mxTableStyle; }; void setData( const Data& rData ); diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index c35228932f64..ead137b261f8 100644 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx @@ -522,7 +522,7 @@ namespace sdr drawinglayer::primitive2d::Primitive2DSequence ViewContactOfTableObj::createViewIndependentPrimitive2DSequence() const { const sdr::table::SdrTableObj& rTableObj = GetTableObj(); - const uno::Reference< com::sun::star::table::XTable > xTable = rTableObj.getTable(); + const uno::Reference< css::table::XTable > xTable = rTableObj.getTable(); if(xTable.is()) { @@ -535,7 +535,7 @@ namespace sdr if(nAllCount) { const sdr::table::TableLayouter& rTableLayouter = rTableObj.getTableLayouter(); - const bool bIsRTL(com::sun::star::text::WritingMode_RL_TB == rTableObj.GetWritingMode()); + const bool bIsRTL(css::text::WritingMode_RL_TB == rTableObj.GetWritingMode()); sdr::table::CellPos aCellPos; sdr::table::CellRef xCurrentCell; basegfx::B2IRectangle aCellArea; diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 5a96720c382b..c18834f75157 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -68,7 +68,7 @@ public: PaletteManager& rPaletteManager, BorderColorStatus& rBorderColorStatus, sal_uInt16 nSlotId, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XFrame >& rFrame, const OUString& rWndTitle, vcl::Window* pParentWindow, std::function maColorSelectFunction); diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index fc45414702e5..0dd059d88cda 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -54,7 +54,7 @@ protected: virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; - virtual bool WriteObject( tools::SvRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) override; + virtual bool WriteObject( tools::SvRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override; public: @@ -80,7 +80,7 @@ bool SvxColorValueSetData::GetData( const css::datatransfer::DataFlavor& rFlavor return bRet; } -bool SvxColorValueSetData::WriteObject( tools::SvRef& rxOStm, void*, SotClipboardFormatId, const ::com::sun::star::datatransfer::DataFlavor& ) +bool SvxColorValueSetData::WriteObject( tools::SvRef& rxOStm, void*, SotClipboardFormatId, const css::datatransfer::DataFlavor& ) { WriteXFillExchangeData( *rxOStm, maData ); return( rxOStm->GetError() == ERRCODE_NONE ); diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 18dfe434e0b8..adac8ed71a2c 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -62,7 +62,7 @@ static const sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rController, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow ) : ToolbarMenu(rFrame, pParentWindow, @@ -169,8 +169,8 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE void ExtrusionDirectionWindow::statusChanged( - const ::com::sun::star::frame::FeatureStateEvent& Event -) throw ( ::com::sun::star::uno::RuntimeException ) + const css::frame::FeatureStateEvent& Event +) throw ( css::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msExtrusionDirection ) ) { @@ -336,7 +336,7 @@ double aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 }; ExtrusionDepthWindow::ExtrusionDepthWindow( svt::ToolboxController& rController, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow ) : ToolbarMenu( rFrame, pParentWindow, WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK) , mrController( rController ) @@ -401,8 +401,8 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) void ExtrusionDepthWindow::statusChanged( - const ::com::sun::star::frame::FeatureStateEvent& Event -) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) + const css::frame::FeatureStateEvent& Event +) throw ( css::uno::RuntimeException, std::exception ) { if( Event.FeatureURL.Main.equals( msExtrusionDepth ) ) { @@ -656,8 +656,8 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) void ExtrusionLightingWindow::statusChanged( - const ::com::sun::star::frame::FeatureStateEvent& Event -) throw ( ::com::sun::star::uno::RuntimeException ) + const css::frame::FeatureStateEvent& Event +) throw ( css::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msExtrusionLightingIntensity ) ) { @@ -826,7 +826,7 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( svt::ToolboxController& rController, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, + const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow) : ToolbarMenu(rFrame, pParentWindow, WB_MOVEABLE|WB_CLOSEABLE|WB_HIDE|WB_3DLOOK) , mrController(rController) @@ -858,8 +858,8 @@ void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled ) } void ExtrusionSurfaceWindow::statusChanged( - const ::com::sun::star::frame::FeatureStateEvent& Event -) throw ( ::com::sun::star::uno::RuntimeException ) + const css::frame::FeatureStateEvent& Event +) throw ( css::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msExtrusionSurface ) ) { diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 478904b938fc..c2d714eb228e 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -40,11 +40,11 @@ namespace svx class ExtrusionDirectionWindow : public svtools::ToolbarMenu { public: - ExtrusionDirectionWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); + ExtrusionDirectionWindow( svt::ToolboxController& rController, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual ~ExtrusionDirectionWindow(); virtual void dispose() override; - virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; private: @@ -72,7 +72,7 @@ private: class ExtrusionDirectionControl : public svt::PopupWindowController { public: - explicit ExtrusionDirectionControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + explicit ExtrusionDirectionControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual VclPtr createPopupWindow( vcl::Window* pParent ) override; @@ -81,8 +81,8 @@ public: throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; using svt::PopupWindowController::createPopupWindow; }; @@ -111,15 +111,15 @@ private: void implSetDepth( double fDepth ); public: - ExtrusionDepthWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); + ExtrusionDepthWindow( svt::ToolboxController& rController, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); - virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; }; class ExtrusionDepthController : public svt::PopupWindowController { public: - explicit ExtrusionDepthController( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + explicit ExtrusionDepthController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual VclPtr createPopupWindow( vcl::Window* pParent ) override; @@ -128,8 +128,8 @@ public: throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; using svt::PopupWindowController::createPopupWindow; }; @@ -165,11 +165,11 @@ private: DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void ); void SelectHdl(void*); public: - ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); + ExtrusionLightingWindow( svt::ToolboxController& rController, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); virtual ~ExtrusionLightingWindow(); virtual void dispose() override; - virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; @@ -178,7 +178,7 @@ public: class ExtrusionLightingControl : public svt::PopupWindowController { public: - explicit ExtrusionLightingControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + explicit ExtrusionLightingControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual VclPtr createPopupWindow( vcl::Window* pParent ) override; @@ -187,8 +187,8 @@ public: throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; using svt::PopupWindowController::createPopupWindow; }; @@ -212,9 +212,9 @@ private: void implSetSurface( int nSurface, bool bEnabled ); public: - ExtrusionSurfaceWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); + ExtrusionSurfaceWindow( svt::ToolboxController& rController, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); - virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override; }; @@ -222,7 +222,7 @@ public: class ExtrusionSurfaceControl : public svt::PopupWindowController { public: - explicit ExtrusionSurfaceControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + explicit ExtrusionSurfaceControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual VclPtr createPopupWindow( vcl::Window* pParent ) override; @@ -231,8 +231,8 @@ public: throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; using svt::PopupWindowController::createPopupWindow; }; diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index ac814fa6df89..126612e0055e 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -343,7 +343,7 @@ IMPL_LINK_NOARG_TYPED(FontworkAlignmentWindow, SelectHdl, ToolbarMenu*, void) class FontworkAlignmentControl : public svt::PopupWindowController { public: - explicit FontworkAlignmentControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + explicit FontworkAlignmentControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual VclPtr createPopupWindow( vcl::Window* pParent ) override; @@ -352,8 +352,8 @@ public: throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; using svt::PopupWindowController::createPopupWindow; }; @@ -428,7 +428,7 @@ class FontworkCharacterSpacingWindow : public ToolbarMenu public: FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, vcl::Window* pParentWindow ); - virtual void statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) override; + virtual void statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) override; private: svt::ToolboxController& mrController; @@ -500,7 +500,7 @@ void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( bool, bool bEnab -void FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException ) +void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException ) { if( Event.FeatureURL.Main.equals( msFontworkCharacterSpacing ) ) { @@ -581,7 +581,7 @@ IMPL_LINK_NOARG_TYPED(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, vo class FontworkCharacterSpacingControl : public svt::PopupWindowController { public: - explicit FontworkCharacterSpacingControl( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + explicit FontworkCharacterSpacingControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual VclPtr createPopupWindow( vcl::Window* pParent ) override; @@ -590,8 +590,8 @@ public: throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; using svt::PopupWindowController::createPopupWindow; }; diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 150511825f6e..1ac1096de6d5 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -373,7 +373,7 @@ void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) Reference< XDispatchProvider > xDispatchProvider( mxFrame, UNO_QUERY ); if ( xDispatchProvider.is() ) { - com::sun::star::util::URL aTargetURL; + css::util::URL aTargetURL; Reference < XURLTransformer > xTrans( URLTransformer::create(::comphelper::getProcessComponentContext()) ); aTargetURL.Complete = maCommand; xTrans->parseStrict( aTargetURL ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 0dc30fa42043..3c2eb62b58a3 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -219,7 +219,7 @@ public: virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual bool Notify( NotifyEvent& rNEvt ) override; - virtual Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() override; + virtual Reference< css::accessibility::XAccessible > CreateAccessible() override; void SetOwnFontList(::std::unique_ptr && _aOwnFontList) { m_aOwnFontList = std::move(_aOwnFontList); } }; @@ -2919,7 +2919,7 @@ static void lcl_CalcSizeValueSet( vcl::Window &rWin, ValueSet &rValueSet, const rWin.SetOutputSizePixel( aSize ); } -Reference< ::com::sun::star::accessibility::XAccessible > SvxFontNameBox_Impl::CreateAccessible() +Reference< css::accessibility::XAccessible > SvxFontNameBox_Impl::CreateAccessible() { FillList(); return FontNameBox::CreateAccessible(); diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 723cde55b9f7..61e060953a45 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -48,38 +48,38 @@ class FontHeightToolBoxControl : public svt::ToolboxController, { public: explicit FontHeightToolBoxControl( - const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rServiceManager ); + const css::uno::Reference< css::uno::XComponentContext >& rServiceManager ); virtual ~FontHeightToolBoxControl(); // 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; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; // XToolbarController - virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL click() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL doubleClick() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override; - void dispatchCommand( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); + void dispatchCommand( const css::uno::Sequence< css::beans::PropertyValue >& rArgs ); using svt::ToolboxController::dispatchCommand; private: VclPtr m_pBox; - ::com::sun::star::awt::FontDescriptor m_aCurrentFont; + css::awt::FontDescriptor m_aCurrentFont; }; class SvxFontSizeBox_Impl : public FontSizeBox @@ -91,7 +91,7 @@ public: FontHeightToolBoxControl& rCtrl ); void statusChanged_Impl( long nHeight, bool bErase = false ); - void UpdateFont( const ::com::sun::star::awt::FontDescriptor& rCurrentFont ); + void UpdateFont( const css::awt::FontDescriptor& rCurrentFont ); void SetOptimalSize(); virtual bool Notify( NotifyEvent& rNEvt ) override; @@ -190,7 +190,7 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase ) -void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescriptor& rCurrentFont ) +void SvxFontSizeBox_Impl::UpdateFont( const css::awt::FontDescriptor& rCurrentFont ) { // Sizes-Liste auff"ullen sal_Int64 nOldVal = GetValue(); // alten Wert merken @@ -286,8 +286,8 @@ FontHeightToolBoxControl::~FontHeightToolBoxControl() } // XInterface -::com::sun::star::uno::Any SAL_CALL FontHeightToolBoxControl::queryInterface( const ::com::sun::star::uno::Type& aType ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL FontHeightToolBoxControl::queryInterface( const css::uno::Type& aType ) +throw (css::uno::RuntimeException, std::exception) { uno::Any a = ToolboxController::queryInterface( aType ); if ( a.hasValue() ) @@ -369,29 +369,29 @@ throw ( uno::RuntimeException, std::exception ) // XToolbarController void SAL_CALL FontHeightToolBoxControl::execute( sal_Int16 /*KeyModifier*/ ) -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL FontHeightToolBoxControl::click() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL FontHeightToolBoxControl::doubleClick() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { } uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createPopupWindow() -throw (::com::sun::star::uno::RuntimeException, std::exception) +throw (css::uno::RuntimeException, std::exception) { return uno::Reference< awt::XWindow >(); } uno::Reference< awt::XWindow > SAL_CALL FontHeightToolBoxControl::createItemWindow( const uno::Reference< awt::XWindow >& Parent ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { uno::Reference< awt::XWindow > xItemWindow; uno::Reference< awt::XWindow > xParent( Parent ); diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 0dd67acaf7d9..61e49f462805 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -118,9 +118,9 @@ void impl_executeSearch( const css::uno::Reference< css::uno::XComponentContext lArgs[3].Name = SEARCHITEM_TRANSLITERATEFLAGS; SvtCTLOptions aCTLOptions; sal_Int32 nFlags = 0; - nFlags |= (!aMatchCase ? static_cast(com::sun::star::i18n::TransliterationModules_IGNORE_CASE) : 0); - nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL:0 ); - nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL:0 ); + nFlags |= (!aMatchCase ? static_cast(css::i18n::TransliterationModules_IGNORE_CASE) : 0); + nFlags |= (aCTLOptions.IsCTLFontEnabled() ? css::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL:0 ); + nFlags |= (aCTLOptions.IsCTLFontEnabled() ? css::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL:0 ); lArgs[3].Value <<= nFlags; lArgs[4].Name = SEARCHITEM_COMMAND; lArgs[4].Value <<= (sal_Int16)(aFindAll ? @@ -436,7 +436,7 @@ void SAL_CALL FindTextToolbarController::dispose() throw ( css::uno::RuntimeExce } // XInitialization -void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) +void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) { svt::ToolboxController::initialize(aArguments); @@ -678,7 +678,7 @@ void SAL_CALL MatchCaseToolboxController::dispose() throw ( css::uno::RuntimeExc } // XInitialization -void SAL_CALL MatchCaseToolboxController::initialize( const css::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) +void SAL_CALL MatchCaseToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) { svt::ToolboxController::initialize(aArguments); @@ -772,7 +772,7 @@ void SAL_CALL SearchFormattedToolboxController::dispose() throw ( css::uno::Runt } // XInitialization -void SAL_CALL SearchFormattedToolboxController::initialize( const css::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) +void SAL_CALL SearchFormattedToolboxController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception) { svt::ToolboxController::initialize(aArguments); diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 52c91fe71336..67687cddbd6d 100644 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -77,11 +77,11 @@ namespace svx { xManager->createElement( m_sToolboxResName ); xManager->showElement( m_sToolboxResName ); - ::com::sun::star::awt::Point aPos; + css::awt::Point aPos; if ( m_bDocking ) xManager->dockWindow( m_sToolboxResName, - ::com::sun::star::ui::DockingArea_DOCKINGAREA_BOTTOM, aPos ); + css::ui::DockingArea_DOCKINGAREA_BOTTOM, aPos ); } } } diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index b71f47bf14b3..1185081d0b18 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -127,7 +127,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem { case SID_EXTRUSION_TOOGLE: { - com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, sExtrusion ); + css::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, sExtrusion ); if( pAny ) { @@ -138,7 +138,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem } else { - com::sun::star::beans::PropertyValue aPropValue; + css::beans::PropertyValue aPropValue; aPropValue.Name = sExtrusion; aPropValue.Value <<= sal_True; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); @@ -160,7 +160,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem aRotateAnglePropPair.First.Type = EnhancedCustomShapeParameterType::NORMAL; aRotateAnglePropPair.Second.Value <<= fY; aRotateAnglePropPair.Second.Type = EnhancedCustomShapeParameterType::NORMAL; - com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, sRotateAngle ); + css::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, sRotateAngle ); if( pAny && ( *pAny >>= aRotateAnglePropPair ) ) { aRotateAnglePropPair.First.Value >>= fX; @@ -172,7 +172,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem fY += nDiff; aRotateAnglePropPair.First.Value <<= fX; aRotateAnglePropPair.Second.Value <<= fY; - com::sun::star::beans::PropertyValue aPropValue; + css::beans::PropertyValue aPropValue; aPropValue.Name = sRotateAngle; aPropValue.Value <<= aRotateAnglePropPair; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); @@ -236,7 +236,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; } - com::sun::star::beans::PropertyValue aPropValue; + css::beans::PropertyValue aPropValue; aPropValue.Name = sViewPoint; aPropValue.Value <<= aViewPoint; @@ -269,7 +269,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem { sal_Int32 nProjection = static_cast(rReq.GetArgs()->GetItem(SID_EXTRUSION_PROJECTION))->GetValue(); ProjectionMode eProjectionMode = nProjection == 1 ? ProjectionMode_PARALLEL : ProjectionMode_PERSPECTIVE; - com::sun::star::beans::PropertyValue aPropValue; + css::beans::PropertyValue aPropValue; aPropValue.Name = sProjectionMode; aPropValue.Value <<= eProjectionMode; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); @@ -288,7 +288,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem aDepthPropPair.Second.Value <<= fFraction; aDepthPropPair.Second.Type = EnhancedCustomShapeParameterType::NORMAL; - com::sun::star::beans::PropertyValue aPropValue; + css::beans::PropertyValue aPropValue; aPropValue.Name = sDepth; aPropValue.Value <<= aDepthPropPair; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); @@ -305,7 +305,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem const bool bAuto = aColor == COL_AUTO; - com::sun::star::beans::PropertyValue aPropValue; + css::beans::PropertyValue aPropValue; aPropValue.Name = sExtrusionColor; aPropValue.Value <<= !bAuto; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); @@ -355,7 +355,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; } - com::sun::star::beans::PropertyValue aPropValue; + css::beans::PropertyValue aPropValue; aPropValue.Name = sShadeMode; aPropValue.Value <<= eShadeMode; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); @@ -414,7 +414,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem break; } - com::sun::star::beans::PropertyValue aPropValue; + css::beans::PropertyValue aPropValue; aPropValue.Name = sBrightness; aPropValue.Value <<= fBrightness; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); @@ -457,7 +457,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem getLightingDirectionDefaults( &pLighting1Defaults, &pLighting2Defaults ); - com::sun::star::beans::PropertyValue aPropValue; + css::beans::PropertyValue aPropValue; aPropValue.Name = sFirstLightDirection; aPropValue.Value <<= pLighting1Defaults[nDirection]; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); @@ -632,7 +632,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) static const char sSkew[] = "Skew"; static const char sProjectionMode[] = "ProjectionMode"; - const com::sun::star::uno::Any* pAny; + const css::uno::Any* pAny; double fFinalSkewAngle = -1; bool bHasCustomShape = false; @@ -780,7 +780,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) static const char sExtrusion[] = "Extrusion"; static const char sProjectionMode[] = "ProjectionMode"; - const com::sun::star::uno::Any* pAny; + const css::uno::Any* pAny; sal_Int32 nFinalProjection = -1; bool bHasCustomShape = false; @@ -838,7 +838,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) static const char sSpecularity[] = "Specularity"; static const char sMetal[] = "Metal"; - const com::sun::star::uno::Any* pAny; + const css::uno::Any* pAny; sal_Int32 nFinalSurface = -1; bool bHasCustomShape = false; @@ -924,7 +924,7 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet ) static const char sExtrusion[] = "Extrusion"; static const char sDepth[] = "Depth"; - const com::sun::star::uno::Any* pAny; + const css::uno::Any* pAny; double fFinalDepth = -1; bool bHasCustomShape = false; @@ -1010,7 +1010,7 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) getLightingDirectionDefaults( &pLighting1Defaults, &pLighting2Defaults ); - const com::sun::star::uno::Any* pAny; + const css::uno::Any* pAny; int nFinalDirection = -1; bool bHasCustomShape = false; @@ -1085,7 +1085,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) static const char sExtrusion[] = "Extrusion"; static const char sBrightness[] = "Brightness"; - const com::sun::star::uno::Any* pAny; + const css::uno::Any* pAny; int nFinalLevel = -1; bool bHasCustomShape = false; @@ -1153,7 +1153,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) static const char sExtrusion[] = "Extrusion"; static const char sExtrusionColor[] = "Color"; - const com::sun::star::uno::Any* pAny; + const css::uno::Any* pAny; bool bInit = false; bool bAmbigius = false; diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 89b3499ac648..f981076e6806 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -255,7 +255,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem { case SID_FONTWORK_SAME_LETTER_HEIGHTS: { - com::sun::star::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sSameLetterHeights ); + css::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sSameLetterHeights ); if( pAny ) { bool bOn = false; @@ -324,7 +324,7 @@ void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const { const OUString sType( "Type" ); - com::sun::star::beans::PropertyValue aPropVal; + css::beans::PropertyValue aPropVal; aPropVal.Name = sType; aPropVal.Value <<= rCustomShape; rGeometryItem.SetPropertyValue( aPropVal ); @@ -365,7 +365,7 @@ void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const { PropertyValue aPropVal_; const SdrCustomShapeGeometryItem& rSourceGeometry = static_cast(pSourceObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); - const com::sun::star::uno::Any* pAny = rSourceGeometry.GetPropertyValueByName( sType ); + const css::uno::Any* pAny = rSourceGeometry.GetPropertyValueByName( sType ); if ( pAny ) { aPropVal_.Name = sType; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index f7122c7c3c96..a639496ec4c1 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -60,55 +60,52 @@ The dialog gets this information from the registry on execute and writes it back class ChineseTranslationDialog; class ChineseTranslation_UnoDialog : public ::cppu::WeakImplHelper < - ::com::sun::star::ui::dialogs::XExecutableDialog - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::beans::XPropertySet - , ::com::sun::star::lang::XComponent - , ::com::sun::star::lang::XServiceInfo + css::ui::dialogs::XExecutableDialog + , css::lang::XInitialization + , css::beans::XPropertySet + , css::lang::XComponent + , css::lang::XServiceInfo > - // ,public ::com::sun::star::uno::XWeak // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::uno::XInterface // implemented by WeakImplHelper(optional interface) - // ,public ::com::sun::star::lang::XTypeProvider // implemented by WeakImplHelper { public: - explicit ChineseTranslation_UnoDialog( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ); + explicit ChineseTranslation_UnoDialog( const css::uno::Reference< + css::uno::XComponentContext >& xContext ); virtual ~ChineseTranslation_UnoDialog(); // lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL - create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext) throw(::com::sun::star::uno::Exception) + static css::uno::Reference< css::uno::XInterface > SAL_CALL + create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) { return static_cast(new ChineseTranslation_UnoDialog( xContext )); } // lang::XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; // ui::dialogs::XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception) override; // beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // lang::XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) throw (css::uno::RuntimeException, std::exception) override; private: //no default constructor @@ -117,10 +114,10 @@ private: void impl_DeleteDialog(); private: - ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext> m_xCC; - com::sun::star::uno::Reference< - com::sun::star::awt::XWindow > m_xParentWindow; + css::uno::Reference< + css::uno::XComponentContext> m_xCC; + css::uno::Reference< + css::awt::XWindow > m_xParentWindow; VclPtr m_pDialog; diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 7eb569d7bb06..b3548ea40ebc 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -95,10 +95,10 @@ namespace { OUString maFilterName; OUString maMediaType; URL maURL; - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > mxOutputStream; - com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicRenderer > mxGraphicRenderer; - com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > mxStatusIndicator; - com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > mxInteractionHandler; + css::uno::Reference< css::io::XOutputStream > mxOutputStream; + css::uno::Reference< css::graphic::XGraphicRenderer > mxGraphicRenderer; + css::uno::Reference< css::task::XStatusIndicator > mxStatusIndicator; + css::uno::Reference< css::task::XInteractionHandler > mxInteractionHandler; sal_Int32 mnWidth; sal_Int32 mnHeight; @@ -1065,7 +1065,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes if ( aSettings.mxInteractionHandler.is() && ( nStatus != GRFILTER_OK ) ) { Any aInteraction; - Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations(1); + Sequence< css::uno::Reference< css::task::XInteractionContinuation > > lContinuations(1); ::comphelper::OInteractionApprove* pApprove = new ::comphelper::OInteractionApprove(); lContinuations[0] = Reference< XInteractionContinuation >(static_cast< XInteractionContinuation* >(pApprove), UNO_QUERY); diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index 2e1d0294004c..1b19d4d853c2 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -36,7 +36,7 @@ class SfxItemPool; class SfxItemSet; typedef std::vector< SfxItemSet* > ItemPoolVector; -class SvxUnoNameItemTable : public cppu::WeakImplHelper< com::sun::star::container::XNameContainer, com::sun::star::lang::XServiceInfo >, +class SvxUnoNameItemTable : public cppu::WeakImplHelper< css::container::XNameContainer, css::lang::XServiceInfo >, public SfxListener { private: @@ -47,7 +47,7 @@ private: ItemPoolVector maItemSetVector; - void SAL_CALL ImplInsertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ); + void SAL_CALL ImplInsertByName( const OUString& aName, const css::uno::Any& aElement ); public: SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw(); @@ -62,22 +62,22 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () override; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByName( const OUString& Name ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XNameAccess - virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) throw( css::uno::RuntimeException, std::exception) override; }; #endif // INCLUDED_SVX_SOURCE_UNODRAW_UNONAMEITEMTABLE_HXX diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 1db71176de10..51f787c28ec9 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -407,7 +407,7 @@ uno::Any SvxUnoXDashTable::getAny( const XPropertyEntry* pEntry ) const throw() drawing::LineDash aLineDash; - aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle()); + aLineDash.Style = (css::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle()); aLineDash.Dots = rXD.GetDots(); aLineDash.DotLen = rXD.GetDotLen(); aLineDash.Dashes = rXD.GetDashes(); diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 05cdced5beef..b65dcc3d2bf8 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -99,7 +99,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo throw(css::uno::RuntimeException, std::exception) override; - virtual com::sun::star::uno::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL, + virtual css::uno::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index 40db6e8eeda7..8858859922d4 100644 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx @@ -30,17 +30,17 @@ class SvxPluginShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; public: explicit SvxPluginShape( SdrObject* pObj ) throw(); virtual ~SvxPluginShape() throw(); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; }; @@ -48,17 +48,17 @@ class SvxAppletShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; public: explicit SvxAppletShape( SdrObject* pObj ) throw(); virtual ~SvxAppletShape() throw(); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) override; }; @@ -66,7 +66,7 @@ class SvxFrameShape : public SvxOle2Shape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual bool getPropertyValueImpl(const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue) throw (css::beans::UnknownPropertyException, @@ -78,10 +78,10 @@ public: explicit SvxFrameShape( SdrObject* pObj ) throw(); virtual ~SvxFrameShape() throw(); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; using SvxUnoTextRangeBase::setPropertyValue; - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) throw (css::uno::RuntimeException, std::exception) override; }; @@ -93,8 +93,8 @@ class SvxTableShape : public SvxShape { protected: // override these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) override; - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void lock() override; virtual void unlock() override; diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index faa6d402144c..fa5daca04b82 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -53,8 +53,8 @@ SvxTableShape::~SvxTableShape() throw() bool SvxTableShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, - const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + const css::uno::Any& rValue ) + throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -106,8 +106,8 @@ bool SvxTableShape::setPropertyValueImpl( bool SvxTableShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, - ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) + css::uno::Any& rValue ) + throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx index 10d5f356c5d1..265d3c2711ed 100644 --- a/svx/source/unodraw/unomlstr.cxx +++ b/svx/source/unodraw/unomlstr.cxx @@ -34,7 +34,7 @@ SvxUnoShapeModifyListener::~SvxUnoShapeModifyListener() throw() { } -// ::com::sun::star::util::XModifyListener +// css::util::XModifyListener void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -45,7 +45,7 @@ void SAL_CALL SvxUnoShapeModifyListener::modified(const lang::EventObject& ) thr } } -// ::com::sun::star::lang::XEventListener +// css::lang::XEventListener void SvxUnoShapeModifyListener::disposing(const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) { invalidate(); diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 6a6ba228f440..6296941e900a 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -69,7 +69,7 @@ using namespace ::com::sun::star; //- -class SvxUnoDrawPagesAccess : public ::cppu::WeakImplHelper< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo > +class SvxUnoDrawPagesAccess : public ::cppu::WeakImplHelper< css::drawing::XDrawPages, css::lang::XServiceInfo > { private: SvxUnoDrawingModel& mrModel; @@ -79,21 +79,21 @@ public: virtual ~SvxUnoDrawPagesAccess() throw(); // XDrawPages - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xPage ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XDrawPage >& xPage ) throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; }; //- @@ -116,7 +116,7 @@ static const SvEventDescription* ImplGetSupportedMacroItems() true if the SdrHint could be translated to an EventObject
false if not */ -bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdrHint, ::com::sun::star::document::EventObject& aEvent ) +bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* pSdrHint, css::document::EventObject& aEvent ) { const SdrObject* pObj = NULL; const SdrPage* pPage = NULL; @@ -202,7 +202,7 @@ css::uno::Reference create( uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance(const OUString& rServiceSpecifier) throw( uno::Exception, uno::RuntimeException, std::exception ) { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet; + css::uno::Reference< css::uno::XInterface > xRet; if ( rServiceSpecifier.startsWith( "com.sun.star.form.component." ) ) { css::uno::Reference xContext = comphelper::getProcessComponentContext(); @@ -218,12 +218,12 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( return xRet; } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createTextField( const OUString& ServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException) { return SvxUnoTextCreateTextField( ServiceSpecifier ); } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< css::uno::Any >& Arguments ) throw( uno::Exception, uno::RuntimeException, std::exception ) { OUString arg; @@ -314,7 +314,7 @@ uno::Any SAL_CALL SvxUnoDrawingModel::queryInterface( const uno::Type & rType ) QUERYINT(lang::XServiceInfo); else QUERYINT(lang::XMultiServiceFactory); else QUERYINT(drawing::XDrawPagesSupplier); - else QUERYINT(com::sun::star::ucb::XAnyCompareFactory); + else QUERYINT(css::ucb::XAnyCompareFactory); else return SfxBaseModel::queryInterface( rType ); @@ -348,7 +348,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes( ) throw(uno:: *pTypes++ = cppu::UnoType::get(); *pTypes++ = cppu::UnoType::get(); *pTypes++ = cppu::UnoType::get(); - *pTypes++ = cppu::UnoType::get(); + *pTypes++ = cppu::UnoType::get(); for( sal_Int32 nType = 0; nType < nBaseTypes; nType++ ) *pTypes++ = *pBaseTypes++; @@ -616,7 +616,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getSupportedServiceNames( } // XAnyCompareFactory -uno::Reference< com::sun::star::ucb::XAnyCompare > SAL_CALL SvxUnoDrawingModel::createAnyCompareByName( const OUString& ) +uno::Reference< css::ucb::XAnyCompare > SAL_CALL SvxUnoDrawingModel::createAnyCompareByName( const OUString& ) throw(uno::RuntimeException, std::exception) { return SvxCreateNumRuleCompare(); @@ -760,7 +760,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawPagesAccess::getSupportedServiceNam return aSeq; } -com::sun::star::uno::Reference< com::sun::star::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw() +css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( SdrModel* pModel ) throw() { const SvxNumRule* pDefaultRule = NULL; if( pModel ) diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 3e355bbb8bf6..9db5d91c1346 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -113,7 +113,7 @@ void SvxDrawPage::disposing() throw() // XComponent void SvxDrawPage::dispose() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -142,7 +142,7 @@ void SvxDrawPage::dispose() try { uno::Reference< uno::XInterface > xSource( uno::Reference< uno::XInterface >::query( static_cast(this) ) ); - ::com::sun::star::document::EventObject aEvt; + css::document::EventObject aEvt; aEvt.Source = xSource; // inform all listeners to release this object // The listener container are automatically cleared @@ -150,7 +150,7 @@ void SvxDrawPage::dispose() // notify subclasses to do their dispose disposing(); } - catch(const ::com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { // catch exception and throw again but signal that // the object was disposed. Dispose should be called @@ -168,7 +168,7 @@ void SvxDrawPage::dispose() } -void SAL_CALL SvxDrawPage::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxDrawPage::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -178,7 +178,7 @@ void SAL_CALL SvxDrawPage::addEventListener( const ::com::sun::star::uno::Refere mrBHelper.addListener( cppu::UnoType::get() , aListener ); } -void SAL_CALL SvxDrawPage::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxDrawPage::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -324,7 +324,7 @@ void SAL_CALL SvxDrawPage::remove( const Reference< drawing::XShape >& xShape ) mpModel->SetChanged(); } -// ::com::sun::star::container::XIndexAccess +// css::container::XIndexAccess sal_Int32 SAL_CALL SvxDrawPage::getCount() throw( uno::RuntimeException, std::exception ) { @@ -355,7 +355,7 @@ uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index ) return makeAny(Reference< drawing::XShape >( pObj->getUnoShape(), uno::UNO_QUERY )); } -// ::com::sun::star::container::XElementAccess +// css::container::XElementAccess uno::Type SAL_CALL SvxDrawPage::getElementType() throw( uno::RuntimeException, std::exception ) { @@ -389,7 +389,7 @@ namespace } } -// ATTENTION: _SelectObjectsInView selects the ::com::sun::star::drawing::Shapes +// ATTENTION: _SelectObjectsInView selects the css::drawing::Shapes // only in the given SdrPageView. It hasn't to be the visible SdrPageView. void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw () { @@ -436,7 +436,7 @@ Reference< drawing::XShapeGroup > SAL_CALL SvxDrawPage::group( const Reference< SAL_WARN_IF(!mpPage , "svx", "SdrPage is NULL!"); SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!"); - Reference< ::com::sun::star::drawing::XShapeGroup > xShapeGroup; + Reference< css::drawing::XShapeGroup > xShapeGroup; if(mpPage==NULL||mpView==NULL||!xShapes.is()) return xShapeGroup; @@ -851,14 +851,14 @@ SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xS return pObj; } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SvxDrawPage"); } sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 2acaf80d1fc0..d089d09153b2 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -64,8 +64,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap() // #FontWork# FONTWORK_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -88,8 +88,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap() // #FontWork# FONTWORK_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -112,8 +112,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -136,8 +136,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -161,8 +161,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap() // #FontWork# FONTWORK_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -187,8 +187,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap() // #FontWork# FONTWORK_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -199,7 +199,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap() { static SfxItemPropertyMapEntry const aPolyPolygonBezierPropertyMap_Impl[] = { - { OUString("Geometry"), OWN_ATTR_BASE_GEOMETRY, cppu::UnoType::get(), 0, 0 }, + { OUString("Geometry"), OWN_ATTR_BASE_GEOMETRY, cppu::UnoType::get(), 0, 0 }, SPECIAL_POLYGON_PROPERTIES SPECIAL_POLYPOLYGONBEZIER_PROPERTIES FILL_PROPERTIES @@ -213,8 +213,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonBezierPropertyMap() // #FontWork# FONTWORK_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -243,9 +243,9 @@ SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap() // #FontWork# FONTWORK_PROPERTIES { OUString("IsMirrored"), OWN_ATTR_MIRRORED, cppu::UnoType::get(), 0, 0}, - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, - { OUString("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("GraphicStream"), OWN_ATTR_GRAPHIC_STREAM, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -283,8 +283,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -304,8 +304,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; return a3DSphereObjectPropertyMap_Impl; @@ -329,8 +329,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -355,8 +355,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -376,8 +376,8 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap() MISC_OBJ_PROPERTIES LINKTARGET_PROPERTIES SHADOW_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -419,8 +419,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap() SPECIAL_3DBACKSCALE_PROPERTIES SPECIAL_3DPOLYGONOBJECT_PROPERTIES CUSTOMSHAPE_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + { OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -456,17 +456,17 @@ SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap() FONTWORK_PROPERTIES { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType::get(), 0, 0 }, - { OUString("Model"), OWN_ATTR_OLEMODEL , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("OriginalSize"), OWN_ATTR_OLESIZE , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("Model"), OWN_ATTR_OLEMODEL , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString("OriginalSize"), OWN_ATTR_OLESIZE , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString("CLSID"), OWN_ATTR_CLSID , cppu::UnoType::get(), 0, 0 }, - { OUString("IsInternal"), OWN_ATTR_INTERNAL_OLE , cppu::UnoType::get() , ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType::get(), 0, 0}, + { OUString("IsInternal"), OWN_ATTR_INTERNAL_OLE , cppu::UnoType::get() , css::beans::PropertyAttribute::READONLY, 0}, + { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType::get(), 0, 0}, { OUString("Aspect"), OWN_ATTR_OLE_ASPECT , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType::get(), 0, 0 }, { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , cppu::UnoType::get(), 0, 0 }, - { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType::get(), 0, 0}, + { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -479,21 +479,21 @@ SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap() { { OUString("PluginMimeType"), OWN_ATTR_PLUGIN_MIMETYPE , cppu::UnoType::get(), 0, 0}, { OUString("PluginURL"), OWN_ATTR_PLUGIN_URL , cppu::UnoType::get(), 0, 0}, - { OUString("PluginCommands"), OWN_ATTR_PLUGIN_COMMANDS , cppu::UnoType>::get(), 0, 0}, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType::get(), 0, 0 }, + { OUString("PluginCommands"), OWN_ATTR_PLUGIN_COMMANDS , cppu::UnoType>::get(), 0, 0}, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , cppu::UnoType>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , cppu::UnoType>::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType::get(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType::get(),0, 0}, { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType::get(), 0, 0 }, { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , cppu::UnoType::get(), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType::get(), 0, 0}, // #i68101# { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType::get(), 0, 0}, @@ -510,24 +510,24 @@ SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap() { { OUString("FrameURL"), OWN_ATTR_FRAME_URL , cppu::UnoType::get(), 0, 0}, { OUString("FrameName"), OWN_ATTR_FRAME_NAME , cppu::UnoType::get(), 0, 0}, - { OUString("FrameIsAutoScroll"), OWN_ATTR_FRAME_ISAUTOSCROLL , cppu::UnoType::get() , ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0}, + { OUString("FrameIsAutoScroll"), OWN_ATTR_FRAME_ISAUTOSCROLL , cppu::UnoType::get() , css::beans::PropertyAttribute::MAYBEVOID, 0}, { OUString("FrameIsBorder"), OWN_ATTR_FRAME_ISBORDER , cppu::UnoType::get() , 0, 0}, { OUString("FrameMarginWidth"), OWN_ATTR_FRAME_MARGIN_WIDTH , cppu::UnoType::get(), 0, 0}, { OUString("FrameMarginHeight"), OWN_ATTR_FRAME_MARGIN_HEIGHT, cppu::UnoType::get(), 0, 0}, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType::get(), 0, 0 }, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , cppu::UnoType>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , cppu::UnoType>::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType::get(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType::get(),0, 0}, { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType::get(), 0, 0 }, { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , cppu::UnoType::get(), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType::get(), 0, 0}, // #i68101# { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType::get(), 0, 0}, @@ -544,23 +544,23 @@ SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap() { OUString("AppletCodeBase"), OWN_ATTR_APPLET_CODEBASE , cppu::UnoType::get(), 0, 0}, { OUString("AppletName"), OWN_ATTR_APPLET_NAME , cppu::UnoType::get(), 0, 0}, { OUString("AppletCode"), OWN_ATTR_APPLET_CODE , cppu::UnoType::get(), 0, 0}, - { OUString("AppletCommands"), OWN_ATTR_APPLET_COMMANDS , cppu::UnoType>::get(), 0, 0}, + { OUString("AppletCommands"), OWN_ATTR_APPLET_COMMANDS , cppu::UnoType>::get(), 0, 0}, { OUString("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , cppu::UnoType::get(), 0, 0}, { OUString("AppletIsScript"), OWN_ATTR_APPLET_ISSCRIPT , cppu::UnoType::get(), 0, 0 }, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType::get(), 0, 0 }, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , cppu::UnoType>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , cppu::UnoType>::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType::get(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType::get(),0, 0}, { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , cppu::UnoType::get(), 0, 0 }, { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , cppu::UnoType::get(), 0, 0 }, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , cppu::UnoType::get(), 0, 0}, // #i68101# { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType::get(), 0, 0}, @@ -581,7 +581,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET), 0, cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_EDIT_CHAR_HEIGHT), 0, cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH), 0, cppu::UnoType::get(), 0, 0 }, - { OUString(UNO_NAME_EDIT_CHAR_POSTURE), 0, cppu::UnoType::get(),0, 0 }, + { OUString(UNO_NAME_EDIT_CHAR_POSTURE), 0, cppu::UnoType::get(),0, 0 }, { OUString(UNO_NAME_EDIT_CHAR_WEIGHT), 0, cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), 0, cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT), 0, cppu::UnoType::get(), 0, 0}, @@ -605,22 +605,22 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap() { OUString("ControlTextEmphasis"), 0, cppu::UnoType::get(), 0, 0 }, { OUString("ControlWritingMode"), 0, cppu::UnoType< sal_Int16 >::get(), 0, 0}, // the following properties are handled by SvxShape - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType::get(), 0, 0 }, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType::get(), 0, 0}, // #i112587# { OUString(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , cppu::UnoType::get(), 0, 0}, { OUString("Visible"), SDRATTR_OBJVISIBLE , cppu::UnoType::get(), 0, 0}, - { OUString(UNO_NAME_MISC_OBJ_INTEROPGRABBAG), OWN_ATTR_INTEROPGRABBAG, cppu::UnoType>::get(), 0, 0}, + { OUString(UNO_NAME_MISC_OBJ_INTEROPGRABBAG), OWN_ATTR_INTEROPGRABBAG, cppu::UnoType>::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -632,15 +632,15 @@ SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap() static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] = { { OUString("PageNumber"), OWN_ATTR_PAGE_NUMBER , cppu::UnoType::get(), 0, 0}, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType::get(), 0, 0 }, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION , cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , cppu::UnoType::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType::get(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType::get(),0, 0}, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType::get(), 0, 0}, @@ -654,7 +654,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() { static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] = { - { OUString("CaptionPoint"), OWN_ATTR_CAPTION_POINT, cppu::UnoType::get(), 0, 0 }, + { OUString("CaptionPoint"), OWN_ATTR_CAPTION_POINT, cppu::UnoType::get(), 0, 0 }, { OUString("CaptionType"), SDRATTR_CAPTIONTYPE, cppu::UnoType::get(), 0, 0}, { OUString("CaptionIsFixedAngle"), SDRATTR_CAPTIONFIXEDANGLE, cppu::UnoType::get(), 0, 0}, { OUString("CaptionAngle"), SDRATTR_CAPTIONANGLE, cppu::UnoType::get(), 0, 0}, @@ -676,8 +676,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap() TEXT_PROPERTIES // #FontWork# FONTWORK_PROPERTIES - { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + { OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -691,7 +691,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() { OUString("CustomShapeEngine"), SDRATTR_CUSTOMSHAPE_ENGINE, cppu::UnoType::get(), 0, 0 }, { OUString("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, cppu::UnoType::get(), 0, 0 }, { OUString("CustomShapeGeometry"), SDRATTR_CUSTOMSHAPE_GEOMETRY, - cppu::UnoType>::get(), 0, 0 }, + cppu::UnoType>::get(), 0, 0 }, { OUString("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, cppu::UnoType::get(), 0, 0}, CUSTOMSHAPE_PROPERTIES FILL_PROPERTIES @@ -702,8 +702,8 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap() LINKTARGET_PROPERTIES SHADOW_PROPERTIES TEXT_PROPERTIES - {OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, - {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, + {OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType::get(), 0, 0}, + {OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, cppu::UnoType::get(), 0, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; return aCustomShapePropertyMap_Impl; @@ -716,25 +716,25 @@ SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap() { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, cppu::UnoType::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, cppu::UnoType::get(), 0, 0 }, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, cppu::UnoType::get(), 0, 0 }, { OUString("MediaURL"), OWN_ATTR_MEDIA_URL, cppu::UnoType::get(), 0, 0}, - { OUString("PreferredSize"), OWN_ATTR_MEDIA_PREFERREDSIZE, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("PreferredSize"), OWN_ATTR_MEDIA_PREFERREDSIZE, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString("Loop"), OWN_ATTR_MEDIA_LOOP, cppu::UnoType::get(), 0, 0}, { OUString("Mute"), OWN_ATTR_MEDIA_MUTE, cppu::UnoType::get(), 0, 0}, { OUString("VolumeDB"), OWN_ATTR_MEDIA_VOLUMEDB, cppu::UnoType::get(), 0, 0}, - { OUString("Zoom"), OWN_ATTR_MEDIA_ZOOM, cppu::UnoType::get(), 0, 0}, + { OUString("Zoom"), OWN_ATTR_MEDIA_ZOOM, cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType::get(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType::get(),0, 0}, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, // #i68101# { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType::get(), 0, 0}, {OUString("PrivateStream"), OWN_ATTR_MEDIA_STREAM, cppu::UnoType::get(), 0, 0}, - {OUString("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + {OUString("PrivateTempFileURL"), OWN_ATTR_MEDIA_TEMPFILEURL, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString("MediaMimeType"), OWN_ATTR_MEDIA_MIMETYPE, cppu::UnoType::get(), 0, 0}, - { OUString("FallbackGraphic"), OWN_ATTR_FALLBACK_GRAPHIC, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("FallbackGraphic"), OWN_ATTR_FALLBACK_GRAPHIC, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; @@ -748,16 +748,16 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, cppu::UnoType::get(), 0, 0}, - { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, - { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, cppu::UnoType::get(), 0, 0 }, + { OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, + { OUString("Transformation"), OWN_ATTR_TRANSFORMATION, cppu::UnoType::get(), 0, 0 }, { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, cppu::UnoType::get(),0, 0}, { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, cppu::UnoType::get(),0, 0}, - { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString(UNO_NAME_MISC_OBJ_NAME), SDRATTR_OBJECTNAME, cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , cppu::UnoType::get(), 0, 0}, { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , cppu::UnoType::get(), 0, 0}, - { OUString("Model"), OWN_ATTR_OLEMODEL , cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("Model"), OWN_ATTR_OLEMODEL , cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString("TableTemplate"), OWN_ATTR_TABLETEMPLATE , cppu::UnoType::get(), 0, 0}, { OUString("UseFirstRowStyle"), OWN_ATTR_TABLETEMPLATE_FIRSTROW, cppu::UnoType::get(),0, 0}, { OUString("UseLastRowStyle"), OWN_ATTR_TABLETEMPLATE_LASTROW, cppu::UnoType::get(),0, 0}, @@ -765,7 +765,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap() { OUString("UseLastColumnStyle"), OWN_ATTR_TABLETEMPLATE_LASTCOLUMN, cppu::UnoType::get(),0, 0}, { OUString("UseBandingRowStyle"), OWN_ATTR_TABLETEMPLATE_BANDINGROWS, cppu::UnoType::get(),0, 0}, { OUString("UseBandingColumnStyle"), OWN_ATTR_TABLETEMPLATE_BANDINGCOULUMNS, cppu::UnoType::get(),0, 0}, - { OUString("ReplacementGraphic"), OWN_ATTR_BITMAP, cppu::UnoType::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, + { OUString("ReplacementGraphic"), OWN_ATTR_BITMAP, cppu::UnoType::get(), css::beans::PropertyAttribute::READONLY, 0}, { OUString(), 0, css::uno::Type(), 0, 0 } }; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 15df912443af..46a7e80fe316 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -132,7 +132,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId() return css::uno::Sequence(); } -// ::com::sun::star::drawing::XShape +// css::drawing::XShape OUString SAL_CALL SvxShapeGroup::getShapeType() @@ -343,7 +343,7 @@ uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index ) return uno::makeAny( xShape ); } -// ::com::sun::star::container::XElementAccess +// css::container::XElementAccess uno::Type SAL_CALL SvxShapeGroup::getElementType() throw( uno::RuntimeException, std::exception ) @@ -360,7 +360,7 @@ sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException, std } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL SvxShapeGroup::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) @@ -420,7 +420,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeConnector::getImplementationId() return css::uno::Sequence(); } -// ::com::sun::star::drawing::XShape +// css::drawing::XShape OUString SAL_CALL SvxShapeConnector::getShapeType() @@ -515,7 +515,7 @@ void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::X } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL SvxShapeConnector::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { @@ -574,7 +574,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeControl::getImplementationId() return css::uno::Sequence(); } -// ::com::sun::star::drawing::XShape +// css::drawing::XShape OUString SAL_CALL SvxShapeControl::getShapeType() @@ -656,7 +656,7 @@ static struct SvxShapeControlPropertyMapping[] = { // Warning: The first entry must be FontSlant because the any needs to be converted - { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_CHAR_POSTURE), RTL_CONSTASCII_STRINGPARAM("FontSlant") }, // const sal_Int16 => ::com::sun::star::awt::FontSlant + { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_CHAR_POSTURE), RTL_CONSTASCII_STRINGPARAM("FontSlant") }, // const sal_Int16 => css::awt::FontSlant { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_CHAR_FONTNAME), RTL_CONSTASCII_STRINGPARAM("FontName") }, { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_CHAR_FONTSTYLENAME), RTL_CONSTASCII_STRINGPARAM("FontStyleName") }, { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_CHAR_FONTFAMILY), RTL_CONSTASCII_STRINGPARAM("FontFamily") }, @@ -805,7 +805,7 @@ namespace } void SAL_CALL SvxShapeControl::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, std::exception) + throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) { OUString aFormsName; if ( lcl_convertPropertyName( aPropertyName, aFormsName ) ) @@ -987,7 +987,7 @@ SvxShapeDimensioning::~SvxShapeDimensioning() throw() { } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL SvxShapeDimensioning::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return SvxShapeText::getSupportedServiceNames(); @@ -1002,7 +1002,7 @@ SvxShapeCircle::~SvxShapeCircle() throw() { } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo // XServiceInfo uno::Sequence< OUString > SAL_CALL SvxShapeCircle::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { @@ -1012,7 +1012,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCircle::getSupportedServiceNames() th SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj , drawing::PolygonKind eNew ) - throw( com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException) + throw( css::beans::PropertyVetoException, css::lang::IllegalArgumentException) : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGON), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGON, SdrObject::GetGlobalDrawObjectItemPool()) ) , mePolygonKind( eNew ) { @@ -1057,7 +1057,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c -bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1167,10 +1167,10 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, - ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException) + css::uno::Any& rValue ) + throw(css::beans::UnknownPropertyException, + css::lang::WrappedTargetException, + css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1266,7 +1266,7 @@ basegfx::B2DPolyPolygon SvxShapePolyPolygon::GetPolygon() const throw() } } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygon::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return SvxShapeText::getSupportedServiceNames(); @@ -1288,7 +1288,7 @@ SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw() -bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1331,7 +1331,7 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, con -bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1395,7 +1395,7 @@ basegfx::B2DPolyPolygon SvxShapePolyPolygonBezier::GetPolygon() const throw() } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygonBezier::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return SvxShapeText::getSupportedServiceNames(); @@ -1420,7 +1420,7 @@ SvxGraphicObject::~SvxGraphicObject() throw() { } -bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { bool bOk = false; switch( pProperty->nWID ) @@ -1574,7 +1574,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte -bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1585,7 +1585,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxIte if(rGraphic.GetType() != GRAPHIC_GDIMETAFILE) { // pack object in a bitmap - Reference< ::com::sun::star::awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap(static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphic().GetBitmapEx()) ); + Reference< css::awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap(static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphic().GetBitmapEx()) ); rValue <<= xBitmap; } else @@ -1697,7 +1697,7 @@ uno::Any SAL_CALL SvxCustomShape::queryInterface( const uno::Type & rType ) uno::Any SAL_CALL SvxCustomShape::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aReturn = SvxShapeText::queryAggregation( rType ); + css::uno::Any aReturn = SvxShapeText::queryAggregation( rType ); if ( !aReturn.hasValue() ) aReturn = ::cppu::queryInterface(rType, static_cast(this) ); return aReturn; @@ -1727,7 +1727,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId() return css::uno::Sequence(); } -// ::com::sun::star::drawing::XShape +// css::drawing::XShape OUString SAL_CALL SvxCustomShape::getShapeType() @@ -1811,7 +1811,7 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException, s aPt -= mpObj->GetAnchorPos(); ForceMetricTo100th_mm(aPt); - return ::com::sun::star::awt::Point( aPt.X(), aPt.Y() ); + return css::awt::Point( aPt.X(), aPt.Y() ); } else return SvxShape::getPosition(); @@ -1841,7 +1841,7 @@ void SAL_CALL SvxCustomShape::setSize( const awt::Size& rSize ) void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, std::exception) + throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, std::exception) { ::SolarMutexGuard aGuard; SdrObject* pObject = mpObj.get(); @@ -1904,7 +1904,7 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c } } -bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -1921,7 +1921,7 @@ bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemP } -void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) throw (css::uno::RuntimeException, std::exception) { static_cast(mpObj.get())->MergeDefaultAttributes( &rValueType ); } diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 842077619cdc..a963a1a4ac9c 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -225,7 +225,7 @@ uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index ) } -// ::com::sun::star::container::XElementAccess +// css::container::XElementAccess uno::Type SAL_CALL Svx3DSceneObject::getElementType() throw( uno::RuntimeException, std::exception ) @@ -304,7 +304,7 @@ struct ImpRememberTransAndRect Rectangle maRect; }; -bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -464,7 +464,7 @@ bool Svx3DSceneObject::getPropertyValueImpl(const OUString& rName, const SfxItem return true; } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { @@ -483,7 +483,7 @@ Svx3DCubeObject::~Svx3DCubeObject() throw() } -bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -540,7 +540,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem -bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -588,7 +588,7 @@ bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItem return true; } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { @@ -609,7 +609,7 @@ Svx3DSphereObject::~Svx3DSphereObject() throw() -bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -655,7 +655,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt -bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -698,7 +698,7 @@ bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxIt return true; } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { @@ -807,7 +807,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon& -bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -854,7 +854,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte } -bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) +bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -900,7 +900,7 @@ bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxIte return true; } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DLatheObject::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { @@ -921,7 +921,7 @@ Svx3DExtrudeObject::~Svx3DExtrudeObject() throw() -bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -958,7 +958,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI -bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -1006,7 +1006,7 @@ bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxI return true; } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { @@ -1026,7 +1026,7 @@ Svx3DPolygonObject::~Svx3DPolygonObject() throw() } -bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { switch( pProperty->nWID ) { @@ -1100,7 +1100,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI } -bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -1145,7 +1145,7 @@ bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxI return true; } -// ::com::sun::star::lang::XServiceInfo +// css::lang::XServiceInfo uno::Sequence< OUString > SAL_CALL Svx3DPolygonObject::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) { diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index dbc3925ad989..d1b4a6516c52 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -79,13 +79,13 @@ SvxOle2Shape::~SvxOle2Shape() throw() { } -::com::sun::star::uno::Any SAL_CALL SvxOle2Shape::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL SvxOle2Shape::queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) { return SvxShapeText::queryAggregation( rType ); } //XPropertySet -bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -203,7 +203,7 @@ bool SvxOle2Shape::setPropertyValueImpl( const OUString& rName, const SfxItemPro throw IllegalArgumentException(); } -bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxOle2Shape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -590,19 +590,19 @@ void SvxAppletShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SetShapeType( OUString( "com.sun.star.drawing.AppletShape" ) ); } -void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxAppletShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxAppletShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxAppletShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -623,7 +623,7 @@ bool SvxAppletShape::setPropertyValueImpl( const OUString& rName, const SfxItemP } } -bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxAppletShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if( (pProperty->nWID >= OWN_ATTR_APPLET_DOCBASE) && (pProperty->nWID <= OWN_ATTR_APPLET_ISSCRIPT) ) { @@ -663,19 +663,19 @@ void SvxPluginShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) SetShapeType( OUString( "com.sun.star.drawing.PluginShape" ) ); } -void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxPluginShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxPluginShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxPluginShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -696,7 +696,7 @@ bool SvxPluginShape::setPropertyValueImpl( const OUString& rName, const SfxItemP } } -bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxPluginShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if( (pProperty->nWID >= OWN_ATTR_PLUGIN_MIMETYPE) && (pProperty->nWID <= OWN_ATTR_PLUGIN_COMMANDS) ) { @@ -736,19 +736,19 @@ void SvxFrameShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw (u SetShapeType( OUString( "com.sun.star.drawing.FrameShape" ) ); } -void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxFrameShape::setPropertyValue( const OUString& aPropertyName, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { SvxShape::setPropertyValue( aPropertyName, rValue ); resetModifiedState(); } -void SAL_CALL SvxFrameShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxFrameShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& rValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { SvxShape::setPropertyValues( aPropertyNames, rValues ); resetModifiedState(); } -bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxFrameShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if( (pProperty->nWID >= OWN_ATTR_FRAME_URL) && (pProperty->nWID <= OWN_ATTR_FRAME_MARGIN_HEIGHT) ) { @@ -807,7 +807,7 @@ SvxMediaShape::~SvxMediaShape() throw() -bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) +bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { if( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) || (pProperty->nWID == OWN_ATTR_MEDIA_STREAM) @@ -868,7 +868,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr case( OWN_ATTR_MEDIA_ZOOM ): { - ::com::sun::star::media::ZoomLevel eLevel; + css::media::ZoomLevel eLevel; if( rValue >>= eLevel ) { @@ -934,7 +934,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr -bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if ( ((pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM)) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index dfa2bbf4c2a7..8a62fcb5656d 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -298,7 +298,7 @@ namespace class theSvxShapeUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theSvxShapeUnoTunnelId > {}; } -const ::com::sun::star::uno::Sequence< sal_Int8 > & SvxShape::getUnoTunnelId() throw() +const css::uno::Sequence< sal_Int8 > & SvxShape::getUnoTunnelId() throw() { return theSvxShapeUnoTunnelId::get().getSeq(); } @@ -306,7 +306,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & SvxShape::getUnoTunnelId() t SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& xInt ) { - uno::Reference< lang::XUnoTunnel > xUT( xInt, ::com::sun::star::uno::UNO_QUERY ); + uno::Reference< lang::XUnoTunnel > xUT( xInt, css::uno::UNO_QUERY ); if( xUT.is() ) return reinterpret_cast(sal::static_int_cast(xUT->getSomething( SvxShape::getUnoTunnelId()))); else @@ -314,7 +314,7 @@ SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& } -sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ +sal_Int64 SAL_CALL SvxShape::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) \ { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { @@ -743,7 +743,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() case E3D_POLYGONOBJ_ID|E3D_INVENTOR_FLAG: case OBJ_MEDIA: { - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > aTypeSequence; + static css::uno::Sequence< css::uno::Type > aTypeSequence; if( aTypeSequence.getLength() == 0 ) { @@ -775,7 +775,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() // group shape case OBJ_GRUP: { - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > aTypeSequence; + static css::uno::Sequence< css::uno::Type > aTypeSequence; if( aTypeSequence.getLength() == 0 ) { @@ -809,7 +809,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() // connector shape case OBJ_EDGE: { - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > aTypeSequence; + static css::uno::Sequence< css::uno::Type > aTypeSequence; if( aTypeSequence.getLength() == 0 ) { @@ -847,7 +847,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() // control shape case OBJ_UNO: { - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > aTypeSequence; + static css::uno::Sequence< css::uno::Type > aTypeSequence; if( aTypeSequence.getLength() == 0 ) { @@ -880,7 +880,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() // 3d scene shape case E3D_POLYSCENE_ID|E3D_INVENTOR_FLAG: { - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > aTypeSequence; + static css::uno::Sequence< css::uno::Type > aTypeSequence; if( aTypeSequence.getLength() == 0 ) { @@ -912,7 +912,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() } case OBJ_CUSTOMSHAPE: { - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > aTypeSequence; + static css::uno::Sequence< css::uno::Type > aTypeSequence; if( aTypeSequence.getLength() == 0 ) { @@ -966,7 +966,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes() case OBJ_OLE2: // #i118485# Moved to shapes with text default: { - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > aTypeSequence; + static css::uno::Sequence< css::uno::Type > aTypeSequence; if( aTypeSequence.getLength() == 0 ) { @@ -1142,7 +1142,7 @@ awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException, std::ex aPt -= mpObj->GetAnchorPos(); ForceMetricTo100th_mm(aPt); - return ::com::sun::star::awt::Point( aPt.X(), aPt.Y() ); + return css::awt::Point( aPt.X(), aPt.Y() ); } else { @@ -1190,7 +1190,7 @@ awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException, std::excepti Rectangle aRect( svx_getLogicRectHack(mpObj.get()) ); Size aObjSize( aRect.getWidth(), aRect.getHeight() ); ForceMetricTo100th_mm(aObjSize); - return ::com::sun::star::awt::Size( aObjSize.getWidth(), aObjSize.getHeight() ); + return css::awt::Size( aObjSize.getWidth(), aObjSize.getHeight() ); } else return maSize; @@ -1250,7 +1250,7 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize ) // XNamed -OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL SvxShape::getName( ) throw(css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; if( mpObj.is() ) @@ -1265,7 +1265,7 @@ OUString SAL_CALL SvxShape::getName( ) throw(::com::sun::star::uno::RuntimeExce -void SAL_CALL SvxShape::setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; if( mpObj.is() ) @@ -1819,7 +1819,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName ) // XMultiPropertySet -void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aSolarGuard; @@ -1892,7 +1892,7 @@ void SvxShape::endSetPropertyValues() -::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL SvxShape::getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Any > SAL_CALL SvxShape::getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) { const sal_Int32 nCount = aPropertyNames.getLength(); const OUString* pNames = aPropertyNames.getConstArray(); @@ -1935,15 +1935,15 @@ void SvxShape::endSetPropertyValues() return aRet; } -void SAL_CALL SvxShape::addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::addPropertiesChangeListener( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL SvxShape::removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL SvxShape::firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::firePropertiesChangeEvent( const css::uno::Sequence< OUString >& , const css::uno::Reference< css::beans::XPropertiesChangeListener >& ) throw (css::uno::RuntimeException, std::exception) { } @@ -2112,7 +2112,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope return eState; } -bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -2556,7 +2556,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl -bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { switch( pProperty->nWID ) { @@ -2636,7 +2636,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl Size aObjSize( aRect.GetWidth(), aRect.GetHeight() ); ForceMetricTo100th_mm(aTopLeft); ForceMetricTo100th_mm(aObjSize); - ::com::sun::star::awt::Rectangle aUnoRect( + css::awt::Rectangle aUnoRect( aTopLeft.X(), aTopLeft.Y(), aObjSize.getWidth(), aObjSize.getHeight() ); rValue <<= aUnoRect; @@ -2650,7 +2650,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl Size aObjSize( aRect.GetWidth(), aRect.GetHeight() ); ForceMetricTo100th_mm(aTopLeft); ForceMetricTo100th_mm(aObjSize); - ::com::sun::star::awt::Rectangle aUnoRect( + css::awt::Rectangle aUnoRect( aTopLeft.X(), aTopLeft.Y(), aObjSize.getWidth(), aObjSize.getHeight() ); rValue <<= aUnoRect; @@ -2944,7 +2944,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl -bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) { @@ -2975,7 +2975,7 @@ bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty -bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( pProperty->nWID == OWN_ATTR_FILLBMP_MODE ) { @@ -3810,7 +3810,7 @@ uno::Reference SAL_CALL SvxShape::getParent() return uno::Reference(); } -void SAL_CALL SvxShape::setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& ) +void SAL_CALL SvxShape::setParent( const css::uno::Reference< css::uno::XInterface >& ) throw(lang::NoSupportException, uno::RuntimeException, std::exception) { throw lang::NoSupportException(); @@ -3833,7 +3833,7 @@ void SvxShape::unlock() // XActionLockable -sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3842,7 +3842,7 @@ sal_Bool SAL_CALL SvxShape::isActionLocked( ) throw (::com::sun::star::uno::Run -void SAL_CALL SvxShape::addActionLock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::addActionLock( ) throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3855,7 +3855,7 @@ void SAL_CALL SvxShape::addActionLock( ) throw (::com::sun::star::uno::RuntimeE -void SAL_CALL SvxShape::removeActionLock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxShape::removeActionLock( ) throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -3868,7 +3868,7 @@ void SAL_CALL SvxShape::removeActionLock( ) throw (::com::sun::star::uno::Runti -void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::star::uno::RuntimeException, std::exception ) +void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (css::uno::RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -3883,7 +3883,7 @@ void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::sta -sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (::com::sun::star::uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxShape::resetActionLocks( ) throw (css::uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -4019,7 +4019,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShapeText::getTypes() return SvxShape::getTypes(); } -sal_Int64 SAL_CALL SvxShapeText::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException, std::exception) \ +sal_Int64 SAL_CALL SvxShapeText::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) \ { const sal_Int64 nReturn = SvxShape::getSomething( rId ); if( nReturn ) @@ -4055,7 +4055,7 @@ void SvxShapeText::unlock() pEditSource->unlock(); } -// ::com::sun::star::text::XTextRange +// css::text::XTextRange uno::Reference< text::XTextRange > SAL_CALL SvxShapeText::getStart() throw(uno::RuntimeException, std::exception) { ::SolarMutexGuard aGuard; @@ -4095,7 +4095,7 @@ void SAL_CALL SvxShapeText::setString( const OUString& aString ) throw(uno::Runt } // override these for special property handling in subcasses. Return true if property is handled -bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { // HACK-fix #99090# // since SdrTextObj::SetVerticalWriting exchanges @@ -4107,10 +4107,10 @@ bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPro SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mpObj.get() ); if( pTextObj ) { - com::sun::star::text::WritingMode eMode; + css::text::WritingMode eMode; if( rValue >>= eMode ) { - pTextObj->SetVerticalWriting( eMode == com::sun::star::text::WritingMode_TB_RL ); + pTextObj->SetVerticalWriting( eMode == css::text::WritingMode_TB_RL ); } } return true; @@ -4118,27 +4118,27 @@ bool SvxShapeText::setPropertyValueImpl( const OUString& rName, const SfxItemPro return SvxShape::setPropertyValueImpl( rName, pProperty, rValue ); } -bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) +bool SvxShapeText::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, css::uno::Any& rValue ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if( pProperty->nWID == SDRATTR_TEXTDIRECTION ) { SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mpObj.get() ); if( pTextObj && pTextObj->IsVerticalWriting() ) - rValue <<= com::sun::star::text::WritingMode_TB_RL; + rValue <<= css::text::WritingMode_TB_RL; else - rValue <<= com::sun::star::text::WritingMode_LR_TB; + rValue <<= css::text::WritingMode_LR_TB; return true; } return SvxShape::getPropertyValueImpl( rName, pProperty, rValue ); } -bool SvxShapeText::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +bool SvxShapeText::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, css::beans::PropertyState& rState ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) { return SvxShape::getPropertyStateImpl( pProperty, rState ); } -bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +bool SvxShapeText::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException) { return SvxShape::setPropertyToDefaultImpl( pProperty ); } @@ -4195,7 +4195,7 @@ SdrObject* GetSdrObjectFromXShape( uno::Reference< drawing::XShape > xShape ) th -SdrObject* SdrObject::getSdrObjectFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInt ) +SdrObject* SdrObject::getSdrObjectFromXShape( const css::uno::Reference< css::uno::XInterface >& xInt ) { SvxShape* pSvxShape = SvxShape::getImplementation( xInt ); return pSvxShape ? pSvxShape->GetSdrObject() : 0; diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 2d7c8745ca40..e28b50288056 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -60,26 +60,26 @@ public: virtual void SAL_CALL release() throw() override; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) override ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; }; SvxShapeCollection::SvxShapeCollection() throw() @@ -108,7 +108,7 @@ void SvxShapeCollection::release() throw() { dispose(); } - catch(::com::sun::star::uno::Exception&) + catch(css::uno::Exception&) { // release should not throw exceptions } @@ -133,7 +133,7 @@ void SvxShapeCollection::disposing() throw() // XComponent void SvxShapeCollection::dispose() - throw(::com::sun::star::uno::RuntimeException, std::exception) + throw(css::uno::RuntimeException, std::exception) { // An frequently programming error is to release the last // reference to this object in the disposing message. @@ -168,7 +168,7 @@ void SvxShapeCollection::dispose() // notify subclasses to do their dispose disposing(); } - catch(const ::com::sun::star::uno::Exception&) + catch(const css::uno::Exception&) { // catch exception and throw again but signal that // the object was disposed. Dispose should be called @@ -192,13 +192,13 @@ void SvxShapeCollection::dispose() } // XComponent -void SAL_CALL SvxShapeCollection::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeCollection::addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) { mrBHelper.addListener( cppu::UnoType::get() , aListener ); } // XComponent -void SAL_CALL SvxShapeCollection::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL SvxShapeCollection::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) { mrBHelper.removeListener( cppu::UnoType::get() , aListener ); } diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index 5801bc257b5e..d761677ae438 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -38,9 +38,9 @@ namespace unogallery { class GalleryItem : public ::cppu::OWeakAggObject, - public ::com::sun::star::lang::XServiceInfo, - public ::com::sun::star::lang::XTypeProvider, - public ::com::sun::star::gallery::XGalleryItem, + public css::lang::XServiceInfo, + public css::lang::XTypeProvider, + public css::gallery::XGalleryItem, public ::comphelper::PropertySetHelper { friend class ::unogallery::GalleryTheme; @@ -53,31 +53,31 @@ public: bool isValid() const; static OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XGalleryItem - virtual ::sal_Int8 SAL_CALL getType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int8 SAL_CALL getType( ) throw (css::uno::RuntimeException, std::exception) override; // PropertySetHelper - virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; - virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) + virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const css::uno::Any* pValues ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; + virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, css::uno::Any* pValue ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index b9c2be856402..f99c87eb6533 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -39,8 +39,8 @@ namespace unogallery { class GalleryTheme : public ::cppu::WeakImplHelper< - ::com::sun::star::gallery::XGalleryTheme, - ::com::sun::star::lang::XServiceInfo >, + css::gallery::XGalleryTheme, + css::lang::XServiceInfo >, public SfxListener { friend class ::unogallery::GalleryItem; @@ -51,34 +51,34 @@ public: virtual ~GalleryTheme(); static OUString getImplementationName_Static() throw(); - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); protected: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) override; // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // XGalleryThemes - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL insertURLByIndex( const OUString& URL, ::sal_Int32 Index ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL insertGraphicByIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& Graphic, ::sal_Int32 Index ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL insertDrawingByIndex( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Drawing, ::sal_Int32 Index ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL insertURLByIndex( const OUString& URL, ::sal_Int32 Index ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL insertGraphicByIndex( const css::uno::Reference< css::graphic::XGraphic >& Graphic, ::sal_Int32 Index ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL insertDrawingByIndex( const css::uno::Reference< css::lang::XComponent >& Drawing, ::sal_Int32 Index ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index e71348314ad6..3964f445c615 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -347,15 +347,15 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() } SvXMLGraphicHelper::SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ) : - ::cppu::WeakComponentImplHelper2< ::com::sun::star::document::XGraphicObjectResolver, - ::com::sun::star::document::XBinaryStreamResolver >( maMutex ) + ::cppu::WeakComponentImplHelper2< css::document::XGraphicObjectResolver, + css::document::XBinaryStreamResolver >( maMutex ) { Init( NULL, eCreateMode, false ); } SvXMLGraphicHelper::SvXMLGraphicHelper() - : ::cppu::WeakComponentImplHelper2< ::com::sun::star::document::XGraphicObjectResolver, - ::com::sun::star::document::XBinaryStreamResolver >( maMutex ) + : ::cppu::WeakComponentImplHelper2< css::document::XGraphicObjectResolver, + css::document::XBinaryStreamResolver >( maMutex ) , meCreateMode(GRAPHICHELPER_MODE_READ) , mbDirect(false) { diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 68c7ee924cab..15b15cbea8f6 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -144,7 +144,7 @@ private: SvxXMLXTableExportComponent::SvxXMLXTableExportComponent( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, const OUString& rFileName, const uno::Reference & rHandler, const uno::Reference& xTable, diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index c5deda806d40..05dd5974a7b9 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -324,7 +324,7 @@ void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& r SvxXMLXTableImport::SvxXMLXTableImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, + const css::uno::Reference< css::uno::XComponentContext >& rContext, const uno::Reference< XNameContainer > & rTable, uno::Reference< XGraphicObjectResolver >& xGrfResolver ) : SvXMLImport(rContext, "", SvXMLImportFlags::NONE), @@ -413,7 +413,7 @@ bool SvxXMLXTableImport::load( const OUString &rPath, const OUString &rReferer, openStorageStream( &aParserInput, &pGraphicHelper, xSubStorage ); else { - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > xStream; + css::uno::Reference< css::io::XStream > xStream; xStream = comphelper::OStorageHelper::GetStreamAtPath( xStorage, rPath, embed::ElementModes::READ, aNasty ); if( !xStream.is() ) diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index e6cfbe3cdcc5..e9f042ccb02b 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -369,7 +369,7 @@ bool XOutBitmap::GraphicToBase64(const Graphic& rGraphic, OUString& rOUString) sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, GraphicFilter& rFilter, const sal_uInt16 nFormat, - const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ) + const css::uno::Sequence< css::beans::PropertyValue >* pFilterData ) { DBG_ASSERT( rURL.GetProtocol() != INetProtocol::NotValid, "XOutBitmap::ExportGraphic(...): invalid URL" ); diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index d83941c95022..eaa7d8cb4851 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -340,13 +340,13 @@ const Color& XColorItem::GetColorValue(const XColorList* pTable) const } -bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XColorItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetColorValue().GetRGBColor(); return true; } -bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XColorItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; @@ -359,7 +359,7 @@ bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*n TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem); -XLineStyleItem::XLineStyleItem(com::sun::star::drawing::LineStyle eTheLineStyle) : +XLineStyleItem::XLineStyleItem(css::drawing::LineStyle eTheLineStyle) : SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< sal_uInt16 >(eTheLineStyle)) { } @@ -393,10 +393,10 @@ bool XLineStyleItem::GetPresentation switch( (sal_uInt16)GetValue() ) { - case com::sun::star::drawing::LineStyle_NONE: + case css::drawing::LineStyle_NONE: nId = RID_SVXSTR_INVISIBLE; break; - case com::sun::star::drawing::LineStyle_SOLID: + case css::drawing::LineStyle_SOLID: nId = RID_SVXSTR_SOLID; break; } @@ -406,23 +406,23 @@ bool XLineStyleItem::GetPresentation return true; } -bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineStyleItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { - ::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue(); + css::drawing::LineStyle eLS = (css::drawing::LineStyle)GetValue(); rVal <<= eLS; return true; } -bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineStyleItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { - ::com::sun::star::drawing::LineStyle eLS; + css::drawing::LineStyle eLS; if(!(rVal >>= eLS )) { // also try an int (for Basic) sal_Int32 nLS = 0; if(!(rVal >>= nLS)) return false; - eLS = (::com::sun::star::drawing::LineStyle)nLS; + eLS = (css::drawing::LineStyle)nLS; } SetValue( sal::static_int_cast< sal_uInt16 >( eLS ) ); @@ -745,7 +745,7 @@ bool XLineDashItem::ScaleMetrics(long nMul, long nDiv) return true; } -bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XLineDashItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -755,10 +755,10 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem { uno::Sequence< beans::PropertyValue > aPropSeq( 2 ); - ::com::sun::star::drawing::LineDash aLineDash; + css::drawing::LineDash aLineDash; const XDash& rXD = GetDashValue(); - aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle()); + aLineDash.Style = (css::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle()); aLineDash.Dots = rXD.GetDots(); aLineDash.DotLen = rXD.GetDotLen(); aLineDash.Dashes = rXD.GetDashes(); @@ -785,9 +785,9 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem { const XDash& rXD = GetDashValue(); - ::com::sun::star::drawing::LineDash aLineDash; + css::drawing::LineDash aLineDash; - aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle()); + aLineDash.Style = (css::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle()); aLineDash.Dots = rXD.GetDots(); aLineDash.DotLen = rXD.GetDotLen(); aLineDash.Dashes = rXD.GetDashes(); @@ -801,7 +801,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem case MID_LINEDASH_STYLE: { const XDash& rXD = GetDashValue(); - rVal <<= (::com::sun::star::drawing::DashStyle)((sal_Int16)rXD.GetDashStyle()); + rVal <<= (css::drawing::DashStyle)((sal_Int16)rXD.GetDashStyle()); break; } @@ -846,7 +846,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem return true; } -bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XLineDashItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; @@ -907,7 +907,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 case MID_LINEDASH: { - ::com::sun::star::drawing::LineDash aLineDash; + css::drawing::LineDash aLineDash; if(!(rVal >>= aLineDash)) return false; @@ -1050,7 +1050,7 @@ bool XLineWidthItem::GetPresentation return true; } -bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XLineWidthItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Int32 nValue = GetValue(); if( 0 != (nMemberId&CONVERT_TWIPS) ) @@ -1060,7 +1060,7 @@ bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe return true; } -bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XLineWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Int32 nValue = 0; rVal >>= nValue; @@ -1110,13 +1110,13 @@ bool XLineColorItem::GetPresentation return true; } -bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineColorItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetColorValue().GetRGBColor(); return true; } -bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineColorItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1296,7 +1296,7 @@ bool XLineStartItem::GetPresentation return true; } -bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XLineStartItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; if( nMemberId == MID_NAME ) @@ -1306,7 +1306,7 @@ bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe } else { - com::sun::star::drawing::PolyPolygonBezierCoords aBezier; + css::drawing::PolyPolygonBezierCoords aBezier; basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier ); rVal <<= aBezier; } @@ -1314,7 +1314,7 @@ bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe return true; } -bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XLineStartItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; if( nMemberId == MID_NAME ) @@ -1327,10 +1327,10 @@ bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 if( rVal.hasValue() && rVal.getValue() ) { - if( rVal.getValueType() != cppu::UnoType::get()) + if( rVal.getValueType() != cppu::UnoType::get()) return false; - com::sun::star::drawing::PolyPolygonBezierCoords const * pCoords = static_cast(rVal.getValue()); + css::drawing::PolyPolygonBezierCoords const * pCoords = static_cast(rVal.getValue()); if( pCoords->Coordinates.getLength() > 0 ) { maPolyPolygon = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( *pCoords ); @@ -1859,7 +1859,7 @@ bool XLineEndItem::GetPresentation return true; } -bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XLineEndItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; if( nMemberId == MID_NAME ) @@ -1869,14 +1869,14 @@ bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemb } else { - com::sun::star::drawing::PolyPolygonBezierCoords aBezier; + css::drawing::PolyPolygonBezierCoords aBezier; basegfx::unotools::b2DPolyPolygonToPolyPolygonBezier( maPolyPolygon, aBezier ); rVal <<= aBezier; } return true; } -bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XLineEndItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; if( nMemberId == MID_NAME ) @@ -1889,10 +1889,10 @@ bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 n if( rVal.hasValue() && rVal.getValue() ) { - if( rVal.getValueType() != cppu::UnoType::get()) + if( rVal.getValueType() != cppu::UnoType::get()) return false; - com::sun::star::drawing::PolyPolygonBezierCoords const * pCoords = static_cast(rVal.getValue()); + css::drawing::PolyPolygonBezierCoords const * pCoords = static_cast(rVal.getValue()); if( pCoords->Coordinates.getLength() > 0 ) { maPolyPolygon = basegfx::unotools::polyPolygonBezierToB2DPolyPolygon( *pCoords ); @@ -1941,13 +1941,13 @@ bool XLineStartWidthItem::GetPresentation return true; } -bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineStartWidthItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineStartWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; @@ -1991,13 +1991,13 @@ bool XLineEndWidthItem::GetPresentation return true; } -bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineEndWidthItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineEndWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; @@ -2040,14 +2040,14 @@ bool XLineStartCenterItem::GetPresentation return true; } -bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineStartCenterItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_Bool bValue = GetValue(); rVal.setValue( &bValue, cppu::UnoType::get() ); return true; } -bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineStartCenterItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { if( !rVal.hasValue() || rVal.getValueType() != cppu::UnoType::get() ) return false; @@ -2091,14 +2091,14 @@ bool XLineEndCenterItem::GetPresentation return true; } -bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineEndCenterItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_Bool bValue = GetValue(); rVal.setValue( &bValue, cppu::UnoType::get() ); return true; } -bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineEndCenterItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { if( !rVal.hasValue() || rVal.getValueType() != cppu::UnoType::get() ) return false; @@ -2172,25 +2172,25 @@ sal_uInt16 XFillStyleItem::GetValueCount() const return 5; } -bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XFillStyleItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { - ::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue(); + css::drawing::FillStyle eFS = (css::drawing::FillStyle)GetValue(); rVal <<= eFS; return true; } -bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XFillStyleItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { - ::com::sun::star::drawing::FillStyle eFS; + css::drawing::FillStyle eFS; if(!(rVal >>= eFS)) { // also try an int (for Basic) sal_Int32 nFS = 0; if(!(rVal >>= nFS)) return false; - eFS = (::com::sun::star::drawing::FillStyle)nFS; + eFS = (css::drawing::FillStyle)nFS; } SetValue( sal::static_int_cast< sal_uInt16 >( eFS ) ); @@ -2250,14 +2250,14 @@ bool XFillColorItem::GetPresentation return true; } -bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XFillColorItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetColorValue().GetRGBColor(); return true; } -bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XFillColorItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue )) @@ -2506,7 +2506,7 @@ bool XFillGradientItem::GetPresentation return true; } -bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XFillGradientItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -2515,10 +2515,10 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 { uno::Sequence< beans::PropertyValue > aPropSeq( 2 ); - ::com::sun::star::awt::Gradient aGradient2; + css::awt::Gradient aGradient2; const XGradient& aXGradient = GetGradientValue(); - aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle(); + aGradient2.Style = (css::awt::GradientStyle) aXGradient.GetGradientStyle(); aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor(); aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor(); aGradient2.Angle = (short)aXGradient.GetAngle(); @@ -2541,9 +2541,9 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 case MID_FILLGRADIENT: { const XGradient& aXGradient = GetGradientValue(); - ::com::sun::star::awt::Gradient aGradient2; + css::awt::Gradient aGradient2; - aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle(); + aGradient2.Style = (css::awt::GradientStyle) aXGradient.GetGradientStyle(); aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor(); aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor(); aGradient2.Angle = (short)aXGradient.GetAngle(); @@ -2582,7 +2582,7 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 return true; } -bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XFillGradientItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; @@ -2644,7 +2644,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uI case MID_FILLGRADIENT: { - ::com::sun::star::awt::Gradient aGradient2; + css::awt::Gradient aGradient2; if(!(rVal >>= aGradient2)) return false; @@ -2796,12 +2796,12 @@ sal_uInt16 XFillFloatTransparenceItem::GetVersion( sal_uInt16 nFileFormatVersion return XFillGradientItem::GetVersion( nFileFormatVersion ); } -bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XFillFloatTransparenceItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { return XFillGradientItem::QueryValue( rVal, nMemberId ); } -bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XFillFloatTransparenceItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { return XFillGradientItem::PutValue( rVal, nMemberId ); } @@ -2977,7 +2977,7 @@ bool XFillHatchItem::ScaleMetrics(long nMul, long nDiv) return true; } -bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const +bool XFillHatchItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -2987,9 +2987,9 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe { uno::Sequence< beans::PropertyValue > aPropSeq( 2 ); - ::com::sun::star::drawing::Hatch aUnoHatch; + css::drawing::Hatch aUnoHatch; - aUnoHatch.Style = (::com::sun::star::drawing::HatchStyle)aHatch.GetHatchStyle(); + aUnoHatch.Style = (css::drawing::HatchStyle)aHatch.GetHatchStyle(); aUnoHatch.Color = aHatch.GetColor().GetColor(); aUnoHatch.Distance = aHatch.GetDistance(); aUnoHatch.Angle = aHatch.GetAngle(); @@ -3005,9 +3005,9 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe case MID_FILLHATCH: { - ::com::sun::star::drawing::Hatch aUnoHatch; + css::drawing::Hatch aUnoHatch; - aUnoHatch.Style = (::com::sun::star::drawing::HatchStyle)aHatch.GetHatchStyle(); + aUnoHatch.Style = (css::drawing::HatchStyle)aHatch.GetHatchStyle(); aUnoHatch.Color = aHatch.GetColor().GetColor(); aUnoHatch.Distance = aHatch.GetDistance(); aUnoHatch.Angle = aHatch.GetAngle(); @@ -3023,7 +3023,7 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe } case MID_HATCH_STYLE: - rVal <<= (::com::sun::star::drawing::HatchStyle)aHatch.GetHatchStyle(); break; + rVal <<= (css::drawing::HatchStyle)aHatch.GetHatchStyle(); break; case MID_HATCH_COLOR: rVal <<= (sal_Int32)aHatch.GetColor().GetColor(); break; case MID_HATCH_DISTANCE: @@ -3037,7 +3037,7 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe return true; } -bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XFillHatchItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; @@ -3079,7 +3079,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 case MID_FILLHATCH: { - ::com::sun::star::drawing::Hatch aUnoHatch; + css::drawing::Hatch aUnoHatch; if(!(rVal >>= aUnoHatch)) return false; diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 0308d87b35e4..5aa7446c19c2 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -81,7 +81,7 @@ bool XLineTransparenceItem::GetPresentation TYPEINIT1_AUTOFACTORY(XLineJointItem, SfxEnumItem); -XLineJointItem::XLineJointItem( com::sun::star::drawing::LineJoint eLineJoint ) : +XLineJointItem::XLineJointItem( css::drawing::LineJoint eLineJoint ) : SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< sal_uInt16 >(eLineJoint)) { } @@ -101,7 +101,7 @@ SfxPoolItem* XLineJointItem::Create( SvStream& rIn, sal_uInt16 nVer ) const XLineJointItem* pRet = new XLineJointItem( rIn ); if(nVer < 1) - pRet->SetValue(com::sun::star::drawing::LineJoint_ROUND); + pRet->SetValue(css::drawing::LineJoint_ROUND); return pRet; } @@ -120,27 +120,27 @@ bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit switch( GetValue() ) { - case( com::sun::star::drawing::LineJoint_MAKE_FIXED_SIZE ): - case( com::sun::star::drawing::LineJoint_NONE ): + case( css::drawing::LineJoint_MAKE_FIXED_SIZE ): + case( css::drawing::LineJoint_NONE ): nId = RID_SVXSTR_LINEJOINT_NONE; break; - case( com::sun::star::drawing::LineJoint_MIDDLE ): + case( css::drawing::LineJoint_MIDDLE ): nId = RID_SVXSTR_LINEJOINT_MIDDLE; break; - case( com::sun::star::drawing::LineJoint_BEVEL ): + case( css::drawing::LineJoint_BEVEL ): nId = RID_SVXSTR_LINEJOINT_BEVEL; break; - case( com::sun::star::drawing::LineJoint_MITER ): + case( css::drawing::LineJoint_MITER ): nId = RID_SVXSTR_LINEJOINT_MITER; break; - case( com::sun::star::drawing::LineJoint_ROUND ): + case( css::drawing::LineJoint_ROUND ): nId = RID_SVXSTR_LINEJOINT_ROUND; break; } @@ -151,16 +151,16 @@ bool XLineJointItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit return true; } -bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineJointItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { - const ::com::sun::star::drawing::LineJoint eJoint = GetValue(); + const css::drawing::LineJoint eJoint = GetValue(); rVal <<= eJoint; return true; } -bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineJointItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { - ::com::sun::star::drawing::LineJoint eUnoJoint; + css::drawing::LineJoint eUnoJoint; if(!(rVal >>= eUnoJoint)) { @@ -168,7 +168,7 @@ bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 sal_Int32 nLJ = 0; if(!(rVal >>= nLJ)) return false; - eUnoJoint = (::com::sun::star::drawing::LineJoint)nLJ; + eUnoJoint = (css::drawing::LineJoint)nLJ; } SetValue( sal::static_int_cast< sal_uInt16 >( eUnoJoint ) ); @@ -184,7 +184,7 @@ sal_uInt16 XLineJointItem::GetValueCount() const TYPEINIT1_AUTOFACTORY(AffineMatrixItem, SfxPoolItem); -AffineMatrixItem::AffineMatrixItem(const com::sun::star::geometry::AffineMatrix2D* pMatrix) +AffineMatrixItem::AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix) : SfxPoolItem(SID_ATTR_TRANSFORM_MATRIX) { if(pMatrix) @@ -266,13 +266,13 @@ SvStream& AffineMatrixItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ return rStream; } -bool AffineMatrixItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const +bool AffineMatrixItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= maMatrix; return true; } -bool AffineMatrixItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) +bool AffineMatrixItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { if (rVal >>= maMatrix) { @@ -285,7 +285,7 @@ bool AffineMatrixItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 TYPEINIT1_AUTOFACTORY(XLineCapItem, SfxEnumItem); -XLineCapItem::XLineCapItem(com::sun::star::drawing::LineCap eLineCap) +XLineCapItem::XLineCapItem(css::drawing::LineCap eLineCap) : SfxEnumItem(XATTR_LINECAP, sal::static_int_cast< sal_uInt16 >(eLineCap)) { } @@ -305,7 +305,7 @@ SfxPoolItem* XLineCapItem::Create( SvStream& rIn, sal_uInt16 nVer ) const XLineCapItem* pRet = new XLineCapItem( rIn ); if(nVer < 1) - pRet->SetValue(com::sun::star::drawing::LineCap_BUTT); + pRet->SetValue(css::drawing::LineCap_BUTT); return pRet; } @@ -324,15 +324,15 @@ bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /* switch( GetValue() ) { - default: /*com::sun::star::drawing::LineCap_BUTT*/ + default: /*css::drawing::LineCap_BUTT*/ nId = RID_SVXSTR_LINECAP_BUTT; break; - case(com::sun::star::drawing::LineCap_ROUND): + case(css::drawing::LineCap_ROUND): nId = RID_SVXSTR_LINECAP_ROUND; break; - case(com::sun::star::drawing::LineCap_SQUARE): + case(css::drawing::LineCap_SQUARE): nId = RID_SVXSTR_LINECAP_SQUARE; break; } @@ -343,16 +343,16 @@ bool XLineCapItem::GetPresentation( SfxItemPresentation /*ePres*/, SfxMapUnit /* return true; } -bool XLineCapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const +bool XLineCapItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { - const com::sun::star::drawing::LineCap eCap(GetValue()); + const css::drawing::LineCap eCap(GetValue()); rVal <<= eCap; return true; } -bool XLineCapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) +bool XLineCapItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { - com::sun::star::drawing::LineCap eUnoCap; + css::drawing::LineCap eUnoCap; if(!(rVal >>= eUnoCap)) { @@ -364,12 +364,12 @@ bool XLineCapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 / return false; } - eUnoCap = (com::sun::star::drawing::LineCap)nLJ; + eUnoCap = (css::drawing::LineCap)nLJ; } - OSL_ENSURE(com::sun::star::drawing::LineCap_BUTT == eUnoCap - || com::sun::star::drawing::LineCap_ROUND == eUnoCap - || com::sun::star::drawing::LineCap_SQUARE == eUnoCap, "Unknown enum value in XATTR_LINECAP (!)"); + OSL_ENSURE(css::drawing::LineCap_BUTT == eUnoCap + || css::drawing::LineCap_ROUND == eUnoCap + || css::drawing::LineCap_SQUARE == eUnoCap, "Unknown enum value in XATTR_LINECAP (!)"); SetValue(sal::static_int_cast< sal_uInt16 >(eUnoCap)); @@ -382,12 +382,12 @@ sal_uInt16 XLineCapItem::GetValueCount() const return 3; } -com::sun::star::drawing::LineCap XLineCapItem::GetValue() const +css::drawing::LineCap XLineCapItem::GetValue() const { - const com::sun::star::drawing::LineCap eRetval((com::sun::star::drawing::LineCap)SfxEnumItem::GetValue()); - OSL_ENSURE(com::sun::star::drawing::LineCap_BUTT == eRetval - || com::sun::star::drawing::LineCap_ROUND == eRetval - || com::sun::star::drawing::LineCap_SQUARE == eRetval, "Unknown enum value in XATTR_LINECAP (!)"); + const css::drawing::LineCap eRetval((css::drawing::LineCap)SfxEnumItem::GetValue()); + OSL_ENSURE(css::drawing::LineCap_BUTT == eRetval + || css::drawing::LineCap_ROUND == eRetval + || css::drawing::LineCap_SQUARE == eRetval, "Unknown enum value in XATTR_LINECAP (!)"); return eRetval; } diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index bfc06ca9d0ac..1393104867c1 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -396,7 +396,7 @@ bool XFillBitmapItem::GetPresentation( return true; } -bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId) const +bool XFillBitmapItem::QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId) const { nMemberId &= ~CONVERT_TWIPS; @@ -406,7 +406,7 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe OUString aInternalName; OUString aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp; + css::uno::Reference< css::awt::XBitmap > xBmp; if( nMemberId == MID_NAME ) { @@ -456,14 +456,14 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe return true; } -bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) +bool XFillBitmapItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; OUString aName; OUString aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap > xBmp; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > xGraphic; + css::uno::Reference< css::awt::XBitmap > xBmp; + css::uno::Reference< css::graphic::XGraphic > xGraphic; bool bSetName = false; bool bSetURL = false; -- cgit