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 /sd/source/ui/inc | |
| 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 'sd/source/ui/inc')
96 files changed, 518 insertions, 518 deletions
diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 16241381f83f..8c4977b243c5 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -116,13 +116,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleDocumentViewBase (void); + virtual ~AccessibleDocumentViewBase(); /** Initialize a new object. Call this method directly after creating a new object. It finished the initialization begun in the constructor but which needs a fully created object. */ - virtual void Init (void); + virtual void Init(); /** Define callback for listening to window child events of VCL. Listen for creation or destruction of OLE objects. @@ -143,14 +143,14 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent (void) + getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This implementation returns either 1 or 0 depending on whether there is an active accessible OLE object or not. */ virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This implementation either returns the active accessible OLE object @@ -169,16 +169,16 @@ public: 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) + 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 (void) + 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 (void) + 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 (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XInterface ====================================================== @@ -188,11 +188,11 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - acquire (void) + acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL - release (void) + release() throw () SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -200,17 +200,17 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL - getTypes (void) + getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ @@ -309,7 +309,7 @@ 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; /** Create a name string. The current name is not modified and, therefore, no events are send. This method is usually called once @@ -339,7 +339,7 @@ protected: Note: Currently used as a substitute for FocusGained. Should be renamed in the future. */ - virtual void Activated (void); + virtual void Activated(); /** This method is called when (before or after?) the frame containing this document has been deactivated. Can be used to send FOCUSED @@ -348,7 +348,7 @@ protected: Note: Currently used as a substitute for FocusLost. Should be renamed in the future. */ - virtual void Deactivated (void); + virtual void Deactivated(); /** Set or remove the currently active accessible OLE object. @param xOLEObject @@ -369,13 +369,13 @@ protected: throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: - void SwitchViewActivated (void) { Activated(); } + void SwitchViewActivated() { Activated(); } 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; - virtual void impl_dispose (void); + virtual void impl_dispose(); }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 2512145cd95d..5552c723c3f0 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -48,11 +48,11 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleDrawDocumentView (void); + virtual ~AccessibleDrawDocumentView(); /** Complete the initialization begun in the constructor. */ - virtual void Init (void) SAL_OVERRIDE; + virtual void Init() SAL_OVERRIDE; //===== IAccessibleViewForwarderListener ================================ @@ -62,7 +62,7 @@ public: //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL @@ -71,7 +71,7 @@ public: ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName(void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ @@ -92,11 +92,11 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - acquire (void) + acquire() throw () SAL_OVERRIDE; virtual void SAL_CALL - release (void) + release() throw () SAL_OVERRIDE; //===== XAccessibleGroupPosition ========================================= @@ -113,11 +113,11 @@ protected: //===== XServiceInfo ==================================================== virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual bool @@ -152,11 +152,11 @@ 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; /** Create a shape the represents the page as seen on the screen. */ - rtl::Reference<AccessiblePageShape> CreateDrawPageShape (void); + rtl::Reference<AccessiblePageShape> CreateDrawPageShape(); /// Create an accessible name that contains the current view mode. virtual OUString @@ -173,14 +173,14 @@ protected: /** Make sure that the currently focused shape sends a FOCUSED state change event indicating that it has (regained) the focus. */ - virtual void Activated (void) SAL_OVERRIDE; + virtual void Activated() SAL_OVERRIDE; /** Make sure that the currently focused shape sends a FOCUSED state change event indicating that it has lost the focus. */ - virtual void Deactivated (void) SAL_OVERRIDE; + virtual void Deactivated() SAL_OVERRIDE; - virtual void impl_dispose (void) SAL_OVERRIDE; + virtual void impl_dispose() SAL_OVERRIDE; //===== XAccessibleGetAccFromXShape ============================================ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > @@ -190,7 +190,7 @@ protected: GetSelAccContextInTable(); private: - void UpdateAccessibleName (void); + void UpdateAccessibleName(); }; } // end of namespace accessibility diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index a11734f42fb0..e3d519a9ccc8 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -49,11 +49,11 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); - virtual ~AccessibleOutlineView (void); + virtual ~AccessibleOutlineView(); /** Complete the initialization begun in the constructor. */ - virtual void Init (void) SAL_OVERRIDE; + virtual void Init() SAL_OVERRIDE; //===== IAccessibleViewForwarderListener ================================ @@ -63,14 +63,14 @@ public: //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) + 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, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName(void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ======================================== @@ -91,7 +91,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ @@ -109,17 +109,17 @@ public: protected: // overridden to detect focus changes - virtual void Activated (void) SAL_OVERRIDE; + virtual void Activated() SAL_OVERRIDE; // overridden to detect focus changes - virtual void Deactivated (void) SAL_OVERRIDE; + virtual void Deactivated() SAL_OVERRIDE; // declared, but not defined AccessibleOutlineView( const AccessibleOutlineView& ); AccessibleOutlineView& operator= ( const AccessibleOutlineView& ); // 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; /// Create an accessible name that contains the current view mode. virtual OUString diff --git a/sd/source/ui/inc/AccessiblePageShape.hxx b/sd/source/ui/inc/AccessiblePageShape.hxx index cddb7a414ca1..8781db72eb34 100644 --- a/sd/source/ui/inc/AccessiblePageShape.hxx +++ b/sd/source/ui/inc/AccessiblePageShape.hxx @@ -67,18 +67,18 @@ public: const AccessibleShapeTreeInfo& rShapeTreeInfo, long nIndex = -1); - virtual ~AccessiblePageShape (void); + virtual ~AccessiblePageShape(); /** Initialize a new shape. See the documentation of the constructor for the reason of this method's existence. */ - virtual void Init (void) SAL_OVERRIDE; + virtual void Init() SAL_OVERRIDE; //===== XAccessibleContext ============================================== /// Returns always 0 because there can be no children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount (void) + getAccessibleChildCount() throw (std::exception) SAL_OVERRIDE; /** Return the specified child. @@ -97,29 +97,29 @@ public: //===== XAccessibleComponent ============================================ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() 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; //===== XComponent ====================================================== virtual void SAL_CALL - dispose (void) + dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== lang::XEventListener ============================================ @@ -134,16 +134,16 @@ protected: /** Create a base name string that contains the accessible name. */ virtual OUString - CreateAccessibleBaseName (void) + CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString - CreateAccessibleName (void) + CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString - CreateAccessibleDescription (void) + CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx index 4a02162c971a..cee2b8d66365 100644 --- a/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationGraphicShape.hxx @@ -35,14 +35,14 @@ public: AccessiblePresentationGraphicShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessiblePresentationGraphicShape (void); + virtual ~AccessiblePresentationGraphicShape(); //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== diff --git a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx index 46f72c1cb3b9..4704774cb5ae 100644 --- a/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationOLEShape.hxx @@ -35,14 +35,14 @@ public: AccessiblePresentationOLEShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessiblePresentationOLEShape (void); + virtual ~AccessiblePresentationOLEShape(); //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== diff --git a/sd/source/ui/inc/AccessiblePresentationShape.hxx b/sd/source/ui/inc/AccessiblePresentationShape.hxx index 200ee7b14964..46580a760168 100644 --- a/sd/source/ui/inc/AccessiblePresentationShape.hxx +++ b/sd/source/ui/inc/AccessiblePresentationShape.hxx @@ -34,14 +34,14 @@ public: AccessiblePresentationShape ( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); - virtual ~AccessiblePresentationShape (void); + virtual ~AccessiblePresentationShape(); //===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index 373f7023b719..b651707a890c 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -67,22 +67,22 @@ public: ::com::sun::star::accessibility::XAccessible >& rxParent, ::sd::slidesorter::SlideSorter& rSlideSorter, sal_uInt16 nPageNumber); - virtual ~AccessibleSlideSorterObject (void); + virtual ~AccessibleSlideSorterObject(); /** Return the page that is made accessible by the called object. */ - SdPage* GetPage (void) const; + SdPage* GetPage() const; /** The page number as given to the constructor. */ - sal_uInt16 GetPageNumber (void) const { return mnPageNumber;} + sal_uInt16 GetPageNumber() const { return mnPageNumber;} void FireAccessibleEvent ( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //===== XComponent ============================================== @@ -97,7 +97,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext (void) + getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ======================================= @@ -116,42 +116,42 @@ 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::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent (void) + getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent (void) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL - getAccessibleRole (void) + getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName (void) + 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) + 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) + 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; @@ -166,25 +166,25 @@ public: 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) + 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 (void) + 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 (void) + 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 (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus (void) + 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; //===== XServiceInfo ==================================================== @@ -192,7 +192,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. @@ -204,7 +204,7 @@ public: /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -219,7 +219,7 @@ private: DisposedException is thrown to inform the (indirect) caller of the foul deed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the @@ -228,7 +228,7 @@ private: @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. */ - bool IsDisposed (void); + bool IsDisposed(); }; } // end of namespace ::accessibility diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 99affbe53d99..bc31ee58bb32 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -69,19 +69,19 @@ public: void Init(); - virtual ~AccessibleSlideSorterView (void); + virtual ~AccessibleSlideSorterView(); /** This method acts like a dispose call. It sends a disposing to all of its listeners. It may be called twice. */ - void Destroyed (void); + void Destroyed(); void FireAccessibleEvent ( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** Return the implementation object of the specified child. @param nIndex @@ -102,7 +102,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext (void) + getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ======================================= @@ -122,7 +122,7 @@ public: /// Return the number of currently visible children. 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; /// Return the specified child or throw exception. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL @@ -131,46 +131,46 @@ public: /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent (void) + getAccessibleParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent (void) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. virtual sal_Int16 SAL_CALL - getAccessibleRole (void) + getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription (void) + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - getAccessibleName (void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet (void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the parents locale or throw exception if this object has no parent yet/anymore. */ 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; @@ -194,40 +194,40 @@ public: /** The default implementation returns an empty rectangle. */ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation uses the result of <member>getBounds</member> to determine the location. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocation (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation returns an empty position, i.e. the * result of the default constructor of <type>com::sun::star::awt::Point</type>. */ - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen (void) + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation uses the result of <member>getBounds</member> to determine the size. */ - virtual ::com::sun::star::awt::Size SAL_CALL getSize (void) + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The default implementation does nothing. */ - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns black as the default foreground color. */ - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns white as the default background color. */ - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleSelection ============================================== @@ -270,7 +270,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName (void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. @@ -282,10 +282,10 @@ public: /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames (void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - void SwitchViewActivated (void); + void SwitchViewActivated(); private: class Implementation; ::std::unique_ptr<Implementation> mpImpl; @@ -304,7 +304,7 @@ private: DisposedException is thrown to inform the (indirect) caller of the foul deed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); /** Check whether or not the object has been disposed (or is in the @@ -313,7 +313,7 @@ private: @return sal_True, if the object is disposed or in the course of being disposed. Otherwise, sal_False is returned. */ - bool IsDisposed (void); + bool IsDisposed(); }; } // end of namespace ::accessibility diff --git a/sd/source/ui/inc/AccessibleViewForwarder.hxx b/sd/source/ui/inc/AccessibleViewForwarder.hxx index b50b91b7651b..d500eb992b4e 100644 --- a/sd/source/ui/inc/AccessibleViewForwarder.hxx +++ b/sd/source/ui/inc/AccessibleViewForwarder.hxx @@ -46,7 +46,7 @@ public: AccessibleViewForwarder (SdrPaintView* pView, OutputDevice& rDevice); - virtual ~AccessibleViewForwarder (void); + virtual ~AccessibleViewForwarder(); //===== IAccessibleViewforwarder ======================================== @@ -56,7 +56,7 @@ public: @return Return <true/> if the view forwarder is valid and <false/> else. */ - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; /** Returns the area of the underlying document that is visible in the * corresponding window. diff --git a/sd/source/ui/inc/Client.hxx b/sd/source/ui/inc/Client.hxx index 5f2fd28422bc..279add7ec642 100644 --- a/sd/source/ui/inc/Client.hxx +++ b/sd/source/ui/inc/Client.hxx @@ -43,7 +43,7 @@ class Client : public SfxInPlaceClient public: Client (SdrOle2Obj* pObj, ViewShell* pSdViewShell, vcl::Window* pWindow); - virtual ~Client (void); + virtual ~Client(); SdrOle2Obj* GetSdrOle2Obj() const { return pSdrOle2Obj; } void SetSdrGrafObj(SdrGrafObj* pObj) { pSdrGrafObj = pObj; } diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index c2713af809f3..055fd8eb6802 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -37,7 +37,7 @@ public: DrawDocShell* pDocSh, OutputDevice* pOutDev, DrawViewShell* pShell); - virtual ~ClientView (void); + virtual ~ClientView(); virtual void CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/DocumentRenderer.hxx b/sd/source/ui/inc/DocumentRenderer.hxx index 403825e45935..77a5d1d8f525 100644 --- a/sd/source/ui/inc/DocumentRenderer.hxx +++ b/sd/source/ui/inc/DocumentRenderer.hxx @@ -41,7 +41,7 @@ class DocumentRenderer { public: DocumentRenderer (ViewShellBase& rBase); - virtual ~DocumentRenderer (void); + virtual ~DocumentRenderer(); // XRenderable virtual sal_Int32 SAL_CALL getRendererCount ( diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 68a20852d081..8db4323178c3 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -99,7 +99,7 @@ public: */ DrawController (ViewShellBase& rBase) throw(); - virtual ~DrawController (void) throw(); + virtual ~DrawController() throw(); /** Replace the currently used sub controller with the given one. This new sub controller is used from now on for the view (that is the @@ -120,7 +120,7 @@ public: /** Call this method when the selection has changed. */ - void FireSelectionChangeListener (void) throw(); + void FireSelectionChangeListener() throw(); /** Call this method when the edit mode has changed. */ @@ -137,7 +137,7 @@ public: /** Broadcast a sidebar context change that is caused by a view switch. */ - void BroadcastContextChange (void) const; + void BroadcastContextChange() const; void NotifyAccUpdate(); void fireChangeLayer( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>* pCurrentLayer ) throw(); // change the parameter to int @@ -152,16 +152,16 @@ public: The returned pointer is <NULL/> after a call to ReleaseViewShellBase(). */ - ViewShellBase* GetViewShellBase (void) { return mpBase;} + ViewShellBase* GetViewShellBase() { return mpBase;} /** This method is typically called from the destructor of ViewShellBase to tell the DrawController that it and its members must not access the ViewShellBase anymore. After this call the DrawController is semi-disposed. */ - void ReleaseViewShellBase (void); + void ReleaseViewShellBase(); - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); + static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() @@ -205,7 +205,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL - getCurrentPage (void) + getCurrentPage() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener @@ -221,11 +221,11 @@ public: // XControllerManager virtual css::uno::Reference<css::drawing::framework::XConfigurationController> SAL_CALL - getConfigurationController (void) + getConfigurationController() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::drawing::framework::XModuleController> SAL_CALL - getModuleController (void) + getModuleController() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel @@ -282,7 +282,7 @@ protected: /** When the called object has been disposed already this method throws a Disposed exception and does not return. */ - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException); using cppu::OPropertySetHelper::disposing; @@ -327,8 +327,8 @@ private: const ::com::sun::star::uno::Any& rNewValue, const ::com::sun::star::uno::Any& rOldValue); - void ProvideFrameworkControllers (void); - void DisposeFrameworkControllers (void); + void ProvideFrameworkControllers(); + void DisposeFrameworkControllers(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 5b25bb8d7339..df23e0a35a56 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -195,7 +195,7 @@ public: @return Returns NULL when the current document has no reference device. */ - virtual OutputDevice* GetDocumentRefDev (void) SAL_OVERRIDE; + virtual OutputDevice* GetDocumentRefDev() SAL_OVERRIDE; DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog* ); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 1eb4498b423b..0012c2a9d7fd 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -92,11 +92,11 @@ public: PageKind ePageKind = PK_STANDARD, FrameView* pFrameView = NULL); - virtual ~DrawViewShell (void); + virtual ~DrawViewShell(); virtual void Init (bool bIsMainViewShell) SAL_OVERRIDE; - virtual void Shutdown (void) SAL_OVERRIDE; + virtual void Shutdown() SAL_OVERRIDE; void PrePaint() SAL_OVERRIDE; virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; @@ -126,7 +126,7 @@ public: the enclosing window and current sizes of buttons, rulers, and sliders. */ - virtual void ArrangeGUIElements (void) SAL_OVERRIDE; + virtual void ArrangeGUIElements() SAL_OVERRIDE; void HidePage(); @@ -136,7 +136,7 @@ public: virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin) SAL_OVERRIDE; virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin) SAL_OVERRIDE; - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void ShowMousePosInfo(const Rectangle& rRect, ::sd::Window* pWin); @@ -289,7 +289,7 @@ public: void ScannerEvent( const ::com::sun::star::lang::EventObject& rEventObject ); - bool IsLayerModeActive (void) const { return mbIsLayerModeActive;} + bool IsLayerModeActive() const { return mbIsLayerModeActive;} sal_uInt16* GetSlotArray() const { return mpSlotArray; } @@ -322,7 +322,7 @@ public: returned value is independent of whether the layer modus is currently active and the tab control is visible. */ - int GetTabLayerCount (void) const; + int GetTabLayerCount() const; /** Return the numerical id of the currently active layer as seen by the layer tab control. @@ -331,7 +331,7 @@ public: number of layers as returned by the <member>GetTabLayerCount</member> method (exclusive). */ - int GetActiveTabLayerIndex (void) const; + int GetActiveTabLayerIndex() const; /** Set the active layer at the layer tab control and update the control accordingly to reflect the change on screen. @@ -345,11 +345,11 @@ public: /** Return a pointer to the tab control for pages. */ - TabControl& GetPageTabControl (void) { return maTabControl;} + TabControl& GetPageTabControl() { return maTabControl;} /** Return a pointer to the tab control for layers. */ - LayerTabBar* GetLayerTabControl (void); + LayerTabBar* GetLayerTabControl(); /** Renames the given slide using an SvxNameDialog @@ -365,7 +365,7 @@ public: /** modifies the given layer with the given values */ void ModifyLayer( SdrLayer* pLayer, const OUString& rLayerName, const OUString& rLayerTitle, const OUString& rLayerDesc, bool bIsVisible, bool bIsLocked, bool bIsPrintable ); - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() SAL_OVERRIDE; DrawView* GetDrawView() const { return mpDrawView; } @@ -374,7 +374,7 @@ public: */ virtual bool RelocateToParentWindow (::vcl::Window* pParentWindow) SAL_OVERRIDE; - OUString GetSidebarContextName (void) const; + OUString GetSidebarContextName() const; //move this method to ViewShell. //void NotifyAccUpdate(); diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx index f7cb8088a5af..68ee23083ca4 100644 --- a/sd/source/ui/inc/EventMultiplexer.hxx +++ b/sd/source/ui/inc/EventMultiplexer.hxx @@ -159,7 +159,7 @@ public: /** Create new EventMultiplexer for the given ViewShellBase object. */ EventMultiplexer (ViewShellBase& rBase); - ~EventMultiplexer (void); + ~EventMultiplexer(); /** Some constants that make it easier to remove a listener for all event types at once. diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index 0168800353ca..ef8a4212dcea 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -51,7 +51,7 @@ class FormShellManager { public: FormShellManager (ViewShellBase& rBase); - virtual ~FormShellManager (void); + virtual ~FormShellManager(); /** Typically called by a ShellFactory. It tells the FormShellManager which form shell to manage. @@ -66,7 +66,7 @@ public: The result may be <NULL/> when the SetFormShell() method has not yet been called or was last called with <NULL/>. */ - FmFormShell* GetFormShell (void) { return mpFormShell;} + FmFormShell* GetFormShell() { return mpFormShell;} private: ViewShellBase& mrBase; @@ -96,12 +96,12 @@ private: the deselection of the form shell. The later informs about its selection. */ - void RegisterAtCenterPane (void); + void RegisterAtCenterPane(); /** Unregister the listeners that were registered in RegisterAtCenterPane(). */ - void UnregisterAtCenterPane (void); + void UnregisterAtCenterPane(); /** This call back is called by the application window (among others) when the window gets the focus. In this case the form shell is diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index d24b0d80581e..2aa665224ae4 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -114,7 +114,7 @@ public: /** Return the value of the edit mode as it was when the document was loaded. */ - EditMode GetViewShEditModeOnLoad (void) const { return meEditModeOnLoad;} + EditMode GetViewShEditModeOnLoad() const { return meEditModeOnLoad;} void SetLayerMode(bool bMode) { mbLayerMode = bMode; } @@ -141,14 +141,14 @@ public: /** Return the type of the view shell previously associated with this frame view. */ - ViewShell::ShellType GetPreviousViewShellType (void) const { return mePreviousViewShellType;} + ViewShell::ShellType GetPreviousViewShellType() const { return mePreviousViewShellType;} /** Remember the type of the view shell at the time when the document is loaded or, rather, when the ViewShellBase is constructed. */ void SetViewShellTypeOnLoad (ViewShell::ShellType eType); - ViewShell::ShellType GetViewShellTypeOnLoad (void) const { return meViewShellTypeOnLoad;} + ViewShell::ShellType GetViewShellTypeOnLoad() const { return meViewShellTypeOnLoad;} void SetPresentationViewShellId(sal_uInt16 nId) { mnPresViewShellId = nId; } @@ -164,7 +164,7 @@ public: sal_uLong GetDrawMode() const { return mnDrawMode; }; void SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAllShapes); - bool IsNavigatorShowingAllShapes (void) const { return mbIsNavigatorShowingAllShapes;} + bool IsNavigatorShowingAllShapes() const { return mbIsNavigatorShowingAllShapes;} void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 7734f9089b83..b11f3c427547 100644 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -56,7 +56,7 @@ public: bool bSdDataObj=false, DocumentType=DOCUMENT_TYPE_DRAW); - virtual ~GraphicDocShell (void); + virtual ~GraphicDocShell(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx index bd0f5804bac5..e0847c8bc6ae 100644 --- a/sd/source/ui/inc/GraphicObjectBar.hxx +++ b/sd/source/ui/inc/GraphicObjectBar.hxx @@ -42,7 +42,7 @@ private: public: GraphicObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); - virtual ~GraphicObjectBar (void); + virtual ~GraphicObjectBar(); void GetAttrState( SfxItemSet& rSet ); void Execute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index 7077e3714568..c8a0b34c4bea 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -62,15 +62,15 @@ public: vcl::Window* pParentWindow, FrameView* pFrameView = NULL); - virtual ~GraphicViewShell (void); + virtual ~GraphicViewShell(); /** Override this method in order to have the layer mode always active. */ virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive) SAL_OVERRIDE; protected: - void ConstructGraphicViewShell (void); - virtual void ArrangeGUIElements (void) SAL_OVERRIDE; + void ConstructGraphicViewShell(); + virtual void ArrangeGUIElements() SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx index d0a58861cd78..3acf53699f96 100644 --- a/sd/source/ui/inc/GraphicViewShellBase.hxx +++ b/sd/source/ui/inc/GraphicViewShellBase.hxx @@ -38,14 +38,14 @@ public: macros. */ GraphicViewShellBase (SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~GraphicViewShellBase (void); + virtual ~GraphicViewShellBase(); /** Callback function for general slot calls. */ virtual void Execute (SfxRequest& rRequest) SAL_OVERRIDE; protected: - virtual void InitializeFramework (void) SAL_OVERRIDE; + virtual void InitializeFramework() SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx index 3538473b386e..c4522288b8fa 100644 --- a/sd/source/ui/inc/ImpressViewShellBase.hxx +++ b/sd/source/ui/inc/ImpressViewShellBase.hxx @@ -38,14 +38,14 @@ public: macros. */ ImpressViewShellBase (SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~ImpressViewShellBase (void); + virtual ~ImpressViewShellBase(); /** Callback function for general slot calls. */ virtual void Execute (SfxRequest& rRequest) SAL_OVERRIDE; protected: - virtual void InitializeFramework (void) SAL_OVERRIDE; + virtual void InitializeFramework() SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/LayerTabBar.hxx b/sd/source/ui/inc/LayerTabBar.hxx index 061c2a78258c..bb79203ea923 100644 --- a/sd/source/ui/inc/LayerTabBar.hxx +++ b/sd/source/ui/inc/LayerTabBar.hxx @@ -38,19 +38,19 @@ public: LayerTabBar ( DrawViewShell* pDrViewSh, vcl::Window* pParent); - virtual ~LayerTabBar (void); + virtual ~LayerTabBar(); /** Inform all listeners of this control that the current layer has been activated. Call this method after switching the current layer and is not done elsewhere (like when using ctrl + page up/down keys). */ - void SendActivatePageEvent (void); + void SendActivatePageEvent(); /** Inform all listeners of this control that the current layer has been deactivated. Call this method before switching the current layer and is not done elsewhere (like when using ctrl page up/down keys). */ - void SendDeactivatePageEvent (void); + void SendDeactivatePageEvent(); protected: DrawViewShell* pDrViewSh; diff --git a/sd/source/ui/inc/MasterPageObserver.hxx b/sd/source/ui/inc/MasterPageObserver.hxx index 0e2f8f77632c..41d454665103 100644 --- a/sd/source/ui/inc/MasterPageObserver.hxx +++ b/sd/source/ui/inc/MasterPageObserver.hxx @@ -43,7 +43,7 @@ public: /** Return the single instance of this class. */ - static MasterPageObserver& Instance (void); + static MasterPageObserver& Instance(); /** The master page observer will listen to events of this document and detect changes of the use of master pages. @@ -77,8 +77,8 @@ private: class Implementation; ::std::unique_ptr<Implementation> mpImpl; - MasterPageObserver (void); - virtual ~MasterPageObserver (void); + MasterPageObserver(); + virtual ~MasterPageObserver(); MasterPageObserver (const MasterPageObserver&) SAL_DELETED_FUNCTION; diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx index 00be1fbfc83b..47aea20a7366 100644 --- a/sd/source/ui/inc/MediaObjectBar.hxx +++ b/sd/source/ui/inc/MediaObjectBar.hxx @@ -43,7 +43,7 @@ private: public: MediaObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); - virtual ~MediaObjectBar (void); + virtual ~MediaObjectBar(); void GetState( SfxItemSet& rSet ); void Execute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index d97042f521a5..8d0cfbd1ba2f 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -59,15 +59,15 @@ public: OutlineView (DrawDocShell& rDocSh, ::vcl::Window* pWindow, OutlineViewShell& rOutlineViewSh); - virtual ~OutlineView (void); + virtual ~OutlineView(); /** This method is called by the view shell that owns the view to tell the view that it can safely connect to the application. This method must not be called before the view shell is on the shell stack. */ - void ConnectToApplication (void); - void DisconnectFromApplication (void); + void ConnectToApplication(); + void DisconnectFromApplication(); TYPEINFO_OVERRIDE(); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index cf8835d4d036..9bf1d45c1b2a 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -59,9 +59,9 @@ public: ::vcl::Window* pParentWindow, FrameView* pFrameView = NULL); - virtual ~OutlineViewShell (void); + virtual ~OutlineViewShell(); - virtual void Shutdown (void) SAL_OVERRIDE; + virtual void Shutdown() SAL_OVERRIDE; virtual void Paint(const Rectangle& rRect, ::sd::Window* pWin) SAL_OVERRIDE; @@ -70,7 +70,7 @@ public: the enclosing window and current sizes of buttons, rulers, and sliders. */ - virtual void ArrangeGUIElements (void) SAL_OVERRIDE; + virtual void ArrangeGUIElements() SAL_OVERRIDE; virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE; @@ -137,7 +137,7 @@ public: */ virtual void UpdatePreview (SdPage* pPage, bool bInit = false) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() SAL_OVERRIDE; /** Make the given page the new current page. This method notifies the controller and adapts the selection of the diff --git a/sd/source/ui/inc/OutlineViewShellBase.hxx b/sd/source/ui/inc/OutlineViewShellBase.hxx index 2cbabd04c0da..68bfb33963bf 100644 --- a/sd/source/ui/inc/OutlineViewShellBase.hxx +++ b/sd/source/ui/inc/OutlineViewShellBase.hxx @@ -38,7 +38,7 @@ public: macros. */ OutlineViewShellBase (SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~OutlineViewShellBase (void); + virtual ~OutlineViewShellBase(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/OutlinerIteratorImpl.hxx b/sd/source/ui/inc/OutlinerIteratorImpl.hxx index eb506187ecec..df8ef82fdcae 100644 --- a/sd/source/ui/inc/OutlinerIteratorImpl.hxx +++ b/sd/source/ui/inc/OutlinerIteratorImpl.hxx @@ -60,14 +60,14 @@ public: IteratorImplBase (SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward, PageKind ePageKind, EditMode eEditMode); - virtual ~IteratorImplBase (void); + virtual ~IteratorImplBase(); /** Advance to the next text of the current object or to the next object. This takes the iteration direction into account. The new object pointed to can be retrieved (among other information) by calling the <member>GetPosition</member> method. */ - virtual void GotoNextText (void) = 0; + virtual void GotoNextText() = 0; /** Return an object that describes the current object. @return The returned object describes the current object pointed to by @@ -75,7 +75,7 @@ public: <type>IteratorPosition</type> for details on the available information. */ - virtual const IteratorPosition& GetPosition (void); + virtual const IteratorPosition& GetPosition(); /** Create an exact copy of this object. No argument should be specified when called from the outside. It then creates an object first and passes that to the inherited <member>Clone()</member> @@ -107,7 +107,7 @@ public: virtual bool IsEqual (const IteratorImplBase& rIterator, IteratorType aType) const; /** Reverse the direction of iteration. The current object stays the same. */ - virtual void Reverse (void); + virtual void Reverse(); protected: /// The current position as returned by <member>GetPosition()</member>. @@ -140,10 +140,10 @@ public: const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward); SelectionIteratorImpl (const SelectionIteratorImpl& rObject); - virtual ~SelectionIteratorImpl (void); + virtual ~SelectionIteratorImpl(); - virtual void GotoNextText (void) SAL_OVERRIDE; - virtual const IteratorPosition& GetPosition (void) SAL_OVERRIDE; + virtual void GotoNextText() SAL_OVERRIDE; + virtual const IteratorPosition& GetPosition() SAL_OVERRIDE; virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; virtual bool operator== (const IteratorImplBase& rIterator) const SAL_OVERRIDE; @@ -188,11 +188,11 @@ public: bool bDirectionIsForward, PageKind ePageKind, EditMode eEditMode); - virtual ~ViewIteratorImpl (void); + virtual ~ViewIteratorImpl(); - virtual void GotoNextText (void) SAL_OVERRIDE; + virtual void GotoNextText() SAL_OVERRIDE; virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; - virtual void Reverse (void) SAL_OVERRIDE; + virtual void Reverse() SAL_OVERRIDE; protected: /** Initialize this iterator with respect to the given location. After @@ -236,9 +236,9 @@ public: SdDrawDocument* pDocument, const ::boost::weak_ptr<ViewShell>& rpViewShellWeak, bool bDirectionIsForward); - virtual ~DocumentIteratorImpl (void); + virtual ~DocumentIteratorImpl(); - virtual void GotoNextText (void) SAL_OVERRIDE; + virtual void GotoNextText() SAL_OVERRIDE; virtual IteratorImplBase* Clone (IteratorImplBase* pObject) const SAL_OVERRIDE; private: diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index fd908f7f033a..a8d3b2167b34 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -65,7 +65,7 @@ public: VerticalOrientation. Otherwise UnknownOrientation is returned. */ - Orientation GetOrientation (void) const; + Orientation GetOrientation() const; }; } // end of namespace ::sd diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index 51dc0f7e9599..b362d3e35c95 100644 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx @@ -41,8 +41,8 @@ private: static void InitInterface_Impl(); public: - LeftImpressPaneShell (void); - virtual ~LeftImpressPaneShell (void); + LeftImpressPaneShell(); + virtual ~LeftImpressPaneShell(); }; /** Shell that displays the left pane for Draw. The shell does not do @@ -60,8 +60,8 @@ private: static void InitInterface_Impl(); public: - LeftDrawPaneShell (void); - virtual ~LeftDrawPaneShell (void); + LeftDrawPaneShell(); + virtual ~LeftDrawPaneShell(); }; /** Shell that displays the right pane for both Impress and Draw. The shell diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index 53bbde6cba4b..e91ae3de7ad6 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -41,7 +41,7 @@ private: public: PresentationViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView = NULL); - virtual ~PresentationViewShell (void); + virtual ~PresentationViewShell(); /** This method is used by a simple class that passes some arguments from the creator of the new view shell to the new view @@ -52,7 +52,7 @@ public: */ void FinishInitialization( FrameView* pFrameView ); - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; protected: virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx index 3eddaaceb19d..f52c6a243cee 100644 --- a/sd/source/ui/inc/PresentationViewShellBase.hxx +++ b/sd/source/ui/inc/PresentationViewShellBase.hxx @@ -38,10 +38,10 @@ public: macros. */ PresentationViewShellBase (SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~PresentationViewShellBase (void); + virtual ~PresentationViewShellBase(); protected: - virtual void InitializeFramework (void) SAL_OVERRIDE; + virtual void InitializeFramework() SAL_OVERRIDE; }; } // end of namespace sd diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index 515918491b3c..ec7c5fadcadc 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -51,7 +51,7 @@ public: OutputDevice* pTemplate = NULL, const bool bPaintFrame = true); - virtual ~PreviewRenderer (void); + virtual ~PreviewRenderer(); /** Render a page with the given pixel size. Use this version when only the width of the preview is known to the @@ -139,12 +139,12 @@ private: const SdPage* pPage, const Size& rPixelSize, const bool bObeyHighContrastMode); - void Cleanup (void); + void Cleanup(); void PaintPage ( const SdPage* pPage, const bool bDisplayPresentationObjects); void PaintSubstitutionText (const OUString& rSubstitutionText); - void PaintFrame (void); + void PaintFrame(); /** Set up the map mode so that the given page is renderer into a bitmap with the specified width. diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index 956585e3a35e..64d214f77420 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -40,7 +40,7 @@ public: sal_uInt16 nRulerFlags, SfxBindings& rBindings, WinBits nWinStyle); - virtual ~Ruler (void); + virtual ~Ruler(); void SetNullOffset(const Point& rOffset); diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx index 3a39b8733eaf..6a9ae21c83a8 100644 --- a/sd/source/ui/inc/SdUnoDrawView.hxx +++ b/sd/source/ui/inc/SdUnoDrawView.hxx @@ -44,7 +44,7 @@ public: SdUnoDrawView ( DrawViewShell& rViewShell, View& rView) throw(); - virtual ~SdUnoDrawView (void) throw(); + virtual ~SdUnoDrawView() throw(); // XSelectionSupplier @@ -54,7 +54,7 @@ public: css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getSelection (void) + virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -73,7 +73,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet @@ -99,9 +99,9 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - bool getMasterPageMode(void) const throw(); + bool getMasterPageMode() const throw(); void setMasterPageMode(bool MasterPageMode_) throw(); - bool getLayerMode(void) const throw(); + bool getLayerMode() const throw(); void setLayerMode(bool LayerMode_) throw(); public: /** Return a reference to the active layer object. @@ -109,7 +109,7 @@ public: The returned value may be empty when the internal state of this view is not valid (like during destruction.) */ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> getActiveLayer (void) throw (); + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer> getActiveLayer() throw (); protected: /** Make the specified object the active layer. @param rxLayer @@ -118,7 +118,7 @@ protected: void setActiveLayer (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XLayer>& rxLayer) throw (css::uno::RuntimeException); void SetZoom( sal_Int16 nZoom ); - sal_Int16 GetZoom(void) const; + sal_Int16 GetZoom() const; void SetViewOffset(const com::sun::star::awt::Point& rWinPos ); com::sun::star::awt::Point GetViewOffset() const; @@ -131,7 +131,7 @@ private: DrawViewShell& mrDrawViewShell; sd::View& mrView; - SdXImpressDocument* GetModel (void) const throw(); + SdXImpressDocument* GetModel() const throw(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index 38691b671761..ad3295718240 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -37,9 +37,9 @@ class SdUnoOutlineView public: SdUnoOutlineView ( OutlineViewShell& rViewShell) throw(); - virtual ~SdUnoOutlineView (void) throw(); + virtual ~SdUnoOutlineView() throw(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XSelectionSupplier @@ -48,7 +48,7 @@ public: throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getSelection (void) + virtual css::uno::Any SAL_CALL getSelection() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener ( @@ -65,7 +65,7 @@ public: const css::uno::Reference<css::drawing::XDrawPage >& xPage) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage (void) + virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx index 38f755ee5e21..7a6d741b555b 100644 --- a/sd/source/ui/inc/SdUnoSlideView.hxx +++ b/sd/source/ui/inc/SdUnoSlideView.hxx @@ -40,7 +40,7 @@ class SdUnoSlideView public: SdUnoSlideView ( slidesorter::SlideSorter& rSlideSorter) throw(); - virtual ~SdUnoSlideView (void) throw(); + virtual ~SdUnoSlideView() throw(); // XSelectionSupplier @@ -48,7 +48,7 @@ public: throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Any SAL_CALL getSelection (void) + virtual ::com::sun::star::uno::Any SAL_CALL getSelection() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener ( @@ -66,7 +66,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL - getCurrentPage (void) + getCurrentPage() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastPropertySet diff --git a/sd/source/ui/inc/ShellFactory.hxx b/sd/source/ui/inc/ShellFactory.hxx index 5cfde74b3c8e..9c8eb4e6aab9 100644 --- a/sd/source/ui/inc/ShellFactory.hxx +++ b/sd/source/ui/inc/ShellFactory.hxx @@ -39,7 +39,7 @@ public: /** This abstract virtual class needs a destructor so that the destructors of derived classes are called. */ - virtual ~ShellFactory (void) {}; + virtual ~ShellFactory() {}; /** Create a new instance of a view shell for the given id that will be stacked onto the given view shell base. diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index ff2d6624f7b7..8854e242eee1 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -72,7 +72,7 @@ class SlideSorter { friend class controller::SlotManager; public: - virtual ~SlideSorter (void); + virtual ~SlideSorter(); /** Return whether the called SlideSorter object is valid and calling its Get(Model,View,Controller) methods is safe. When <FALSE/> is @@ -80,7 +80,7 @@ public: Calling this method should be necessary only during startup and shutdown (when that can be detected). */ - bool IsValid (void) const { return mbIsValid;} + bool IsValid() const { return mbIsValid;} /** Create a new slide sorter that is strongly coupled to the given view shell. Use this function for a slide sorter in the left pane. @@ -120,44 +120,44 @@ public: /** Return the control of the vertical scroll bar. */ - ::boost::shared_ptr<ScrollBar> GetVerticalScrollBar (void) const { return mpVerticalScrollBar;} + ::boost::shared_ptr<ScrollBar> GetVerticalScrollBar() const { return mpVerticalScrollBar;} /** Return the control of the horizontal scroll bar. */ - ::boost::shared_ptr<ScrollBar> GetHorizontalScrollBar (void) const { return mpHorizontalScrollBar;} + ::boost::shared_ptr<ScrollBar> GetHorizontalScrollBar() const { return mpHorizontalScrollBar;} /** Return the scroll bar filler that paints the little square that is enclosed by the two scroll bars. */ - ::boost::shared_ptr<ScrollBarBox> GetScrollBarFiller (void) const { return mpScrollBarBox;} + ::boost::shared_ptr<ScrollBarBox> GetScrollBarFiller() const { return mpScrollBarBox;} /** Return the content window. This is a sibling and is geometrically enclosed by the scroll bars. */ - SharedSdWindow GetContentWindow (void) const { return mpContentWindow;} + SharedSdWindow GetContentWindow() const { return mpContentWindow;} - model::SlideSorterModel& GetModel (void) const; + model::SlideSorterModel& GetModel() const; - view::SlideSorterView& GetView (void) const; + view::SlideSorterView& GetView() const; - controller::SlideSorterController& GetController (void) const; + controller::SlideSorterController& GetController() const; /** Return the view shell that was given at construction. @return May be empty. */ - ViewShell* GetViewShell (void) const { return mpViewShell;} + ViewShell* GetViewShell() const { return mpViewShell;} /** Return the XController object of the main view. */ ::com::sun::star::uno::Reference<com::sun::star::frame::XController> - GetXController (void) const; + GetXController() const; /** Return the ViewShellBase object. @return May be empty. */ - ViewShellBase* GetViewShellBase (void) const { return mpViewShellBase;} + ViewShellBase* GetViewShellBase() const { return mpViewShellBase;} void Paint (const Rectangle& rRepaintArea); @@ -180,11 +180,11 @@ public: /** Return a collection of properties that are used throughout the slide sorter. */ - ::boost::shared_ptr<controller::Properties> GetProperties (void) const; + ::boost::shared_ptr<controller::Properties> GetProperties() const; /** Return the active theme which gives access to colors and fonts. */ - ::boost::shared_ptr<view::Theme> GetTheme (void) const; + ::boost::shared_ptr<view::Theme> GetTheme() const; protected: /** This virtual method makes it possible to create a specialization of @@ -193,25 +193,25 @@ protected: calls the CreateModel(), CreateView(), and CreateController() methods in this order. */ - void CreateModelViewController (void); + void CreateModelViewController(); /** Create the model for the view shell. When called from the default implementation of CreateModelViewController() then neither view nor controller do exist. Test their pointers when in doubt. */ - model::SlideSorterModel* CreateModel (void); + model::SlideSorterModel* CreateModel(); /** Create the view for the view shell. When called from the default implementation of CreateModelViewController() then the model but not the controller does exist. Test their pointers when in doubt. */ - view::SlideSorterView* CreateView (void); + view::SlideSorterView* CreateView(); /** Create the controller for the view shell. When called from the default implementation of CreateModelViewController() then both the view and the controller do exist. Test their pointers when in doubt. */ - controller::SlideSorterController* CreateController (void); + controller::SlideSorterController* CreateController(); private: bool mbIsValid; @@ -249,7 +249,7 @@ private: ViewShell* pViewShell, ::vcl::Window& rParentWindow); - void Init (void); + void Init(); /** Create the controls for the slide sorter. This are the tab bar for switching the edit mode, the scroll bar, and the actual slide sorter view window. @@ -261,11 +261,11 @@ private: /** This method is usually called exactly one time from the constructor. */ - void SetupListeners (void); + void SetupListeners(); /** Release the listeners that have been installed in SetupListeners(). */ - void ReleaseListeners (void); + void ReleaseListeners(); }; } } // end of namespace ::sd::slidesorter diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 659727588b1e..292993522034 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -56,7 +56,7 @@ public: FrameView* pFrameView, const bool bIsCenterPane); - virtual ~SlideSorterViewShell (void); + virtual ~SlideSorterViewShell(); /** Late initialization that has to be called after a new instance has completed its construction. @@ -72,7 +72,7 @@ public: */ static SlideSorterViewShell* GetSlideSorter (ViewShellBase& rBase); - virtual SdPage* GetActualPage (void) SAL_OVERRIDE; + virtual SdPage* GetActualPage() SAL_OVERRIDE; /// inherited from sd::ViewShell virtual SdPage* getCurrentPage() const SAL_OVERRIDE; @@ -90,7 +90,7 @@ public: void GetClipboardState (SfxItemSet &rSet); virtual void ReadFrameViewData (FrameView* pView) SAL_OVERRIDE; - virtual void WriteFrameViewData (void) SAL_OVERRIDE; + virtual void WriteFrameViewData() SAL_OVERRIDE; /** Set the zoom factor. The given value is clipped against an upper bound. @@ -110,7 +110,7 @@ public: method when something has changed that for instance affects the visibility state of the scroll bars. */ - virtual void ArrangeGUIElements (void) SAL_OVERRIDE; + virtual void ArrangeGUIElements() SAL_OVERRIDE; virtual void Activate (bool IsMDIActivate) SAL_OVERRIDE; virtual void Deactivate (bool IsMDIActivate) SAL_OVERRIDE; @@ -137,7 +137,7 @@ public: /** Return the set of selected pages. */ - ::boost::shared_ptr<PageSelection> GetPageSelection (void) const; + ::boost::shared_ptr<PageSelection> GetPageSelection() const; void SetPageSelection (const ::boost::shared_ptr<PageSelection>& rSelection); @@ -158,7 +158,7 @@ public: */ void RemoveSelectionChangeListener (const Link& rListener); - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() SAL_OVERRIDE; /** Create an accessible object representing the specified window. @param pWindow @@ -173,7 +173,7 @@ public: // handle SlideSorterView specially because AccessibleSlideSorterView doesn't inherit from AccessibleDocumentViewBase virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ) SAL_OVERRIDE; - SlideSorter& GetSlideSorter (void) const; + SlideSorter& GetSlideSorter() const; /** Try to relocate all toplevel window elements to the given parent window. @@ -185,7 +185,7 @@ protected: /** Override this method to handle a missing tool bar correctly. This is the case when the slide sorter is not the main view shell. */ - virtual ::svl::IUndoManager* ImpGetUndoManager (void) const SAL_OVERRIDE; + virtual ::svl::IUndoManager* ImpGetUndoManager() const SAL_OVERRIDE; private: ::boost::shared_ptr<SlideSorter> mpSlideSorter; @@ -196,13 +196,13 @@ private: ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView); - void Initialize (void); + void Initialize(); /** This method overwrites the one from our base class: We do our own scroll bar and the base class call is thus unnecessary. It simply calls UpdateScrollBars(false). */ - virtual void UpdateScrollBars (void) SAL_OVERRIDE; + virtual void UpdateScrollBars() SAL_OVERRIDE; }; typedef ::boost::shared_ptr<SlideSorterViewShell::PageSelection> SharedPageSelection; diff --git a/sd/source/ui/inc/SlideSorterViewShellBase.hxx b/sd/source/ui/inc/SlideSorterViewShellBase.hxx index b76dc738c7cc..4c78ca9abfa7 100644 --- a/sd/source/ui/inc/SlideSorterViewShellBase.hxx +++ b/sd/source/ui/inc/SlideSorterViewShellBase.hxx @@ -38,7 +38,7 @@ public: macros. */ SlideSorterViewShellBase (SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~SlideSorterViewShellBase (void); + virtual ~SlideSorterViewShellBase(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 73e3ba0c07a2..db658e8ffb61 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -39,12 +39,12 @@ public: sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); - virtual ~SpellDialogChildWindow (void); + virtual ~SpellDialogChildWindow(); /** This method makes the one from the base class public so that it can be called from the view shell when one is created. */ - void InvalidateSpellDialog (void); + void InvalidateSpellDialog(); SFX_DECL_CHILDWINDOW_WITHID(SpellDialogChildWindow); @@ -59,8 +59,8 @@ protected: spelling dialog back into the document. */ virtual void ApplyChangedSentence(const ::svx::SpellPortions& rChanged, bool bRecheck) SAL_OVERRIDE; - virtual void GetFocus (void) SAL_OVERRIDE; - virtual void LoseFocus (void) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; private: /** This outliner is used to do the main work of iterating over a @@ -78,7 +78,7 @@ private: deletion/release of formerly created/obtained one prior to construction/obtaining of a new one. */ - void ProvideOutliner (void); + void ProvideOutliner(); }; } // end of namespace ::sd diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index ece600143a64..b767cc8b2ba7 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -40,19 +40,19 @@ class TabControl sal_uInt16 RrePageID; public: TabControl (DrawViewShell* pDrViewSh, vcl::Window* pParent); - virtual ~TabControl (void); + virtual ~TabControl(); /** Inform all listeners of this control that the current page has been activated. Call this method after switching the current page and is not done elsewhere (like when using page up/down keys). */ - void SendActivatePageEvent (void); + void SendActivatePageEvent(); /** Inform all listeners of this control that the current page has been deactivated. Call this method before switching the current page and is not done elsewhere (like when using page up/down keys). */ - void SendDeactivatePageEvent (void); + void SendDeactivatePageEvent(); protected: DrawViewShell* pDrViewSh; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index e74f33e1f8c7..1a066eebd0c0 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -106,33 +106,33 @@ class SD_DLLPUBLIC TemplateScanner public: /** Create a new template scanner and prepare but do not execute the scanning. */ - TemplateScanner (void); + TemplateScanner(); /** The destructor deletes any remaining entries of the local list of templates. */ - virtual ~TemplateScanner (void); + virtual ~TemplateScanner(); /** Execute the actual scanning of templates. When this method terminates the result can be obtained by calling the <member>GetTemplateList</member> method. */ - void Scan (void); + void Scan(); /** Return the list of template folders. It lies in the responsibility of the caller to take ownership of some or all entries and remove them from the returned list. All entries that remain until the destructor is called will be destroyed. */ - std::vector<TemplateDir*>& GetFolderList (void) { return maFolderList;} + std::vector<TemplateDir*>& GetFolderList() { return maFolderList;} /** Implementation of the AsynchronousTask interface method. */ - virtual void RunNextStep (void) SAL_OVERRIDE; + virtual void RunNextStep() SAL_OVERRIDE; /** Implementation of the AsynchronousTask interface method. */ - virtual bool HasNextStep (void) SAL_OVERRIDE; + virtual bool HasNextStep() SAL_OVERRIDE; /** Return the TemplateDir object that was last added to mpTemplateDirectory. @@ -140,7 +140,7 @@ public: <NULL/> is returned either before the template scanning is started or after it has ended. */ - const TemplateEntry* GetLastAddedEntry (void) const { return mpLastAddedEntry;} + const TemplateEntry* GetLastAddedEntry() const { return mpLastAddedEntry;} /** Set whether to sort the template entries inside the regions. */ @@ -198,40 +198,40 @@ private: /** Obtain the root folder of the template folder hierarchy. The result is stored in mxTemplateRoot for later use. */ - State GetTemplateRoot (void); + State GetTemplateRoot(); /** Initialize the scanning of folders. This is called exactly once. @return Returns one of the two states ERROR or GATHER_FOLDER_LIST. */ - State InitializeFolderScanning (void); + State InitializeFolderScanning(); /** Collect all available top-level folders in an ordered list which can then be processed by ScanFolder(). @return Returns one of the two states ERROR or SCAN_FOLDER. */ - State GatherFolderList (void); + State GatherFolderList(); /** From the list of top-level folders collected by GatherFolderList() the one with highest priority is processed. @return Returns one of the states ERROR, DONE, or INITILIZE_ENTRY_SCAN. */ - State ScanFolder (void); + State ScanFolder(); /** Initialize the scanning of entries of a top-level folder. @return Returns one of the states ERROR or SCAN_ENTRY. */ - State InitializeEntryScanning (void); + State InitializeEntryScanning(); /** Scan one entry. When this entry matches the recognized template types it is appended to the result set. @return Returns one of the states ERROR, SCAN_ENTRY, or SCAN_FOLDER. */ - State ScanEntry (void); + State ScanEntry(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx index 1b12cfe1c6df..026f664995e2 100644 --- a/sd/source/ui/inc/TextObjectBar.hxx +++ b/sd/source/ui/inc/TextObjectBar.hxx @@ -47,7 +47,7 @@ public: ViewShell* pSdViewShell, SfxItemPool& rItemPool, ::sd::View* pSdView); - virtual ~TextObjectBar (void); + virtual ~TextObjectBar(); void GetAttrState( SfxItemSet& rSet ); void GetCharState( SfxItemSet& rSet ); diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index 5d3e392ba9e1..b5b9f80df612 100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -74,14 +74,14 @@ public: const ::boost::shared_ptr<tools::EventMultiplexer>& rpMultiplexer, const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager); - ~ToolBarManager (void); + ~ToolBarManager(); /** Call this method prior to the destructor to prevent the ToolBarManager from accessing the ViewShellManager or the XLayoutManager when those are possibly not well and alive anymore (like during the destruction of the ViewShellBase.) */ - void Shutdown (void); + void Shutdown(); /** When the view in the center pane changes then this method sets up the initial set of tool bars for the new view. @@ -146,7 +146,7 @@ public: When this shell is not the main view then the method returns immediately. */ - void ResetAllToolBars (void); + void ResetAllToolBars(); /** Add the tool bar with the given name to the specified group of tool bars. @@ -223,19 +223,19 @@ public: ToolBarGroup eGroup, ShellId nToolBarId); - void PreUpdate (void); + void PreUpdate(); /** Request an update of the active tool bars. The update is made asynchronously. */ - void RequestUpdate (void); + void RequestUpdate(); /** This is a hint for the ToolBarManager to improve the performance when it updates its tool bars when its own lock is released. Taking control of the release of the update lock of the ViewShellManager avoids some shell stack modifications and tool bar updates. */ - void LockViewShellManager (void); + void LockViewShellManager(); /** Use this class to prevent the visible tool bars from being updated (and thus causing repaints and GUI rearrangements) when several tool @@ -244,13 +244,13 @@ public: class UpdateLock { public: UpdateLock(const ::boost::shared_ptr<ToolBarManager>& rpManager) : mpManager(rpManager) { mpManager->LockUpdate(); } - ~UpdateLock(void) { mpManager->UnlockUpdate(); } + ~UpdateLock() { mpManager->UnlockUpdate(); } private: ::boost::shared_ptr<ToolBarManager> mpManager; }; friend class UpdateLock; - void ToolBarsDestroyed(void); + void ToolBarsDestroyed(); private: class Implementation; @@ -259,10 +259,10 @@ private: /** The ViewShellBase is used to get the XLayoutManager and to determine the plug in mode. */ - ToolBarManager (void); + ToolBarManager(); - void LockUpdate (void); - void UnlockUpdate (void); + void LockUpdate(); + void UnlockUpdate(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 9e60436b5e77..1b22016d93e2 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -91,7 +91,7 @@ public: SdDrawDocument& rDrawDoc, OutputDevice* pOutDev, ViewShell* pViewSh=NULL); - virtual ~View (void); + virtual ~View(); void CompleteRedraw( OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; @@ -133,9 +133,9 @@ public: void UpdateSelectionClipboard( bool bForceDeselect ); - inline DrawDocShell* GetDocSh(void) const { return mpDocSh; } - inline SdDrawDocument& GetDoc(void) const; - inline ViewShell* GetViewShell(void) const { return mpViewSh; } + inline DrawDocShell* GetDocSh() const { return mpDocSh; } + inline SdDrawDocument& GetDoc() const; + inline ViewShell* GetViewShell() const { return mpViewSh; } virtual bool SdrBeginTextEdit(SdrObject* pObj, SdrPageView* pPV = 0L, ::vcl::Window* pWin = 0L, bool bIsNewObj = false, SdrOutliner* pGivenOutliner = 0L, OutlinerView* pGivenOutlinerView = 0L, @@ -297,7 +297,7 @@ private: OutlinerMasterViewFilter maMasterViewFilter; }; -SdDrawDocument& View::GetDoc (void) const +SdDrawDocument& View::GetDoc() const { return mrDoc; } diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx index 86f3bbaaf7f6..6778d7dcf09d 100644 --- a/sd/source/ui/inc/ViewClipboard.hxx +++ b/sd/source/ui/inc/ViewClipboard.hxx @@ -35,7 +35,7 @@ class ViewClipboard { public: ViewClipboard (::sd::View& rView); - virtual ~ViewClipboard (void); + virtual ~ViewClipboard(); /** Handle the drop of a drag-and-drop action where the transferable contains a set of pages. diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 6d8ba4080a0e..1b46129e1087 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -118,7 +118,7 @@ public: ::vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, bool bAllowCenter = true); - virtual ~ViewShell (void); + virtual ~ViewShell(); /** The Init method has to be called from the outside directly after a new object of this class has been created. It can be @@ -138,27 +138,27 @@ public: view shell is still a valid object and can safely call methods that rely on that. */ - void Exit (void); + void Exit(); void Cancel(); /** Return the window that is the parent of all controls of this view shell. This may or may not be the window of the frame. */ - inline ::vcl::Window* GetParentWindow (void) const { return mpParentWindow; } + inline ::vcl::Window* GetParentWindow() const { return mpParentWindow; } - inline ::sd::View* GetView (void) const { return mpView; } - inline SdrView* GetDrawView (void) const; - SD_DLLPUBLIC DrawDocShell* GetDocSh (void) const; + inline ::sd::View* GetView() const { return mpView; } + inline SdrView* GetDrawView() const; + SD_DLLPUBLIC DrawDocShell* GetDocSh() const; - SdDrawDocument* GetDoc (void) const; + SdDrawDocument* GetDoc() const; - SD_DLLPUBLIC SfxViewFrame* GetViewFrame (void) const; + SD_DLLPUBLIC SfxViewFrame* GetViewFrame() const; /** The active window is usually the mpContentWindow. When there is a show running then the active window is a ShowWindow. */ - ::sd::Window* GetActiveWindow (void) const { return mpActiveWindow;} + ::sd::Window* GetActiveWindow() const { return mpActiveWindow;} /** Set the active window. When the shell is displayed in the center pane then the window of the ViewShellBase is also set to the given @@ -173,7 +173,7 @@ public: The rectangle is returned in screen coordinates, i.e. pixel values relative to the upper left corner of the screen?. */ - const Rectangle& GetAllWindowRect (void); + const Rectangle& GetAllWindowRect(); // Mouse- & Key-Events virtual void PrePaint(); @@ -193,14 +193,14 @@ public: const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId); - bool HasRuler (void) { return mbHasRulers;} + bool HasRuler() { return mbHasRulers;} void SetRuler(bool bRuler); /** Set internal values of all scroll bars that determine thumb size and position. The external values like size and position of the scroll bar controls are not modified. */ - virtual void UpdateScrollBars (void); + virtual void UpdateScrollBars(); void Scroll(long nX, long nY); void ScrollLines(long nX, long nY); virtual void SetZoom(long nZoom); @@ -218,9 +218,9 @@ public: void ExecReq( SfxRequest &rReq ); - ZoomList* GetZoomList (void) { return mpZoomList;} + ZoomList* GetZoomList() { return mpZoomList;} - FrameView* GetFrameView (void) { return mpFrameView; } + FrameView* GetFrameView() { return mpFrameView; } /** Setting a frame view triggers ReadFrameViewData() for the new frame. @param pFrameView @@ -265,10 +265,10 @@ public: void SetStartShowWithDialog( bool bIn = true ) { mbStartShowWithDialog = bIn; } bool IsStartShowWithDialog() const { return mbStartShowWithDialog; } - sal_uInt16 GetPrintedHandoutPageNum (void) const { return mnPrintedHandoutPageNum; } + sal_uInt16 GetPrintedHandoutPageNum() const { return mnPrintedHandoutPageNum; } void SetPrintedHandoutPageNum (sal_uInt16 nPageNumber) {mnPrintedHandoutPageNum=nPageNumber; } - sal_uInt16 GetPrintedHandoutPageCount(void) const { return mnPrintedHandoutPageCount; } + sal_uInt16 GetPrintedHandoutPageCount() const { return mnPrintedHandoutPageCount; } void SetPrintedHandoutPageCount (sal_uInt16 nPageCount) {mnPrintedHandoutPageCount=nPageCount; } virtual bool PrepareClose( bool bUI = true ); @@ -312,7 +312,7 @@ public: In rare circumstances the returned pointer may be <null/>, i.e. when no memory is available anymore. */ - ::sd::WindowUpdater* GetWindowUpdater (void) const; + ::sd::WindowUpdater* GetWindowUpdater() const; /** Return the border that is drawn around the actual document view. The border contains typically rulers and scroll bars. @@ -332,7 +332,7 @@ public: The ViewShell places and resizes its UI elements accordingly. The new size can be obtained from the parent window. */ - virtual void Resize (void); + virtual void Resize(); /** Set the position and size of the area which contains the GUI elements like rulers, sliders, and buttons as well as the document @@ -360,19 +360,19 @@ public: document view according to the position and size that were given with the last Resize() call. */ - virtual void ArrangeGUIElements (void); + virtual void ArrangeGUIElements(); // virtual void OuterResizePixel(const Point &rPos, const Size &rSize); // virtual void InnerResizePixel(const Point &rPos, const Size &rSize); - ViewShellBase& GetViewShellBase (void) const; + ViewShellBase& GetViewShellBase() const; /** Return <TRUE/> when the called view shell is the main sub shell of its ViewShellBase object, i.e. is display in the center pane. This convenience function is equivalent to comparing the this pointer to the result of ViewShellBase::GetViewShell(PT_CENTER). */ - bool IsMainViewShell (void) const; + bool IsMainViewShell() const; /** Set or reset the flag that indicates whether the called shell is the one displayed in the center pane. By default this flag is set to @@ -383,11 +383,11 @@ public: /** Return a sub controller that implements the view shell specific part of the DrawController. */ - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) = 0; + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() = 0; /** Return the type of the shell. */ - ShellType GetShellType (void) const; + ShellType GetShellType() const; /** This method is more or less an alias to Deactivate(). It is called before an object of this class is taken from the stack of view @@ -398,7 +398,7 @@ public: RemoveSubShell() comes to late when the view shell is not on the stack anymore.</p> */ - virtual void Shutdown (void); + virtual void Shutdown(); /** This function is called from the underlying ViewShellBase object to handle a verb execution request. @@ -412,7 +412,7 @@ public: As a result the border is adapted. */ virtual void ShowUIControls (bool bVisible = true); - bool IsPageFlipMode(void) const; + bool IsPageFlipMode() const; /** Set the given window as new parent window. This is not possible for all views, so the return value tells the caller if the relocation @@ -521,7 +521,7 @@ protected: ::std::unique_ptr<Implementation> mpImpl; // Support methods for centralized UNDO/REDO - virtual ::svl::IUndoManager* ImpGetUndoManager (void) const; + virtual ::svl::IUndoManager* ImpGetUndoManager() const; void ImpGetUndoStrings(SfxItemSet &rSet) const; void ImpGetRedoStrings(SfxItemSet &rSet) const; void ImpSidUndo(bool bDrawViewShell, SfxRequest& rReq); @@ -578,16 +578,16 @@ private: /** Code common to all constructors. It generally is a bad idea to call this function from outside a constructor. */ - void construct (void); + void construct(); DECL_LINK(FrameWindowEventListener, VclSimpleEvent*); /** Create the rulers. */ - void SetupRulers (void); + void SetupRulers(); }; -SdrView* ViewShell::GetDrawView (void) const +SdrView* ViewShell::GetDrawView() const { return static_cast<SdrView*>(mpView); } diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index e1a180757c2c..b4e86bb90459 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -79,20 +79,20 @@ public: SfxViewFrame *pFrame, SfxViewShell* pOldShell); - virtual ~ViewShellBase (void); + virtual ~ViewShellBase(); /** This method is part of the object construction. It HAS to be called after the constructor has created a new object. */ void LateInit (const OUString& rsDefaultView); - ::boost::shared_ptr<ViewShellManager> GetViewShellManager (void) const; + ::boost::shared_ptr<ViewShellManager> GetViewShellManager() const; /** Return the main view shell stacked on the called ViewShellBase object. This is usually the view shell displayed in the center pane. */ - ::boost::shared_ptr<ViewShell> GetMainViewShell (void) const; + ::boost::shared_ptr<ViewShell> GetMainViewShell() const; /** When given a view frame this static method returns the corresponding sd::ViewShellBase object. @@ -102,8 +102,8 @@ public: */ static ViewShellBase* GetViewShellBase (SfxViewFrame* pFrame); - DrawDocShell* GetDocShell (void) const { return mpDocShell;} - SdDrawDocument* GetDocument (void) const { return mpDocument;} + DrawDocShell* GetDocShell() const { return mpDocShell;} + SdDrawDocument* GetDocument() const { return mpDocument;} /** Callback function for general slot calls. At the moment these are slots for switching the pane docking windows on and off. @@ -131,7 +131,7 @@ public: /** Return a new renderer that can be used for example for printing the document. */ - virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable (void) SAL_OVERRIDE; + virtual com::sun::star::uno::Reference<com::sun::star::view::XRenderable> GetRenderable() SAL_OVERRIDE; /// Forwarded to the print manager. virtual SfxPrinter* GetPrinter (bool bCreate = false) SAL_OVERRIDE; @@ -166,7 +166,7 @@ public: virtual bool PrepareClose (bool bUI = true) SAL_OVERRIDE; virtual void WriteUserData (OUString&, bool bBrowse = false) SAL_OVERRIDE; virtual void ReadUserData (const OUString&, bool bBrowse = false) SAL_OVERRIDE; - virtual SdrView* GetDrawView (void) const SAL_OVERRIDE; + virtual SdrView* GetDrawView() const SAL_OVERRIDE; virtual void AdjustPosSizePixel (const Point &rOfs, const Size &rSize) SAL_OVERRIDE; /** When <TRUE/> is given, then the mouse shape is set to hour glass (or @@ -181,7 +181,7 @@ public: This method is like ResizePixel() with no arguments. */ - void Rearrange (void); + void Rearrange(); /** Update the border that is set with SfxViewShell::SetBorderPixel(). This is done by adding the border used by the ViewShellBase itself @@ -206,17 +206,17 @@ public: events from various sources. This method must not be called before LateInit() has terminated. */ - ::boost::shared_ptr<tools::EventMultiplexer> GetEventMultiplexer (void); + ::boost::shared_ptr<tools::EventMultiplexer> GetEventMultiplexer(); /** returns the complete area of the current view relative to the frame window */ const Rectangle& getClientRectangle() const; - ::boost::shared_ptr<ToolBarManager> GetToolBarManager (void) const; - ::boost::shared_ptr<FormShellManager> GetFormShellManager (void) const; + ::boost::shared_ptr<ToolBarManager> GetToolBarManager() const; + ::boost::shared_ptr<FormShellManager> GetFormShellManager() const; - DrawController& GetDrawController (void) const; + DrawController& GetDrawController() const; void SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabBar); @@ -224,7 +224,7 @@ public: view and other UI elements, like scroll bars and rulers. Ownership of that window remains with the called ViewShellBase object. */ - vcl::Window* GetViewWindow (void); + vcl::Window* GetViewWindow(); /** returns the ui descriptive name for the given uno slot. The result is taken from the configuration and not cached, so do not use it excessive (f.e. in status updates) */ @@ -235,7 +235,7 @@ protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; - virtual void InitializeFramework (void); + virtual void InitializeFramework(); private: class Implementation; @@ -249,7 +249,7 @@ private: we check that the right type is active and change again if that is not the case because something went wrong. */ - OUString GetInitialViewShellType (void); + OUString GetInitialViewShellType(); }; OUString ImplRetrieveLabelFromCommand( const css::uno::Reference< css::frame::XFrame >& xFrame, const OUString& aCmdURL ); diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index 03ab7aaaf75b..dbbd3d3d0d03 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -47,7 +47,7 @@ public: ViewShellHint (HintId nHintId); - HintId GetHintId (void) const { return meHintId;} + HintId GetHintId() const { return meHintId;} private: HintId meHintId; diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index a98a89f1dcbd..ad604e01bf88 100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -89,7 +89,7 @@ public: */ ::boost::shared_ptr<ToolBarManagerLock> mpSelf; ToolBarManagerLock (const ::boost::shared_ptr<sd::ToolBarManager>& rpManager); - ~ToolBarManagerLock (void); + ~ToolBarManagerLock(); class Deleter; friend class Deleter; @@ -99,7 +99,7 @@ public: ::boost::weak_ptr<ToolBarManagerLock> mpUpdateLockForMouse; Implementation (ViewShell& rViewShell); - ~Implementation (void); + ~Implementation(); /** Process the SID_MODIFY slot. */ @@ -136,14 +136,14 @@ public: configuration that has in the center pane a view shell of the same type as mrViewShell. */ - sal_uInt16 GetViewId (void); + sal_uInt16 GetViewId(); /** Return a pointer to the image map dialog that is displayed in some child window. @return Returns <NULL/> when the image map dialog is not available. */ - static SvxIMapDlg* GetImageMapDialog (void); + static SvxIMapDlg* GetImageMapDialog(); private: ViewShell& mrViewShell; diff --git a/sd/source/ui/inc/ViewShellManager.hxx b/sd/source/ui/inc/ViewShellManager.hxx index 683eb2387de4..66eb593f8c18 100644 --- a/sd/source/ui/inc/ViewShellManager.hxx +++ b/sd/source/ui/inc/ViewShellManager.hxx @@ -61,14 +61,14 @@ public: /** Before the destructor is called the method Shutdown() has to have been called. */ - ~ViewShellManager (void); + ~ViewShellManager(); /** Tell a ViewShellManager object to prepare to be deleted, i.e. to destroy all of its resources and to ignore all following calls. Use this when the owner of the view shell manager is about being destroyed but the view shell manager itself can not yet be deleted. */ - void Shutdown (void); + void Shutdown(); /** Set the factory for sub shells of the specified view shell. */ @@ -162,11 +162,11 @@ public: /** Return the top-most shell on the SFX shell stack regardless of whether that is a view shell or a sub shell. */ - SfxShell* GetTopShell (void) const; + SfxShell* GetTopShell() const; /** Return the top-most active view shell on the internal shell stack. */ - SfxShell* GetTopViewShell (void) const; + SfxShell* GetTopViewShell() const; /** Use this class to safely lock updates of the view shell stack. */ @@ -175,7 +175,7 @@ public: public: UpdateLock (const ::boost::shared_ptr<ViewShellManager>& rpManager) : mpManager(rpManager) {mpManager->LockUpdate();} - ~UpdateLock (void) {mpManager->UnlockUpdate();}; + ~UpdateLock() {mpManager->UnlockUpdate();}; private: ::boost::shared_ptr<ViewShellManager> mpManager; }; @@ -186,8 +186,8 @@ private: ::std::unique_ptr<ViewShellManager::Implementation> mpImpl; bool mbValid; - void LockUpdate (void); - void UnlockUpdate (void); + void LockUpdate(); + void UnlockUpdate(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index b259f3ffcdff..f3b40694cc33 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -63,13 +63,13 @@ public: com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& rxController); - virtual ~ViewTabBar (void); + virtual ~ViewTabBar(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - ::boost::shared_ptr< ::TabControl> GetTabControl (void) const { return mpTabControl;} + ::boost::shared_ptr< ::TabControl> GetTabControl() const { return mpTabControl;} - bool ActivatePage (void); + bool ActivatePage(); //----- drawing::framework::XConfigurationChangeListener ------------------ @@ -108,16 +108,16 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> - SAL_CALL getTabBarButtons (void) + SAL_CALL getTabBarButtons() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + ::com::sun::star::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XUnoTunnel -------------------------------------------------------- @@ -134,7 +134,7 @@ public: To be on the safe side wait for this control to become visible and the call this method again. */ - int GetHeight (void); + int GetHeight(); void AddTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton, @@ -146,7 +146,7 @@ public: bool HasTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton); ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> - GetTabBarButtons (void); + GetTabBarButtons(); private: ::boost::shared_ptr< ::TabControl> mpTabControl; @@ -161,11 +161,11 @@ private: ::com::sun::star::drawing::framework::XResourceId> mxViewTabBarId; ViewShellBase* mpViewShellBase; - void UpdateActiveButton (void); + void UpdateActiveButton(); void AddTabBarButton ( const ::com::sun::star::drawing::framework::TabBarButton& rButton, sal_Int32 nPosition); - void UpdateTabBarButtons (void); + void UpdateTabBarButtons(); /** This method is called from the constructor to get the window for an anchor ResourceId and pass it to our base class. It has to be @@ -177,7 +177,7 @@ private: ::com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& rxController); - const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); + const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index dca72fbdc519..718c17842a5b 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -45,7 +45,7 @@ class Window { public: Window (vcl::Window* pParent); - virtual ~Window (void); + virtual ~Window(); void SetViewShell (ViewShell* pViewSh); @@ -98,17 +98,17 @@ public: <p>This calculation is performed only when the <member>bMinZoomAutoCalc</member> is set (to <TRUE/>).</p> */ - void CalcMinZoom (void); + void CalcMinZoom(); void SetMinZoom (long int nMin); - long GetMinZoom (void) const { return mnMinZoom;} + long GetMinZoom() const { return mnMinZoom;} void SetMaxZoom (long int nMax); - long GetMaxZoom (void) const { return mnMaxZoom;} + long GetMaxZoom() const { return mnMaxZoom;} - long GetZoom (void) const; + long GetZoom() const; - Point GetWinViewPos (void) const { return maWinPos;} - Point GetViewOrigin (void) const { return maViewOrigin;} - Size GetViewSize (void) const { return maViewSize;} + Point GetWinViewPos() const { return maWinPos;} + Point GetViewOrigin() const { return maViewOrigin;} + Size GetViewSize() const { return maViewSize;} void SetWinViewPos(const Point& rPnt); void SetViewOrigin(const Point& rPnt); void SetViewSize(const Size& rSize); @@ -123,7 +123,7 @@ public: */ void UpdateMapOrigin (bool bInvalidate = true); - void UpdateMapMode (void); + void UpdateMapMode(); double GetVisibleX(); // Interface fuer ScrollBars double GetVisibleY(); @@ -188,7 +188,7 @@ protected: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessible (void) SAL_OVERRIDE; + CreateAccessible() SAL_OVERRIDE; OUString GetSurroundingText() const SAL_OVERRIDE; Selection GetSurroundingTextSelection() const SAL_OVERRIDE; diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index b35c73c82a0c..f7f2a1830a64 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -53,8 +53,8 @@ class SD_DLLPUBLIC WindowUpdater : public utl::ConfigurationListener { public: - explicit WindowUpdater (void); - virtual ~WindowUpdater (void) throw(); + explicit WindowUpdater(); + virtual ~WindowUpdater() throw(); /** Add the given device to the list of devices which will be updated when one of the monitored values changes. diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 7d20d8bd4863..7d4ad1c6780a 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -39,7 +39,7 @@ public: DrawDocShell* pDocSh, OutputDevice* pOutDev, DrawViewShell* pShell); - virtual ~DrawView (void); + virtual ~DrawView(); virtual void MarkListHasChanged() SAL_OVERRIDE; void CompleteRedraw(OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 7d17b200a533..c5b60e2c2c4a 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -81,9 +81,9 @@ public: Configuration (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XConfigurationControllerBroadcaster>& rxBroadcaster, bool bBroadcastRequestEvents); - virtual ~Configuration (void); + virtual ~Configuration(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfiguration @@ -113,7 +113,7 @@ public: // XCloneable virtual ::com::sun::star::uno::Reference<com::sun::star::util::XCloneable> - SAL_CALL createClone (void) + SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNamed @@ -121,7 +121,7 @@ public: /** Return a human readable string representation. This is used for debugging purposes. */ - virtual OUString SAL_CALL getName (void) + virtual OUString SAL_CALL getName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This call is ignored because the XNamed interface is (mis)used to @@ -184,7 +184,7 @@ private: /** When the called object has already been disposed this method throws an exception and does not return. */ - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException); }; diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index fd09381e6a81..45f82cfe4127 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -64,12 +64,12 @@ class ConfigurationController public ConfigurationControllerInterfaceBase { public: - ConfigurationController (void) throw(); - virtual ~ConfigurationController (void) throw(); + ConfigurationController() throw(); + virtual ~ConfigurationController() throw(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - void ProcessEvent (void); + void ProcessEvent(); /** Normally the requested changes of the configuration are executed asynchronously. However, there is at least one situation (searching @@ -80,7 +80,7 @@ public: Do not use this method until there is absolutely no other way. */ - void RequestSynchronousUpdate (void); + void RequestSynchronousUpdate(); // XConfigurationController @@ -88,7 +88,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unlock (void) + virtual void SAL_CALL unlock() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL requestResourceActivation ( @@ -106,17 +106,17 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxResourceId) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL update (void) + virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XConfiguration> - SAL_CALL getRequestedConfiguration (void) + SAL_CALL getRequestedConfiguration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XConfiguration> - SAL_CALL getCurrentConfiguration (void) + SAL_CALL getCurrentConfiguration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL restoreConfiguration ( @@ -145,7 +145,7 @@ public: // XConfigurationRequestQueue - virtual sal_Bool SAL_CALL hasPendingRequests (void) + virtual sal_Bool SAL_CALL hasPendingRequests() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL postChangeRequest ( @@ -187,7 +187,7 @@ public: public: Lock (const css::uno::Reference< css::drawing::framework::XConfigurationController>& rxController); - ~Lock (void); + ~Lock(); private: css::uno::Reference< css::drawing::framework::XConfigurationController> mxController; diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx index 749c57d6fc65..2dd9aa0cbf00 100644 --- a/sd/source/ui/inc/framework/FrameworkHelper.hxx +++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx @@ -159,7 +159,7 @@ public: @return When the object has already been disposed then <FALSE/> is returned. */ - bool IsValid (void); + bool IsValid(); /** Return a pointer to the view shell that is displayed in the specified pane. See GetView() for a variant that returns a @@ -244,7 +244,7 @@ public: Do not use this method until there is absolutely no other way. */ - void RequestSynchronousUpdate (void); + void RequestSynchronousUpdate(); /** Block until the specified event is notified by the configuration controller. When the configuration controller is not processing any @@ -255,7 +255,7 @@ public: /** This is a short cut for WaitForEvent(msConfigurationUpdateEndEvent). Call this method to execute the pending requests. */ - void WaitForUpdate (void) const; + void WaitForUpdate() const; /** Explicit request for an update of the current configuration. Call this method when one of the resources managed by the sd framework @@ -263,7 +263,7 @@ public: framework itself. An example for this is a click on the closer button of one of the side panes. */ - void UpdateConfiguration (void); + void UpdateConfiguration(); /** Return a string representation of the given XResourceId object. */ @@ -297,7 +297,7 @@ public: css::drawing::framework::XResourceId>& rxAnchor); css::uno::Reference<css::drawing::framework::XConfigurationController> - GetConfigurationController (void) const { return mxConfigurationController;} + GetConfigurationController() const { return mxConfigurationController;} private: typedef ::std::map< @@ -321,13 +321,13 @@ private: FrameworkHelper (ViewShellBase& rBase); FrameworkHelper (const FrameworkHelper& rHelper) SAL_DELETED_FUNCTION; - virtual ~FrameworkHelper (void); + virtual ~FrameworkHelper(); class Deleter; friend class Deleter; FrameworkHelper& operator= (const FrameworkHelper& rHelper) SAL_DELETED_FUNCTION; - void Initialize (void); + void Initialize(); - void Dispose (void); + void Dispose(); /** Run the given callback when an event of the specified type is received from the ConfigurationController or when the diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index b1d279c79451..525fabc9a639 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -72,7 +72,7 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XModuleController @@ -98,7 +98,7 @@ private: const css::uno::Reference<css::uno::XComponentContext>& rxContext) throw (std::exception); ModuleController (const ModuleController&) SAL_DELETED_FUNCTION; - virtual ~ModuleController (void) throw(); + virtual ~ModuleController() throw(); /** Load a list of URL to service mappings from the /org.openoffice.Office.Impress/MultiPaneGUI/Framework/ResourceFactories @@ -116,7 +116,7 @@ private: configuration entry. This method is called once when a new ModuleController object is created. */ - void InstantiateStartupServices (void); + void InstantiateStartupServices(); /** Called for one entry in the StartupServices configuration list this method instantiates the service described by the entry. It does not diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index b4ee242f32bf..e9c94df151db 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -76,16 +76,16 @@ public: com::sun::star::drawing::framework::XResourceId>& rxPaneId, vcl::Window* pWindow) throw (); - virtual ~Pane (void); + virtual ~Pane(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); + static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); /** This method is typically used together with the XUnoTunnel to obtain a Window pointer from an XPane object. */ - virtual vcl::Window* GetWindow (void); + virtual vcl::Window* GetWindow(); //----- XPane ------------------------------------------------------------- @@ -94,22 +94,22 @@ public: in the window of the pane. */ virtual css::uno::Reference<css::awt::XWindow> - SAL_CALL getWindow (void) + SAL_CALL getWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::rendering::XCanvas> - SAL_CALL getCanvas (void) + SAL_CALL getCanvas() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XPane2 ------------------------------------------------------------- - virtual sal_Bool SAL_CALL isVisible (void) + virtual sal_Bool SAL_CALL isVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible (sal_Bool bIsVisible) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible (void) + virtual css::uno::Reference<css::accessibility::XAccessible> SAL_CALL getAccessible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAccessible ( @@ -119,13 +119,13 @@ public: //----- XResource --------------------------------------------------------- virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> - SAL_CALL getResourceId (void) + SAL_CALL getResourceId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** For the typical pane it makes no sense to be dislayed without a view. Therefore this default implementation returns always <TRUE/>. */ - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XUnoTunnel -------------------------------------------------------- @@ -143,14 +143,14 @@ protected: different canvas. */ virtual ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> - CreateCanvas (void) + CreateCanvas() throw (::com::sun::star::uno::RuntimeException); /** Throw DisposedException when the object has already been disposed or is currently being disposed. Otherwise this method returns normally. */ - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException); }; diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 1c00b5f73995..f07edf30899e 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -58,9 +58,9 @@ public: PresentationFactory ( const css::uno::Reference<css::frame::XController>& rxController); - virtual ~PresentationFactory (void); + virtual ~PresentationFactory(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XResourceFactory @@ -91,7 +91,7 @@ private: mxConfigurationController; css::uno::Reference<css::frame::XController> mxController; - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; diff --git a/sd/source/ui/inc/framework/ResourceId.hxx b/sd/source/ui/inc/framework/ResourceId.hxx index c407db582777..d048f517a527 100644 --- a/sd/source/ui/inc/framework/ResourceId.hxx +++ b/sd/source/ui/inc/framework/ResourceId.hxx @@ -53,7 +53,7 @@ class ResourceId public: /** Create a new, empty resource id. */ - ResourceId (void); + ResourceId(); /** Create a new resource id that is described by the given URLs. @param rsResourceURLs @@ -99,38 +99,38 @@ public: const OUString& rsFirstAnchorURL, const css::uno::Sequence<OUString>& rAnchorURLs); - virtual ~ResourceId (void); + virtual ~ResourceId(); /** Return the list of URLs of both the resource URL and the anchor URLs. */ - const ::std::vector<OUString>& GetResourceURLs (void) const; + const ::std::vector<OUString>& GetResourceURLs() const; //===== XResourceId ======================================================= virtual OUString SAL_CALL - getResourceURL (void) + getResourceURL() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::URL SAL_CALL - getFullResourceURL (void) + getFullResourceURL() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL - hasAnchor (void) + hasAnchor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL - getAnchor (void) + getAnchor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL - getAnchorURLs (void) + getAnchorURLs() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getResourceTypePrefix (void) + getResourceTypePrefix() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL @@ -153,7 +153,7 @@ public: virtual css::uno::Reference< css::drawing::framework::XResourceId> SAL_CALL - clone (void) + clone() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XInitialization =================================================== @@ -226,7 +226,7 @@ private: const ::std::vector<OUString>& rResourceURLs, css::drawing::framework::AnchorBindingMode eMode) const; - void ParseResourceURL (void); + void ParseResourceURL(); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index e785952ebb92..5b384485c13f 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -72,18 +72,18 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxViewId, const ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow>& rxWindow); - virtual ~ViewShellWrapper (void); + virtual ~ViewShellWrapper(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId (void); + static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); /** This method is typically used together with the XUnoTunnel interface to obtain a pointer to the wrapped ViewShell object for a given XView object. */ - ::boost::shared_ptr<ViewShell> GetViewShell (void) { return mpViewShell;} + ::boost::shared_ptr<ViewShell> GetViewShell() { return mpViewShell;} // XUnoTunnel @@ -93,10 +93,10 @@ public: // XResource virtual ::com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> - SAL_CALL getResourceId (void) + SAL_CALL getResourceId() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSelectionSupplier diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index e67218d62c55..dbbd8fc6b826 100644 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -45,7 +45,7 @@ public: virtual void Deactivate() SAL_OVERRIDE; protected: - virtual ~FuDisplayOrder (void); + virtual ~FuDisplayOrder(); void implClearOverlay(); Pointer maPtr; diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx index 5eb054b01771..99fbf7bcb800 100644 --- a/sd/source/ui/inc/fuediglu.hxx +++ b/sd/source/ui/inc/fuediglu.hxx @@ -57,7 +57,7 @@ protected: ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); - virtual ~FuEditGluePoints (void); + virtual ~FuEditGluePoints(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index 81b12eba87e4..d1ff3ba0141e 100644 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -44,7 +44,7 @@ class FuPage const SfxItemSet* ExecuteDialog( vcl::Window* pParent ); protected: - virtual ~FuPage (void); + virtual ~FuPage(); private: FuPage ( diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 00817a769d5a..9f50c75ed925 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -124,7 +124,7 @@ protected: ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq); - virtual ~FuPoor (void); + virtual ~FuPoor(); DECL_LINK( DelayHdl, void * ); diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index be7ad1bfceee..3e9a73b26269 100644 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -42,7 +42,7 @@ public: ::sd::Outliner* GetOutliner() const { return pSdOutliner; } protected: - virtual ~FuSearch (void); + virtual ~FuSearch(); ::sd::Outliner* pSdOutliner; bool bOwnOutliner; diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 8f42cb0d04b1..3e80b33e474e 100644 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -44,7 +44,7 @@ public: virtual void Deactivate() SAL_OVERRIDE; ///< deactivates the function protected: - virtual ~FuZoom (void); + virtual ~FuZoom(); Point aBeginPosPix; Point aBeginPos; diff --git a/sd/source/ui/inc/morphdlg.hxx b/sd/source/ui/inc/morphdlg.hxx index f23d69207d98..06b5b3624495 100644 --- a/sd/source/ui/inc/morphdlg.hxx +++ b/sd/source/ui/inc/morphdlg.hxx @@ -38,7 +38,7 @@ public: vcl::Window* pParent, const SdrObject* pObj1, const SdrObject* pObj2); - virtual ~MorphDlg (void); + virtual ~MorphDlg(); void SaveSettings() const; sal_uInt16 GetFadeSteps() const { return (sal_uInt16) m_pMtfSteps->GetValue(); } diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index fa388da27ea7..b5771f38b92e 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -82,7 +82,7 @@ class SdNavigatorWin : public vcl::Window { public: - typedef ::boost::function<void(void)> UpdateRequestFunctor; + typedef ::boost::function<void()> UpdateRequestFunctor; /** Create a new instance of the navigator. @param bUseActiveUpdate diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx index ea68e8de3214..bef6400329ff 100644 --- a/sd/source/ui/inc/sdpreslt.hxx +++ b/sd/source/ui/inc/sdpreslt.hxx @@ -42,7 +42,7 @@ public: vcl::Window* pWindow, const SfxItemSet& rInAttrs); - virtual ~SdPresLayoutDlg (void); + virtual ~SdPresLayoutDlg(); void GetAttr(SfxItemSet& rOutAttrs); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 1d2a5bbdbe73..bbbfeed10c68 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -84,7 +84,7 @@ public: internally in the navigator for reordering entries. Its lifetime ends with the office application. */ - static SotClipboardFormatId GetListBoxDropFormatId (void); + static SotClipboardFormatId GetListBoxDropFormatId(); private: /** Temporary drop flavor id that is used internally in the @@ -201,7 +201,7 @@ public: void Fill( const SdDrawDocument*, bool bAllPages, const OUString& rDocName ); void Fill( const SdDrawDocument*, SfxMedium* pSfxMedium, const OUString& rDocName ); void SetShowAllShapes (const bool bShowAllShapes, const bool bFill); - bool GetShowAllShapes (void) const { return mbShowAllShapes;} + bool GetShowAllShapes() const { return mbShowAllShapes;} bool IsEqualToDoc( const SdDrawDocument* pInDoc = NULL ); bool HasSelectedChildren( const OUString& rName ); bool SelectEntry( const OUString& rName ); diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 136c3838de29..d249a1579e6a 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -78,7 +78,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; - SdDrawDocument* GetSourceDoc (void) const { return mpSourceDoc;} + SdDrawDocument* GetSourceDoc() const { return mpSourceDoc;} /** User data objects can be used to store information temporarily at the transferable. The slide sorter uses this to store @@ -94,7 +94,7 @@ public: /** Return the number of user data objects. */ - sal_Int32 GetUserDataCount (void) const; + sal_Int32 GetUserDataCount() const; /** Return the specified user data object. When the index is not valid, ie not in the range [0,count) then an empty pointer is diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 2f19ca0e3ff1..af0b1ef22f9c 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -116,7 +116,7 @@ public: // uno api - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx index f06f06be51b4..fbec419860d8 100644 --- a/sd/source/ui/inc/taskpane/ControlContainer.hxx +++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx @@ -57,7 +57,7 @@ public: */ ControlContainer (TreeNode* pNode); - virtual ~ControlContainer (void); + virtual ~ControlContainer(); /** This is function makes sure that all children are deleted. Call this function from the destructor of a sub class to have all child @@ -65,7 +65,7 @@ public: sub class is called. When that other base class is some kind of a window it would otherwise complain that there are living children. */ - void DeleteChildren (void); + void DeleteChildren(); /** Add the given control to the set of controls managed by the container. This control is then expanded. @@ -97,11 +97,11 @@ public: /** Return the number of controls in the container. */ - sal_uInt32 GetControlCount (void) const; + sal_uInt32 GetControlCount() const; /** Return the number of visible controls in the container. */ - sal_uInt32 GetVisibleControlCount (void) const; + sal_uInt32 GetVisibleControlCount() const; /** Return the control with the specified index regardless of whether that control is hidden or visible. @@ -159,7 +159,7 @@ public: empty. Overwrite this method in derived classes in order to react to such changes. */ - virtual void ListHasChanged (void); + virtual void ListHasChanged(); private: osl::Mutex maMutex; diff --git a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx index 31d40c573bd2..9a5344266eeb 100644 --- a/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx +++ b/sd/source/ui/inc/taskpane/ILayoutableWindow.hxx @@ -33,7 +33,7 @@ public: /** This method is called by layoutable controls when they have to be resized. */ - virtual void RequestResize (void) = 0; + virtual void RequestResize() = 0; protected: ~ILayouter() {} @@ -45,14 +45,14 @@ protected: class ILayoutableWindow { public: - virtual ~ILayoutableWindow (void) {}; + virtual ~ILayoutableWindow() {}; /** Return the preferred size without constraints on either the height or the width. The size the window will later be set to may but does not have to be equal to this size. */ - virtual Size GetPreferredSize (void) = 0; + virtual Size GetPreferredSize() = 0; /** Return the preferred width with the constraint, that the window will be set to the given height. @@ -73,18 +73,18 @@ public: the return value of this method determines whether the height may be modified as well. */ - virtual bool IsResizable (void) = 0; + virtual bool IsResizable() = 0; /** Return the window so that its size and position can be set. @return Returns the window which is layouted or NULL to indicate that the object is in an invalid state. */ - virtual vcl::Window* GetWindow (void) = 0; + virtual vcl::Window* GetWindow() = 0; /** Return the minimal width of the window. */ - virtual sal_Int32 GetMinimumWidth (void) = 0; + virtual sal_Int32 GetMinimumWidth() = 0; }; } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx index e6ae9d24572b..a5d1abef8580 100644 --- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx +++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx @@ -52,12 +52,12 @@ class SlideSorterCacheDisplay { public: SlideSorterCacheDisplay (const SdDrawDocument* pDocument); - virtual ~SlideSorterCacheDisplay (void); + virtual ~SlideSorterCacheDisplay(); void SetParentWindow (vcl::Window* pParentWindow); virtual void Paint (const Rectangle& rBoundingBox); - virtual void Resize (void); + virtual void Resize(); static SlideSorterCacheDisplay* Instance (const SdDrawDocument* pDocument); @@ -73,13 +73,13 @@ public: void SetPageVisibility (sal_Int32 nPageIndex, bool bVisible); void SetUpToDate (sal_Int32 nPageIndex, bool bUpToDate); - virtual Size GetPreferredSize (void); + virtual Size GetPreferredSize(); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeigh); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); - virtual vcl::Window* GetWindow (void); - virtual bool IsResizable (void); - virtual bool IsExpandable (void) const; - virtual bool IsExpanded (void) const; + virtual vcl::Window* GetWindow(); + virtual bool IsResizable(); + virtual bool IsExpandable() const; + virtual bool IsExpanded() const; private: static ::std::map<const SdDrawDocument*, SlideSorterCacheDisplay*> maDisplays; diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx index 34b921477edd..8b4056c7eb22 100644 --- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx +++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx @@ -54,27 +54,27 @@ class TreeNode { public: TreeNode (TreeNode* pParent); - virtual ~TreeNode (void); + virtual ~TreeNode(); void SetParentNode (TreeNode* pNewParent); - TreeNode* GetParentNode (void); + TreeNode* GetParentNode(); /** Return the Window pointer of a tree node. */ - virtual vcl::Window* GetWindow (void); + virtual vcl::Window* GetWindow(); /** Return a const pointer to the window of a tree node. */ - virtual const vcl::Window* GetConstWindow (void) const; + virtual const vcl::Window* GetConstWindow() const; /** Return the joined minimum width of all children, i.e. the largest of the minimum widths. */ - virtual sal_Int32 GetMinimumWidth (void); + virtual sal_Int32 GetMinimumWidth(); /** The default implementaion always returns <FALSE/> */ - virtual bool IsResizable (void); + virtual bool IsResizable(); /** Call this method whenever the size of one of the children of the called node has to be changed, e.g. when the layout menu shows more @@ -86,7 +86,7 @@ public: The default implementation passes this call to its parent. */ - virtual void RequestResize (void); + virtual void RequestResize(); /** The default implementation shows the window (when it exists) when bExpansionState is <TRUE/>. It hides the window otherwise. @@ -100,7 +100,7 @@ public: /** The default implementation returns whether the window is showing. When there is no window then it returns <FALSE/>. */ - virtual bool IsExpanded (void) const; + virtual bool IsExpanded() const; /** Return whether the node can be expanded or collapsed. The default implementation always returns <TRUE/> when there is window and @@ -108,7 +108,7 @@ public: then Expand() may be called but it will not change the expansion state. */ - virtual bool IsExpandable (void) const; + virtual bool IsExpandable() const; /** The default implementation calls GetWindow()->Show(). */ @@ -116,9 +116,9 @@ public: /** The default implementation returns GetWindow()->IsVisible(). */ - virtual bool IsShowing (void) const; + virtual bool IsShowing() const; - ControlContainer& GetControlContainer (void); + ControlContainer& GetControlContainer(); /** Give each node access to a shell manage. This usually is the shell manager of the ToolPanelViewShell. @@ -127,13 +127,13 @@ public: default implementation simply returns the shell manager of its parent. */ - virtual TaskPaneShellManager* GetShellManager (void); + virtual TaskPaneShellManager* GetShellManager(); /** You will rarely need to override this method. To supply your own accessible object you should override CreateAccessible() instead. */ virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible> GetAccessibleObject (void); + ::com::sun::star::accessibility::XAccessible> GetAccessibleObject(); /** Override this method in order to supply a class specific accessible object. diff --git a/sd/source/ui/inc/taskpane/TitleBar.hxx b/sd/source/ui/inc/taskpane/TitleBar.hxx index 05f34c540cf7..a51cf2003345 100644 --- a/sd/source/ui/inc/taskpane/TitleBar.hxx +++ b/sd/source/ui/inc/taskpane/TitleBar.hxx @@ -55,21 +55,21 @@ public: const OUString& rsTitle, TitleBarType eType, bool bIsExpandable); - virtual ~TitleBar (void); + virtual ~TitleBar(); - virtual Size GetPreferredSize (void); + virtual Size GetPreferredSize(); virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); - virtual bool IsResizable (void); - virtual vcl::Window* GetWindow (void); - virtual sal_Int32 GetMinimumWidth (void); + virtual bool IsResizable(); + virtual vcl::Window* GetWindow(); + virtual sal_Int32 GetMinimumWidth(); virtual void Paint (const Rectangle& rBoundingBox); virtual bool Expand (bool bFlag = true); - virtual bool IsExpanded (void) const; + virtual bool IsExpanded() const; virtual void SetEnabledState(bool bFlag); - virtual void GetFocus (void); - virtual void LoseFocus (void); + virtual void GetFocus(); + virtual void LoseFocus(); virtual void MouseMove(const MouseEvent& rEvent); /** Empty implementation prevents forwarding to docking window. @@ -101,7 +101,7 @@ private: bitmap. It is safe to call GetExpansionIndicator() when this method returns <FALSE/> but unnecessary. */ - bool HasExpansionIndicator (void) const; + bool HasExpansionIndicator() const; /** Return the image of the expansion indicator. @return @@ -109,7 +109,7 @@ private: then an empty Image is returned. You better call HasExpansionIndicator() to prevent this. */ - Image GetExpansionIndicator (void) const; + Image GetExpansionIndicator() const; /** Calculate the bounding box of the title text. This takes into account indentation due to an expansion indicator and the given @@ -130,7 +130,7 @@ private: const Rectangle& rTextBox, int nTitleBarWidth); - void PaintSubPanelHeadLineBar (void); + void PaintSubPanelHeadLineBar(); void PaintBackground (const Rectangle& rTextBox); @@ -141,12 +141,12 @@ private: void PaintText (const Rectangle& rTextBox); - sal_uInt16 GetTextStyle (void); + sal_uInt16 GetTextStyle(); const static int snIndentationWidth; // Default constructor, copy constructor, and assignment are not supported. - TitleBar (void); + TitleBar(); TitleBar (const TitleBar&); TitleBar& operator= (const TitleBar&); diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 93f5de4563f6..bd69db1766f3 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -68,19 +68,19 @@ public: ViewShellBase& rViewShellBase, vcl::Window* pParentWindow, FrameView* pFrameView); - virtual ~ToolPanelViewShell (void); + virtual ~ToolPanelViewShell(); - void GetFocus (void); - void LoseFocus (void); + void GetFocus(); + void LoseFocus(); void KeyInput (const KeyEvent& rEvent); using sd::ViewShell::KeyInput; - virtual SdPage* GetActualPage (void) SAL_OVERRIDE; - virtual SdPage* getCurrentPage (void) const SAL_OVERRIDE; + virtual SdPage* GetActualPage() SAL_OVERRIDE; + virtual SdPage* getCurrentPage() const SAL_OVERRIDE; - virtual void ArrangeGUIElements (void) SAL_OVERRIDE; + virtual void ArrangeGUIElements() SAL_OVERRIDE; - TaskPaneShellManager& GetSubShellManager (void) const; + TaskPaneShellManager& GetSubShellManager() const; /** deactivates the given panel, bypassing the configuration controller. Only valid for tool panels which are not under the drawing framework's control. @@ -97,13 +97,13 @@ public: When the view shell is not placed in a docking window, e.g. when shown in the center pane, then <NULL?> is returned. */ - DockingWindow* GetDockingWindow (void); + DockingWindow* GetDockingWindow(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessibleDocumentView (::sd::Window* pWindow) SAL_OVERRIDE; - virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController (void) SAL_OVERRIDE; + virtual css::uno::Reference<css::drawing::XDrawSubController> CreateSubController() SAL_OVERRIDE; /** Relocate all toplevel controls to the given parent window. */ @@ -143,7 +143,7 @@ private: before. If mbIsInitialized is already set to <TRUE/> then this method returns immediately. */ - void Initialize (void); + void Initialize(); }; } } // end of namespace ::sd::toolpanel diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx index c6d101d01257..52bbb3ad8093 100644 --- a/sd/source/ui/inc/tools/AsynchronousCall.hxx +++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx @@ -48,9 +48,9 @@ public: /** Create a new asynchronous call. Each object of this class processes one (semantical) type of call. */ - AsynchronousCall (void); + AsynchronousCall(); - ~AsynchronousCall (void); + ~AsynchronousCall(); /** Post a function object that is to be executed asynchronously. When this method is called while the current function object has not bee diff --git a/sd/source/ui/inc/tools/AsynchronousTask.hxx b/sd/source/ui/inc/tools/AsynchronousTask.hxx index 3a2211f5c588..dae3210e57bd 100644 --- a/sd/source/ui/inc/tools/AsynchronousTask.hxx +++ b/sd/source/ui/inc/tools/AsynchronousTask.hxx @@ -33,13 +33,13 @@ public: /** Run the next step of the task. After HasNextStep() returns false this method should ignore further calls. */ - virtual void RunNextStep (void) = 0; + virtual void RunNextStep() = 0; /** Return <TRUE/> when there is at least one more step to execute. When the task has been executed completely then <FALSE/> is returned. */ - virtual bool HasNextStep (void) = 0; + virtual bool HasNextStep() = 0; protected: ~AsynchronousTask() {} diff --git a/sd/source/ui/inc/tools/ConfigurationAccess.hxx b/sd/source/ui/inc/tools/ConfigurationAccess.hxx index b19e313c8b3a..fa17a6a6caf6 100644 --- a/sd/source/ui/inc/tools/ConfigurationAccess.hxx +++ b/sd/source/ui/inc/tools/ConfigurationAccess.hxx @@ -85,7 +85,7 @@ public: This call is ignored when the called ConfigurationAccess object was not create with read-write mode. */ - void CommitChanges (void); + void CommitChanges(); /** This functor is typically called for every item in a set. Its two parameters are the name of key item (often of no further interest) diff --git a/sd/source/ui/inc/tools/IconCache.hxx b/sd/source/ui/inc/tools/IconCache.hxx index 3ef8bc7dc2bb..8caf5a67009f 100644 --- a/sd/source/ui/inc/tools/IconCache.hxx +++ b/sd/source/ui/inc/tools/IconCache.hxx @@ -41,7 +41,7 @@ public: /** The lifetime of the returned reference is limited to that of the sd module. */ - static IconCache& Instance (void); + static IconCache& Instance(); /** Return the icon with the given resource id. @return @@ -59,11 +59,11 @@ private: it at the SdGlobalResourceContainer to limit is lifetime to that of the sd module. */ - IconCache (void); + IconCache(); /** This destructor is called by SdGlobalResourceContainer. */ - virtual ~IconCache (void); + virtual ~IconCache(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/tools/IdleDetection.hxx b/sd/source/ui/inc/tools/IdleDetection.hxx index 7bdb8401e924..63690dc84662 100644 --- a/sd/source/ui/inc/tools/IdleDetection.hxx +++ b/sd/source/ui/inc/tools/IdleDetection.hxx @@ -69,11 +69,11 @@ public: private: /** Check whether there are input events pending. */ - static sal_Int32 CheckInputPending (void); + static sal_Int32 CheckInputPending(); /** Check whether a slide show is running full screen or in a window. */ - static sal_Int32 CheckSlideShowRunning (void); + static sal_Int32 CheckSlideShowRunning(); static sal_Int32 CheckWindowPainting (const vcl::Window& rWindow); }; diff --git a/sd/source/ui/inc/tools/PropertySet.hxx b/sd/source/ui/inc/tools/PropertySet.hxx index e4a97978073d..e44224377df8 100644 --- a/sd/source/ui/inc/tools/PropertySet.hxx +++ b/sd/source/ui/inc/tools/PropertySet.hxx @@ -46,15 +46,15 @@ class PropertySet public PropertySetInterfaceBase { public: - explicit PropertySet (void); - virtual ~PropertySet (void); + explicit PropertySet(); + virtual ~PropertySet(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> - SAL_CALL getPropertySetInfo (void) + SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue ( @@ -130,7 +130,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx index 65e1065a1a35..b9281ab6be4a 100644 --- a/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx +++ b/sd/source/ui/inc/tools/SdGlobalResourceContainer.hxx @@ -30,7 +30,7 @@ namespace sd { class SdGlobalResource { public: - virtual ~SdGlobalResource (void) {}; + virtual ~SdGlobalResource() {}; }; /** The purpose of this container is to hold references to resources that @@ -58,7 +58,7 @@ public: class SdGlobalResourceContainer { public: - static SdGlobalResourceContainer& Instance (void); + static SdGlobalResourceContainer& Instance(); /** Add a resource to the container. The ownership of the resource is transferred to the container. The resource is destroyed when the @@ -89,8 +89,8 @@ protected: class Implementation; ::std::unique_ptr<Implementation> mpImpl; - SdGlobalResourceContainer (void); - ~SdGlobalResourceContainer (void); + SdGlobalResourceContainer(); + ~SdGlobalResourceContainer(); }; } // end of namespace sd diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 2e148b485dbe..64045d50509e 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -59,7 +59,7 @@ public: /** The constructor de-registers all remaining listeners. Usually a prior dispose() call should have done that already. */ - virtual ~SlotStateListener (void); + virtual ~SlotStateListener(); /** Set the callback to the given value. Whenever one of the observed slots changes its state this callback is informed about it. @@ -108,7 +108,7 @@ protected: reaction to a XComponent::dispose() call. It releases all currently active listeners. */ - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: Link maCallback; @@ -124,12 +124,12 @@ private: /** Deregister all currently active state change listeners. */ - void ReleaseListeners (void); + void ReleaseListeners(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); /** Transform the given string into a URL object. diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index 7a79d06da1df..1bf5ec72cf14 100644 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -56,7 +56,7 @@ public: /** Stop the execution of the task and release the shared pointer to itself so that it will eventually be destroyed. */ - void Release (void); + void Release(); /** Convenience method that calls Release() on the given task. It checks the given weak_ptr for being expired and catches bad_weak_ptr @@ -77,7 +77,7 @@ private: const ::boost::shared_ptr<AsynchronousTask>& rpTask, sal_uInt32 nMillisecondsBetweenSteps, sal_uInt32 nMaxTimePerStep); - ~TimerBasedTaskExecution (void); + ~TimerBasedTaskExecution(); void SetSelf (const ::boost::shared_ptr<TimerBasedTaskExecution>& rpSelf); class Deleter; diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 353b06eee46f..58bd4e965c80 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -122,7 +122,7 @@ private: 'general' tab page depending on whether there is at least one document. */ - void UpdateCompatibilityControls (void); + void UpdateCompatibilityControls(); protected: virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; @@ -140,13 +140,13 @@ public: and arrange the visible controls. Do not call this method or the <member>SetImpressMode()</member> method more than once. */ - void SetDrawMode (void); + void SetDrawMode(); /** Hide Draw specific controls, make Impress specific controls visible and arrange the visible controls. Do not call this method or the <member>SetDrawMode()</member> method more than once. */ - void SetImpressMode (void); + void SetImpressMode(); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; using TabPage::ActivatePage; |