diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-14 12:44:47 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-15 11:47:12 +0200 |
commit | 71b809959bb8f775d83dc52628448bb8b8322b28 (patch) | |
tree | f9aa4308050eb7d55611068602c0cf0e3c1b3690 /svx | |
parent | 135907f2061550624ee1859745d94eee01849070 (diff) |
remove unnecessary use of void in function declarations
ie.
void f(void);
becomes
void f();
I used the following command to make the changes:
git grep -lP '\(\s*void\s*\)' -- *.cxx \
| xargs perl -pi -w -e 's/(\w+)\s*\(\s*void\s*\)/$1\(\)/g;'
and ran it for both .cxx and .hxx files.
Change-Id: I314a1b56e9c14d10726e32841736b0ad5eef8ddd
Diffstat (limited to 'svx')
91 files changed, 452 insertions, 452 deletions
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx index a531837de3eb..934fd33d50e0 100644 --- a/svx/inc/AccessibleTableShape.hxx +++ b/svx/inc/AccessibleTableShape.hxx @@ -57,7 +57,7 @@ public: AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo ); virtual ~AccessibleTableShape( ); - virtual void Init (void) SAL_OVERRIDE; + virtual void Init() SAL_OVERRIDE; // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -71,7 +71,7 @@ public: virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleTable virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -140,7 +140,7 @@ public: AccessibleCell* GetActiveAccessibleCell(); protected: - virtual OUString CreateAccessibleBaseName(void) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; sdr::table::SvxTableController* getTableController(); diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index 8b58d7639ac5..f85af689ce4a 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -43,7 +43,7 @@ public: GalleryControl ( SfxBindings* pBindings, vcl::Window* pParentWindow); - virtual ~GalleryControl (void); + virtual ~GalleryControl(); bool GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow); @@ -55,15 +55,15 @@ private: Size maLastSize; bool mbIsInitialResize; - void InitSettings (void); + void InitSettings(); - virtual void Resize (void) SAL_OVERRIDE; - virtual void GetFocus (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; DECL_LINK(SplitHdl, void*); protected: - void ThemeSelectionHasChanged (void); + void ThemeSelectionHasChanged(); }; } } // end of namespace svx::sidebar 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(); diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 04df8dddad1f..7f580d80ffe2 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -43,11 +43,11 @@ SpellDialogChildWindow::SpellDialogChildWindow ( SetHideNotDelete(true); } -SpellDialogChildWindow::~SpellDialogChildWindow (void) +SpellDialogChildWindow::~SpellDialogChildWindow() { } -SfxBindings& SpellDialogChildWindow::GetBindings (void) const +SfxBindings& SpellDialogChildWindow::GetBindings() const { OSL_ASSERT (m_pAbstractSpellDialog != NULL); return m_pAbstractSpellDialog->GetBindings(); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 215869e6d376..984eb164047a 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -1128,7 +1128,7 @@ bool SvxBmpMask::IsEyedropping() const /** Set an accessible name for the source color check boxes. Without this the lengthy description is read. */ -void SvxBmpMask::SetAccessibleNames (void) +void SvxBmpMask::SetAccessibleNames() { OUString sSourceColor(BMP_RESID(RID_SVXDLG_BMPMASK_STR_SOURCECOLOR).toString()); OUString sSourceColorN; diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 75ec603653b3..28519890f12c 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -210,7 +210,7 @@ sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) const -int SvxShowCharSet::FirstInView( void ) const +int SvxShowCharSet::FirstInView() const { int nIndex = 0; if( aVscrollSB.IsVisible() ) @@ -220,7 +220,7 @@ int SvxShowCharSet::FirstInView( void ) const -int SvxShowCharSet::LastInView( void ) const +int SvxShowCharSet::LastInView() const { sal_uIntPtr nIndex = FirstInView(); nIndex += ROW_COUNT * COLUMN_COUNT - 1; diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 075cc89b29ae..7ced4eaf2856 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -59,7 +59,7 @@ using namespace ::com::sun::star::accessibility; // Control for display and selection of the corner points and // mid point of an object -Bitmap& SvxRectCtl::GetRectBitmap( void ) +Bitmap& SvxRectCtl::GetRectBitmap() { if( !pBitmap ) InitRectBitmap(); @@ -162,7 +162,7 @@ void SvxRectCtl::Resize_Impl() } -void SvxRectCtl::InitRectBitmap( void ) +void SvxRectCtl::InitRectBitmap() { delete pBitmap; @@ -675,12 +675,12 @@ void SvxRectCtl::SetState( CTL_STATE nState ) static_cast<SvxTabPage*>(pTabPage)->PointChanged(this, eRP); } -sal_uInt8 SvxRectCtl::GetNumOfChildren( void ) const +sal_uInt8 SvxRectCtl::GetNumOfChildren() const { return ( eCS == CS_ANGLE )? 8 : 9; } -Rectangle SvxRectCtl::CalculateFocusRectangle( void ) const +Rectangle SvxRectCtl::CalculateFocusRectangle() const { Size aDstBtnSize( PixelToLogic( Size( 15, 15 ) ) ); return Rectangle( aPtNew - Point( aDstBtnSize.Width() >> 1, aDstBtnSize.Height() >> 1 ), aDstBtnSize ); @@ -1696,7 +1696,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeLineEndLB(vcl::Window return pListBox; } -LineEndLB::~LineEndLB(void) +LineEndLB::~LineEndLB() { } diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 98a054b417d8..4b0b3920d59d 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -838,7 +838,7 @@ void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n ) -void SvxFontPrevWindow::AutoCorrectFontColor( void ) +void SvxFontPrevWindow::AutoCorrectFontColor() { Color aFontColor( GetTextColor() ); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 7c05cd5cfa58..e85409be5e4a 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -716,7 +716,7 @@ void SvxRubyDialog::AssertOneEntry() -void SvxRubyDialog::UpdateColors( void ) +void SvxRubyDialog::UpdateColors() { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); svtools::ColorConfig aColorConfig; diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index 236e5d6cd766..40a34118d14a 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -66,7 +66,7 @@ SvxSwFrameExample::~SvxSwFrameExample() { } -void SvxSwFrameExample::InitColors_Impl( void ) +void SvxSwFrameExample::InitColors_Impl() { const StyleSettings& rSettings = GetSettings().GetStyleSettings(); m_aBgCol = Color( rSettings.GetWindowColor() ); diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx index f59c25c5cd88..743b60d41a12 100644 --- a/svx/source/engine3d/viewpt3d2.cxx +++ b/svx/source/engine3d/viewpt3d2.cxx @@ -67,7 +67,7 @@ const basegfx::B3DPoint& Viewport3D::GetViewPoint() // Calculate View transformations matrix -void Viewport3D::MakeTransform(void) +void Viewport3D::MakeTransform() { if ( !bTfValid ) { diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index b5bda2378e40..cbad27e1bd6f 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3709,7 +3709,7 @@ OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException, std::exception } -OUString SAL_CALL FmXEditCell::getSelectedText( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXEditCell::getSelectedText() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3732,7 +3732,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& } -::com::sun::star::awt::Selection SAL_CALL FmXEditCell::getSelection( void ) throw( RuntimeException, std::exception ) +::com::sun::star::awt::Selection SAL_CALL FmXEditCell::getSelection() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -3744,7 +3744,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& } -sal_Bool SAL_CALL FmXEditCell::isEditable( void ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXEditCell::isEditable() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4652,7 +4652,7 @@ OUString SAL_CALL FmXFilterCell::getText() throw( RuntimeException, std::excepti } -OUString SAL_CALL FmXFilterCell::getSelectedText( void ) throw( RuntimeException, std::exception ) +OUString SAL_CALL FmXFilterCell::getSelectedText() throw( RuntimeException, std::exception ) { return getText(); } @@ -4663,13 +4663,13 @@ void SAL_CALL FmXFilterCell::setSelection( const ::com::sun::star::awt::Selectio } -::com::sun::star::awt::Selection SAL_CALL FmXFilterCell::getSelection( void ) throw( RuntimeException, std::exception ) +::com::sun::star::awt::Selection SAL_CALL FmXFilterCell::getSelection() throw( RuntimeException, std::exception ) { return ::com::sun::star::awt::Selection(); } -sal_Bool SAL_CALL FmXFilterCell::isEditable( void ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FmXFilterCell::isEditable() throw( RuntimeException, std::exception ) { return sal_True; } diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index e9e8a8ffc57b..447ad5a65b91 100644 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx @@ -61,7 +61,7 @@ SAL_WNOUNREACHABLE_CODE_PUSH SAL_WNOUNREACHABLE_CODE_POP -::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { static const OUString aSvxComponentServiceNameList[] = { diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index edcf75f3b60d..73bbae161c87 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -92,7 +92,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } // XFormsSupplier -::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL SvxFmDrawPage::getForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xForms; @@ -104,7 +104,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen } // XFormsSupplier2 -sal_Bool SAL_CALL SvxFmDrawPage::hasForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxFmDrawPage::hasForms() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { bool bHas = false; FmFormPage* pFormPage = PTR_CAST( FmFormPage, GetSdrPage() ); @@ -114,7 +114,7 @@ sal_Bool SAL_CALL SvxFmDrawPage::hasForms(void) throw( ::com::sun::star::uno::Ru } // ::com::sun::star::lang::XServiceInfo -::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return SvxDrawPage::getSupportedServiceNames(); } diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index af8af5cf1436..52e48aa1c5b5 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -231,18 +231,18 @@ void FormViewPageWindowAdapter::dispose() m_aControllerList.clear(); } -sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements(void) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements() throw( RuntimeException, std::exception ) { return getCount() != 0; } -Type SAL_CALL FormViewPageWindowAdapter::getElementType(void) throw( RuntimeException, std::exception ) +Type SAL_CALL FormViewPageWindowAdapter::getElementType() throw( RuntimeException, std::exception ) { return cppu::UnoType<XFormController>::get(); } // XIndexAccess -sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount(void) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount() throw( RuntimeException, std::exception ) { return m_aControllerList.size(); } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 3497bd05de1e..04fddee8576e 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -668,7 +668,7 @@ OUString SAL_CALL FormController::getImplementationName() throw( RuntimeExceptio return OUString("org.openoffice.comp.svx.FormController"); } -Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) +Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames() throw( RuntimeException, std::exception ) { // service names which are supported only, but cannot be used to created an // instance at a service factory @@ -695,7 +695,7 @@ void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( Runtime } -Sequence< OUString> FormController::getSupportedServiceNames_Static(void) +Sequence< OUString> FormController::getSupportedServiceNames_Static() { static Sequence< OUString> aServices; if (!aServices.getLength()) @@ -1066,14 +1066,14 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (In // XElementAccess -sal_Bool SAL_CALL FormController::hasElements(void) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FormController::hasElements() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return !m_aChildren.empty(); } -Type SAL_CALL FormController::getElementType(void) throw( RuntimeException, std::exception ) +Type SAL_CALL FormController::getElementType() throw( RuntimeException, std::exception ) { return cppu::UnoType<XFormController>::get(); @@ -1081,7 +1081,7 @@ Type SAL_CALL FormController::getElementType(void) throw( RuntimeException, std // XEnumerationAccess -Reference< XEnumeration > SAL_CALL FormController::createEnumeration(void) throw( RuntimeException, std::exception ) +Reference< XEnumeration > SAL_CALL FormController::createEnumeration() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return new ::comphelper::OEnumerationByIndex(this); @@ -1089,7 +1089,7 @@ Reference< XEnumeration > SAL_CALL FormController::createEnumeration(void) thro // XIndexAccess -sal_Int32 SAL_CALL FormController::getCount(void) throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL FormController::getCount() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_aChildren.size(); @@ -1151,7 +1151,7 @@ void FormController::disposeAllFeaturesAndDispatchers() } -void FormController::disposing(void) +void FormController::disposing() { EventObject aEvt( *this ); @@ -2109,7 +2109,7 @@ Reference< XControlContainer > FormController::getContainer() throw( RuntimeExc } -Sequence< Reference< XControl > > FormController::getControls(void) throw( RuntimeException, std::exception ) +Sequence< Reference< XControl > > FormController::getControls() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -2957,7 +2957,7 @@ Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw } -Reference< XControl> SAL_CALL FormController::getCurrentControl(void) throw( RuntimeException, std::exception ) +Reference< XControl> SAL_CALL FormController::getCurrentControl() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3479,7 +3479,7 @@ void FormController::setMode(const OUString& Mode) throw( NoSupportException, Ru } -OUString SAL_CALL FormController::getMode(void) throw( RuntimeException, std::exception ) +OUString SAL_CALL FormController::getMode() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -3488,7 +3488,7 @@ OUString SAL_CALL FormController::getMode(void) throw( RuntimeException, std::ex } -Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL FormController::getSupportedModes() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index 157a7507fba8..603f27421f1b 100644 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx @@ -122,7 +122,7 @@ namespace svxform } - Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider(void) throw( RuntimeException, std::exception ) + Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider() throw( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( *m_pMutex ); return m_xMasterDispatcher; diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index 5c3679ecfc01..69474d0eb144 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -65,11 +65,11 @@ GalleryControl::GalleryControl ( InitSettings(); } -GalleryControl::~GalleryControl (void) +GalleryControl::~GalleryControl() { } -void GalleryControl::InitSettings (void) +void GalleryControl::InitSettings() { SetBackground( Wallpaper( GALLERY_DLG_COLOR ) ); SetControlBackground( GALLERY_DLG_COLOR ); @@ -93,7 +93,7 @@ void GalleryControl::InitSettings (void) mpBrowser2->SetBackground(aBackground); } -void GalleryControl::Resize (void) +void GalleryControl::Resize() { // call parent Window::Resize(); @@ -203,13 +203,13 @@ bool GalleryControl::GalleryKeyInput( const KeyEvent& rKEvt, vcl::Window* ) return bRet; } -void GalleryControl::GetFocus (void) +void GalleryControl::GetFocus() { Window::GetFocus(); mpBrowser1->GrabFocus(); } -void GalleryControl::ThemeSelectionHasChanged (void) +void GalleryControl::ThemeSelectionHasChanged() { mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme()); } diff --git a/svx/source/gallery2/GallerySplitter.cxx b/svx/source/gallery2/GallerySplitter.cxx index cd8121ad1625..f6857f84abd1 100644 --- a/svx/source/gallery2/GallerySplitter.cxx +++ b/svx/source/gallery2/GallerySplitter.cxx @@ -22,7 +22,7 @@ GallerySplitter::GallerySplitter( vcl::Window* pParent, WinBits nStyle, - const ::boost::function<void(void)>& rDataChangeFunctor) + const ::boost::function<void()>& rDataChangeFunctor) : Splitter(pParent, nStyle) , maDataChangeFunctor(rDataChangeFunctor) { diff --git a/svx/source/gallery2/GallerySplitter.hxx b/svx/source/gallery2/GallerySplitter.hxx index f5c787d6b8f5..179ffbe99205 100644 --- a/svx/source/gallery2/GallerySplitter.hxx +++ b/svx/source/gallery2/GallerySplitter.hxx @@ -28,13 +28,13 @@ public: GallerySplitter( vcl::Window* pParent, WinBits nStyle, - const ::boost::function<void(void)>& rDataChangeFunctor); + const ::boost::function<void()>& rDataChangeFunctor); protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: - ::boost::function<void(void)> maDataChangeFunctor; + ::boost::function<void()> maDataChangeFunctor; }; diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index f6af4e4fb090..7d33453facd8 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -116,7 +116,7 @@ GalleryBrowser1::GalleryBrowser1( vcl::Window* pParent, Gallery* pGallery, const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler, - const ::boost::function<void(void)>& rThemeSlectionHandler) + const ::boost::function<void()>& rThemeSlectionHandler) : Control ( pParent, WB_TABSTOP ), maNewTheme ( this, WB_3DLOOK ), diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index ce391f0d170a..a10df2ec3e7d 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -94,7 +94,7 @@ private: Image aImgImported; ::boost::function<sal_Bool(const KeyEvent&,Window*)> maKeyInputHandler; - ::boost::function<void(void)> maThemeSlectionHandler; + ::boost::function<void()> maThemeSlectionHandler; void ImplAdjustControls(); sal_uIntPtr ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ); @@ -125,7 +125,7 @@ public: vcl::Window* pParent, Gallery* pGallery, const ::boost::function<sal_Bool(const KeyEvent&,Window*)>& rKeyInputHandler, - const ::boost::function<void(void)>& rThemeSlectionHandler); + const ::boost::function<void()>& rThemeSlectionHandler); virtual ~GalleryBrowser1(); void SelectTheme( const OUString& rThemeName ) { mpThemes->SelectEntry( rThemeName ); SelectThemeHdl( NULL ); } diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 1c0955c26f85..03248840e3e1 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -99,7 +99,7 @@ public: // XAccessible /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -110,23 +110,23 @@ public: virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleDescription (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale (void) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; // virtual void SAL_CALL addPropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {} // virtual void SAL_CALL removePropertyChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) {} @@ -135,15 +135,15 @@ public: virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService (const OUString& sServiceName) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName - virtual OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleSelection virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -155,7 +155,7 @@ public: virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // IAccessibleViewforwarder - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; @@ -183,10 +183,10 @@ protected: When the object is already disposed then a <type>DisposedException</type> is thrown. */ - Rectangle GetBoundingBoxOnScreen(void) throw (::com::sun::star::uno::RuntimeException); + Rectangle GetBoundingBoxOnScreen() throw (::com::sun::star::uno::RuntimeException); /// Return the object's current bounding box relative to the parent object. - Rectangle GetBoundingBox(void) throw (::com::sun::star::uno::RuntimeException); + Rectangle GetBoundingBox() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing() SAL_OVERRIDE; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 49bb1e3b2510..68df2a58396a 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -130,7 +130,7 @@ namespace svxform DataTreeListBox( vcl::Window* pParent, WinBits nBits ); virtual ~DataTreeListBox(); - virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) SAL_OVERRIDE; virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; @@ -314,7 +314,7 @@ namespace svxform inline XPropertySet_t GetBindingForNode( const XNode_t &xNode ) { return m_xUIHelper->getBindingForNode(xNode,true); } inline OUString GetServiceNameForNode( const XNode_t &xNode ) { return m_xUIHelper->getDefaultServiceNameForNode(xNode); } - inline XFormsUIHelper1_ref GetXFormsHelper( void ) const { return m_xUIHelper; } + inline XFormsUIHelper1_ref GetXFormsHelper() const { return m_xUIHelper; } }; diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index 7d36fe55ff09..2e390aec2a3a 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -144,7 +144,7 @@ public: // UNO Anbindung // SMART_UNO_DECLARATION(FmXUndoEnvironment, ::cppu::OWeakObject); // virtual sal_Bool queryInterface(UsrUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>&); - // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass>> getIdlClasses(void); + // virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass>> getIdlClasses(); void Lock() { osl_atomic_increment( &m_Locks ); } void UnLock() { osl_atomic_decrement( &m_Locks ); } diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index c71b40b91899..1944a2eebcf1 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -230,7 +230,7 @@ namespace svxform virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& _rxListener, const ::com::sun::star::util::URL& _rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL getParent(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL getParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setParent(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& Parent) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XEventListener @@ -266,11 +266,11 @@ namespace svxform virtual void SAL_CALL setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XContainerListener virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -286,12 +286,12 @@ namespace svxform // XModeSelector virtual void SAL_CALL setMode(const OUString& Mode) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual OUString SAL_CALL getMode(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getMode() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 Index) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XModifyBroadcaster @@ -331,7 +331,7 @@ namespace svxform // XFormController virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormOperations > SAL_CALL getFormOperations() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> SAL_CALL getCurrentControl(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> SAL_CALL getCurrentControl() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeActivateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormControllerListener>& l) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addChildController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController >& _ChildController ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; @@ -342,7 +342,7 @@ namespace svxform virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _interactionHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTabController - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> > SAL_CALL getControls(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> > SAL_CALL getControls() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel>& Model) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel> SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -398,7 +398,7 @@ namespace svxform // XServiceInfo virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XResetListener virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -409,7 +409,7 @@ namespace svxform virtual void SAL_CALL invalidateAllFeatures( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // method for registration - static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); // comphelper::OPropertyArrayUsageHelper virtual void fillProperties( diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index 02cea4f5e026..37bd498c6031 100644 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx @@ -106,7 +106,7 @@ namespace svxform inline ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray> getArray() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); // XColumnUpdate - inline void updateNull(void) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); + inline void updateNull() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateBoolean(bool x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateByte(sal_Int8 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); inline void updateShort(sal_Int16 x) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index 089904adbe95..b87cd5299be9 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -138,16 +138,16 @@ public: void FireAccessibleEvent (short nEventId, const ::com::sun::star::uno::Any& rOld, const ::com::sun::star::uno::Any& rNew); virtual void SAL_CALL disposing() SAL_OVERRIDE; - Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); - Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); void CheckChild(); @@ -245,9 +245,9 @@ public: void LoseFocus(); /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; protected: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> m_xCurChild; @@ -255,22 +255,22 @@ public: void NotifyChild(long nIndex, bool bSelect, bool bCheck); }; -inline bool SvxPixelCtlAccessible::IsAlive( void ) const +inline bool SvxPixelCtlAccessible::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxPixelCtlAccessible::IsNotAlive( void ) const +inline bool SvxPixelCtlAccessible::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } -inline bool SvxPixelCtlAccessibleChild::IsAlive( void ) const +inline bool SvxPixelCtlAccessibleChild::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxPixelCtlAccessibleChild::IsNotAlive( void ) const +inline bool SvxPixelCtlAccessibleChild::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 2ef95908230d..772400605850 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -83,7 +83,7 @@ protected: public: // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL @@ -117,35 +117,35 @@ public: // XAccessibleContext virtual sal_Int32 SAL_CALL - getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild( sal_Int32 nIndex ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL - getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleDescription( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName( void ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale( void ) + getLocale() throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_OVERRIDE; @@ -162,17 +162,17 @@ public: // XServiceInfo virtual OUString SAL_CALL - getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleSelection virtual void SAL_CALL @@ -232,10 +232,10 @@ public: protected: /// @Return the object's current bounding box relative to the desktop. - Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); /// @Return the object's current bounding box relative to the parent object. - Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); /// Calls all Listener to tell they the change. void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); @@ -243,13 +243,13 @@ protected: virtual void SAL_CALL disposing() SAL_OVERRIDE; /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); private: /** Description of this object. This is not a constant because it can @@ -281,12 +281,12 @@ private: bool mbAngleMode; }; -inline bool SvxRectCtlAccessibleContext::IsAlive( void ) const +inline bool SvxRectCtlAccessibleContext::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxRectCtlAccessibleContext::IsNotAlive( void ) const +inline bool SvxRectCtlAccessibleContext::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } @@ -315,7 +315,7 @@ protected: public: // XAccessible virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleComponent virtual sal_Bool SAL_CALL @@ -346,35 +346,35 @@ public: // XAccessibleContext virtual sal_Int32 SAL_CALL - getAccessibleChildCount( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleChildCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 nIndex ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleIndexInParent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL - getAccessibleRole( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRole() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleDescription( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleDescription() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleRelationSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getAccessibleStateSet() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale( void ) + getLocale() throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception ) SAL_OVERRIDE; // XAccessibleEventBroadcaster @@ -408,17 +408,17 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL - getImplementationName( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTypeProvider virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // internal /// Sets the checked status @@ -426,22 +426,22 @@ public: void FireFocusEvent(); protected: - Rectangle GetBoundingBoxOnScreen( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBoxOnScreen() throw( ::com::sun::star::uno::RuntimeException ); - Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException ); + Rectangle GetBoundingBox() throw( ::com::sun::star::uno::RuntimeException ); void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent ); virtual void SAL_CALL disposing() SAL_OVERRIDE; /// @returns true if it's disposed or in disposing - inline bool IsAlive( void ) const; + inline bool IsAlive() const; /// @returns true if it's not disposed and no in disposing - inline bool IsNotAlive( void ) const; + inline bool IsNotAlive() const; /// throws the exception DisposedException if it's not alive - void ThrowExceptionIfNotAlive( void ) throw( ::com::sun::star::lang::DisposedException ); + void ThrowExceptionIfNotAlive() throw( ::com::sun::star::lang::DisposedException ); /// Mutex guarding this object. ::osl::Mutex maMutex; @@ -479,12 +479,12 @@ private: bool mbIsChecked; }; -inline bool SvxRectCtlChildAccessibleContext::IsAlive( void ) const +inline bool SvxRectCtlChildAccessibleContext::IsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose; } -inline bool SvxRectCtlChildAccessibleContext::IsNotAlive( void ) const +inline bool SvxRectCtlChildAccessibleContext::IsNotAlive() const { return rBHelper.bDisposed || rBHelper.bInDispose; } diff --git a/svx/source/sidebar/ColorPanel.hxx b/svx/source/sidebar/ColorPanel.hxx index d4dc6980c71f..b41b12672d05 100644 --- a/svx/source/sidebar/ColorPanel.hxx +++ b/svx/source/sidebar/ColorPanel.hxx @@ -34,10 +34,10 @@ class ColorPanel { public: ColorPanel (vcl::Window* pParent); - virtual ~ColorPanel (void); + virtual ~ColorPanel(); // From vcl::Window - virtual void Resize (void); + virtual void Resize(); virtual void DataChanged (const DataChangedEvent& rEvent); private: @@ -48,7 +48,7 @@ private: items. */ int CalculateRowCount (const Size& rItemSize, int nColumnCount); - void Fill (void); + void Fill(); }; } } // end of namespace ::svx::sidebar diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx index 2d28f8a99ba2..784949a7ea3a 100644 --- a/svx/source/sidebar/EmptyPanel.cxx +++ b/svx/source/sidebar/EmptyPanel.cxx @@ -46,14 +46,14 @@ EmptyPanel::EmptyPanel (vcl::Window* pParent) -EmptyPanel::~EmptyPanel (void) +EmptyPanel::~EmptyPanel() { } -void EmptyPanel::Resize (void) +void EmptyPanel::Resize() { const Size aSize (GetSizePixel()); maMessageControl.SetSizePixel(aSize); diff --git a/svx/source/sidebar/EmptyPanel.hxx b/svx/source/sidebar/EmptyPanel.hxx index de166cf80953..1242d13ce8b8 100644 --- a/svx/source/sidebar/EmptyPanel.hxx +++ b/svx/source/sidebar/EmptyPanel.hxx @@ -35,9 +35,9 @@ class EmptyPanel { public: EmptyPanel (vcl::Window* pParent); - virtual ~EmptyPanel (void); + virtual ~EmptyPanel(); - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; private: FixedText maMessageControl; diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index e5a0cad0085b..ecc22dc7a6fc 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -65,8 +65,8 @@ class PanelFactory public PanelFactoryInterfaceBase { public: - PanelFactory (void); - virtual ~PanelFactory (void); + PanelFactory(); + virtual ~PanelFactory(); // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement ( @@ -90,7 +90,7 @@ public: { return css::uno::Sequence<OUString>{"com.sun.star.ui.UIElementFactory"}; } }; -PanelFactory::PanelFactory (void) +PanelFactory::PanelFactory() : PanelFactoryInterfaceBase(m_aMutex) { } @@ -98,7 +98,7 @@ PanelFactory::PanelFactory (void) -PanelFactory::~PanelFactory (void) +PanelFactory::~PanelFactory() { } diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx index bf62a1dc2314..b25011fd6586 100644 --- a/svx/source/sidebar/SelectionChangeHandler.cxx +++ b/svx/source/sidebar/SelectionChangeHandler.cxx @@ -33,7 +33,7 @@ using namespace sfx2::sidebar; namespace svx { namespace sidebar { SelectionChangeHandler::SelectionChangeHandler ( - const boost::function<rtl::OUString(void)>& rSelectionChangeCallback, + const boost::function<rtl::OUString()>& rSelectionChangeCallback, const Reference<frame::XController>& rxController, const EnumContext::Context eDefaultContext) : SelectionChangeHandlerInterfaceBase(m_aMutex), @@ -47,7 +47,7 @@ SelectionChangeHandler::SelectionChangeHandler ( -SelectionChangeHandler::~SelectionChangeHandler (void) +SelectionChangeHandler::~SelectionChangeHandler() { } @@ -80,7 +80,7 @@ void SAL_CALL SelectionChangeHandler::disposing (const lang::EventObject&) -void SAL_CALL SelectionChangeHandler::disposing (void) +void SAL_CALL SelectionChangeHandler::disposing() throw (uno::RuntimeException) { if (mbIsConnected) @@ -90,7 +90,7 @@ void SAL_CALL SelectionChangeHandler::disposing (void) -void SelectionChangeHandler::Connect (void) +void SelectionChangeHandler::Connect() { uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY); if (xSupplier.is()) @@ -103,7 +103,7 @@ void SelectionChangeHandler::Connect (void) -void SelectionChangeHandler::Disconnect (void) +void SelectionChangeHandler::Disconnect() { uno::Reference<view::XSelectionSupplier> xSupplier (mxController, uno::UNO_QUERY); if (xSupplier.is()) diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 024ed48b2e33..ab4a4ff4e516 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -490,7 +490,7 @@ PopupControl* AreaPropertyPanel::CreateTransparencyGradientControl (PopupContain -void AreaPropertyPanel::SetupIcons(void) +void AreaPropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { @@ -1262,7 +1262,7 @@ void AreaPropertyPanel::SetGradient (const XGradient& rGradient) -sal_Int32 AreaPropertyPanel::GetSelectedTransparencyTypeIndex (void) const +sal_Int32 AreaPropertyPanel::GetSelectedTransparencyTypeIndex() const { return mpLBTransType->GetSelectEntryPos(); } diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index a2a9f42ffca0..39a491d34080 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -78,7 +78,7 @@ public: XGradient GetGradient (const css::awt::GradientStyle eStyle) const; void SetGradient (const XGradient& rGradient); - sal_Int32 GetSelectedTransparencyTypeIndex (void) const; + sal_Int32 GetSelectedTransparencyTypeIndex() const; private: sal_uInt16 meLastXFS; @@ -151,9 +151,9 @@ private: vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); - virtual ~AreaPropertyPanel(void); + virtual ~AreaPropertyPanel(); - void SetupIcons(void); + void SetupIcons(); void Initialize(); void Update(); void ImpUpdateTransparencies(); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index ebe4210ce688..61bd9f120243 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -108,7 +108,7 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl ( -AreaTransparencyGradientControl::~AreaTransparencyGradientControl (void) +AreaTransparencyGradientControl::~AreaTransparencyGradientControl() { } diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx index 8a526175b999..3486508cb133 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx @@ -41,7 +41,7 @@ public: AreaTransparencyGradientControl ( vcl::Window* pParent, AreaPropertyPanel& rPanel); - virtual ~AreaTransparencyGradientControl (void); + virtual ~AreaTransparencyGradientControl(); void Rearrange(XFillFloatTransparenceItem* pGradientItem); void InitStatus(XFillFloatTransparenceItem* pGradientItem); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx index 5a1971ad4e68..6a132b69a2d8 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx @@ -32,7 +32,7 @@ AreaTransparencyGradientPopup::AreaTransparencyGradientPopup ( { } -AreaTransparencyGradientPopup::~AreaTransparencyGradientPopup (void) +AreaTransparencyGradientPopup::~AreaTransparencyGradientPopup() { } diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx index 5d6ac9e8ec7c..ebbd1987bc2e 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx @@ -36,7 +36,7 @@ public : AreaTransparencyGradientPopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); - virtual ~AreaTransparencyGradientPopup (void); + virtual ~AreaTransparencyGradientPopup(); void Rearrange (XFillFloatTransparenceItem* pItem); }; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index dd371dfa0861..55caa6c2feba 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -207,7 +207,7 @@ IMPL_LINK(GraphicPropertyPanel, GammaHdl, void *, EMPTYARG) -void GraphicPropertyPanel::SetupIcons(void) +void GraphicPropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 8f3babcd40e8..a44f357674d5 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -100,7 +100,7 @@ private: SfxBindings* pBindings); virtual ~GraphicPropertyPanel(); - void SetupIcons(void); + void SetupIcons(); void Initialize(); }; diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index 7f4925b22e51..cbf133f32eca 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -75,7 +75,7 @@ InsertPropertyPanel::InsertPropertyPanel ( -InsertPropertyPanel::~InsertPropertyPanel (void) +InsertPropertyPanel::~InsertPropertyPanel() { // Remove window child listener. vcl::Window* pTopWindow = this; diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx index b0a5426b84d5..bef58fd1919c 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.hxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx @@ -41,7 +41,7 @@ public: InsertPropertyPanel ( vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame); - virtual ~InsertPropertyPanel (void); + virtual ~InsertPropertyPanel(); private: ToolBox* mpStandardShapesToolBox; diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 052e16e7f47b..02d7f3389aec 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -255,7 +255,7 @@ void LinePropertyPanel::Initialize() mpLBCapStyle->SetAccessibleName(OUString("Cap Style")); } -void LinePropertyPanel::SetupIcons(void) +void LinePropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { @@ -755,7 +755,7 @@ PopupControl* LinePropertyPanel::CreateLineWidthPopupControl (PopupContainer* pP return new LineWidthControl(pParent, *this); } -void LinePropertyPanel::EndLineWidthPopupMode (void) +void LinePropertyPanel::EndLineWidthPopupMode() { maLineWidthPopup.Hide(); } diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 586573f506ed..bfa573a81ce8 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -80,7 +80,7 @@ public: void SetWidthIcon(int n); void SetWidthIcon(); - void EndLineWidthPopupMode (void); + void EndLineWidthPopupMode(); private: //ui controls @@ -136,7 +136,7 @@ private: /// bitfield bool mbWidthValuable : 1; - void SetupIcons(void); + void SetupIcons(); void Initialize(); void FillLineEndList(); void FillLineStyleList(); @@ -157,7 +157,7 @@ private: vcl::Window* pParent, const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings); - virtual ~LinePropertyPanel(void); + virtual ~LinePropertyPanel(); PopupControl* CreateLineWidthPopupControl (PopupContainer* pParent); }; diff --git a/svx/source/sidebar/line/LineWidthControl.cxx b/svx/source/sidebar/line/LineWidthControl.cxx index bf87a3d9b193..98fb8d2e9b1f 100644 --- a/svx/source/sidebar/line/LineWidthControl.cxx +++ b/svx/source/sidebar/line/LineWidthControl.cxx @@ -64,7 +64,7 @@ LineWidthControl::LineWidthControl ( -LineWidthControl::~LineWidthControl (void) +LineWidthControl::~LineWidthControl() { delete[] rStr; } diff --git a/svx/source/sidebar/line/LineWidthControl.hxx b/svx/source/sidebar/line/LineWidthControl.hxx index c2904381647a..4afa1e595c88 100644 --- a/svx/source/sidebar/line/LineWidthControl.hxx +++ b/svx/source/sidebar/line/LineWidthControl.hxx @@ -37,7 +37,7 @@ class LineWidthControl { public: LineWidthControl (vcl::Window* pParent, LinePropertyPanel& rPanel); - virtual ~LineWidthControl (void); + virtual ~LineWidthControl(); virtual void GetFocus() SAL_OVERRIDE; virtual void Paint(const Rectangle& rect) SAL_OVERRIDE; diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 5e587821b21a..686850e327e2 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -38,7 +38,7 @@ LineWidthPopup::LineWidthPopup ( SetPopupModeEndHandler(::boost::bind(&LineWidthPopup::PopupModeEndCallback, this)); } -LineWidthPopup::~LineWidthPopup (void) +LineWidthPopup::~LineWidthPopup() { } @@ -51,7 +51,7 @@ void LineWidthPopup::SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMa pControl->SetWidthSelect(lValue, bValuable, eMapUnit); } -void LineWidthPopup::PopupModeEndCallback (void) +void LineWidthPopup::PopupModeEndCallback() { LineWidthControl* pControl = dynamic_cast<LineWidthControl*>(mxControl.get()); if (pControl != NULL) diff --git a/svx/source/sidebar/line/LineWidthPopup.hxx b/svx/source/sidebar/line/LineWidthPopup.hxx index 8cbe0e5ee960..7a2fe7b5c8f4 100644 --- a/svx/source/sidebar/line/LineWidthPopup.hxx +++ b/svx/source/sidebar/line/LineWidthPopup.hxx @@ -35,12 +35,12 @@ public : LineWidthPopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); - virtual ~LineWidthPopup (void); + virtual ~LineWidthPopup(); void SetWidthSelect (long lValue, bool bValuable, SfxMapUnit eMapUnit); private: - void PopupModeEndCallback (void); + void PopupModeEndCallback(); }; } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index d9af174bc253..fb17d25cc84d 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -39,7 +39,7 @@ LineWidthValueSet::LineWidthValueSet ( -LineWidthValueSet::~LineWidthValueSet (void) +LineWidthValueSet::~LineWidthValueSet() { delete pVDev; delete[] strUnit; diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx index 75c2b69286a1..4fe20e46208f 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.hxx +++ b/svx/source/sidebar/line/LineWidthValueSet.hxx @@ -29,7 +29,7 @@ class LineWidthValueSet { public: LineWidthValueSet (vcl::Window* pParent, const ResId& rResId); - virtual ~LineWidthValueSet (void); + virtual ~LineWidthValueSet(); void SetUnit(OUString* str); void SetSelItem(sal_uInt16 nSel); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index a6b3f74cf6d5..c110d74502fd 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -113,7 +113,7 @@ private: const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~ParaPropertyPanel (void); + virtual ~ParaPropertyPanel(); DECL_LINK(ModifyIndentHdl_Impl, void*); DECL_LINK(ClickIndent_IncDec_Hdl_Impl, ToolBox*); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index d4011d67c0dc..b9c3c3cd5b6f 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -199,7 +199,7 @@ void PosSizePropertyPanel::Initialize() -void PosSizePropertyPanel::SetupIcons(void) +void PosSizePropertyPanel::SetupIcons() { if(Theme::GetBoolean(Theme::Bool_UseSymphonyIcons)) { diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index e9d665673773..1d2af6c7c916 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -148,7 +148,7 @@ private: DECL_LINK( RotationHdl, void * ); DECL_LINK( FlipHdl, ToolBox * ); - void SetupIcons(void); + void SetupIcons(); void Initialize(); void executePosX(); void executePosY(); diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx b/svx/source/sidebar/possize/SidebarDialControl.cxx index 2f422a9b5166..dc30100751e6 100644 --- a/svx/source/sidebar/possize/SidebarDialControl.cxx +++ b/svx/source/sidebar/possize/SidebarDialControl.cxx @@ -35,7 +35,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSidebarDialControl(vcl return new SidebarDialControl(pParent, WB_TABSTOP); } -SidebarDialControl::~SidebarDialControl (void) +SidebarDialControl::~SidebarDialControl() { } diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index 57ea21ad0c52..1137cdb41aaa 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -34,7 +34,7 @@ TextCharacterSpacingPopup::TextCharacterSpacingPopup ( SetPopupModeEndHandler(::boost::bind(&TextCharacterSpacingPopup::PopupModeEndCallback, this)); } -TextCharacterSpacingPopup::~TextCharacterSpacingPopup (void) +TextCharacterSpacingPopup::~TextCharacterSpacingPopup() { } @@ -47,7 +47,7 @@ void TextCharacterSpacingPopup::Rearrange (bool bLBAvailable,bool bAvailable, lo pControl->Rearrange(bLBAvailable,bAvailable,nKerning); } -void TextCharacterSpacingPopup::PopupModeEndCallback (void) +void TextCharacterSpacingPopup::PopupModeEndCallback() { ProvideContainerAndControl(); TextCharacterSpacingControl* pControl = dynamic_cast<TextCharacterSpacingControl*>(mxControl.get()); diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx index 17ad29cfd09f..9a55c0faa8d4 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx @@ -32,11 +32,11 @@ public : TextCharacterSpacingPopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); - virtual ~TextCharacterSpacingPopup (void); + virtual ~TextCharacterSpacingPopup(); void Rearrange (bool bLBAvailable,bool bAvailable, long nKerning); private: - void PopupModeEndCallback (void); + void PopupModeEndCallback(); }; } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 5744f0a1449c..b069099feb56 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -114,7 +114,7 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref mlKerning = 0; } -TextPropertyPanel::~TextPropertyPanel (void) +TextPropertyPanel::~TextPropertyPanel() { } @@ -168,12 +168,12 @@ void TextPropertyPanel::DataChanged (const DataChangedEvent& /*rEvent*/) SetupToolboxItems(); } -void TextPropertyPanel::EndSpacingPopupMode (void) +void TextPropertyPanel::EndSpacingPopupMode() { maCharSpacePopup.Hide(); } -void TextPropertyPanel::EndUnderlinePopupMode (void) +void TextPropertyPanel::EndUnderlinePopupMode() { maUnderlinePopup.Hide(); } @@ -194,7 +194,7 @@ void TextPropertyPanel::InitToolBoxSpacing() mpToolBoxSpacing->SetSelectHdl( aLink ); } -void TextPropertyPanel::SetupToolboxItems (void) +void TextPropertyPanel::SetupToolboxItems() { maUnderlineControl.SetupToolBoxItem(*mpToolBoxFont, mpToolBoxFont->GetItemId(UNO_UNDERLINE)); maSpacingControl.SetupToolBoxItem(*mpToolBoxSpacing, mpToolBoxSpacing->GetItemId(UNO_SPACING)); diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index f0734dab09a7..7d7a229ddcfc 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -56,8 +56,8 @@ public: ::sfx2::sidebar::ControllerItem& GetSpaceController() { return maSpacingControl;} long GetSelFontSize(); - void EndSpacingPopupMode (void); - void EndUnderlinePopupMode (void); + void EndSpacingPopupMode(); + void EndUnderlinePopupMode(); Color& GetUnderlineColor() { return meUnderlineColor;} @@ -102,7 +102,7 @@ private: const css::uno::Reference<css::frame::XFrame>& rxFrame, SfxBindings* pBindings, const ::sfx2::sidebar::EnumContext& rContext); - virtual ~TextPropertyPanel (void); + virtual ~TextPropertyPanel(); PopupControl* CreateCharacterSpacingControl (PopupContainer* pParent); @@ -110,7 +110,7 @@ private: DECL_LINK(SpacingClickHdl, ToolBox*); DECL_LINK(UnderlineClickHdl, ToolBox* ); - void SetupToolboxItems (void); + void SetupToolboxItems(); void InitToolBoxFont(); void InitToolBoxSpacing(); }; diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 0aab2b4e58a9..f9ce1bc4e674 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -32,7 +32,7 @@ TextUnderlinePopup::TextUnderlinePopup ( { } -TextUnderlinePopup::~TextUnderlinePopup (void) +TextUnderlinePopup::~TextUnderlinePopup() { } diff --git a/svx/source/sidebar/text/TextUnderlinePopup.hxx b/svx/source/sidebar/text/TextUnderlinePopup.hxx index ce4caa0b28f9..0643d927abb0 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.hxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.hxx @@ -32,7 +32,7 @@ public : TextUnderlinePopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); - virtual ~TextUnderlinePopup (void); + virtual ~TextUnderlinePopup(); void Rearrange (FontUnderline eLine); }; diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index 18109ec39f9d..8647fb398b16 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -40,7 +40,7 @@ Popup::Popup ( OSL_ASSERT(maControlCreator); } -Popup::~Popup (void) +Popup::~Popup() { mxControl.reset(); mxContainer.reset(); @@ -77,21 +77,21 @@ void Popup::Show (ToolBox& rToolBox) } } -void Popup::Hide (void) +void Popup::Hide() { if (mxContainer) if (mxContainer->IsInPopupMode()) mxContainer->EndPopupMode(); } -void Popup::SetPopupModeEndHandler (const ::boost::function<void(void)>& rCallback) +void Popup::SetPopupModeEndHandler (const ::boost::function<void()>& rCallback) { maPopupModeEndCallback = rCallback; if (mxContainer) mxContainer->SetPopupModeEndHdl(LINK(this, Popup, PopupModeEndHandler)); } -void Popup::ProvideContainerAndControl (void) +void Popup::ProvideContainerAndControl() { if ( ! (mxContainer && mxControl) && mpParent!=NULL @@ -101,7 +101,7 @@ void Popup::ProvideContainerAndControl (void) } } -void Popup::CreateContainerAndControl (void) +void Popup::CreateContainerAndControl() { mxContainer.reset(new PopupContainer(mpParent)); mxContainer->SetAccessibleName(msAccessibleName); diff --git a/svx/source/sidebar/tools/PopupContainer.cxx b/svx/source/sidebar/tools/PopupContainer.cxx index 1c37b6c6bbf0..675e80fbabf1 100644 --- a/svx/source/sidebar/tools/PopupContainer.cxx +++ b/svx/source/sidebar/tools/PopupContainer.cxx @@ -30,7 +30,7 @@ PopupContainer::PopupContainer (vcl::Window* pParent) -PopupContainer::~PopupContainer (void) +PopupContainer::~PopupContainer() { } diff --git a/svx/source/sidebar/tools/PopupControl.cxx b/svx/source/sidebar/tools/PopupControl.cxx index d8c686546e29..48a908b4938f 100644 --- a/svx/source/sidebar/tools/PopupControl.cxx +++ b/svx/source/sidebar/tools/PopupControl.cxx @@ -38,7 +38,7 @@ PopupControl::PopupControl ( -PopupControl::~PopupControl (void) +PopupControl::~PopupControl() { } diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx index 5ef7f36ca384..3927029ad371 100644 --- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx +++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx @@ -42,7 +42,7 @@ ValueSetWithTextControl::ValueSetWithTextControl( } -ValueSetWithTextControl::~ValueSetWithTextControl(void) +ValueSetWithTextControl::~ValueSetWithTextControl() { } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 2108dab7b940..3ea38340eaf4 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -840,7 +840,7 @@ void SdrObject::SetGrabBagItem(const com::sun::star::uno::Any& rVal) BroadcastObjectChange(); } -sal_uInt32 SdrObject::GetNavigationPosition (void) +sal_uInt32 SdrObject::GetNavigationPosition() { if (pObjList!=NULL && pObjList->RecalcNavigationPositions()) { diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index d3f9a931b1c1..3aec601a17f8 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -131,9 +131,9 @@ class SdrGraphicUpdater : public ::osl::Thread { public: SdrGraphicUpdater( const OUString& rFileName, const OUString& rFilterName, SdrGraphicLink& ); - virtual ~SdrGraphicUpdater( void ); + virtual ~SdrGraphicUpdater(); - void SAL_CALL Terminate( void ); + void SAL_CALL Terminate(); bool GraphicLinkChanged( const OUString& rFileName ){ return maFileName != rFileName; }; @@ -142,12 +142,12 @@ protected: /** is called from the inherited create method and acts as the main function of this thread. */ - virtual void SAL_CALL run(void) SAL_OVERRIDE; + virtual void SAL_CALL run() SAL_OVERRIDE; /** Called after the thread is terminated via the terminate method. Used to kill the thread by calling delete on this. */ - virtual void SAL_CALL onTerminated(void) SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; private: @@ -167,7 +167,7 @@ SdrGraphicUpdater::SdrGraphicUpdater( const OUString& rFileName, const OUString& create(); } -SdrGraphicUpdater::~SdrGraphicUpdater( void ) +SdrGraphicUpdater::~SdrGraphicUpdater() { } @@ -176,12 +176,12 @@ void SdrGraphicUpdater::Terminate() mbIsTerminated = true; } -void SAL_CALL SdrGraphicUpdater::onTerminated(void) +void SAL_CALL SdrGraphicUpdater::onTerminated() { delete this; } -void SAL_CALL SdrGraphicUpdater::run(void) +void SAL_CALL SdrGraphicUpdater::run() { osl_setThreadName("SdrGraphicUpdater"); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 590f847a62cb..ede8b069f5b3 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -763,7 +763,7 @@ void SdrObjList::UnGroupObj( size_t nObjNum ) -bool SdrObjList::HasObjectNavigationOrder (void) const +bool SdrObjList::HasObjectNavigationOrder() const { return mxNavigationOrder.get() != NULL; } @@ -857,7 +857,7 @@ SdrObject* SdrObjList::GetObjectForNavigationPosition (const sal_uInt32 nNavigat -void SdrObjList::ClearObjectNavigationOrder (void) +void SdrObjList::ClearObjectNavigationOrder() { mxNavigationOrder.reset(); mbIsNavigationOrderDirty = true; @@ -866,7 +866,7 @@ void SdrObjList::ClearObjectNavigationOrder (void) -bool SdrObjList::RecalcNavigationPositions (void) +bool SdrObjList::RecalcNavigationPositions() { if (mbIsNavigationOrderDirty) { diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index e04614eb363e..3770c656a2a2 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -59,14 +59,14 @@ AccessibleCell::AccessibleCell( const ::com::sun::star::uno::Reference< ::com::s -AccessibleCell::~AccessibleCell (void) +AccessibleCell::~AccessibleCell() { DBG_ASSERT( mpText == 0, "svx::AccessibleCell::~AccessibleCell(), not disposed!?" ); } -void AccessibleCell::Init (void) +void AccessibleCell::Init() { SdrView* pView = maShapeTreeInfo.GetSdrView(); const vcl::Window* pWindow = maShapeTreeInfo.GetWindow (); @@ -198,7 +198,7 @@ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nI SHOWING VISIBLE */ -Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet (void) throw (RuntimeException, std::exception) +Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet() throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -313,7 +313,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -::com::sun::star::awt::Rectangle SAL_CALL AccessibleCell::getBounds(void) throw(RuntimeException, std::exception) +::com::sun::star::awt::Rectangle SAL_CALL AccessibleCell::getBounds() throw(RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -360,7 +360,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocation(void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocation() throw (RuntimeException, std::exception) { ThrowIfDisposed (); ::com::sun::star::awt::Rectangle aBoundingBox(getBounds()); @@ -369,7 +369,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen(void) throw(RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen() throw(RuntimeException, std::exception) { ThrowIfDisposed (); @@ -394,7 +394,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : -awt::Size SAL_CALL AccessibleCell::getSize (void) throw (RuntimeException, std::exception) +awt::Size SAL_CALL AccessibleCell::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed (); awt::Rectangle aBoundingBox (getBounds()); @@ -417,14 +417,14 @@ void SAL_CALL AccessibleCell::removeFocusListener (const ::com::sun::star::uno:: -void SAL_CALL AccessibleCell::grabFocus (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +void SAL_CALL AccessibleCell::grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) { AccessibleComponentBase::grabFocus(); } -sal_Int32 SAL_CALL AccessibleCell::getForeground(void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getForeground() throw (RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0x0ffffffL); @@ -435,7 +435,7 @@ sal_Int32 SAL_CALL AccessibleCell::getForeground(void) throw (RuntimeException, -sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getBackground() throw (RuntimeException, std::exception) { ThrowIfDisposed (); sal_Int32 nColor (0L); @@ -448,7 +448,7 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException, // XAccessibleExtendedComponent -::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL AccessibleCell::getFont (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL AccessibleCell::getFont() throw (::com::sun::star::uno::RuntimeException, std::exception) { //todo return AccessibleComponentBase::getFont(); @@ -456,14 +456,14 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException, -OUString SAL_CALL AccessibleCell::getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getTitledBorderText() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getTitledBorderText(); } -OUString SAL_CALL AccessibleCell::getToolTipText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getToolTipText() throw (::com::sun::star::uno::RuntimeException, std::exception) { return AccessibleComponentBase::getToolTipText(); } @@ -504,14 +504,14 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc // XServiceInfo -OUString SAL_CALL AccessibleCell::getImplementationName(void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getImplementationName() throw (RuntimeException, std::exception) { return OUString("AccessibleCell"); } -Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames(void) throw (RuntimeException, std::exception) +Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -545,7 +545,7 @@ void AccessibleCell::ViewForwarderChanged (ChangeType /*aChangeType*/, const IAc // protected -void AccessibleCell::disposing (void) +void AccessibleCell::disposing() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard (maMutex); @@ -572,7 +572,7 @@ void AccessibleCell::disposing (void) AccessibleContextBase::dispose (); } -sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleCell::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { ThrowIfDisposed (); return mnIndexInParent; @@ -615,7 +615,7 @@ OUString AccessibleCell::getCellName( sal_Int32 nCol, sal_Int32 nRow ) return aBuf.makeStringAndClear(); } -OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) +OUString SAL_CALL AccessibleCell::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); SolarMutexGuard aSolarGuard; @@ -646,7 +646,7 @@ void AccessibleCell::UpdateChildren() +If this is correct, we also don't need sdr::table::CellRef getCellRef(), UpdateChildren(), getCellName( sal_Int32 nCol, sal_Int32 nRow ) above + -OUString SAL_CALL AccessibleCell::getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException) +OUString SAL_CALL AccessibleCell::getAccessibleName() throw (::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); SolarMutexGuard aSolarGuard; diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 86d31e9d38d1..f004442639bf 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -52,9 +52,9 @@ class AccessibleCell : boost::noncopyable, public AccessibleCellBase, public Acc { public: AccessibleCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessibleCell (void); + virtual ~AccessibleCell(); - void Init (void); + void Init(); bool operator== (const AccessibleCell& rAccessibleCell); @@ -67,11 +67,11 @@ public: virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sdr::table::CellRef getCellRef() { return mxCell;} void UpdateChildren(); OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); @@ -79,28 +79,28 @@ public: // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint(const ::com::sun::star::awt::Point& aPoint) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocation(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::awt::Size SAL_CALL getSize(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addFocusListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void SAL_CALL removeFocusListener (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleExtendedComponent - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getToolTipText (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTitledBorderText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getToolTipText() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventBroadcaster virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName (void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // IAccessibleViewForwarderListener virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; @@ -126,7 +126,7 @@ protected: sdr::table::CellRef mxCell; /// 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; AccessibleTableShape *pAccTable; diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 1cb7685b2004..862c39f58507 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -311,7 +311,7 @@ AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& rShapeInf -AccessibleTableShape::~AccessibleTableShape (void) +AccessibleTableShape::~AccessibleTableShape() { } @@ -380,20 +380,20 @@ void SAL_CALL AccessibleTableShape::release( ) throw () // XAccessible -Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleContext(void) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleContext() throw (RuntimeException, std::exception) { return AccessibleShape::getAccessibleContext (); } -OUString SAL_CALL AccessibleTableShape::getImplementationName(void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableShape::getImplementationName() throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" ); } -OUString AccessibleTableShape::CreateAccessibleBaseName(void) throw (RuntimeException) +OUString AccessibleTableShape::CreateAccessibleBaseName() throw (RuntimeException) { return OUString("TableShape"); } @@ -423,14 +423,14 @@ Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableShape::getAccessible -sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole (void) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole() throw (RuntimeException, std::exception) { return AccessibleRole::TABLE; } -void SAL_CALL AccessibleTableShape::disposing (void) +void SAL_CALL AccessibleTableShape::disposing() { mxImpl->dispose(); @@ -1037,13 +1037,13 @@ AccessibleTableHeaderShape::AccessibleTableHeaderShape( AccessibleTableShape* pT mbRow = bRow; } -AccessibleTableHeaderShape::~AccessibleTableHeaderShape (void) +AccessibleTableHeaderShape::~AccessibleTableHeaderShape() { mpTable = NULL; } // XAccessible -Reference< XAccessibleContext > SAL_CALL AccessibleTableHeaderShape::getAccessibleContext(void) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL AccessibleTableHeaderShape::getAccessibleContext() throw (RuntimeException, std::exception) { return this; } @@ -1059,43 +1059,43 @@ Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleChild return mpTable->getAccessibleChild( i ); } -Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleParent (void) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleParent() throw (RuntimeException, std::exception) { Reference< XAccessible > XParent; return XParent; } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { return -1; } -sal_Int16 SAL_CALL AccessibleTableHeaderShape::getAccessibleRole (void) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AccessibleTableHeaderShape::getAccessibleRole() throw (RuntimeException, std::exception) { return mpTable->getAccessibleRole(); } -OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleDescription (void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleDescription() throw (RuntimeException, std::exception) { return mpTable->getAccessibleDescription(); } -OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleName (void) throw (RuntimeException, std::exception) +OUString SAL_CALL AccessibleTableHeaderShape::getAccessibleName() throw (RuntimeException, std::exception) { return mpTable->getAccessibleName(); } -Reference< XAccessibleStateSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleStateSet (void) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleStateSet() throw (RuntimeException, std::exception) { return mpTable->getAccessibleStateSet(); } -Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleRelationSet (void) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableHeaderShape::getAccessibleRelationSet() throw (RuntimeException, std::exception) { return mpTable->getAccessibleRelationSet(); } -Locale SAL_CALL AccessibleTableHeaderShape::getLocale (void) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale SAL_CALL AccessibleTableHeaderShape::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { return mpTable->getLocale(); } @@ -1111,37 +1111,37 @@ Reference< XAccessible > SAL_CALL AccessibleTableHeaderShape::getAccessibleAtPoi return mpTable->getAccessibleAtPoint( aPoint ); } -::com::sun::star::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Rectangle SAL_CALL AccessibleTableHeaderShape::getBounds() throw (RuntimeException, std::exception) { return mpTable->getBounds(); } -::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocation() throw (RuntimeException, std::exception) { return mpTable->getLocation(); } -::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Point SAL_CALL AccessibleTableHeaderShape::getLocationOnScreen() throw (RuntimeException, std::exception) { return mpTable->getLocationOnScreen(); } -::com::sun::star::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize (void) throw (RuntimeException, std::exception) +::com::sun::star::awt::Size SAL_CALL AccessibleTableHeaderShape::getSize() throw (RuntimeException, std::exception) { return mpTable->getSize(); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getForeground (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getForeground() throw (RuntimeException, std::exception) { return mpTable->getForeground(); } -sal_Int32 SAL_CALL AccessibleTableHeaderShape::getBackground (void) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleTableHeaderShape::getBackground() throw (RuntimeException, std::exception) { return mpTable->getBackground(); } -void SAL_CALL AccessibleTableHeaderShape::grabFocus (void) throw (RuntimeException, std::exception) +void SAL_CALL AccessibleTableHeaderShape::grabFocus() throw (RuntimeException, std::exception) { mpTable->grabFocus(); } diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index f78e8276db9e..8aaf2c187823 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -484,7 +484,7 @@ void SvxColorDockingWindow::Resize() -void SvxColorDockingWindow::GetFocus (void) +void SvxColorDockingWindow::GetFocus() { SfxDockingWindow::GetFocus(); // Grab the focus to the color value set so that it can be controlled diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index bee2f93e3def..836fad360479 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -594,7 +594,7 @@ void SvxLineEndWindow::SetSize() //SetMinOutputSizePixel( aSize ); } -void SvxLineEndWindow::GetFocus (void) +void SvxLineEndWindow::GetFocus() { SfxPopupWindow::GetFocus(); // Grab the focus to the line ends value set so that it can be controlled diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 8782e769deef..88a6b93f6139 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1879,7 +1879,7 @@ struct SvxStyleToolBoxControl::Impl bool bSpecModeWriter; bool bSpecModeCalc; - inline Impl( void ) + inline Impl() :aClearForm ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) ) ,aMore ( SVX_RESSTR( RID_SVXSTR_MORE_STYLES ) ) ,bSpecModeWriter ( false ) diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index ce5c75e22124..6924b90d4343 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -4183,7 +4183,7 @@ void SAL_CALL SvxShapeRect::release() throw() // XServiceInfo -uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { return SvxShape::getSupportedServiceNames(); } diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index 4bdd057f3b88..a3324a3027c4 100644 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx @@ -55,8 +55,8 @@ class ConfigHandler : public ::cppu::WeakAggImplHelper1<XDocumentHandler> { public: // XDocumentHandler - virtual void SAL_CALL startDocument(void) throw( SAXException, RuntimeException ); - virtual void SAL_CALL endDocument(void) throw( SAXException, RuntimeException ); + virtual void SAL_CALL startDocument() throw( SAXException, RuntimeException ); + virtual void SAL_CALL endDocument() throw( SAXException, RuntimeException ); virtual void SAL_CALL startElement(const OUString& aName, const Reference< XAttributeList > & xAttribs) throw( SAXException, RuntimeException ); virtual void SAL_CALL endElement(const OUString& aName) throw( SAXException, RuntimeException ); virtual void SAL_CALL characters(const OUString& aChars) throw( SAXException, RuntimeException ); @@ -147,11 +147,11 @@ OUString ConfigHandler::getAttribute( const Reference< XAttributeList > & xAttri return OUString(); } -void SAL_CALL ConfigHandler::startDocument(void) throw( SAXException, RuntimeException ) +void SAL_CALL ConfigHandler::startDocument() throw( SAXException, RuntimeException ) { } -void SAL_CALL ConfigHandler::endDocument(void) throw( SAXException, RuntimeException ) +void SAL_CALL ConfigHandler::endDocument() throw( SAXException, RuntimeException ) { } |