diff options
Diffstat (limited to 'svx/source/accessibility')
| -rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 16 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleGraphicShape.cxx | 24 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleOLEShape.cxx | 18 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 50 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleShapeInfo.cxx | 2 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleShapeTreeInfo.cxx | 4 | ||||
| -rw-r--r-- | svx/source/accessibility/ChildrenManager.cxx | 12 | ||||
| -rw-r--r-- | svx/source/accessibility/ChildrenManagerImpl.cxx | 22 | ||||
| -rw-r--r-- | svx/source/accessibility/ChildrenManagerImpl.hxx | 22 | ||||
| -rw-r--r-- | svx/source/accessibility/DescriptionGenerator.cxx | 10 | ||||
| -rw-r--r-- | svx/source/accessibility/GraphCtlAccessibleContext.cxx | 40 | ||||
| -rw-r--r-- | svx/source/accessibility/ShapeTypeHandler.cxx | 6 | ||||
| -rw-r--r-- | svx/source/accessibility/SvxShapeTypes.cxx | 2 | ||||
| -rw-r--r-- | svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 30 | ||||
| -rw-r--r-- | svx/source/accessibility/svxrectctaccessiblecontext.cxx | 64 |
15 files changed, 161 insertions, 161 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index a6cb01783966..a9215eb20c0c 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -125,7 +125,7 @@ AccessibleControlShape::AccessibleControlShape ( osl_atomic_decrement( &m_refCount ); } -AccessibleControlShape::~AccessibleControlShape (void) +AccessibleControlShape::~AccessibleControlShape() { m_pChildManager->release(); m_pChildManager = NULL; @@ -279,12 +279,12 @@ void AccessibleControlShape::Init() } } -Reference< XAccessibleContext > SAL_CALL AccessibleControlShape::getAccessibleContext(void) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL AccessibleControlShape::getAccessibleContext() throw (RuntimeException, std::exception) { return AccessibleShape::getAccessibleContext (); } -void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleControlShape::grabFocus() throw (RuntimeException, std::exception) { if ( !m_xUnoControl.is() || !isAliveMode( m_xUnoControl ) ) { @@ -300,12 +300,12 @@ void SAL_CALL AccessibleControlShape::grabFocus(void) throw (RuntimeException, } } -OUString SAL_CALL AccessibleControlShape::getImplementationName(void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleControlShape::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.accessibility.AccessibleControlShape" ); } -OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeException) +OUString AccessibleControlShape::CreateAccessibleBaseName() throw (RuntimeException) { OUString sName; @@ -329,7 +329,7 @@ OUString AccessibleControlShape::CreateAccessibleBaseName(void) throw (RuntimeEx OUString - AccessibleControlShape::CreateAccessibleDescription (void) + AccessibleControlShape::CreateAccessibleDescription() throw (RuntimeException) { DescriptionGenerator aDG (mxShape); @@ -608,7 +608,7 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleControlShape::getAccessib return xSet; } -OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeException) +OUString AccessibleControlShape::CreateAccessibleName() throw (RuntimeException) { ensureControlModelAccess(); @@ -640,7 +640,7 @@ OUString AccessibleControlShape::CreateAccessibleName (void) throw (RuntimeExcep return sName; } -void SAL_CALL AccessibleControlShape::disposing (void) +void SAL_CALL AccessibleControlShape::disposing() { // ensure we're not listening m_bListeningForName = ensureListeningState( m_bListeningForName, false, lcl_getPreferredAccNameProperty( m_xModelPropsMeta ) ); diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index bd39f4b4975c..a688a8a0995f 100644 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx @@ -41,12 +41,12 @@ AccessibleGraphicShape::AccessibleGraphicShape ( -AccessibleGraphicShape::~AccessibleGraphicShape (void) +AccessibleGraphicShape::~AccessibleGraphicShape() { } // XAccessibleImage -OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) +OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) { if (m_pShape) @@ -57,7 +57,7 @@ OUString SAL_CALL AccessibleGraphicShape::getAccessibleImageDescription (void) -sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight (void) +sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleShape::getSize().Height; @@ -66,7 +66,7 @@ sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageHeight (void) -sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth (void) +sal_Int32 SAL_CALL AccessibleGraphicShape::getAccessibleImageWidth() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleShape::getSize().Width; @@ -87,7 +87,7 @@ com::sun::star::uno::Any SAL_CALL void SAL_CALL - AccessibleGraphicShape::acquire (void) + AccessibleGraphicShape::acquire() throw () { AccessibleShape::acquire (); @@ -96,7 +96,7 @@ void SAL_CALL void SAL_CALL - AccessibleGraphicShape::release (void) + AccessibleGraphicShape::release() throw () { AccessibleShape::release (); @@ -104,7 +104,7 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL - AccessibleGraphicShape::getImplementationName (void) + AccessibleGraphicShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleGraphicShape"); @@ -114,7 +114,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessibleGraphicShape::getSupportedServiceNames (void) + AccessibleGraphicShape::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -132,7 +132,7 @@ OUString SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL - AccessibleGraphicShape::getTypes (void) + AccessibleGraphicShape::getTypes() throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... @@ -152,7 +152,7 @@ uno::Sequence<uno::Type> SAL_CALL /// Create the base name of this object, i.e. the name without appended number. OUString - AccessibleGraphicShape::CreateAccessibleBaseName (void) + AccessibleGraphicShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -174,7 +174,7 @@ OUString return sName; } -OUString AccessibleGraphicShape::CreateAccessibleDescription (void) +OUString AccessibleGraphicShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { //Don't use the same information for accessible name and accessible description. @@ -187,7 +187,7 @@ OUString AccessibleGraphicShape::CreateAccessibleDescription (void) } // Return this object's role. -sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleGraphicShape::getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) { if( m_pShape->GetModel()->GetImageMapForObject(m_pShape) != NULL ) diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 9e5c27f80b20..3c4bbac8387a 100644 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx @@ -41,12 +41,12 @@ AccessibleOLEShape::AccessibleOLEShape ( -AccessibleOLEShape::~AccessibleOLEShape (void) +AccessibleOLEShape::~AccessibleOLEShape() { } // XAccessibleAction -sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount (void) +sal_Int32 SAL_CALL AccessibleOLEShape::getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException, std::exception) { return 0; @@ -96,7 +96,7 @@ com::sun::star::uno::Any SAL_CALL void SAL_CALL - AccessibleOLEShape::acquire (void) + AccessibleOLEShape::acquire() throw () { AccessibleShape::acquire (); @@ -105,7 +105,7 @@ void SAL_CALL void SAL_CALL - AccessibleOLEShape::release (void) + AccessibleOLEShape::release() throw () { AccessibleShape::release (); @@ -113,7 +113,7 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL - AccessibleOLEShape::getImplementationName (void) + AccessibleOLEShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleOLEShape"); @@ -123,7 +123,7 @@ OUString SAL_CALL ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessibleOLEShape::getSupportedServiceNames (void) + AccessibleOLEShape::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -141,7 +141,7 @@ OUString SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL - AccessibleOLEShape::getTypes (void) + AccessibleOLEShape::getTypes() throw (uno::RuntimeException, std::exception) { // Get list of types from the context base implementation... @@ -173,7 +173,7 @@ uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes() /// Set this object's name if is different to the current name. OUString - AccessibleOLEShape::CreateAccessibleBaseName (void) + AccessibleOLEShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -207,7 +207,7 @@ OUString OUString - AccessibleOLEShape::CreateAccessibleDescription (void) + AccessibleOLEShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { return CreateAccessibleName (); diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 45ce17b92747..2f9c3741a50e 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -114,7 +114,7 @@ AccessibleShape::AccessibleShape ( UpdateNameAndDescription(); } -AccessibleShape::~AccessibleShape (void) +AccessibleShape::~AccessibleShape() { delete mpChildrenManager; delete mpText; @@ -125,7 +125,7 @@ AccessibleShape::~AccessibleShape (void) // broadcasters would still hold a strong reference to this object. } -void AccessibleShape::Init (void) +void AccessibleShape::Init() { // Update the OPAQUE and SELECTED shape. UpdateStates (); @@ -194,7 +194,7 @@ void AccessibleShape::Init (void) -void AccessibleShape::UpdateStates (void) +void AccessibleShape::UpdateStates() { ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); @@ -313,7 +313,7 @@ bool AccessibleShape::GetState (sal_Int16 aState) } // OverWrite the parent's getAccessibleName method -OUString SAL_CALL AccessibleShape::getAccessibleName (void) +OUString SAL_CALL AccessibleShape::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -323,7 +323,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleName (void) return CreateAccessibleName(); } -OUString SAL_CALL AccessibleShape::getAccessibleDescription (void) +OUString SAL_CALL AccessibleShape::getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -391,7 +391,7 @@ uno::Reference<XAccessible> SAL_CALL } uno::Reference<XAccessibleRelationSet> SAL_CALL - AccessibleShape::getAccessibleRelationSet (void) + AccessibleShape::getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -418,7 +418,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL VISIBLE */ uno::Reference<XAccessibleStateSet> SAL_CALL - AccessibleShape::getAccessibleStateSet (void) + AccessibleShape::getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -552,7 +552,7 @@ uno::Reference<XAccessible > SAL_CALL -awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) +awt::Rectangle SAL_CALL AccessibleShape::getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -667,7 +667,7 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds (void) -awt::Point SAL_CALL AccessibleShape::getLocation (void) +awt::Point SAL_CALL AccessibleShape::getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -678,7 +678,7 @@ awt::Point SAL_CALL AccessibleShape::getLocation (void) -awt::Point SAL_CALL AccessibleShape::getLocationOnScreen (void) +awt::Point SAL_CALL AccessibleShape::getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -703,7 +703,7 @@ awt::Point SAL_CALL AccessibleShape::getLocationOnScreen (void) -awt::Size SAL_CALL AccessibleShape::getSize (void) +awt::Size SAL_CALL AccessibleShape::getSize() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -714,7 +714,7 @@ awt::Size SAL_CALL AccessibleShape::getSize (void) -sal_Int32 SAL_CALL AccessibleShape::getForeground (void) +sal_Int32 SAL_CALL AccessibleShape::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -740,7 +740,7 @@ sal_Int32 SAL_CALL AccessibleShape::getForeground (void) -sal_Int32 SAL_CALL AccessibleShape::getBackground (void) +sal_Int32 SAL_CALL AccessibleShape::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -833,7 +833,7 @@ com::sun::star::uno::Any SAL_CALL void SAL_CALL - AccessibleShape::acquire (void) + AccessibleShape::acquire() throw () { AccessibleContextBase::acquire (); @@ -843,7 +843,7 @@ void SAL_CALL void SAL_CALL - AccessibleShape::release (void) + AccessibleShape::release() throw () { AccessibleContextBase::release (); @@ -965,7 +965,7 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes() // XServiceInfo OUString SAL_CALL - AccessibleShape::getImplementationName (void) + AccessibleShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleShape"); @@ -975,7 +975,7 @@ OUString SAL_CALL uno::Sequence<OUString> SAL_CALL - AccessibleShape::getSupportedServiceNames (void) + AccessibleShape::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -993,7 +993,7 @@ uno::Sequence<OUString> SAL_CALL // XTypeProvider uno::Sequence<uno::Type> SAL_CALL - AccessibleShape::getTypes (void) + AccessibleShape::getTypes() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -1146,14 +1146,14 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, // protected internal // Set this object's name if is different to the current name. -OUString AccessibleShape::CreateAccessibleBaseName (void) +OUString AccessibleShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { return ShapeTypeHandler::CreateAccessibleBaseName( mxShape ); } -OUString AccessibleShape::CreateAccessibleName (void) +OUString AccessibleShape::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { return GetFullAccessibleName(this); @@ -1196,7 +1196,7 @@ OUString AccessibleShape::GetFullAccessibleName (AccessibleShape *shape) } OUString - AccessibleShape::CreateAccessibleDescription (void) + AccessibleShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { DescriptionGenerator aDG (mxShape); @@ -1266,7 +1266,7 @@ OUString // protected -void AccessibleShape::disposing (void) +void AccessibleShape::disposing() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -1311,7 +1311,7 @@ void AccessibleShape::disposing (void) } sal_Int32 SAL_CALL - AccessibleShape::getAccessibleIndexInParent (void) + AccessibleShape::getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -1326,7 +1326,7 @@ sal_Int32 SAL_CALL -void AccessibleShape::UpdateNameAndDescription (void) +void AccessibleShape::UpdateNameAndDescription() { // Ignore missing title, name, or description. There are fallbacks for // them. @@ -1359,7 +1359,7 @@ void AccessibleShape::UpdateNameAndDescription (void) } // Return this object's role. -sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleShape::getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 nAccessibleRole = AccessibleRole::SHAPE ; diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx index ef9f09c58d09..d2e324c80217 100644 --- a/svx/source/accessibility/AccessibleShapeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeInfo.cxx @@ -64,7 +64,7 @@ AccessibleShapeInfo::AccessibleShapeInfo (const AccessibleShapeInfo &rOther) } -AccessibleShapeInfo::~AccessibleShapeInfo (void) +AccessibleShapeInfo::~AccessibleShapeInfo() { // empty. } diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 3be00eee0bf4..89476a4535f3 100644 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx @@ -26,7 +26,7 @@ using ::com::sun::star::uno::Reference; namespace accessibility { -AccessibleShapeTreeInfo::AccessibleShapeTreeInfo (void) +AccessibleShapeTreeInfo::AccessibleShapeTreeInfo() : mpView (NULL), mpWindow (NULL), mpViewForwarder (NULL) @@ -68,7 +68,7 @@ AccessibleShapeTreeInfo& AccessibleShapeTreeInfo::operator= (const AccessibleSha -AccessibleShapeTreeInfo::~AccessibleShapeTreeInfo (void) +AccessibleShapeTreeInfo::~AccessibleShapeTreeInfo() { //empty } diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 134f17ff1821..ada8b29df564 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -46,7 +46,7 @@ ChildrenManager::ChildrenManager ( -ChildrenManager::~ChildrenManager (void) +ChildrenManager::~ChildrenManager() { if (mpImpl != NULL) mpImpl->dispose(); @@ -55,7 +55,7 @@ ChildrenManager::~ChildrenManager (void) OSL_TRACE ("~ChildrenManager"); } -long ChildrenManager::GetChildCount (void) const throw () +long ChildrenManager::GetChildCount() const throw () { assert(mpImpl != NULL); return mpImpl->GetChildCount(); @@ -104,7 +104,7 @@ void ChildrenManager::AddAccessibleShape (css::uno::Reference<css::accessibility mpImpl->AddAccessibleShape (shape); } -void ChildrenManager::ClearAccessibleShapeList (void) +void ChildrenManager::ClearAccessibleShapeList() { assert(mpImpl != NULL); mpImpl->ClearAccessibleShapeList (); @@ -116,19 +116,19 @@ void ChildrenManager::SetInfo (AccessibleShapeTreeInfo& rShapeTreeInfo) mpImpl->SetInfo (rShapeTreeInfo); } -void ChildrenManager::UpdateSelection (void) +void ChildrenManager::UpdateSelection() { assert(mpImpl != NULL); mpImpl->UpdateSelection (); } -bool ChildrenManager::HasFocus (void) +bool ChildrenManager::HasFocus() { assert(mpImpl != NULL); return mpImpl->HasFocus (); } -void ChildrenManager::RemoveFocus (void) +void ChildrenManager::RemoveFocus() { assert(mpImpl != NULL); mpImpl->RemoveFocus (); diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 869c5dd4acfc..4cea26f20bf6 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -73,7 +73,7 @@ ChildrenManagerImpl::ChildrenManagerImpl ( -ChildrenManagerImpl::~ChildrenManagerImpl (void) +ChildrenManagerImpl::~ChildrenManagerImpl() { DBG_ASSERT (rBHelper.bDisposed || rBHelper.bInDispose, "~AccessibleDrawDocumentView: object has not been disposed"); @@ -82,7 +82,7 @@ ChildrenManagerImpl::~ChildrenManagerImpl (void) -void ChildrenManagerImpl::Init (void) +void ChildrenManagerImpl::Init() { // Register as view::XSelectionChangeListener. Reference<frame::XController> xController(maShapeTreeInfo.GetController()); @@ -106,7 +106,7 @@ void ChildrenManagerImpl::Init (void) -long ChildrenManagerImpl::GetChildCount (void) const throw () +long ChildrenManagerImpl::GetChildCount() const throw () { return maVisibleChildren.size(); } @@ -558,7 +558,7 @@ void ChildrenManagerImpl::AddAccessibleShape (css::uno::Reference<css::accessibi -void ChildrenManagerImpl::ClearAccessibleShapeList (void) +void ChildrenManagerImpl::ClearAccessibleShapeList() { // Copy the list of (visible) shapes to local lists and clear the // originals. @@ -723,7 +723,7 @@ void SAL_CALL -void ChildrenManagerImpl::impl_dispose (void) +void ChildrenManagerImpl::impl_dispose() { Reference<frame::XController> xController(maShapeTreeInfo.GetController()); // Remove from broadcasters. @@ -768,7 +768,7 @@ void ChildrenManagerImpl::impl_dispose (void) -void SAL_CALL ChildrenManagerImpl::disposing (void) +void SAL_CALL ChildrenManagerImpl::disposing() { impl_dispose(); } @@ -886,7 +886,7 @@ uno::Reference<XAccessible> unfocused. If the controller's frame is not active then all shapes are unfocused. */ -void ChildrenManagerImpl::UpdateSelection (void) +void ChildrenManagerImpl::UpdateSelection() { Reference<frame::XController> xController(maShapeTreeInfo.GetController()); Reference<view::XSelectionSupplier> xSelectionSupplier ( @@ -1054,7 +1054,7 @@ void ChildrenManagerImpl::UpdateSelection (void) -bool ChildrenManagerImpl::HasFocus (void) +bool ChildrenManagerImpl::HasFocus() { return mpFocusedShape != NULL; } @@ -1062,7 +1062,7 @@ bool ChildrenManagerImpl::HasFocus (void) -void ChildrenManagerImpl::RemoveFocus (void) +void ChildrenManagerImpl::RemoveFocus() { if (mpFocusedShape != NULL) { @@ -1120,14 +1120,14 @@ ChildDescriptor::ChildDescriptor (const Reference<XAccessible>& rxAccessibleShap -ChildDescriptor::~ChildDescriptor (void) +ChildDescriptor::~ChildDescriptor() { } -AccessibleShape* ChildDescriptor::GetAccessibleShape (void) const +AccessibleShape* ChildDescriptor::GetAccessibleShape() const { return static_cast<AccessibleShape*> (mxAccessibleShape.get()); } diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index 93769e05f2e9..1e0ec534a98e 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -107,18 +107,18 @@ public: /** If there still are managed children these are disposed and released. */ - virtual ~ChildrenManagerImpl (void); + virtual ~ChildrenManagerImpl(); /** Do that part of the initialization that you can not or should not do in the constructor like registering at broadcasters. */ - void Init (void); + void Init(); /** Return the number of currently visible accessible children. @return If there are no children a 0 is returned. */ - long GetChildCount (void) const throw (); + long GetChildCount() const throw (); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape> GetChildShape(long nIndex) @@ -214,7 +214,7 @@ public: /** Clear the lists of accessible shapes and that of visible accessible shapes. The list of UNO shapes is not modified. */ - void ClearAccessibleShapeList (void); + void ClearAccessibleShapeList(); /** Set a new event shape tree info. Call this method to inform the children manager of a change of the info bundle. @@ -227,7 +227,7 @@ public: according to the given selection. This includes setting <em>and</em> resetting the states. */ - void UpdateSelection (void); + void UpdateSelection(); /** Return whether one of the shapes managed by this object has currently the focus. @@ -235,13 +235,13 @@ public: Returns <true/> when there is a shape that has the focus and <false/> when there is no such shape. */ - bool HasFocus (void); + bool HasFocus(); /** When there is a shape that currently has the focus, i.e. <member>HasFocus()</member> returns <true/> then remove the focus from that shape. Otherwise nothing changes. */ - void RemoveFocus (void); + void RemoveFocus(); // lang::XEventListener virtual void SAL_CALL @@ -352,9 +352,9 @@ protected: /** This method is called from the component helper base class while disposing. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - void impl_dispose (void); + void impl_dispose(); private: /** Names of new accessible objects are disambiguated with this index. @@ -487,7 +487,7 @@ public: shape is empty or it can not be transformed into a pointer to the desired class. */ - AccessibleShape* GetAccessibleShape (void) const; + AccessibleShape* GetAccessibleShape() const; /** set the index _nIndex at the accessible shape @param _nIndex @@ -515,7 +515,7 @@ public: explicit ChildDescriptor (const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxAccessibleShape); - ~ChildDescriptor (void); + ~ChildDescriptor(); /** Dispose the accessible object of this descriptor. If that object does not exist then do nothing. diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 9b19877512b0..ebb3fe34f809 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -64,7 +64,7 @@ DescriptionGenerator::DescriptionGenerator ( -DescriptionGenerator::~DescriptionGenerator (void) +DescriptionGenerator::~DescriptionGenerator() { } @@ -202,7 +202,7 @@ void DescriptionGenerator::AppendString (const OUString& sString) -void DescriptionGenerator::AddLineProperties (void) +void DescriptionGenerator::AddLineProperties() { AddProperty ("LineColor", DescriptionGenerator::COLOR, SIP_XA_LINECOLOR); AddProperty ("LineDashName", DescriptionGenerator::STRING, @@ -216,7 +216,7 @@ void DescriptionGenerator::AddLineProperties (void) /** The fill style is described by the property "FillStyle". Depending on its value a hatch-, gradient-, or bitmap name is appended. */ -void DescriptionGenerator::AddFillProperties (void) +void DescriptionGenerator::AddFillProperties() { AddProperty ("FillStyle", DescriptionGenerator::FILL_STYLE, SIP_XA_FILLSTYLE); } @@ -224,7 +224,7 @@ void DescriptionGenerator::AddFillProperties (void) -void DescriptionGenerator::Add3DProperties (void) +void DescriptionGenerator::Add3DProperties() { AddProperty ("D3DMaterialColor", DescriptionGenerator::COLOR, RID_SVXSTR_A11Y_3D_MATERIAL_COLOR); @@ -235,7 +235,7 @@ void DescriptionGenerator::Add3DProperties (void) -void DescriptionGenerator::AddTextProperties (void) +void DescriptionGenerator::AddTextProperties() { AddProperty ("CharColor", DescriptionGenerator::COLOR); AddFillProperties (); diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index ecb05b5fedcc..a00131c50183 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -175,7 +175,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessible( } // XAccessible -Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleContext > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -264,7 +264,7 @@ awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeExcept } // XAccessibleContext -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -327,14 +327,14 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleCh -Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; // Use a simple but slow solution for now. Optimize later. @@ -366,14 +366,14 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( vo -sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::PANEL; } -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; return msDescription; @@ -381,7 +381,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; return msName; @@ -392,14 +392,14 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw /** Return empty reference to indicate that the relation set is not supported. */ -Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { return Reference< XAccessibleRelationSet >(); } -Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -424,7 +424,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce -lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::SolarMutexGuard aGuard; @@ -484,7 +484,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException mpControl->GrabFocus(); } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { svtools::ColorConfig aColorConfig; @@ -492,7 +492,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) return static_cast<sal_Int32>(nColor); } -sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) +sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); @@ -500,7 +500,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) } // XServiceInfo -OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext" ); } @@ -510,7 +510,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aSNs( 3 ); @@ -522,13 +522,13 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService } // XTypeProvider -Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) +Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } // XServiceName -OUString SvxGraphCtrlAccessibleContext::getServiceName( void ) throw( RuntimeException, std::exception ) +OUString SvxGraphCtrlAccessibleContext::getServiceName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleContext" ); } @@ -725,7 +725,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing() -Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::SolarMutexGuard aGuard; @@ -744,7 +744,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( R between the absolute coordinates of the bounding boxes of this control and its parent in the accessibility tree. */ -Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox() throw( RuntimeException ) { ::SolarMutexGuard aGuard; @@ -816,14 +816,14 @@ void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHi } // IAccessibleViewforwarder -bool SvxGraphCtrlAccessibleContext::IsValid (void) const +bool SvxGraphCtrlAccessibleContext::IsValid() const { return true; } -Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea (void) const +Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea() const { Rectangle aVisArea; diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 44fa312551d5..2581573e4993 100644 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -54,7 +54,7 @@ AccessibleShape* -ShapeTypeHandler& ShapeTypeHandler::Instance (void) +ShapeTypeHandler& ShapeTypeHandler::Instance() { // Using double check pattern to make sure that exactly one instance of // the shape type handler is instantiated. @@ -133,7 +133,7 @@ AccessibleShape* /** Create the single instance of this class and initialize its list of type descriptors with an entry of an unknown type. */ -ShapeTypeHandler::ShapeTypeHandler (void) +ShapeTypeHandler::ShapeTypeHandler() : maShapeTypeDescriptorList (1) { // Make sure that at least the UNKNOWN entry is present. @@ -147,7 +147,7 @@ ShapeTypeHandler::ShapeTypeHandler (void) -ShapeTypeHandler::~ShapeTypeHandler (void) +ShapeTypeHandler::~ShapeTypeHandler() { // Because this class is a singleton and the only instance, whose // destructor has just been called, is pointed to from instance, diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index 1f1346a8e27e..261c7fd6527e 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -84,7 +84,7 @@ AccessibleShape* CreateSvxAccessibleShape ( } } -void RegisterDrawShapeTypes (void) +void RegisterDrawShapeTypes() { /** List of shape type descriptors corresponding to the <type>SvxShapeTypes</type> enum. diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index 0498e6acac62..5357656db43b 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -583,7 +583,7 @@ SvxPixelCtlAccessibleChild::~SvxPixelCtlAccessibleChild() } // XAccessible -uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleContext> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -652,7 +652,7 @@ sal_Int32 SvxPixelCtlAccessibleChild::getBackground( ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleChildCount() throw( RuntimeException, std::exception ) { return 0; } @@ -663,29 +663,29 @@ uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessible throw lang::IndexOutOfBoundsException(); } -uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { return mnIndexInParent; } -sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::CHECK_BOX; } -OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return GetName(); } -OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return GetName(); @@ -694,12 +694,12 @@ OUString SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleName( void ) throw( R /** Return empty uno::Reference to indicate that the relation set is not supported. */ -uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +uno::Reference<XAccessibleRelationSet> SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { return uno::Reference< XAccessibleRelationSet >(); } -uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -730,7 +730,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SvxPixelCtlAccessibleChild::getAc return pStateSetHelper; } -lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxPixelCtlAccessibleChild::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -778,7 +778,7 @@ void SAL_CALL SvxPixelCtlAccessibleChild::removeAccessibleEventListener( const u } // XServiceInfo -OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxPixelCtlAccessibleChild::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxPixelCtlAccessibleChild" ) ); } @@ -788,7 +788,7 @@ sal_Bool SAL_CALL SvxPixelCtlAccessibleChild::supportsService( const OUString& r return cppu::supportsService( this, rServiceName ); } -Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxPixelCtlAccessibleChild::getSupportedServiceNames() throw( RuntimeException, std::exception ) { uno::Sequence< OUString > aRet(3); OUString* pArray = aRet.getArray(); @@ -824,13 +824,13 @@ void SAL_CALL SvxPixelCtlAccessibleChild::disposing() } } -void SvxPixelCtlAccessibleChild::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException ) +void SvxPixelCtlAccessibleChild::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) { if( IsNotAlive() ) throw lang::DisposedException(); } -Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -840,7 +840,7 @@ Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen( void ) throw( Runt return Rectangle( mrParentWindow.OutputToAbsoluteScreenPixel( aRect.TopLeft() ), aRect.GetSize() ); } -Rectangle SvxPixelCtlAccessibleChild::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxPixelCtlAccessibleChild::GetBoundingBox() throw( RuntimeException ) { // no guard necessary, because no one changes mpBoundingBox after creating it ThrowExceptionIfNotAlive(); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 0fd553d8aa68..2c87389ff5e2 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -181,7 +181,7 @@ SvxRectCtlAccessibleContext::~SvxRectCtlAccessibleContext() } // XAccessible -Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleContext > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -244,7 +244,7 @@ bool SAL_CALL SvxRectCtlAccessibleContext::isVisible() throw( RuntimeException ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -291,12 +291,12 @@ Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleChil return xChild; } -Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); // Use a simple but slow solution for now. Optimize later. @@ -322,18 +322,18 @@ sal_Int32 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleIndexInParent( void return -1; } -sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::PANEL; } -OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return msDescription + " Please use arrow key to selection."; } -OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return msName; @@ -342,7 +342,7 @@ OUString SAL_CALL SvxRectCtlAccessibleContext::getAccessibleName( void ) throw( /** Return empty reference to indicate that the relation set is not supported. */ -Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { //return Reference< XAccessibleRelationSet >(); utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; @@ -369,7 +369,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxRectCtlAccessibleContext::getAcc return xSet; } -Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -393,7 +393,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlAccessibleContext::getAccess return pStateSetHelper; } -lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxRectCtlAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); if( mxParent.is() ) @@ -469,7 +469,7 @@ sal_Int32 SvxRectCtlAccessibleContext::getBackground( ) } // XServiceInfo -OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxRectCtlAccessibleContext" ); } @@ -479,14 +479,14 @@ sal_Bool SAL_CALL SvxRectCtlAccessibleContext::supportsService( const OUString& return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) { const OUString sServiceName( "com.sun.star.accessibility.AccessibleContext" ); return Sequence< OUString >( &sServiceName, 1 ); } // XTypeProvider -Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -683,7 +683,7 @@ void SAL_CALL SvxRectCtlAccessibleContext::disposing() } } -Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -693,7 +693,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( Run return Rectangle( mpRepr->GetParent()->OutputToScreenPixel( mpRepr->GetPosPixel() ), mpRepr->GetSizePixel() ); } -Rectangle SvxRectCtlAccessibleContext::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxRectCtlAccessibleContext::GetBoundingBox() throw( RuntimeException ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -703,7 +703,7 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBox( void ) throw( RuntimeExce return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() ); } -void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException ) +void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) { if( IsNotAlive() ) throw lang::DisposedException(); @@ -746,7 +746,7 @@ SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext() } // XAccessible -Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleContext> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleContext() throw( RuntimeException, std::exception ) { return this; } @@ -810,7 +810,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getBackground( ) } // XAccessibleContext -sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleChildCount() throw( RuntimeException, std::exception ) { return 0; } @@ -820,28 +820,28 @@ Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibl throw lang::IndexOutOfBoundsException(); } -Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent( void ) throw( RuntimeException, std::exception ) +Reference< XAccessible > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleParent() throw( RuntimeException, std::exception ) { return mxParent; } -sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleIndexInParent() throw( RuntimeException, std::exception ) { return mnIndexInParent; } -sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole( void ) throw( RuntimeException, std::exception ) +sal_Int16 SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRole() throw( RuntimeException, std::exception ) { return AccessibleRole::RADIO_BUTTON; } -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleDescription() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); return msDescription; } -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); return msName; @@ -850,7 +850,7 @@ OUString SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleName( void ) th /** Return empty reference to indicate that the relation set is not supported. */ -Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet( void ) throw( RuntimeException, std::exception ) +Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleRelationSet() throw( RuntimeException, std::exception ) { utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; uno::Reference< css::accessibility::XAccessibleRelationSet > xSet = pRelationSetHelper; @@ -865,7 +865,7 @@ Reference<XAccessibleRelationSet> SAL_CALL SvxRectCtlChildAccessibleContext::get return xSet; } -Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException, std::exception ) +Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getAccessibleStateSet() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -891,7 +891,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxRectCtlChildAccessibleContext::getA return pStateSetHelper; } -lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) +lang::Locale SAL_CALL SvxRectCtlChildAccessibleContext::getLocale() throw( IllegalAccessibleComponentStateException, RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( maMutex ); if( mxParent.is() ) @@ -1022,7 +1022,7 @@ Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessib } // XServiceInfo -OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ui.SvxRectCtlChildAccessibleContext" ); } @@ -1032,14 +1032,14 @@ sal_Bool SAL_CALL SvxRectCtlChildAccessibleContext::supportsService( const OUStr return cppu::supportsService(this, sServiceName); } -Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames( void ) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServiceNames() throw( RuntimeException, std::exception ) { const OUString sServiceName ("com.sun.star.accessibility.AccessibleContext"); return Sequence< OUString >( &sServiceName, 1 ); } // XTypeProvider -Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId() throw( RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -1069,13 +1069,13 @@ void SAL_CALL SvxRectCtlChildAccessibleContext::disposing() } } -void SvxRectCtlChildAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException ) +void SvxRectCtlChildAccessibleContext::ThrowExceptionIfNotAlive() throw( lang::DisposedException ) { if( IsNotAlive() ) throw lang::DisposedException(); } -Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException ) +Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen() throw( RuntimeException ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1085,7 +1085,7 @@ Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen( void ) throw return Rectangle( mrParentWindow.OutputToScreenPixel( aRect.TopLeft() ), aRect.GetSize() ); } -Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBox( void ) throw( RuntimeException ) +Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBox() throw( RuntimeException ) { // no guard necessary, because no one changes mpBoundingBox after creating it ThrowExceptionIfNotAlive(); |