diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-30 14:59:47 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-31 12:56:21 +0000 |
commit | 4530451d40470bf5359645de0c142ddf9dc329b6 (patch) | |
tree | 8b57614e9316685a8178d9d61795932c3e705d45 /svx/source/accessibility | |
parent | Replace boost::bind by lambdas in canvas/source/directx tree. (diff) | |
download | core-4530451d40470bf5359645de0c142ddf9dc329b6.tar.gz core-4530451d40470bf5359645de0c142ddf9dc329b6.zip |
com::sun::star->css in svx
Change-Id: If2c11fa548c5ebef2297d2491edd837b54e3707c
Reviewed-on: https://gerrit.libreoffice.org/19690
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source/accessibility')
-rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 6 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleGraphicShape.cxx | 26 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleOLEShape.cxx | 30 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 167 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleShapeInfo.cxx | 12 | ||||
-rw-r--r-- | svx/source/accessibility/ChildrenManager.cxx | 22 | ||||
-rw-r--r-- | svx/source/accessibility/ChildrenManagerImpl.cxx | 24 | ||||
-rw-r--r-- | svx/source/accessibility/ChildrenManagerImpl.hxx | 101 | ||||
-rw-r--r-- | svx/source/accessibility/DescriptionGenerator.cxx | 10 | ||||
-rw-r--r-- | svx/source/accessibility/GraphCtlAccessibleContext.cxx | 4 | ||||
-rw-r--r-- | svx/source/accessibility/ShapeTypeHandler.cxx | 2 | ||||
-rw-r--r-- | svx/source/accessibility/SvxShapeTypes.cxx | 4 | ||||
-rw-r--r-- | svx/source/accessibility/charmapacc.cxx | 12 | ||||
-rw-r--r-- | svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 16 | ||||
-rw-r--r-- | svx/source/accessibility/svxrectctaccessiblecontext.cxx | 8 |
15 files changed, 208 insertions, 236 deletions
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<XAccessibleImage*>(this)); @@ -105,7 +105,7 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL AccessibleGraphicShape::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleGraphicShape"); } @@ -113,9 +113,9 @@ OUString SAL_CALL -::com::sun::star::uno::Sequence< OUString> SAL_CALL +css::uno::Sequence< OUString> SAL_CALL AccessibleGraphicShape::getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Get list of supported service names from base class... @@ -153,7 +153,7 @@ uno::Sequence<uno::Type> SAL_CALL /// Create the base name of this object, i.e. the name without appended number. OUString AccessibleGraphicShape::CreateAccessibleBaseName() - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { OUString sName; @@ -175,7 +175,7 @@ OUString } OUString AccessibleGraphicShape::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { //Don't use the same information for accessible name and accessible description. OUString sDesc; @@ -188,7 +188,7 @@ OUString AccessibleGraphicShape::CreateAccessibleDescription() // Return this object's role. sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != NULL ) return AccessibleRole::IMAGE_MAP; diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 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<XAccessibleKeyBinding> SAL_CALL AccessibleOLEShape::getAccessibleActionKeyBinding (sal_Int32 /*nIndex*/) - throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, + css::uno::RuntimeException, std::exception) { throw lang::IndexOutOfBoundsException(); } // XInterface -com::sun::star::uno::Any SAL_CALL - AccessibleOLEShape::queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL + AccessibleOLEShape::queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aReturn = AccessibleShape::queryInterface (rType); + css::uno::Any aReturn = AccessibleShape::queryInterface (rType); if ( ! aReturn.hasValue()) aReturn = ::cppu::queryInterface (rType, static_cast<XAccessibleAction*>(this)); @@ -114,7 +114,7 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL AccessibleOLEShape::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleOLEShape"); } @@ -122,9 +122,9 @@ OUString SAL_CALL -::com::sun::star::uno::Sequence< OUString> SAL_CALL +css::uno::Sequence< OUString> SAL_CALL AccessibleOLEShape::getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); // Get list of supported service names from base class... @@ -158,7 +158,7 @@ uno::Sequence<uno::Type> SAL_CALL // XAccessibleExtendedAttributes uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { uno::Any strRet; ::rtl::OUString style; @@ -174,7 +174,7 @@ uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes() /// Set this object's name if is different to the current name. OUString AccessibleOLEShape::CreateAccessibleBaseName() - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { OUString sName; @@ -206,7 +206,7 @@ OUString OUString AccessibleOLEShape::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return CreateAccessibleName (); } diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 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<XAccessible> SAL_CALL AccessibleShape::getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -392,7 +392,7 @@ uno::Reference<XAccessible> SAL_CALL uno::Reference<XAccessibleRelationSet> SAL_CALL AccessibleShape::getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); if (mpParent == NULL) @@ -418,7 +418,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL */ uno::Reference<XAccessibleStateSet> SAL_CALL AccessibleShape::getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); Reference<XAccessibleStateSet> xStateSet; @@ -429,34 +429,35 @@ uno::Reference<XAccessibleStateSet> SAL_CALL xStateSet = AccessibleContextBase::getAccessibleStateSet (); ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); - ::com::sun::star::uno::Reference<XAccessible> xTempAcc = getAccessibleParent(); - if( xTempAcc.is() ) + css::uno::Reference<XAccessible> xTempAcc = getAccessibleParent(); + if( xTempAcc.is() ) + { + css::uno::Reference<XAccessibleContext> + xTempAccContext = xTempAcc->getAccessibleContext(); + if( xTempAccContext.is() ) { - ::com::sun::star::uno::Reference<XAccessibleContext> - xTempAccContext = xTempAcc->getAccessibleContext(); - if( xTempAccContext.is() ) - { - ::com::sun::star::uno::Reference<XAccessibleStateSet> rState = - xTempAccContext->getAccessibleStateSet(); - if( rState.is() ) { - com::sun::star::uno::Sequence<short> pStates = rState->getStates(); - int count = pStates.getLength(); - for( int iIndex = 0;iIndex < count;iIndex++ ) + css::uno::Reference<XAccessibleStateSet> rState = + xTempAccContext->getAccessibleStateSet(); + if( rState.is() ) { + css::uno::Sequence<short> pStates = rState->getStates(); + int count = pStates.getLength(); + for( int iIndex = 0;iIndex < count;iIndex++ ) + { + if( pStates[iIndex] == AccessibleStateType::EDITABLE ) { - if( pStates[iIndex] == AccessibleStateType::EDITABLE ) - { - pStateSet->AddState (AccessibleStateType::EDITABLE); - pStateSet->AddState (AccessibleStateType::RESIZABLE); - pStateSet->AddState (AccessibleStateType::MOVEABLE); - break; - } + pStateSet->AddState (AccessibleStateType::EDITABLE); + pStateSet->AddState (AccessibleStateType::RESIZABLE); + pStateSet->AddState (AccessibleStateType::MOVEABLE); + break; } } } } - xStateSet = Reference<XAccessibleStateSet>( + } + xStateSet = Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*pStateSet)); - }else + } + else { ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); @@ -472,17 +473,17 @@ uno::Reference<XAccessibleStateSet> SAL_CALL pStateSet->RemoveState (AccessibleStateType::FOCUSED); } //Just when the document is not read-only,set states EDITABLE,RESIZABLE,MOVEABLE - ::com::sun::star::uno::Reference<XAccessible> xTempAcc = getAccessibleParent(); + css::uno::Reference<XAccessible> xTempAcc = getAccessibleParent(); if( xTempAcc.is() ) { - ::com::sun::star::uno::Reference<XAccessibleContext> + css::uno::Reference<XAccessibleContext> xTempAccContext = xTempAcc->getAccessibleContext(); if( xTempAccContext.is() ) { - ::com::sun::star::uno::Reference<XAccessibleStateSet> rState = + css::uno::Reference<XAccessibleStateSet> rState = xTempAccContext->getAccessibleStateSet(); if( rState.is() ) { - com::sun::star::uno::Sequence<short> pStates = rState->getStates(); + css::uno::Sequence<short> pStates = rState->getStates(); int count = pStates.getLength(); for( int iIndex = 0;iIndex < count;iIndex++ ) { @@ -552,7 +553,7 @@ uno::Reference<XAccessible > SAL_CALL awt::Rectangle SAL_CALL AccessibleShape::getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -667,7 +668,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds() awt::Point SAL_CALL AccessibleShape::getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); awt::Rectangle aBoundingBox (getBounds()); @@ -678,7 +679,7 @@ awt::Point SAL_CALL AccessibleShape::getLocation() awt::Point SAL_CALL AccessibleShape::getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -714,7 +715,7 @@ awt::Size SAL_CALL AccessibleShape::getSize() sal_Int32 SAL_CALL AccessibleShape::getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x0ffffffL); @@ -729,7 +730,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground() aColor >>= nColor; } } - catch (const ::com::sun::star::beans::UnknownPropertyException &) + catch (const css::beans::UnknownPropertyException &) { // Ignore exception and return default color. } @@ -740,7 +741,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground() sal_Int32 SAL_CALL AccessibleShape::getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0L); @@ -769,7 +770,7 @@ sal_Int32 SAL_CALL AccessibleShape::getBackground() nColor = crBk.GetColor(); } } - catch (const ::com::sun::star::beans::UnknownPropertyException &) + catch (const css::beans::UnknownPropertyException &) { // Ignore exception and return default color. } @@ -808,17 +809,17 @@ void SAL_CALL AccessibleShape::removeAccessibleEventListener ( } // XInterface -com::sun::star::uno::Any SAL_CALL - AccessibleShape::queryInterface (const com::sun::star::uno::Type & rType) - throw (::com::sun::star::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL + AccessibleShape::queryInterface (const css::uno::Type & rType) + throw (css::uno::RuntimeException, std::exception) { - ::com::sun::star::uno::Any aReturn = AccessibleContextBase::queryInterface (rType); + css::uno::Any aReturn = AccessibleContextBase::queryInterface (rType); if ( ! aReturn.hasValue()) aReturn = ::cppu::queryInterface (rType, static_cast<XAccessibleComponent*>(this), static_cast<XAccessibleExtendedComponent*>(this), - static_cast< ::com::sun::star::accessibility::XAccessibleSelection* >(this), - static_cast< ::com::sun::star::accessibility::XAccessibleExtendedAttributes* >(this), + static_cast< css::accessibility::XAccessibleSelection* >(this), + static_cast< css::accessibility::XAccessibleExtendedAttributes* >(this), static_cast<lang::XEventListener*>(this), static_cast<document::XEventListener*>(this), static_cast<lang::XUnoTunnel*>(this), @@ -870,7 +871,7 @@ throw ( IndexOutOfBoundsException, { if( xContext->getAccessibleRole() == AccessibleRole::PARAGRAPH ) { - uno::Reference< ::com::sun::star::accessibility::XAccessibleText > + uno::Reference< css::accessibility::XAccessibleText > xText(xAcc, uno::UNO_QUERY); if( xText.is() ) { @@ -948,7 +949,7 @@ void SAL_CALL AccessibleShape::deselectAccessibleChild( sal_Int32 ) // XAccessibleExtendedAttributes uno::Any SAL_CALL AccessibleShape::getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { uno::Any strRet; OUString style; @@ -965,7 +966,7 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes() // XServiceInfo OUString SAL_CALL AccessibleShape::getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return OUString("AccessibleShape"); } @@ -975,7 +976,7 @@ OUString SAL_CALL uno::Sequence<OUString> SAL_CALL AccessibleShape::getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Get list of supported service names from base class... @@ -1146,20 +1147,20 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, // protected internal // Set this object's name if is different to the current name. OUString AccessibleShape::CreateAccessibleBaseName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return ShapeTypeHandler::CreateAccessibleBaseName( mxShape ); } OUString AccessibleShape::CreateAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { return GetFullAccessibleName(this); } OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { OUString sName (shape->CreateAccessibleBaseName()); // Append the shape's index to the name to disambiguate between shapes @@ -1196,7 +1197,7 @@ OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape) OUString AccessibleShape::CreateAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { DescriptionGenerator aDG (mxShape); aDG.Initialize (CreateAccessibleBaseName()); @@ -1311,7 +1312,7 @@ void AccessibleShape::disposing() sal_Int32 SAL_CALL AccessibleShape::getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed (); // Use a simple but slow solution for now. Optimize later. @@ -1359,7 +1360,7 @@ void AccessibleShape::UpdateNameAndDescription() // Return this object's role. sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { sal_Int16 nAccessibleRole = AccessibleRole::SHAPE ; switch (ShapeTypeHandler::Instance().GetTypeId (mxShape)) @@ -1423,7 +1424,7 @@ throw (uno::RuntimeException, std::exception) aRet[1] = 0; aRet[2] = 0; - ::com::sun::star::uno::Reference<XAccessible> xParent = getAccessibleParent(); + css::uno::Reference<XAccessible> xParent = getAccessibleParent(); if (!xParent.is()) { return aRet; @@ -1445,7 +1446,7 @@ throw (uno::RuntimeException, std::exception) pUper = pUper->GetUpGroup(); } - ::com::sun::star::uno::Reference<XAccessibleContext> xParentContext = xParent->getAccessibleContext(); + css::uno::Reference<XAccessibleContext> xParentContext = xParent->getAccessibleContext(); if( xParentContext->getAccessibleRole() == AccessibleRole::DOCUMENT || xParentContext->getAccessibleRole() == AccessibleRole::DOCUMENT_PRESENTATION || xParentContext->getAccessibleRole() == AccessibleRole::DOCUMENT_SPREADSHEET || @@ -1528,7 +1529,7 @@ OUString AccessibleShape::getObjectLink( const uno::Any& ) // XAccesibleHypertext sal_Int32 SAL_CALL AccessibleShape::getHyperLinkCount() - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) { // MT: Introduced with IA2 CWS, but SvxAccessibleHyperlink was redundant to svx::AccessibleHyperlink which we introduced meanwhile. // Code need to be adapted.... @@ -1544,7 +1545,7 @@ sal_Int32 SAL_CALL AccessibleShape::getHyperLinkCount() } uno::Reference< XAccessibleHyperlink > SAL_CALL AccessibleShape::getHyperLink( sal_Int32 ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) + throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { uno::Reference< XAccessibleHyperlink > xRet; // MT: Introduced with IA2 CWS, but SvxAccessibleHyperlink was redundant to svx::AccessibleHyperlink which we introduced meanwhile. @@ -1554,53 +1555,53 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL if (pLink->IsValidHyperlink()) xRet = pLink; if( !xRet.is() ) - throw ::com::sun::star::lang::IndexOutOfBoundsException(); + throw css::lang::IndexOutOfBoundsException(); */ return xRet; } sal_Int32 SAL_CALL AccessibleShape::getHyperLinkIndex( sal_Int32 ) -throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) +throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { sal_Int32 nRet = 0; return nRet; } // XAccesibleText -sal_Int32 SAL_CALL AccessibleShape::getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} -sal_Bool SAL_CALL AccessibleShape::setCaretPosition( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;} -sal_Unicode SAL_CALL AccessibleShape::getCharacter( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return 0;} -::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleShape::getCharacterAttributes( sal_Int32, const ::com::sun::star::uno::Sequence< OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleShape::getCaretPosition( ) throw (css::uno::RuntimeException, std::exception){return 0;} +sal_Bool SAL_CALL AccessibleShape::setCaretPosition( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;} +sal_Unicode SAL_CALL AccessibleShape::getCharacter( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return 0;} +css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleShape::getCharacterAttributes( sal_Int32, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { - uno::Sequence< ::com::sun::star::beans::PropertyValue > aValues(0); + uno::Sequence< css::beans::PropertyValue > aValues(0); return aValues; } -::com::sun::star::awt::Rectangle SAL_CALL AccessibleShape::getCharacterBounds( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL AccessibleShape::getCharacterBounds( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) { - return com::sun::star::awt::Rectangle(0, 0, 0, 0 ); + return css::awt::Rectangle(0, 0, 0, 0 ); } -sal_Int32 SAL_CALL AccessibleShape::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} -sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const ::com::sun::star::awt::Point& ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} -OUString SAL_CALL AccessibleShape::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return OUString();} -sal_Int32 SAL_CALL AccessibleShape::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} -sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return 0;} -sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return sal_True;} -OUString SAL_CALL AccessibleShape::getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception){return OUString();} -OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return OUString();} -::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleShape::getCharacterCount( ) throw (css::uno::RuntimeException, std::exception){return 0;} +sal_Int32 SAL_CALL AccessibleShape::getIndexAtPoint( const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception){return 0;} +OUString SAL_CALL AccessibleShape::getSelectedText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} +sal_Int32 SAL_CALL AccessibleShape::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception){return 0;} +sal_Int32 SAL_CALL AccessibleShape::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception){return 0;} +sal_Bool SAL_CALL AccessibleShape::setSelection( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;} +OUString SAL_CALL AccessibleShape::getText( ) throw (css::uno::RuntimeException, std::exception){return OUString();} +OUString SAL_CALL AccessibleShape::getTextRange( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return OUString();} +css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextAtIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; return aResult; } -::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBeforeIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; return aResult; } -::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sal_Int32, sal_Int16 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL AccessibleShape::getTextBehindIndex( sal_Int32, sal_Int16 ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { - ::com::sun::star::accessibility::TextSegment aResult; + css::accessibility::TextSegment aResult; return aResult; } -sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception){return sal_True;} +sal_Bool SAL_CALL AccessibleShape::copyText( sal_Int32, sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception){return sal_True;} } // end of namespace accessibility diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx index 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<css::drawing::XShape>& rxShape, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, IAccessibleParent* pChildrenManager, sal_Int32 nIndex) : mxShape (rxShape), @@ -41,10 +39,8 @@ AccessibleShapeInfo::AccessibleShapeInfo ( AccessibleShapeInfo::AccessibleShapeInfo ( - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& rxShape, - const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::drawing::XShape>& rxShape, + const css::uno::Reference<css::accessibility::XAccessible>& rxParent, sal_Int32 nIndex) : mxShape (rxShape), mxParent (rxParent), diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 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<XAccessible>& rxParent, - const ::com::sun::star::uno::Reference<drawing::XShapes>& rxShapeList, + const css::uno::Reference<XAccessible>& rxParent, + const css::uno::Reference<drawing::XShapes>& rxShapeList, const AccessibleShapeTreeInfo& rShapeTreeInfo, AccessibleContextBase& rContext) : mpImpl (NULL) @@ -61,25 +61,24 @@ long ChildrenManager::GetChildCount() const throw () return mpImpl->GetChildCount(); } -::com::sun::star::uno::Reference<XAccessible> ChildrenManager::GetChild (long nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException) +css::uno::Reference<XAccessible> ChildrenManager::GetChild (long nIndex) + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException) { assert(mpImpl != NULL); return mpImpl->GetChild (nIndex); } Reference<XAccessible> ChildrenManager::GetChild (const Reference<drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { assert(mpImpl != NULL); return mpImpl->GetChild (xShape); } -::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape> ChildrenManager::GetChildShape(long nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException) +css::uno::Reference<css::drawing::XShape> ChildrenManager::GetChildShape(long nIndex) + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException) { assert(mpImpl != NULL); return mpImpl->GetChildShape(nIndex); @@ -91,8 +90,7 @@ void ChildrenManager::Update (bool bCreateNewObjectsOnDemand) mpImpl->Update (bCreateNewObjectsOnDemand); } -void ChildrenManager::SetShapeList (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes>& xShapeList) +void ChildrenManager::SetShapeList (const css::uno::Reference<css::drawing::XShapes>& xShapeList) { assert(mpImpl != NULL); mpImpl->SetShapeList (xShapeList); diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 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<css::drawing::XShape> ChildrenManagerImpl::GetChildShape(long nIndex) + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException) { uno::Reference<XAccessible> xAcc = GetChild(nIndex); ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end(); @@ -132,8 +131,8 @@ long ChildrenManagerImpl::GetChildCount() const throw () */ uno::Reference<XAccessible> ChildrenManagerImpl::GetChild (long nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException) + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException) { // Check whether the given index is valid. if (nIndex < 0 || (unsigned long)nIndex >= maVisibleChildren.size()) @@ -152,7 +151,7 @@ uno::Reference<XAccessible> */ uno::Reference<XAccessible> ChildrenManagerImpl::GetChild (ChildDescriptor& rChildDescriptor,sal_Int32 _nIndex) - throw (::com::sun::star::uno::RuntimeException) + throw (css::uno::RuntimeException) { if ( ! rChildDescriptor.mxAccessibleShape.is()) { @@ -538,8 +537,7 @@ void ChildrenManagerImpl::RemoveShape (const Reference<drawing::XShape>& rxShape -void ChildrenManagerImpl::SetShapeList (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes>& xShapeList) +void ChildrenManagerImpl::SetShapeList (const css::uno::Reference<css::drawing::XShapes>& xShapeList) { mxShapeList = xShapeList; } @@ -793,7 +791,7 @@ void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType, // IAccessibleParent bool ChildrenManagerImpl::ReplaceChild ( AccessibleShape* pCurrentChild, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, + const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const AccessibleShapeTreeInfo& _rShapeTreeInfo) throw (uno::RuntimeException) @@ -845,7 +843,7 @@ bool ChildrenManagerImpl::ReplaceChild ( } // Add the impl method for IAccessibleParent interface -AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet* pSet) throw (::com::sun::star::uno::RuntimeException) +AccessibleControlShape * ChildrenManagerImpl::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet) throw (css::uno::RuntimeException) { sal_Int32 count = GetChildCount(); for (sal_Int32 index=0;index<count;index++) diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 86a1b8db1586..c6a94c65bfe8 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -74,8 +74,8 @@ typedef ::std::vector<ChildDescriptor> ChildDescriptorListType; class ChildrenManagerImpl : public MutexOwner, public cppu::WeakComponentImplHelper< - ::com::sun::star::document::XEventListener, - ::com::sun::star::view::XSelectionChangeListener>, + css::document::XEventListener, + css::view::XSelectionChangeListener>, public IAccessibleViewForwarderListener, public IAccessibleParent { @@ -97,10 +97,8 @@ public: for new and deleted children, i.e. that holds a list of listeners to be informed. */ - ChildrenManagerImpl (const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxParent, - const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes>& rxShapeList, + ChildrenManagerImpl (const css::uno::Reference<css::accessibility::XAccessible>& rxParent, + const css::uno::Reference<css::drawing::XShapes>& rxShapeList, const AccessibleShapeTreeInfo& rShapeTreeInfo, AccessibleContextBase& rContext); @@ -120,10 +118,9 @@ public: */ long GetChildCount() const throw (); - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape> GetChildShape(long nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException); + css::uno::Reference<css::drawing::XShape> GetChildShape(long nIndex) + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException); /** Return the requested accessible child or throw and IndexOutOfBoundsException if the given index is invalid. @param nIndex @@ -137,11 +134,10 @@ public: @raises Throws an IndexOutOfBoundsException if the index is not valid. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + css::uno::Reference<css::accessibility::XAccessible> GetChild (long nIndex) - throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException); + throw (css::uno::RuntimeException, + css::lang::IndexOutOfBoundsException); /** Return the requested accessible child. @param aChildDescriptor @@ -154,10 +150,9 @@ public: reference is empty if it has not been possible to create the accessible object of the corresponding shape. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> + css::uno::Reference<css::accessibility::XAccessible> GetChild (ChildDescriptor& aChildDescriptor,sal_Int32 _nIndex) - throw (::com::sun::star::uno::RuntimeException); + throw (css::uno::RuntimeException); /** Return the requested accessible child given a shape. This method searches the list of descriptors for the one that holds the @@ -171,11 +166,9 @@ public: reference is empty if there is no shape descriptor that associates the shape with an accessible object. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - GetChild (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException); + css::uno::Reference<css::accessibility::XAccessible> + GetChild (const css::uno::Reference<css::drawing::XShape>& xShape) + throw (css::uno::RuntimeException); /** Update the child manager. Take care of a modified set of children and modified visible area. This method can optimize the update @@ -198,8 +191,7 @@ public: @param xShapeList The list of UNO shapes that replaces the old list. */ - void SetShapeList (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes>& xShapeList); + void SetShapeList (const css::uno::Reference<css::drawing::XShapes>& xShapeList); /** Add a accessible shape. This does not modify the list of UNO shapes or the list of visible shapes. Accessible shapes are, at the @@ -245,18 +237,18 @@ public: // lang::XEventListener virtual void SAL_CALL - disposing (const ::com::sun::star::lang::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + disposing (const css::lang::EventObject& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; // document::XEventListener virtual void SAL_CALL - notifyEvent (const ::com::sun::star::document::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + notifyEvent (const css::document::EventObject& rEventObject) + throw (css::uno::RuntimeException, std::exception) override; // view::XSelectionChangeListener virtual void SAL_CALL - selectionChanged (const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception) override; + selectionChanged (const css::lang::EventObject& rEvent) + throw (css::uno::RuntimeException, std::exception) override; // IAccessibleViewForwarderListener /** Informs this children manager and its children about a change of one @@ -285,20 +277,18 @@ public: */ virtual bool ReplaceChild ( AccessibleShape* pCurrentChild, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, + const css::uno::Reference< css::drawing::XShape >& _rxShape, const long _nIndex, const AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException) override; + ) throw (css::uno::RuntimeException) override; // Add the impl method for IAccessibleParent interface virtual AccessibleControlShape* GetAccControlShapeFromModel - (::com::sun::star::beans::XPropertySet* pSet) - throw (::com::sun::star::uno::RuntimeException) override; - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> - GetAccessibleCaption (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException) override; + (css::beans::XPropertySet* pSet) + throw (css::uno::RuntimeException) override; + virtual css::uno::Reference<css::accessibility::XAccessible> + GetAccessibleCaption (const css::uno::Reference<css::drawing::XShape>& xShape) + throw (css::uno::RuntimeException) override; protected: /** This list holds the descriptors of all currently visible shapes and associated accessible object. @@ -318,14 +308,12 @@ protected: into the list of visible children <member>maVisibleChildren</member>. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes> mxShapeList; + css::uno::Reference<css::drawing::XShapes> mxShapeList; /** This list of additional accessible shapes that can or shall not be created by the shape factory. */ - typedef std::vector< ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> > AccessibleShapeList; + typedef std::vector< css::uno::Reference< css::accessibility::XAccessible> > AccessibleShapeList; AccessibleShapeList maAccessibleShapes; /** Rectangle that describes the visible area in which a shape has to lie @@ -337,8 +325,7 @@ protected: /** The parent of the shapes. It is used for creating accessible objects for given shapes. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> mxParent; + css::uno::Reference<css::accessibility::XAccessible> mxParent; /** Bundel of information passed down the shape tree. */ @@ -425,15 +412,13 @@ private: accordingly. Use this method instead of <member>Update()</member> when only a single shape has been added. */ - void AddShape (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape); + void AddShape (const css::uno::Reference<css::drawing::XShape>& xShape); /** Remove a single shape. Update all relevant data structures accordingly. Use this method instead of <member>Update()</member> when only a single shape has been removed. */ - void RemoveShape (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape); + void RemoveShape (const css::uno::Reference<css::drawing::XShape>& xShape); /** Add the children manager as dispose listener at the given shape so that the associated accessible object can be disposed when the shape @@ -441,15 +426,13 @@ private: @param xShape Register at this shape as dispose listener. */ - void RegisterAsDisposeListener (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape); + void RegisterAsDisposeListener (const css::uno::Reference<css::drawing::XShape>& xShape); /** Remove the children manager as dispose listener at the given shape @param xShape Unregister at this shape as dispose listener. */ - void UnregisterAsDisposeListener (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape); + void UnregisterAsDisposeListener (const css::uno::Reference<css::drawing::XShape>& xShape); }; @@ -470,15 +453,13 @@ class ChildDescriptor public: /** Reference to a (partially) visible shape. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape> mxShape; + css::uno::Reference<css::drawing::XShape> mxShape; /** The corresponding accessible object. This reference is initially empty and only replaced by a reference to a new object when that is requested from the outside. */ - ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> mxAccessibleShape; + css::uno::Reference<css::accessibility::XAccessible> mxAccessibleShape; /** Return a pointer to the implementation object of the accessible shape of this descriptor. @@ -506,14 +487,12 @@ public: /** Create a new descriptor for the specified shape with empty reference to accessible object. */ - explicit ChildDescriptor (const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShape>& xShape); + explicit ChildDescriptor (const css::uno::Reference<css::drawing::XShape>& xShape); /** Create a new descriptor for the specified shape with empty reference to the original shape. */ - explicit ChildDescriptor (const ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible>& rxAccessibleShape); + explicit ChildDescriptor (const css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleShape); ~ChildDescriptor(); diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 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 ("<no style>"); } - catch (const ::com::sun::star::beans::UnknownPropertyException &) + catch (const css::beans::UnknownPropertyException &) { msDescription.append ("<unknown>"); } @@ -265,7 +265,7 @@ void DescriptionGenerator::AddColor (const OUString& sPropertyName, msDescription.append (lookUpColorName(nValue)); } - catch (const ::com::sun::star::beans::UnknownPropertyException &) + catch (const css::beans::UnknownPropertyException &) { msDescription.append ("<unknown>"); } @@ -290,7 +290,7 @@ void DescriptionGenerator::AddInteger (const OUString& sPropertyName, msDescription.append (nValue); } } - catch (const ::com::sun::star::beans::UnknownPropertyException &) + catch (const css::beans::UnknownPropertyException &) { msDescription.append ("<unknown>"); } @@ -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 ("<unknown>"); } @@ -401,7 +401,7 @@ void DescriptionGenerator::AddFillStyle (const OUString& sPropertyName, } } } - catch (const ::com::sun::star::beans::UnknownPropertyException &) + catch (const css::beans::UnknownPropertyException &) { msDescription.append ("<unknown>"); } 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<sal_Int32>(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<drawing::XShape>& rxShape /// get the accessible base name for an object OUString ShapeTypeHandler::CreateAccessibleBaseName (const uno::Reference<drawing::XShape>& 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 ); |