diff options
Diffstat (limited to 'sd')
389 files changed, 2242 insertions, 2242 deletions
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx index 4999b48d1dac..f4b1a6f64deb 100644 --- a/sd/inc/Outliner.hxx +++ b/sd/inc/Outliner.hxx @@ -120,12 +120,12 @@ public: search mode, may be restored after finishing searching/spell checking. */ - void PrepareSpelling (void); + void PrepareSpelling(); /** Initialize a spell check but do not start it yet. This method is a better candidate for the name PrepareSpelling. */ - void StartSpelling (void); + void StartSpelling(); /** Proxy for method from base class to avoid compiler warning */ void StartSpelling(EditView&, unsigned char); @@ -142,15 +142,15 @@ public: next sentence with spelling errors. While doing so the view mode may be changed and text shapes are set into edit mode. */ - ::svx::SpellPortions GetNextSpellSentence (void); + ::svx::SpellPortions GetNextSpellSentence(); /** Release all resources that have been created during the find&replace or spell check. */ - void EndSpelling (void); + void EndSpelling(); /** callback for textconversion */ - bool ConvertNextDocument (void) SAL_OVERRIDE; + bool ConvertNextDocument() SAL_OVERRIDE; /** Starts the text conversion (hangul/hanja or Chinese simplified/traditional) for the current viewshell */ @@ -161,10 +161,10 @@ public: The position of current view mode/page/object/caret position is remembered and will be restored after conversion. */ - void BeginConversion (void); + void BeginConversion(); /** Release all resources that have been created during the conversion */ - void EndConversion (void); + void EndConversion(); DECL_LINK( SpellError, void * ); @@ -354,14 +354,14 @@ private: /** Do search and replace for whole document. */ - bool SearchAndReplaceAll (void); + bool SearchAndReplaceAll(); /** Do search and replace for next match. @return The return value specifies whether the search ended (</sal_True>) or another call to this method is required (</sal_False>). */ - bool SearchAndReplaceOnce (void); + bool SearchAndReplaceOnce(); /** Detect changes of the document or view and react accordingly. Such changes may occur because different calls to @@ -370,50 +370,50 @@ private: button but may include any other action some of which affect the search. */ - void DetectChange (void); + void DetectChange(); /** Detect whether the selection has changed. @return Return <TRUE/> when the selection has been changed since the last call to this method. */ - bool DetectSelectionChange (void); + bool DetectSelectionChange(); /** Remember the current edited object/caret position/page/view mode when starting to search/spell check so that it can be restored on termination. */ - void RememberStartPosition (void); + void RememberStartPosition(); /** Restore the position stored in the last call of <member>RememberStartPositiony</member>. */ - void RestoreStartPosition (void); + void RestoreStartPosition(); /** Provide next object to search or spell check as text object in edit mode on the current page. This skips all objects that do not match or are no text object. */ - void ProvideNextTextObject (void); + void ProvideNextTextObject(); /** Handle the situation that the iterator has reached the last object. This may result in setting the <member>mbEndOfSearch</member> flag back to </sal_False>. This method may show either the end-of-search dialog or the wrap-around dialog. */ - void EndOfSearch (void); + void EndOfSearch(); /** Show a dialog that tells the user that the search has ended either because there are no more matches after finding at least one or that no match has been found at all. */ - void ShowEndOfSearchDialog (void); + void ShowEndOfSearchDialog(); /** Show a dialog that asks the user whether to wrap around to the beginning/end of the document and continue with the search/spell check. */ - bool ShowWrapArroundDialog (void); + bool ShowWrapArroundDialog(); /** Check whether the object pointed to by the iterator is a valid text object. @@ -425,23 +425,23 @@ private: /** Put text of current text object into outliner so that the text can be searched/spell checked. */ - void PutTextIntoOutliner (void); + void PutTextIntoOutliner(); /** Prepare to do spell checking on the current text object. This includes putting it into edit mode. Under certain conditions this method sets <member>mbEndOfSearch</member> to <TRUE/>. */ - void PrepareSpellCheck (void); + void PrepareSpellCheck(); /** Prepare to search and replace on the current text object. This includes putting it into edit mode. */ - void PrepareSearchAndReplace (void); + void PrepareSearchAndReplace(); /** Prepare to do a text conversion on the current text object. This includes putting it into edit mode. */ - void PrepareConversion (void); + void PrepareConversion(); /** Switch to a new view mode. Try to restore the original edit mode before doing so. @@ -470,7 +470,7 @@ private: The position mentioned above in form of a selection with start equals end. */ - ESelection GetSearchStartPosition (void); + ESelection GetSearchStartPosition(); /** Detect whether there exists a previous match. Note that only the absence of such a match can be detected reliably. An existing match @@ -481,7 +481,7 @@ private: Returns </True> when there is no previous match and </False> when there may be one. */ - bool HasNoPreviousMatch (void); + bool HasNoPreviousMatch(); /** Handle a failed search (with or without replace) for the outline mode. Show message boxes when the search failed completely, @@ -492,7 +492,7 @@ private: search shall take place. If that is so, then it is the caller's responsibility to set the cursor position accordingly. */ - bool HandleFailedSearch (void); + bool HandleFailedSearch(); /** Take a position as returned by an object iterator and switch to the view and page on which the object specified by this position is @@ -516,7 +516,7 @@ private: a copy of the current selection and reassigns the object iterator to the current() iterator. */ - void HandleChangedSelection (void); + void HandleChangedSelection(); /** Initiate the spell check of the next relevant text object. When the outline view is active then this method is called @@ -526,7 +526,7 @@ private: required. When all text objects have been processed then <FALSE/> is returned. */ - virtual bool SpellNextDocument (void) SAL_OVERRIDE; + virtual bool SpellNextDocument() SAL_OVERRIDE; /** Show the given message box and make it modal. It is assumed that the parent of the given dialog is NULL, i.e. the application diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index d056ed412267..81f48c16e510 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -85,7 +85,7 @@ enum IteratorType {SELECTION,SINGLE_VIEW,DOCUMENT}; class Iterator { public: - Iterator (void); + Iterator(); /** The copy constructor creates a new iterator by copying the implementation object. @@ -99,7 +99,7 @@ public: */ explicit Iterator (IteratorImplBase* pObject); - ~Iterator (void); + ~Iterator(); /** Assign the iterator from the given one. The implementation object of this iterator will be a copy of the given iterator. @@ -152,7 +152,7 @@ public: /** Reverse the direction of iteration. The position of the iterator is not changed. Thus calling this method twice returns to the old state. */ - void Reverse (void); + void Reverse(); private: /// The implementation object to which most of the methods are forwarded. @@ -186,7 +186,7 @@ public: The returned iterator points either to the first (forward search) or to the last object (backward search) of the set. */ - Iterator begin (void); + Iterator begin(); /** Return an iterator that marks the end of the iteration. This takes also into account the direction of iteration. The object pointed to @@ -196,7 +196,7 @@ public: one (forward search) or to the one in front of the first (backward search). */ - Iterator end (void); + Iterator end(); /** Return an iterator that points to the current object of one of the sets described above. This takes also into account the direction of @@ -207,7 +207,7 @@ public: selected objects or of the current page if the search set spans more than one page. */ - Iterator current (void); + Iterator current(); private: /// The wrapped outliner that is represented as object container. @@ -292,7 +292,7 @@ private: // Do not allow default constructor and copying of outliner containers. OutlinerContainer (const OutlinerContainer&) {}; - OutlinerContainer (void) {}; + OutlinerContainer() {}; OutlinerContainer& operator= (const OutlinerContainer&) {return *this;}; }; @@ -306,7 +306,7 @@ public: These values should not be accessed. The only use of the object as it is as a marker in comparisons. */ - IteratorPosition (void); + IteratorPosition(); /** Create a new object with all data members set from the given position. @param aPosition @@ -316,7 +316,7 @@ public: IteratorPosition (const IteratorPosition& aPosition); /// The destructor is a no-op at the moment. - ~IteratorPosition (void); + ~IteratorPosition(); /** Assign the content of the given position to this one. @param aPosition This is the position object from which to take the values of all diff --git a/sd/inc/SdShapeTypes.hxx b/sd/inc/SdShapeTypes.hxx index ff2223479152..307a8cf1251b 100644 --- a/sd/inc/SdShapeTypes.hxx +++ b/sd/inc/SdShapeTypes.hxx @@ -29,7 +29,7 @@ namespace accessibility { /** Register the SD presentation shape types with the ShapeTypeHandler singleton. This method is usually called while loading the sd library. */ -void RegisterImpressShapeTypes (void); +void RegisterImpressShapeTypes(); /** Enum describing all shape types known in the SD project. */ diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 47c4fe719020..394f62f82286 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -405,7 +405,7 @@ public: scope="com::sun::star::document::PrinterIndependentLayout">DISABLED</const> when formatting depends on the current printer metrics. */ - SAL_DLLPRIVATE sal_Int32 GetPrinterIndependentLayout (void) { return mnPrinterIndependentLayout;} + SAL_DLLPRIVATE sal_Int32 GetPrinterIndependentLayout() { return mnPrinterIndependentLayout;} SAL_DLLPRIVATE void SetOnlineSpell( bool bIn ); SAL_DLLPRIVATE bool GetOnlineSpell() const { return mbOnlineSpell; } diff --git a/sd/inc/sdcgmfilter.hxx b/sd/inc/sdcgmfilter.hxx index 144f0a03a3cb..4ac21541a1b4 100644 --- a/sd/inc/sdcgmfilter.hxx +++ b/sd/inc/sdcgmfilter.hxx @@ -30,7 +30,7 @@ public: SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress ); - virtual ~SdCGMFilter (void); + virtual ~SdCGMFilter(); bool Import(); bool Export() SAL_OVERRIDE; diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx index d4d87c4b8fb4..c14662441cec 100644 --- a/sd/inc/sdgrffilter.hxx +++ b/sd/inc/sdgrffilter.hxx @@ -31,7 +31,7 @@ class SdGRFFilter : public SdFilter public: SdGRFFilter ( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ); - virtual ~SdGRFFilter (void); + virtual ~SdGRFFilter(); bool Import(); bool Export() SAL_OVERRIDE; diff --git a/sd/inc/sdhtmlfilter.hxx b/sd/inc/sdhtmlfilter.hxx index 130f84a7b07e..356d3a2dce09 100644 --- a/sd/inc/sdhtmlfilter.hxx +++ b/sd/inc/sdhtmlfilter.hxx @@ -31,7 +31,7 @@ public: SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress); - virtual ~SdHTMLFilter (void); + virtual ~SdHTMLFilter(); virtual bool Export() SAL_OVERRIDE; diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 624b0a8b492e..5ad63fd081ee 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -112,7 +112,7 @@ public: The returned pointer is NULL when the device could not be created when this modules was instantiated. */ - OutputDevice* GetVirtualRefDevice (void) { return mpVirtualRefDevice;} + OutputDevice* GetVirtualRefDevice() { return mpVirtualRefDevice;} /** Deprecated alias to <member>GetVirtualRefDevice</member>. @param rDocShell diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index 87d2e7ee7ba2..6e6a354408b1 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -376,7 +376,7 @@ public: When this method returns <TRUE/> for a master page then this master page should not be deleted automatically. */ - bool IsPrecious (void) const { return mbIsPrecious; } + bool IsPrecious() const { return mbIsPrecious; } void createAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation ); void addAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, int nIndex = -1 ); diff --git a/sd/inc/sdpptwrp.hxx b/sd/inc/sdpptwrp.hxx index 01432bd0df70..823a3b3d4c50 100644 --- a/sd/inc/sdpptwrp.hxx +++ b/sd/inc/sdpptwrp.hxx @@ -30,7 +30,7 @@ public: SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, bool bShowProgress); - virtual ~SdPPTFilter (void); + virtual ~SdPPTFilter(); /// these methods are necessary for the export to PowerPoint bool Import(); diff --git a/sd/inc/sdxmlwrp.hxx b/sd/inc/sdxmlwrp.hxx index 8945ab1fac78..f144461ae4f1 100644 --- a/sd/inc/sdxmlwrp.hxx +++ b/sd/inc/sdxmlwrp.hxx @@ -39,7 +39,7 @@ public: bool bShowProgress, SdXMLFilterMode eFilterMode = SDXMLMODE_Normal, sal_uLong nStoreVer = SOFFICE_FILEFORMAT_8 ); - virtual ~SdXMLFilter (void); + virtual ~SdXMLFilter(); bool Import( ErrCode& nError ); bool Export() SAL_OVERRIDE; diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 33255377e06e..5a22993fd36f 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -121,8 +121,8 @@ public: virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire (void) throw () SAL_OVERRIDE; - virtual void SAL_CALL release (void) throw () SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; protected: void RenameAndCopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily, SdStyleSheetVector& rCreatedSheets, OUString &rRenameSuffix); void CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily eFamily ); diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index a3f68f929b03..470609ffea88 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -55,7 +55,7 @@ private: outline view seems to have a bug. Therefore this method is called whenever a new undo action is added. */ - void ClearLinkedRedoActions (void); + void ClearLinkedRedoActions(); }; } diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index d427b831f446..3c2a1265265d 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -1451,12 +1451,12 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet ) return aResult; } -void SAL_CALL SdStyleSheetPool::acquire (void) throw () +void SAL_CALL SdStyleSheetPool::acquire() throw () { SdStyleSheetPoolBase::acquire(); } -void SAL_CALL SdStyleSheetPool::release (void) throw () +void SAL_CALL SdStyleSheetPool::release() throw () { SdStyleSheetPoolBase::release(); } diff --git a/sd/source/core/undo/undomanager.cxx b/sd/source/core/undo/undomanager.cxx index 801c63ab3226..d7006175ea8a 100644 --- a/sd/source/core/undo/undomanager.cxx +++ b/sd/source/core/undo/undomanager.cxx @@ -54,7 +54,7 @@ void UndoManager::SetLinkedUndoManager (::svl::IUndoManager* pLinkedUndoManager) mpLinkedUndoManager = pLinkedUndoManager; } -void UndoManager::ClearLinkedRedoActions (void) +void UndoManager::ClearLinkedRedoActions() { if (mpLinkedUndoManager != NULL) mpLinkedUndoManager->ClearRedo(); diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index bb7dd9671561..e746db3dfa5d 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -172,7 +172,7 @@ SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, boo { } -SdXMLFilter::~SdXMLFilter(void) +SdXMLFilter::~SdXMLFilter() { } diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index b3866bc14e20..00dd5f964877 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -89,13 +89,13 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase ( mpViewShell = pViewShell; } -AccessibleDocumentViewBase::~AccessibleDocumentViewBase (void) +AccessibleDocumentViewBase::~AccessibleDocumentViewBase() { // At this place we should be disposed. You may want to add a // corresponding assertion into the destructor of a derived class. } -void AccessibleDocumentViewBase::Init (void) +void AccessibleDocumentViewBase::Init() { // Finish the initialization of the shape tree info container. maShapeTreeInfo.SetDocumentWindow (this); @@ -226,7 +226,7 @@ void AccessibleDocumentViewBase::ViewForwarderChanged(ChangeType, const IAccessi //===== XAccessibleContext ================================================== Reference<XAccessible> SAL_CALL - AccessibleDocumentViewBase::getAccessibleParent (void) + AccessibleDocumentViewBase::getAccessibleParent() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -235,7 +235,7 @@ Reference<XAccessible> SAL_CALL } sal_Int32 SAL_CALL - AccessibleDocumentViewBase::getAccessibleChildCount (void) + AccessibleDocumentViewBase::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -305,7 +305,7 @@ uno::Reference<XAccessible > SAL_CALL } awt::Rectangle SAL_CALL - AccessibleDocumentViewBase::getBounds (void) + AccessibleDocumentViewBase::getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -341,7 +341,7 @@ awt::Rectangle SAL_CALL } awt::Point SAL_CALL - AccessibleDocumentViewBase::getLocation (void) + AccessibleDocumentViewBase::getLocation() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -350,7 +350,7 @@ awt::Point SAL_CALL } awt::Point SAL_CALL - AccessibleDocumentViewBase::getLocationOnScreen (void) + AccessibleDocumentViewBase::getLocationOnScreen() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -360,7 +360,7 @@ awt::Point SAL_CALL } awt::Size SAL_CALL - AccessibleDocumentViewBase::getSize (void) + AccessibleDocumentViewBase::getSize() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -402,14 +402,14 @@ uno::Any SAL_CALL } void SAL_CALL - AccessibleDocumentViewBase::acquire (void) + AccessibleDocumentViewBase::acquire() throw () { AccessibleContextBase::acquire (); } void SAL_CALL - AccessibleDocumentViewBase::release (void) + AccessibleDocumentViewBase::release() throw () { AccessibleContextBase::release (); @@ -418,14 +418,14 @@ void SAL_CALL //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessibleDocumentViewBase::getImplementationName (void) + AccessibleDocumentViewBase::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleDocumentViewBase"); } ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessibleDocumentViewBase::getSupportedServiceNames (void) + AccessibleDocumentViewBase::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -435,7 +435,7 @@ OUString SAL_CALL //===== XTypeProvider ======================================================= ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> SAL_CALL - AccessibleDocumentViewBase::getTypes (void) + AccessibleDocumentViewBase::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -626,7 +626,7 @@ void AccessibleDocumentViewBase::focusLost (const ::com::sun::star::awt::FocusEv //===== protected internal ================================================== // This method is called from the component helper base class while disposing. -void SAL_CALL AccessibleDocumentViewBase::disposing (void) +void SAL_CALL AccessibleDocumentViewBase::disposing() { impl_dispose(); @@ -635,7 +635,7 @@ void SAL_CALL AccessibleDocumentViewBase::disposing (void) /// Create a name for this view. OUString - AccessibleDocumentViewBase::CreateAccessibleName (void) + AccessibleDocumentViewBase::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { return OUString ("AccessibleDocumentViewBase"); @@ -645,7 +645,7 @@ OUString if a description is not available. */ OUString - AccessibleDocumentViewBase::CreateAccessibleDescription (void) + AccessibleDocumentViewBase::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { OUString sDescription; @@ -666,12 +666,12 @@ OUString return sDescription; } -void AccessibleDocumentViewBase::Activated (void) +void AccessibleDocumentViewBase::Activated() { // Empty. Overwrite to do something useful. } -void AccessibleDocumentViewBase::Deactivated (void) +void AccessibleDocumentViewBase::Deactivated() { // Empty. Overwrite to do something useful. } diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 16208b1eb870..f6df1c395f1c 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -92,14 +92,14 @@ AccessibleDrawDocumentView::AccessibleDrawDocumentView ( UpdateAccessibleName(); } -AccessibleDrawDocumentView::~AccessibleDrawDocumentView (void) +AccessibleDrawDocumentView::~AccessibleDrawDocumentView() { OSL_TRACE ("~AccessibleDrawDocumentView"); DBG_ASSERT (rBHelper.bDisposed || rBHelper.bInDispose, "~AccessibleDrawDocumentView: object has not been disposed"); } -void AccessibleDrawDocumentView::Init (void) +void AccessibleDrawDocumentView::Init() { AccessibleDocumentViewBase::Init (); @@ -135,7 +135,7 @@ void AccessibleDrawDocumentView::ViewForwarderChanged (ChangeType aChangeType, /** The page shape is created on every call at the moment (provided that every thing goes well). */ -rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageShape (void) +rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageShape() { rtl::Reference<AccessiblePageShape> xShape; @@ -188,7 +188,7 @@ rtl::Reference<AccessiblePageShape> AccessibleDrawDocumentView::CreateDrawPageSh //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL - AccessibleDrawDocumentView::getAccessibleChildCount (void) + AccessibleDrawDocumentView::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -237,7 +237,7 @@ uno::Reference<XAccessible> SAL_CALL } OUString SAL_CALL - AccessibleDrawDocumentView::getAccessibleName(void) + AccessibleDrawDocumentView::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -394,14 +394,14 @@ void SAL_CALL //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessibleDrawDocumentView::getImplementationName (void) + AccessibleDrawDocumentView::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleDrawDocumentView"); } ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessibleDrawDocumentView::getSupportedServiceNames (void) + AccessibleDrawDocumentView::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -432,13 +432,13 @@ uno::Any SAL_CALL } void SAL_CALL - AccessibleDrawDocumentView::acquire (void) + AccessibleDrawDocumentView::acquire() throw () { AccessibleDocumentViewBase::acquire (); } void SAL_CALL - AccessibleDrawDocumentView::release (void) + AccessibleDrawDocumentView::release() throw () { AccessibleDocumentViewBase::release (); @@ -553,7 +553,7 @@ OUString AccessibleDrawDocumentView::getObjectLink( const uno::Any& rAny ) } /// Create a name for this view. -OUString AccessibleDrawDocumentView::CreateAccessibleName (void) +OUString AccessibleDrawDocumentView::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -606,7 +606,7 @@ OUString AccessibleDrawDocumentView::CreateAccessibleName (void) if a description is not available. */ OUString - AccessibleDrawDocumentView::CreateAccessibleDescription (void) + AccessibleDrawDocumentView::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { OUString sDescription; @@ -785,7 +785,7 @@ void } } -void AccessibleDrawDocumentView::Activated (void) +void AccessibleDrawDocumentView::Activated() { if (mpChildrenManager != NULL) { @@ -806,14 +806,14 @@ void AccessibleDrawDocumentView::Activated (void) } } -void AccessibleDrawDocumentView::Deactivated (void) +void AccessibleDrawDocumentView::Deactivated() { if (mpChildrenManager != NULL) mpChildrenManager->RemoveFocus(); ResetState (AccessibleStateType::FOCUSED); } -void AccessibleDrawDocumentView::impl_dispose (void) +void AccessibleDrawDocumentView::impl_dispose() { if (mpChildrenManager != NULL) { @@ -827,7 +827,7 @@ void AccessibleDrawDocumentView::impl_dispose (void) /** This method is called from the component helper base class while disposing. */ -void SAL_CALL AccessibleDrawDocumentView::disposing (void) +void SAL_CALL AccessibleDrawDocumentView::disposing() { // Release resources. @@ -994,7 +994,7 @@ uno::Reference<XAccessible> AccessibleDrawDocumentView::GetSelAccContextInTable( return xRet; } -void AccessibleDrawDocumentView::UpdateAccessibleName (void) +void AccessibleDrawDocumentView::UpdateAccessibleName() { OUString sNewName (CreateAccessibleName()); sNewName += ": "; diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 398abdd7d816..7d17fe6c69d9 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -90,12 +90,12 @@ AccessibleOutlineView::AccessibleOutlineView ( } } -AccessibleOutlineView::~AccessibleOutlineView (void) +AccessibleOutlineView::~AccessibleOutlineView() { OSL_TRACE ("~AccessibleOutlineView"); } -void AccessibleOutlineView::Init (void) +void AccessibleOutlineView::Init() { // Set event source _before_ starting to listen maTextHelper.SetEventSource(this); @@ -114,7 +114,7 @@ void AccessibleOutlineView::ViewForwarderChanged (ChangeType aChangeType, //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL - AccessibleOutlineView::getAccessibleChildCount (void) + AccessibleOutlineView::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -135,7 +135,7 @@ uno::Reference<XAccessible> SAL_CALL #include <drawdoc.hxx> OUString SAL_CALL - AccessibleOutlineView::getAccessibleName(void) + AccessibleOutlineView::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -183,7 +183,7 @@ void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const uno::R //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessibleOutlineView::getImplementationName (void) + AccessibleOutlineView::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleOutlineView"); @@ -200,7 +200,7 @@ void SAL_CALL //===== protected internal ================================================== -void AccessibleOutlineView::Activated (void) +void AccessibleOutlineView::Activated() { SolarMutexGuard aGuard; @@ -208,7 +208,7 @@ void AccessibleOutlineView::Activated (void) maTextHelper.SetFocus(true); } -void AccessibleOutlineView::Deactivated (void) +void AccessibleOutlineView::Deactivated() { SolarMutexGuard aGuard; @@ -216,7 +216,7 @@ void AccessibleOutlineView::Deactivated (void) maTextHelper.SetFocus(false); } -void SAL_CALL AccessibleOutlineView::disposing (void) +void SAL_CALL AccessibleOutlineView::disposing() { // dispose children maTextHelper.Dispose(); @@ -261,7 +261,7 @@ void SAL_CALL /// Create a name for this view. OUString - AccessibleOutlineView::CreateAccessibleName (void) + AccessibleOutlineView::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -273,7 +273,7 @@ OUString if a description is not available. */ OUString - AccessibleOutlineView::CreateAccessibleDescription (void) + AccessibleOutlineView::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx index 29ec73d5c085..4ebed11874ac 100644 --- a/sd/source/ui/accessibility/AccessiblePageShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx @@ -50,12 +50,12 @@ AccessiblePageShape::AccessiblePageShape ( // has to be called from this constructor's caller. } -AccessiblePageShape::~AccessiblePageShape (void) +AccessiblePageShape::~AccessiblePageShape() { OSL_TRACE ("~AccessiblePageShape"); } -void AccessiblePageShape::Init (void) +void AccessiblePageShape::Init() { AccessibleShape::Init (); } @@ -63,7 +63,7 @@ void AccessiblePageShape::Init (void) //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL - AccessiblePageShape::getAccessibleChildCount (void) + AccessiblePageShape::getAccessibleChildCount() throw (std::exception) { return 0; @@ -82,7 +82,7 @@ uno::Reference<XAccessible> SAL_CALL //===== XAccessibleComponent ================================================ -awt::Rectangle SAL_CALL AccessiblePageShape::getBounds (void) +awt::Rectangle SAL_CALL AccessiblePageShape::getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -146,7 +146,7 @@ awt::Rectangle SAL_CALL AccessiblePageShape::getBounds (void) return aBoundingBox; } -sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void) +sal_Int32 SAL_CALL AccessiblePageShape::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -172,7 +172,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getForeground (void) /** Extract the background color from the Background property of eithe the draw page or its master page. */ -sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) +sal_Int32 SAL_CALL AccessiblePageShape::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -222,7 +222,7 @@ sal_Int32 SAL_CALL AccessiblePageShape::getBackground (void) //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessiblePageShape::getImplementationName (void) + AccessiblePageShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -230,7 +230,7 @@ OUString SAL_CALL } ::com::sun::star::uno::Sequence< OUString> SAL_CALL - AccessiblePageShape::getSupportedServiceNames (void) + AccessiblePageShape::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -249,7 +249,7 @@ void SAL_CALL //===== XComponent ========================================================== -void AccessiblePageShape::dispose (void) +void AccessiblePageShape::dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) { OSL_TRACE ("AccessiblePageShape::dispose"); @@ -269,14 +269,14 @@ void AccessiblePageShape::dispose (void) //===== protected internal ================================================== OUString - AccessiblePageShape::CreateAccessibleBaseName (void) + AccessiblePageShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { return OUString ("PageShape"); } OUString - AccessiblePageShape::CreateAccessibleName (void) + AccessiblePageShape::CreateAccessibleName() throw (::com::sun::star::uno::RuntimeException) { Reference<beans::XPropertySet> xPageProperties (mxPage, UNO_QUERY); @@ -298,7 +298,7 @@ OUString } OUString - AccessiblePageShape::CreateAccessibleDescription (void) + AccessiblePageShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { return OUString ("Page Shape"); diff --git a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx index 0b45b4cbee71..150fe48e6882 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationGraphicShape.cxx @@ -38,14 +38,14 @@ AccessiblePresentationGraphicShape::AccessiblePresentationGraphicShape ( { } -AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape (void) +AccessiblePresentationGraphicShape::~AccessiblePresentationGraphicShape() { } //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessiblePresentationGraphicShape::getImplementationName (void) + AccessiblePresentationGraphicShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationGraphicShape"); @@ -53,7 +53,7 @@ OUString SAL_CALL /// Set this object's name if is different to the current name. OUString - AccessiblePresentationGraphicShape::CreateAccessibleBaseName (void) + AccessiblePresentationGraphicShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -75,7 +75,7 @@ OUString } OUString - AccessiblePresentationGraphicShape::CreateAccessibleDescription (void) + AccessiblePresentationGraphicShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { // return createAccessibleName (); diff --git a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx index 76f2d6060183..3eb1a82773cc 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationOLEShape.cxx @@ -38,14 +38,14 @@ AccessiblePresentationOLEShape::AccessiblePresentationOLEShape ( { } -AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape (void) +AccessiblePresentationOLEShape::~AccessiblePresentationOLEShape() { } //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessiblePresentationOLEShape::getImplementationName (void) + AccessiblePresentationOLEShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationOLEShape"); @@ -53,7 +53,7 @@ OUString SAL_CALL /// Set this object's name if it is different to the current name. OUString - AccessiblePresentationOLEShape::CreateAccessibleBaseName (void) + AccessiblePresentationOLEShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -81,7 +81,7 @@ OUString } OUString - AccessiblePresentationOLEShape::CreateAccessibleDescription (void) + AccessiblePresentationOLEShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { // return createAccessibleName(); diff --git a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx index 1651f1b224a3..c0a5520fbb35 100644 --- a/sd/source/ui/accessibility/AccessiblePresentationShape.cxx +++ b/sd/source/ui/accessibility/AccessiblePresentationShape.cxx @@ -40,21 +40,21 @@ AccessiblePresentationShape::AccessiblePresentationShape ( { } -AccessiblePresentationShape::~AccessiblePresentationShape (void) +AccessiblePresentationShape::~AccessiblePresentationShape() { } //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessiblePresentationShape::getImplementationName (void) + AccessiblePresentationShape::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessiblePresentationShape"); } /// Set this object's name if is different to the current name. -OUString AccessiblePresentationShape::CreateAccessibleBaseName (void) +OUString AccessiblePresentationShape::CreateAccessibleBaseName() throw (::com::sun::star::uno::RuntimeException) { OUString sName; @@ -103,7 +103,7 @@ OUString AccessiblePresentationShape::CreateAccessibleBaseName (void) } OUString - AccessiblePresentationShape::CreateAccessibleDescription (void) + AccessiblePresentationShape::CreateAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) { // return createAccessibleName (); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index b8e75ff2cc2a..a9c6a05c9abd 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -59,7 +59,7 @@ AccessibleSlideSorterObject::AccessibleSlideSorterObject( { } -AccessibleSlideSorterObject::~AccessibleSlideSorterObject (void) +AccessibleSlideSorterObject::~AccessibleSlideSorterObject() { if ( ! IsDisposed()) dispose(); @@ -83,7 +83,7 @@ void AccessibleSlideSorterObject::FireAccessibleEvent ( } } -void SAL_CALL AccessibleSlideSorterObject::disposing (void) +void SAL_CALL AccessibleSlideSorterObject::disposing() { const SolarMutexGuard aSolarGuard; @@ -98,7 +98,7 @@ void SAL_CALL AccessibleSlideSorterObject::disposing (void) //===== XAccessible =========================================================== Reference<XAccessibleContext> SAL_CALL - AccessibleSlideSorterObject::getAccessibleContext (void) + AccessibleSlideSorterObject::getAccessibleContext() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -107,7 +107,7 @@ Reference<XAccessibleContext> SAL_CALL //===== XAccessibleContext ==================================================== -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount (void) +sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -121,7 +121,7 @@ Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleChild throw lang::IndexOutOfBoundsException(); } -Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent (void) +Reference<XAccessible> SAL_CALL AccessibleSlideSorterObject::getAccessibleParent() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -154,7 +154,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getAccessibleIndexInParent() return nIndexInParent; } -sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -164,14 +164,14 @@ sal_Int16 SAL_CALL AccessibleSlideSorterObject::getAccessibleRole (void) return nRole; } -OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription (void) +OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); return SD_RESSTR(STR_PAGE); } -OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) +OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -185,7 +185,7 @@ OUString SAL_CALL AccessibleSlideSorterObject::getAccessibleName (void) } Reference<XAccessibleRelationSet> SAL_CALL - AccessibleSlideSorterObject::getAccessibleRelationSet (void) + AccessibleSlideSorterObject::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -193,7 +193,7 @@ Reference<XAccessibleRelationSet> SAL_CALL } Reference<XAccessibleStateSet> SAL_CALL - AccessibleSlideSorterObject::getAccessibleStateSet (void) + AccessibleSlideSorterObject::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -222,7 +222,7 @@ Reference<XAccessibleStateSet> SAL_CALL return pStateSet; } -lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale (void) +lang::Locale SAL_CALL AccessibleSlideSorterObject::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { @@ -306,7 +306,7 @@ Reference<XAccessible> SAL_CALL return NULL; } -awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds (void) +awt::Rectangle SAL_CALL AccessibleSlideSorterObject::getBounds() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -348,7 +348,7 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocation () return awt::Point(aBBox.X, aBBox.Y); } -awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void) +awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -371,7 +371,7 @@ awt::Point SAL_CALL AccessibleSlideSorterObject::getLocationOnScreen (void) return aLocation; } -awt::Size SAL_CALL AccessibleSlideSorterObject::getSize (void) +awt::Size SAL_CALL AccessibleSlideSorterObject::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed (); @@ -379,13 +379,13 @@ awt::Size SAL_CALL AccessibleSlideSorterObject::getSize (void) return awt::Size(aBBox.Width,aBBox.Height); } -void SAL_CALL AccessibleSlideSorterObject::grabFocus (void) +void SAL_CALL AccessibleSlideSorterObject::grabFocus() throw (RuntimeException, std::exception) { // nothing to do } -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground (void) +sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -394,7 +394,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getForeground (void) return static_cast<sal_Int32>(nColor); } -sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) +sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -404,7 +404,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterObject::getBackground (void) //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessibleSlideSorterObject::getImplementationName (void) + AccessibleSlideSorterObject::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleSlideSorterObject"); @@ -417,7 +417,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterObject::supportsService (const OUString& } uno::Sequence< OUString> SAL_CALL - AccessibleSlideSorterObject::getSupportedServiceNames (void) + AccessibleSlideSorterObject::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -429,7 +429,7 @@ uno::Sequence< OUString> SAL_CALL return uno::Sequence<OUString> (sServiceNames, 2); } -void AccessibleSlideSorterObject::ThrowIfDisposed (void) +void AccessibleSlideSorterObject::ThrowIfDisposed() throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -440,12 +440,12 @@ void AccessibleSlideSorterObject::ThrowIfDisposed (void) } } -bool AccessibleSlideSorterObject::IsDisposed (void) +bool AccessibleSlideSorterObject::IsDisposed() { return (rBHelper.bDisposed || rBHelper.bInDispose); } -SdPage* AccessibleSlideSorterObject::GetPage (void) const +SdPage* AccessibleSlideSorterObject::GetPage() const { ::sd::slidesorter::model::SharedPageDescriptor pDescriptor( mrSlideSorter.GetModel().GetPageDescriptor(mnPageNumber)); diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 8d04f48fe315..6cde28c4d4f1 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -69,16 +69,16 @@ public: AccessibleSlideSorterView& rAccessibleSlideSorter, ::sd::slidesorter::SlideSorter& rSlideSorter, vcl::Window* pWindow); - virtual ~Implementation (void); + virtual ~Implementation(); - void RequestUpdateChildren (void); - void Clear (void); - sal_Int32 GetVisibleChildCount (void) const; + void RequestUpdateChildren(); + void Clear(); + sal_Int32 GetVisibleChildCount() const; AccessibleSlideSorterObject* GetAccessibleChild (sal_Int32 nIndex); AccessibleSlideSorterObject* GetVisibleChild (sal_Int32 nIndex); - void ConnectListeners (void); - void ReleaseListeners (void); + void ConnectListeners(); + void ReleaseListeners(); void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) SAL_OVERRIDE; DECL_LINK(WindowEventListener, VclWindowEvent*); DECL_LINK(SelectionChangeListener, void*); @@ -87,7 +87,7 @@ public: DECL_LINK(VisibilityChangeListener, void*); DECL_LINK(UpdateChildrenCallback, void*); - void Activated(void); + void Activated(); private: AccessibleSlideSorterView& mrAccessibleSlideSorter; ::sd::slidesorter::SlideSorter& mrSlideSorter; @@ -102,7 +102,7 @@ private: ImplSVEvent * mnUpdateChildrenUserEventId; ImplSVEvent * mnSelectionChangeUserEventId; - void UpdateChildren (void); + void UpdateChildren(); }; //===== AccessibleSlideSorterView ============================================= @@ -124,7 +124,7 @@ void AccessibleSlideSorterView::Init() mpImpl.reset(new Implementation(*this,mrSlideSorter,mpContentWindow)); } -AccessibleSlideSorterView::~AccessibleSlideSorterView (void) +AccessibleSlideSorterView::~AccessibleSlideSorterView() { Destroyed (); } @@ -147,7 +147,7 @@ void AccessibleSlideSorterView::FireAccessibleEvent ( } } -void SAL_CALL AccessibleSlideSorterView::disposing (void) +void SAL_CALL AccessibleSlideSorterView::disposing() { if (mnClientId != 0) { @@ -169,7 +169,7 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::GetAccessibleChildImplem return pResult; } -void AccessibleSlideSorterView::Destroyed (void) +void AccessibleSlideSorterView::Destroyed() { ::osl::MutexGuard aGuard (maMutex); @@ -184,7 +184,7 @@ void AccessibleSlideSorterView::Destroyed (void) //===== XAccessible ========================================================= Reference<XAccessibleContext > SAL_CALL - AccessibleSlideSorterView::getAccessibleContext (void) + AccessibleSlideSorterView::getAccessibleContext() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -193,7 +193,7 @@ Reference<XAccessibleContext > SAL_CALL //===== XAccessibleContext ================================================== -sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -214,7 +214,7 @@ Reference<XAccessible > SAL_CALL return mpImpl->GetVisibleChild(nIndex); } -Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent (void) +Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -231,7 +231,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleParent return xParent; } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { OSL_ASSERT(getAccessibleParent().is()); @@ -255,7 +255,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleIndexInParent (void) return nIndexInParent; } -sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) +sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -263,7 +263,7 @@ sal_Int16 SAL_CALL AccessibleSlideSorterView::getAccessibleRole (void) return nRole; } -OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) +OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -272,7 +272,7 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleDescription (void) return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_D); } -OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) +OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -282,14 +282,14 @@ OUString SAL_CALL AccessibleSlideSorterView::getAccessibleName (void) } Reference<XAccessibleRelationSet> SAL_CALL - AccessibleSlideSorterView::getAccessibleRelationSet (void) + AccessibleSlideSorterView::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { return Reference<XAccessibleRelationSet>(); } Reference<XAccessibleStateSet > SAL_CALL - AccessibleSlideSorterView::getAccessibleStateSet (void) + AccessibleSlideSorterView::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -313,7 +313,7 @@ Reference<XAccessibleStateSet > SAL_CALL return pStateSet; } -lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale (void) +lang::Locale SAL_CALL AccessibleSlideSorterView::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { @@ -409,7 +409,7 @@ Reference<XAccessible> SAL_CALL return xAccessible; } -awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void) +awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -430,7 +430,7 @@ awt::Rectangle SAL_CALL AccessibleSlideSorterView::getBounds (void) return aBBox; } -awt::Point SAL_CALL AccessibleSlideSorterView::getLocation (void) +awt::Point SAL_CALL AccessibleSlideSorterView::getLocation() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -472,7 +472,7 @@ awt::Point SAL_CALL AccessibleSlideSorterView::getLocationOnScreen() return aLocationOnScreen; } -awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void) +awt::Size SAL_CALL AccessibleSlideSorterView::getSize() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -488,7 +488,7 @@ awt::Size SAL_CALL AccessibleSlideSorterView::getSize (void) return aSize; } -void SAL_CALL AccessibleSlideSorterView::grabFocus (void) +void SAL_CALL AccessibleSlideSorterView::grabFocus() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -498,7 +498,7 @@ void SAL_CALL AccessibleSlideSorterView::grabFocus (void) mpContentWindow->GrabFocus(); } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -507,7 +507,7 @@ sal_Int32 SAL_CALL AccessibleSlideSorterView::getForeground (void) return static_cast<sal_Int32>(nColor); } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getBackground() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -549,7 +549,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::isAccessibleChildSelected (sal_Int3 return bIsSelected; } -void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection (void) +void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -558,7 +558,7 @@ void SAL_CALL AccessibleSlideSorterView::clearAccessibleSelection (void) mrSlideSorter.GetController().GetPageSelector().DeselectAllPages(); } -void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren (void) +void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -567,7 +567,7 @@ void SAL_CALL AccessibleSlideSorterView::selectAllAccessibleChildren (void) mrSlideSorter.GetController().GetPageSelector().SelectAllPages(); } -sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount (void) +sal_Int32 SAL_CALL AccessibleSlideSorterView::getSelectedAccessibleChildCount() throw (uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -620,7 +620,7 @@ void SAL_CALL AccessibleSlideSorterView::deselectAccessibleChild (sal_Int32 nChi //===== XServiceInfo ======================================================== OUString SAL_CALL - AccessibleSlideSorterView::getImplementationName (void) + AccessibleSlideSorterView::getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) { return OUString("AccessibleSlideSorterView"); @@ -633,7 +633,7 @@ sal_Bool SAL_CALL AccessibleSlideSorterView::supportsService (const OUString& sS } uno::Sequence< OUString> SAL_CALL - AccessibleSlideSorterView::getSupportedServiceNames (void) + AccessibleSlideSorterView::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed (); @@ -646,7 +646,7 @@ uno::Sequence< OUString> SAL_CALL return uno::Sequence<OUString> (sServiceNames, 3); } -void AccessibleSlideSorterView::ThrowIfDisposed (void) +void AccessibleSlideSorterView::ThrowIfDisposed() throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -657,7 +657,7 @@ void AccessibleSlideSorterView::ThrowIfDisposed (void) } } -bool AccessibleSlideSorterView::IsDisposed (void) +bool AccessibleSlideSorterView::IsDisposed() { return (rBHelper.bDisposed || rBHelper.bInDispose); } @@ -684,7 +684,7 @@ AccessibleSlideSorterView::Implementation::Implementation ( UpdateChildren(); } -AccessibleSlideSorterView::Implementation::~Implementation (void) +AccessibleSlideSorterView::Implementation::~Implementation() { if (mnUpdateChildrenUserEventId != 0) Application::RemoveUserEvent(mnUpdateChildrenUserEventId); @@ -694,7 +694,7 @@ AccessibleSlideSorterView::Implementation::~Implementation (void) Clear(); } -void AccessibleSlideSorterView::Implementation::RequestUpdateChildren (void) +void AccessibleSlideSorterView::Implementation::RequestUpdateChildren() { if (mnUpdateChildrenUserEventId == 0) mnUpdateChildrenUserEventId = Application::PostUserEvent( @@ -702,7 +702,7 @@ void AccessibleSlideSorterView::Implementation::RequestUpdateChildren (void) UpdateChildrenCallback)); } -void AccessibleSlideSorterView::Implementation::UpdateChildren (void) +void AccessibleSlideSorterView::Implementation::UpdateChildren() { //By default, all children should be accessible. So here workaround is to make all children visible. // MT: THis was in UpdateVisibility, which has some similarity, and hg merge automatically has put it here. Correct?! @@ -734,7 +734,7 @@ void AccessibleSlideSorterView::Implementation::UpdateChildren (void) GetAccessibleChild(nIndex); } -void AccessibleSlideSorterView::Implementation::Clear (void) +void AccessibleSlideSorterView::Implementation::Clear() { PageObjectList::iterator iPageObject; PageObjectList::iterator iEnd = maPageObjects.end(); @@ -754,7 +754,7 @@ void AccessibleSlideSorterView::Implementation::Clear (void) maPageObjects.clear(); } -sal_Int32 AccessibleSlideSorterView::Implementation::GetVisibleChildCount (void) const +sal_Int32 AccessibleSlideSorterView::Implementation::GetVisibleChildCount() const { if (mnFirstVisibleChild<=mnLastVisibleChild && mnFirstVisibleChild>=0) return mnLastVisibleChild - mnFirstVisibleChild + 1; @@ -806,7 +806,7 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAcces return pChild; } -void AccessibleSlideSorterView::Implementation::ConnectListeners (void) +void AccessibleSlideSorterView::Implementation::ConnectListeners() { StartListening (*mrSlideSorter.GetModel().GetDocument()); if (mrSlideSorter.GetViewShell() != NULL) @@ -825,7 +825,7 @@ void AccessibleSlideSorterView::Implementation::ConnectListeners (void) LINK(this,AccessibleSlideSorterView::Implementation,VisibilityChangeListener)); } -void AccessibleSlideSorterView::Implementation::ReleaseListeners (void) +void AccessibleSlideSorterView::Implementation::ReleaseListeners() { mrSlideSorter.GetController().GetFocusManager().RemoveFocusChangeListener( LINK(this,AccessibleSlideSorterView::Implementation,FocusChangeListener)); @@ -882,7 +882,7 @@ void AccessibleSlideSorterView::Implementation::Notify ( } } -void AccessibleSlideSorterView::SwitchViewActivated (void) +void AccessibleSlideSorterView::SwitchViewActivated() { // Firstly, set focus to view this->FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx index ea1fb773a277..f110a6b676af 100644 --- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx +++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx @@ -50,17 +50,17 @@ AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDev } } -AccessibleViewForwarder::~AccessibleViewForwarder (void) +AccessibleViewForwarder::~AccessibleViewForwarder() { // empty } -bool AccessibleViewForwarder::IsValid (void) const +bool AccessibleViewForwarder::IsValid() const { return true; } -Rectangle AccessibleViewForwarder::GetVisibleArea (void) const +Rectangle AccessibleViewForwarder::GetVisibleArea() const { Rectangle aVisibleArea; diff --git a/sd/source/ui/accessibility/SdShapeTypes.cxx b/sd/source/ui/accessibility/SdShapeTypes.cxx index 3dfbab2f0c75..75ef2c14897f 100644 --- a/sd/source/ui/accessibility/SdShapeTypes.cxx +++ b/sd/source/ui/accessibility/SdShapeTypes.cxx @@ -58,7 +58,7 @@ AccessibleShape* } } -void RegisterImpressShapeTypes (void) +void RegisterImpressShapeTypes() { /** List of shape type descriptors corresponding to the <type>SdShapeTypes</type> enum. diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index b28f4cf138c5..66301bb6f830 100644 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -71,7 +71,7 @@ public: virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; + virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index f327dc95bfc5..1e4cb028cb4e 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -803,7 +803,7 @@ void CustomAnimationPane::DataChanged (const DataChangedEvent& rEvent) UpdateLook(); } -void CustomAnimationPane::UpdateLook (void) +void CustomAnimationPane::UpdateLook() { const Wallpaper aBackground ( ::sfx2::sidebar::Theme::GetWallpaper( @@ -2199,7 +2199,7 @@ void CustomAnimationPane::onSelect() markShapesFromSelectedEffects(); } -const CustomAnimationPresets& CustomAnimationPane::getPresets (void) +const CustomAnimationPresets& CustomAnimationPane::getPresets() { if (mpCustomAnimationPresets == NULL) mpCustomAnimationPresets = &CustomAnimationPresets::getCustomAnimationPresets(); diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 0cbd137a1441..57d10c613611 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -113,7 +113,7 @@ private: ::com::sun::star::uno::Any getProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect ); bool setProperty1Value( sal_Int32 nType, CustomAnimationEffectPtr pEffect, const ::com::sun::star::uno::Any& rValue ); - void UpdateLook (void); + void UpdateLook(); DECL_LINK( implControlHdl, Control* ); DECL_LINK(implPropertyHdl, void *); @@ -168,7 +168,7 @@ private: /** This method initializes the mpCustomAnimationPresets on demand and returns a reference to the list. */ - const CustomAnimationPresets& getPresets (void); + const CustomAnimationPresets& getPresets(); MotionPathTagVector maMotionPathTags; diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 7548ad9e0b88..47b98b6dc326 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -493,7 +493,7 @@ void SlideTransitionPane::DataChanged (const DataChangedEvent& rEvent) UpdateLook(); } -void SlideTransitionPane::UpdateLook (void) +void SlideTransitionPane::UpdateLook() { SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground)); mpFT_SPEED->SetBackground(Wallpaper()); @@ -510,7 +510,7 @@ void SlideTransitionPane::onChangeCurrentPage() updateControls(); } -::sd::slidesorter::SharedPageSelection SlideTransitionPane::getSelectedPages (void) const +::sd::slidesorter::SharedPageSelection SlideTransitionPane::getSelectedPages() const { ::sd::slidesorter::SlideSorterViewShell * pSlideSorterViewShell = ::sd::slidesorter::SlideSorterViewShell::GetSlideSorter(mrBase); diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index a75ca210a19c..3bb556d74112 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -82,9 +82,9 @@ private: void addListener(); void removeListener(); - ::sd::slidesorter::SharedPageSelection getSelectedPages (void) const; + ::sd::slidesorter::SharedPageSelection getSelectedPages() const; - void UpdateLook (void); + void UpdateLook(); DECL_LINK( ApplyToAllButtonClicked, void * ); DECL_LINK( PlayButtonClicked, void * ); diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 24ce6a43e0e5..9129ca8f952b 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -505,7 +505,7 @@ IMPL_LINK_NOARG(AnnotationWindow, ModifyHdl) return 0; } -SvxLanguageItem AnnotationWindow::GetLanguage(void) +SvxLanguageItem AnnotationWindow::GetLanguage() { return SvxLanguageItem( Doc()->GetLanguage( EE_CHAR_LANGUAGE ), SID_ATTR_LANGUAGE ); } diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index ed2c13ee39d6..f8adcdf99a81 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -105,7 +105,7 @@ class AnnotationWindow : public FloatingWindow void StartEdit(); - SvxLanguageItem GetLanguage(void); + SvxLanguageItem GetLanguage(); void setAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, bool bGrabFocus = false ); const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& getAnnotation() const { return mxAnnotation; } diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 65108f1bffee..c7bebb074c29 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -80,7 +80,7 @@ public: ::sd::ViewShellBase& rBase, SdDrawDocument& rDocument, SvLockBytes& rBytes); - virtual ~OutlineToImpressFinalizer (void) {}; + virtual ~OutlineToImpressFinalizer() {}; void operator() (bool bEventSeen); private: ::sd::ViewShellBase& mrBase; diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 0bd42e937b44..283544f8aa99 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -744,7 +744,7 @@ void SdTransferable::AddUserData (const ::boost::shared_ptr<UserData>& rpData) maUserData.push_back(rpData); } -sal_Int32 SdTransferable::GetUserDataCount (void) const +sal_Int32 SdTransferable::GetUserDataCount() const { return maUserData.size(); } diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 98df417636ce..8b6875284bb8 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -287,13 +287,13 @@ void LayerTabBar::ActivatePage() } } -void LayerTabBar::SendActivatePageEvent (void) +void LayerTabBar::SendActivatePageEvent() { CallEventListeners (VCLEVENT_TABBAR_PAGEACTIVATED, reinterpret_cast<void*>(GetCurPageId())); } -void LayerTabBar::SendDeactivatePageEvent (void) +void LayerTabBar::SendDeactivatePageEvent() { CallEventListeners (VCLEVENT_TABBAR_PAGEDEACTIVATED, reinterpret_cast<void*>(GetCurPageId())); diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx b/sd/source/ui/dlg/PaneChildWindows.cxx index 15908461a011..364a4dc47b4b 100644 --- a/sd/source/ui/dlg/PaneChildWindows.cxx +++ b/sd/source/ui/dlg/PaneChildWindows.cxx @@ -72,7 +72,7 @@ PaneChildWindow::PaneChildWindow ( } } -PaneChildWindow::~PaneChildWindow (void) +PaneChildWindow::~PaneChildWindow() { ViewShellBase* pBase = NULL; PaneDockingWindow* pDockingWindow = dynamic_cast<PaneDockingWindow*>(pWindow); diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 4a38a10341a4..4947dd78f088 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -46,7 +46,7 @@ PaneDockingWindow::PaneDockingWindow( SetSizePixel(LogicToPixel(Size(80,200), MAP_APPFONT)); } -PaneDockingWindow::~PaneDockingWindow (void) +PaneDockingWindow::~PaneDockingWindow() { } @@ -116,7 +116,7 @@ void PaneDockingWindow::SetValidSizeRange (const Range& rValidSizeRange) } } -PaneDockingWindow::Orientation PaneDockingWindow::GetOrientation (void) const +PaneDockingWindow::Orientation PaneDockingWindow::GetOrientation() const { SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent()); if (pSplitWindow == NULL) diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx index ce6c512484cb..cd2b3c48ffc4 100644 --- a/sd/source/ui/dlg/PaneShells.cxx +++ b/sd/source/ui/dlg/PaneShells.cxx @@ -45,13 +45,13 @@ void LeftImpressPaneShell::InitInterface_Impl() TYPEINIT1(LeftImpressPaneShell, SfxShell); -LeftImpressPaneShell::LeftImpressPaneShell (void) +LeftImpressPaneShell::LeftImpressPaneShell() : SfxShell() { SetName(OUString("LeftImpressPane")); } -LeftImpressPaneShell::~LeftImpressPaneShell (void) +LeftImpressPaneShell::~LeftImpressPaneShell() { } @@ -71,13 +71,13 @@ void LeftDrawPaneShell::InitInterface_Impl() TYPEINIT1(LeftDrawPaneShell, SfxShell); -LeftDrawPaneShell::LeftDrawPaneShell (void) +LeftDrawPaneShell::LeftDrawPaneShell() : SfxShell() { SetName(OUString("LeftDrawPane")); } -LeftDrawPaneShell::~LeftDrawPaneShell (void) +LeftDrawPaneShell::~LeftDrawPaneShell() { } diff --git a/sd/source/ui/dlg/SpellDialogChildWindow.cxx b/sd/source/ui/dlg/SpellDialogChildWindow.cxx index daf0aaaa4541..e3b6c961f99d 100644 --- a/sd/source/ui/dlg/SpellDialogChildWindow.cxx +++ b/sd/source/ui/dlg/SpellDialogChildWindow.cxx @@ -49,7 +49,7 @@ SpellDialogChildWindow::SpellDialogChildWindow ( ProvideOutliner(); } -SpellDialogChildWindow::~SpellDialogChildWindow (void) +SpellDialogChildWindow::~SpellDialogChildWindow() { if (mpSdOutliner != NULL) mpSdOutliner->EndSpelling(); @@ -58,12 +58,12 @@ SpellDialogChildWindow::~SpellDialogChildWindow (void) delete mpSdOutliner; } -SfxChildWinInfo SpellDialogChildWindow::GetInfo (void) const +SfxChildWinInfo SpellDialogChildWindow::GetInfo() const { return ::svx::SpellDialogChildWindow::GetInfo(); } -void SpellDialogChildWindow::InvalidateSpellDialog (void) +void SpellDialogChildWindow::InvalidateSpellDialog() { ::svx::SpellDialogChildWindow::InvalidateSpellDialog(); } @@ -106,7 +106,7 @@ void SpellDialogChildWindow::ApplyChangedSentence ( } } -void SpellDialogChildWindow::GetFocus (void) +void SpellDialogChildWindow::GetFocus() { // In order to detect a cursor movement we could compare the // currently selected text shape with the one that was selected @@ -119,7 +119,7 @@ void SpellDialogChildWindow::LoseFocus() { } -void SpellDialogChildWindow::ProvideOutliner (void) +void SpellDialogChildWindow::ProvideOutliner() { ViewShellBase* pViewShellBase = PTR_CAST (ViewShellBase, SfxViewShell::Current()); diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 3e43b1923ccd..0416c639c476 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -165,7 +165,7 @@ class TemplateScanner::FolderDescriptorList { }; -TemplateScanner::TemplateScanner (void) +TemplateScanner::TemplateScanner() : meState(INITIALIZE_SCANNING), maFolderContent(), mpTemplateDirectory(NULL), @@ -182,7 +182,7 @@ TemplateScanner::TemplateScanner (void) // empty; } -TemplateScanner::~TemplateScanner (void) +TemplateScanner::~TemplateScanner() { mpFolderDescriptors.reset(); @@ -194,7 +194,7 @@ TemplateScanner::~TemplateScanner (void) delete *I; } -TemplateScanner::State TemplateScanner::GetTemplateRoot (void) +TemplateScanner::State TemplateScanner::GetTemplateRoot() { State eNextState (INITIALIZE_FOLDER_SCANNING); @@ -205,7 +205,7 @@ TemplateScanner::State TemplateScanner::GetTemplateRoot (void) return eNextState; } -TemplateScanner::State TemplateScanner::InitializeEntryScanning (void) +TemplateScanner::State TemplateScanner::InitializeEntryScanning() { State eNextState (SCAN_ENTRY); @@ -231,7 +231,7 @@ TemplateScanner::State TemplateScanner::InitializeEntryScanning (void) return eNextState; } -TemplateScanner::State TemplateScanner::ScanEntry (void) +TemplateScanner::State TemplateScanner::ScanEntry() { State eNextState (ERROR); @@ -290,7 +290,7 @@ TemplateScanner::State TemplateScanner::ScanEntry (void) return eNextState; } -TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) +TemplateScanner::State TemplateScanner::InitializeFolderScanning() { State eNextState (ERROR); @@ -322,7 +322,7 @@ TemplateScanner::State TemplateScanner::InitializeFolderScanning (void) return eNextState; } -TemplateScanner::State TemplateScanner::GatherFolderList (void) +TemplateScanner::State TemplateScanner::GatherFolderList() { State eNextState (ERROR); @@ -354,7 +354,7 @@ TemplateScanner::State TemplateScanner::GatherFolderList (void) return eNextState; } -TemplateScanner::State TemplateScanner::ScanFolder (void) +TemplateScanner::State TemplateScanner::ScanFolder() { State eNextState (ERROR); @@ -386,13 +386,13 @@ TemplateScanner::State TemplateScanner::ScanFolder (void) return eNextState; } -void TemplateScanner::Scan (void) +void TemplateScanner::Scan() { while (HasNextStep()) RunNextStep(); } -void TemplateScanner::RunNextStep (void) +void TemplateScanner::RunNextStep() { switch (meState) { @@ -440,7 +440,7 @@ void TemplateScanner::RunNextStep (void) } } -bool TemplateScanner::HasNextStep (void) +bool TemplateScanner::HasNextStep() { switch (meState) { diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 9a41a1235d2c..98df35d60900 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -95,9 +95,9 @@ class NextButton public: NextButton (vcl::Window* pParent); - void ForceFocusEventBroadcast (void); + void ForceFocusEventBroadcast(); void SetClickHdl (const Link& rLink); - bool IsEnabled (void); + bool IsEnabled(); void Enable (bool bEnable); private: @@ -123,7 +123,7 @@ public: /** Extract form the history list of recently used files the impress files and insert them into a listbox. */ - void ScanDocmenu (void); + void ScanDocmenu(); /** Flag that is set to sal_True after the recently used files have been scanned. */ @@ -136,7 +136,7 @@ public: <member>maPresentList</member>. Note that the first call to this method after installing a new Office may take some time. */ - void ProvideTemplates (void); + void ProvideTemplates(); /** This method transfers the template folders from the template scanner to the internal structures of this class. On termination it sets @@ -683,7 +683,7 @@ void AssistentDlgImpl::EndDialog( long ) mpWindow = NULL; } -void AssistentDlgImpl::ScanDocmenu (void) +void AssistentDlgImpl::ScanDocmenu() { if( mbRecentDocumentsReady ) return; @@ -761,7 +761,7 @@ void AssistentDlgImpl::ScanDocmenu (void) } } -void AssistentDlgImpl::ProvideTemplates (void) +void AssistentDlgImpl::ProvideTemplates() { if ( ! mbTemplatesReady) { @@ -1836,7 +1836,7 @@ NextButton::NextButton (vcl::Window* pParent) : mpNextButton2->Hide(); } -void NextButton::ForceFocusEventBroadcast (void) +void NextButton::ForceFocusEventBroadcast() { // Hide the currently visible button and show and focus the other one. if (mbIsFirstButtonActive) @@ -1863,7 +1863,7 @@ void NextButton::SetClickHdl (const Link& rLink) mpNextButton2->SetClickHdl(rLink); } -bool NextButton::IsEnabled (void) +bool NextButton::IsEnabled() { // Because the buttons are both either enabled or disabled, it is // sufficient to ask one to determine the state. diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index a0358f4c379f..2599f3be7c65 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -60,7 +60,7 @@ using namespace com::sun::star; class SdPageObjsTLB::IconProvider { public: - IconProvider (void); + IconProvider(); // Regular icons. Image maImgPage; @@ -1600,7 +1600,7 @@ void SdPageObjsTLB::AddShapeToTransferable ( //===== IconProvider ========================================================== -SdPageObjsTLB::IconProvider::IconProvider (void) +SdPageObjsTLB::IconProvider::IconProvider() : maImgPage( BitmapEx( SdResId( BMP_PAGE ) ) ), maImgPageExcl( BitmapEx( SdResId( BMP_PAGE_EXCLUDED ) ) ), maImgPageObjsExcl( BitmapEx( SdResId( BMP_PAGEOBJS_EXCLUDED ) ) ), diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 9065e1ebe922..66eaeeb73030 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -509,7 +509,7 @@ IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl) return 0; } -void SdTpOptionsMisc::SetImpressMode (void) +void SdTpOptionsMisc::SetImpressMode() { #ifndef ENABLE_SDREMOTE_BLUETOOTH m_pCbxEnableSdremote->Hide(); @@ -570,7 +570,7 @@ bool SdTpOptionsMisc::SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32 return true; } -void SdTpOptionsMisc::UpdateCompatibilityControls (void) +void SdTpOptionsMisc::UpdateCompatibilityControls() { // Disable the compatibility controls by default. Enable them only when // there is at least one open document. diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 4232b3f70f5b..2705eaed58b6 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -1112,7 +1112,7 @@ void DrawDocShell::FillClass(SvGlobalName* pClassName, STR_GRAPHIC_DOCUMENT : STR_IMPRESS_DOCUMENT )); } -OutputDevice* DrawDocShell::GetDocumentRefDev (void) +OutputDevice* DrawDocShell::GetDocumentRefDev() { OutputDevice* pReferenceDevice = SfxObjectShell::GetDocumentRefDev (); // Only when our parent does not have a reference device then we return diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx index 4758f5ab828f..f41f4e7417ff 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.cxx @@ -21,7 +21,7 @@ namespace sd { namespace framework { -ChangeRequestQueue::ChangeRequestQueue (void) +ChangeRequestQueue::ChangeRequestQueue() { } diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx index a9fbae6a5d8f..2792539b389e 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueue.hxx @@ -37,7 +37,7 @@ class ChangeRequestQueue public: /** Create an empty queue. */ - ChangeRequestQueue (void); + ChangeRequestQueue(); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 15a472007b5a..a8cf31ee5cd1 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -62,7 +62,7 @@ ChangeRequestQueueProcessor::ChangeRequestQueueProcessor ( { } -ChangeRequestQueueProcessor::~ChangeRequestQueueProcessor (void) +ChangeRequestQueueProcessor::~ChangeRequestQueueProcessor() { if (mnUserEventId != 0) Application::RemoveUserEvent(mnUserEventId); @@ -97,7 +97,7 @@ void ChangeRequestQueueProcessor::AddRequest ( StartProcessing(); } -void ChangeRequestQueueProcessor::StartProcessing (void) +void ChangeRequestQueueProcessor::StartProcessing() { ::osl::MutexGuard aGuard (maMutex); @@ -130,7 +130,7 @@ IMPL_LINK(ChangeRequestQueueProcessor, ProcessEvent, void*, pUnused) return 0; } -void ChangeRequestQueueProcessor::ProcessOneEvent (void) +void ChangeRequestQueueProcessor::ProcessOneEvent() { ::osl::MutexGuard aGuard (maMutex); @@ -169,18 +169,18 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void) } } -bool ChangeRequestQueueProcessor::IsEmpty (void) const +bool ChangeRequestQueueProcessor::IsEmpty() const { return maQueue.empty(); } -void ChangeRequestQueueProcessor::ProcessUntilEmpty (void) +void ChangeRequestQueueProcessor::ProcessUntilEmpty() { while ( ! IsEmpty()) ProcessOneEvent(); } -void ChangeRequestQueueProcessor::Clear (void) +void ChangeRequestQueueProcessor::Clear() { ::osl::MutexGuard aGuard (maMutex); maQueue.clear(); diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx index d58b1a676422..fa3b4d456b9c 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.hxx @@ -57,7 +57,7 @@ public: ChangeRequestQueueProcessor ( const ::rtl::Reference<ConfigurationController>& rxController, const ::boost::shared_ptr<ConfigurationUpdater>& rpUpdater); - ~ChangeRequestQueueProcessor (void); + ~ChangeRequestQueueProcessor(); /** Sets the configuration who will be changed by subsequent change requests. This method should be called only by the configuration @@ -76,25 +76,25 @@ public: /** Returns </sal_True> when the queue is empty. */ - bool IsEmpty (void) const; + bool IsEmpty() const; /** Process all events in the queue synchronously. <p>This method is typically called when the framework is shut down to establish an empty configuration.</p> */ - void ProcessUntilEmpty (void); + void ProcessUntilEmpty(); /** Process the first event in queue. */ - void ProcessOneEvent (void); + void ProcessOneEvent(); /** Remove all events from the queue. <p>This method is typically called when the framework is shut down to avoid the processing of still pending activation requests.</p> */ - void Clear (void); + void Clear(); private: mutable ::osl::Mutex maMutex; @@ -117,7 +117,7 @@ private: /** Initiate the processing of the entries in the queue. The actual processing starts asynchronously. */ - void StartProcessing (void); + void StartProcessing(); /** Callback function for the PostUserEvent() call. */ diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index b25a33d0bb21..f64bcd5f9346 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -50,7 +50,7 @@ class Configuration::ResourceContainer : public ::std::set<Reference<XResourceId>, XResourceIdLess> { public: - ResourceContainer (void) {} + ResourceContainer() {} }; //===== Configuration ========================================================= @@ -76,11 +76,11 @@ Configuration::Configuration ( { } -Configuration::~Configuration (void) +Configuration::~Configuration() { } -void SAL_CALL Configuration::disposing (void) +void SAL_CALL Configuration::disposing() { ::osl::MutexGuard aGuard (maMutex); mpResourceContainer->clear(); @@ -188,7 +188,7 @@ sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxRe //----- XCloneable ------------------------------------------------------------ -Reference<util::XCloneable> SAL_CALL Configuration::createClone (void) +Reference<util::XCloneable> SAL_CALL Configuration::createClone() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -204,7 +204,7 @@ Reference<util::XCloneable> SAL_CALL Configuration::createClone (void) //----- XNamed ---------------------------------------------------------------- -OUString SAL_CALL Configuration::getName (void) +OUString SAL_CALL Configuration::getName() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -280,7 +280,7 @@ void Configuration::PostEvent ( } } -void Configuration::ThrowIfDisposed (void) const +void Configuration::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx index d970b447efd6..50d99322068e 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.cxx @@ -38,7 +38,7 @@ ConfigurationClassifier::ConfigurationClassifier ( { } -bool ConfigurationClassifier::Partition (void) +bool ConfigurationClassifier::Partition() { maC1minusC2.clear(); maC2minusC1.clear(); diff --git a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx index b74a4487a946..da7038241e0b 100644 --- a/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationClassifier.hxx @@ -51,7 +51,7 @@ public: When the two configurations differ then return <TRUE/>. When they are equivalent then return <FALSE/>. */ - bool Partition (void); + bool Partition(); typedef ::std::vector<com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId> > ResourceIdVector; @@ -64,7 +64,7 @@ public: returned. This reference remains valid as long as the called ConfigurationClassifier object stays alive. */ - const ResourceIdVector& GetC1minusC2 (void) const { return maC1minusC2;} + const ResourceIdVector& GetC1minusC2() const { return maC1minusC2;} /** Return the resources that belong to the configuration given as rxConfiguration2 to the constructor but that do not belong to @@ -74,7 +74,7 @@ public: returned. This reference remains valid as long as the called ConfigurationClassifier object stays alive. */ - const ResourceIdVector& GetC2minusC1 (void) const { return maC2minusC1;} + const ResourceIdVector& GetC2minusC1() const { return maC2minusC1;} /** Return the resources that belong to both the configurations that where given to the constructor. @@ -83,7 +83,7 @@ public: returned. This reference remains valid as long as the called ConfigurationClassifier object stays alive. */ - const ResourceIdVector& GetC1andC2 (void) const { return maC1andC2;} + const ResourceIdVector& GetC1andC2() const { return maC1andC2;} void TraceResourceIdVector ( const sal_Char* pMessage, diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index e0744a417f32..e2ecae03f79d 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -52,7 +52,7 @@ public: Implementation ( ConfigurationController& rController, const Reference<frame::XController>& rxController); - ~Implementation (void); + ~Implementation(); Reference<XControllerManager> mxControllerManager; @@ -97,7 +97,7 @@ ConfigurationController::Lock::Lock (const Reference<XConfigurationController>& mxController->lock(); } -ConfigurationController::Lock::~Lock (void) +ConfigurationController::Lock::~Lock() { if (mxController.is()) mxController->unlock(); @@ -105,18 +105,18 @@ ConfigurationController::Lock::~Lock (void) //===== ConfigurationController =============================================== -ConfigurationController::ConfigurationController (void) throw() +ConfigurationController::ConfigurationController() throw() : ConfigurationControllerInterfaceBase(MutexOwner::maMutex) , mpImplementation() , mbIsDisposed(false) { } -ConfigurationController::~ConfigurationController (void) throw() +ConfigurationController::~ConfigurationController() throw() { } -void SAL_CALL ConfigurationController::disposing (void) +void SAL_CALL ConfigurationController::disposing() { if (mpImplementation.get() == NULL) return; @@ -148,7 +148,7 @@ void SAL_CALL ConfigurationController::disposing (void) mpImplementation.reset(); } -void ConfigurationController::ProcessEvent (void) +void ConfigurationController::ProcessEvent() { if (mpImplementation.get() != NULL) { @@ -158,7 +158,7 @@ void ConfigurationController::ProcessEvent (void) } } -void ConfigurationController::RequestSynchronousUpdate (void) +void ConfigurationController::RequestSynchronousUpdate() { if (mpImplementation.get() == NULL) return; @@ -217,7 +217,7 @@ void SAL_CALL ConfigurationController::lock() = mpImplementation->mpConfigurationUpdater->GetLock(); } -void SAL_CALL ConfigurationController::unlock (void) +void SAL_CALL ConfigurationController::unlock() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -342,7 +342,7 @@ Reference<XResource> SAL_CALL ConfigurationController::getResource ( return aDescriptor.mxResource; } -void SAL_CALL ConfigurationController::update (void) +void SAL_CALL ConfigurationController::update() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -361,7 +361,7 @@ void SAL_CALL ConfigurationController::update (void) } } -sal_Bool SAL_CALL ConfigurationController::hasPendingRequests (void) +sal_Bool SAL_CALL ConfigurationController::hasPendingRequests() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -380,7 +380,7 @@ void SAL_CALL ConfigurationController::postChangeRequest ( mpImplementation->mpQueueProcessor->AddRequest(rxRequest); } -Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfiguration (void) +Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfiguration() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -393,7 +393,7 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfigur return Reference<XConfiguration>(); } -Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfiguration (void) +Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfiguration() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -563,7 +563,7 @@ ConfigurationController::Implementation::Implementation ( mpQueueProcessor->SetConfiguration(mxRequestedConfiguration); } -ConfigurationController::Implementation::~Implementation (void) +ConfigurationController::Implementation::~Implementation() { } diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx index fbe1ed0c13c3..5ee7f9d15780 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx @@ -147,7 +147,7 @@ void ConfigurationControllerBroadcaster::NotifyListeners ( } } -void ConfigurationControllerBroadcaster::DisposeAndClear (void) +void ConfigurationControllerBroadcaster::DisposeAndClear() { lang::EventObject aEvent; aEvent.Source = mxConfigurationController; diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx index 6b801500e070..049a8703ac0b 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.hxx @@ -104,7 +104,7 @@ public: the list of registered listeners is empty. Further calls to RemoveListener() are not necessary but do not result in an error. */ - void DisposeAndClear (void); + void DisposeAndClear(); private: css::uno::Reference< diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx index d7a04442539c..5e0e92864b15 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx @@ -43,7 +43,7 @@ ConfigurationControllerResourceManager::ConfigurationControllerResourceManager ( { } -ConfigurationControllerResourceManager::~ConfigurationControllerResourceManager (void) +ConfigurationControllerResourceManager::~ConfigurationControllerResourceManager() { } diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx index ccfcf3f0bfe8..727365574207 100644 --- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx @@ -61,7 +61,7 @@ public: const ::boost::shared_ptr<ResourceFactoryManager>& rpResourceFactoryContainer, const ::boost::shared_ptr<ConfigurationControllerBroadcaster>& rpBroadcaster); - ~ConfigurationControllerResourceManager (void); + ~ConfigurationControllerResourceManager(); /** Activate all the resources that are specified by resource ids in rResources. The resource ids of activated resources are added to diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 10ea9201038f..5cc3a3a2fad8 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -52,7 +52,7 @@ class ConfigurationUpdaterLock public: ConfigurationUpdaterLock (ConfigurationUpdater& rUpdater) : mrUpdater(rUpdater) { mrUpdater.LockUpdates(); } - ~ConfigurationUpdaterLock(void) { mrUpdater.UnlockUpdates(); } + ~ConfigurationUpdaterLock() { mrUpdater.UnlockUpdates(); } private: ConfigurationUpdater& mrUpdater; }; @@ -82,7 +82,7 @@ ConfigurationUpdater::ConfigurationUpdater ( SetControllerManager(rxControllerManager); } -ConfigurationUpdater::~ConfigurationUpdater (void) +ConfigurationUpdater::~ConfigurationUpdater() { maUpdateTimer.Stop(); } @@ -118,7 +118,7 @@ void ConfigurationUpdater::RequestUpdate ( } } -bool ConfigurationUpdater::IsUpdatePossible (void) +bool ConfigurationUpdater::IsUpdatePossible() { return ! mbUpdateBeingProcessed && mxControllerManager.is() @@ -127,7 +127,7 @@ bool ConfigurationUpdater::IsUpdatePossible (void) && mxCurrentConfiguration.is(); } -void ConfigurationUpdater::UpdateConfiguration (void) +void ConfigurationUpdater::UpdateConfiguration() { SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": UpdateConfiguration update"); SetUpdateBeingProcessed(true); @@ -192,7 +192,7 @@ void ConfigurationUpdater::UpdateConfiguration (void) SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": UpdateConfiguration end"); } -void ConfigurationUpdater::CleanRequestedConfiguration (void) +void ConfigurationUpdater::CleanRequestedConfiguration() { if (mxControllerManager.is()) { @@ -211,7 +211,7 @@ void ConfigurationUpdater::CleanRequestedConfiguration (void) } } -void ConfigurationUpdater::CheckUpdateSuccess (void) +void ConfigurationUpdater::CheckUpdateSuccess() { // When the two configurations differ then start the timer to call // another update later. @@ -341,12 +341,12 @@ void ConfigurationUpdater::CheckPureAnchors ( } } -void ConfigurationUpdater::LockUpdates (void) +void ConfigurationUpdater::LockUpdates() { ++mnLockCount; } -void ConfigurationUpdater::UnlockUpdates (void) +void ConfigurationUpdater::UnlockUpdates() { --mnLockCount; if (mnLockCount == 0 && mbUpdatePending) @@ -355,7 +355,7 @@ void ConfigurationUpdater::UnlockUpdates (void) } } -::boost::shared_ptr<ConfigurationUpdaterLock> ConfigurationUpdater::GetLock (void) +::boost::shared_ptr<ConfigurationUpdaterLock> ConfigurationUpdater::GetLock() { return ::boost::shared_ptr<ConfigurationUpdaterLock>(new ConfigurationUpdaterLock(*this)); } diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index bde705ff32af..8c25b7575387 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -53,7 +53,7 @@ public: const ::boost::shared_ptr<ConfigurationControllerResourceManager>& rpResourceManager, const css::uno::Reference< css::drawing::framework::XControllerManager>& rxControllerManager); - ~ConfigurationUpdater (void); + ~ConfigurationUpdater(); /** This method is typically called once, when the controller manager is accessible to the caller. @@ -72,14 +72,14 @@ public: css::drawing::framework::XConfiguration>& rxRequestedConfiguration); css::uno::Reference< - css::drawing::framework::XConfiguration> GetCurrentConfiguration (void) const { return mxCurrentConfiguration;} + css::drawing::framework::XConfiguration> GetCurrentConfiguration() const { return mxCurrentConfiguration;} friend class ConfigurationUpdaterLock; /** Return a lock of the called ConfigurationUpdater. While the returned object exists no update of the current configuration is made. */ - ::boost::shared_ptr<ConfigurationUpdaterLock> GetLock (void); + ::boost::shared_ptr<ConfigurationUpdaterLock> GetLock(); private: /** A reference to the XControllerManager is kept so that @@ -146,7 +146,7 @@ private: and tells them to update their active resources. It notifies listeners about the start and end of the configuration update. */ - void UpdateConfiguration (void); + void UpdateConfiguration(); /** Basically calls UpdaterStart() andUpdateEnd() and makes some debug output. @@ -167,12 +167,12 @@ private: because without the actual resource the 'pureness' of an anchor can not be determined. */ - void CleanRequestedConfiguration (void); + void CleanRequestedConfiguration(); /** Check the success of a recently executed configuration update. When the update failed then start the timer. */ - void CheckUpdateSuccess (void); + void CheckUpdateSuccess(); /** This method sets the mbUpdateBeingProcessed member that is used to prevent reentrance problems. This method allows function objects @@ -185,17 +185,17 @@ private: executed, the lock count, and whether the configuration controller is still valid. */ - bool IsUpdatePossible (void); + bool IsUpdatePossible(); /** Lock updates of the current configuration. For intermediate requests for updates mbUpdatePending is set to <TRUE/>. */ - void LockUpdates (void); + void LockUpdates(); /** When an update was requested since the last LockUpdates() call then RequestUpdate() is called. */ - void UnlockUpdates (void); + void UnlockUpdates(); DECL_LINK(TimeoutHandler, void *); }; diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx index 6653a3409550..c4f569109684 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx @@ -38,7 +38,7 @@ GenericConfigurationChangeRequest::GenericConfigurationChangeRequest ( throw ::com::sun::star::lang::IllegalArgumentException(); } -GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest (void) throw() +GenericConfigurationChangeRequest::~GenericConfigurationChangeRequest() throw() { } @@ -61,7 +61,7 @@ void SAL_CALL GenericConfigurationChangeRequest::execute ( } } -OUString SAL_CALL GenericConfigurationChangeRequest::getName (void) +OUString SAL_CALL GenericConfigurationChangeRequest::getName() throw (RuntimeException, std::exception) { return "GenericConfigurationChangeRequest " diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx index 1eb507da9f30..36bdacdb34a9 100644 --- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx +++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx @@ -70,7 +70,7 @@ public: const Mode eMode) throw (::com::sun::star::lang::IllegalArgumentException); - virtual ~GenericConfigurationChangeRequest (void) throw(); + virtual ~GenericConfigurationChangeRequest() throw(); // XConfigurationChangeOperation @@ -91,7 +91,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 diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index 7602b0847cdb..e3a7cd911783 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -48,7 +48,7 @@ ResourceFactoryManager::ResourceFactoryManager (const Reference<XControllerManag mxURLTransformer = util::URLTransformer::create(xContext); } -ResourceFactoryManager::~ResourceFactoryManager (void) +ResourceFactoryManager::~ResourceFactoryManager() { Reference<lang::XComponent> xComponent (mxURLTransformer, UNO_QUERY); if (xComponent.is()) diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx index 3087051118f1..dcb24835f1fc 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.hxx @@ -42,7 +42,7 @@ public: ResourceFactoryManager ( const css::uno::Reference<css::drawing::framework::XControllerManager>& rxManager); - ~ResourceFactoryManager (void); + ~ResourceFactoryManager(); /** Register a resource factory for one type of resource. @param rsURL diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 1aef100bf4c7..3f343c989069 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -47,7 +47,7 @@ namespace sd { namespace framework { WeakReference<util::XURLTransformer> ResourceId::mxURLTransformerWeak; -ResourceId::ResourceId (void) +ResourceId::ResourceId() : ResourceIdInterfaceBase(), maResourceURLs(0), mpURL() @@ -102,13 +102,13 @@ ResourceId::ResourceId ( ParseResourceURL(); } -ResourceId::~ResourceId (void) +ResourceId::~ResourceId() { mpURL.reset(); } OUString SAL_CALL - ResourceId::getResourceURL (void) + ResourceId::getResourceURL() throw(com::sun::star::uno::RuntimeException, std::exception) { if (!maResourceURLs.empty()) @@ -118,7 +118,7 @@ OUString SAL_CALL } util::URL SAL_CALL - ResourceId::getFullResourceURL (void) + ResourceId::getFullResourceURL() throw(com::sun::star::uno::RuntimeException, std::exception) { if (mpURL.get() != NULL) @@ -140,14 +140,14 @@ util::URL SAL_CALL } sal_Bool SAL_CALL - ResourceId::hasAnchor (void) + ResourceId::hasAnchor() throw (RuntimeException, std::exception) { return maResourceURLs.size()>1; } Reference<XResourceId> SAL_CALL - ResourceId::getAnchor (void) + ResourceId::getAnchor() throw (RuntimeException, std::exception) { ::rtl::Reference<ResourceId> rResourceId (new ResourceId()); @@ -162,7 +162,7 @@ Reference<XResourceId> SAL_CALL } Sequence<OUString> SAL_CALL - ResourceId::getAnchorURLs (void) + ResourceId::getAnchorURLs() throw (RuntimeException, std::exception) { const sal_Int32 nAnchorCount (maResourceURLs.size() - 1); @@ -178,7 +178,7 @@ Sequence<OUString> SAL_CALL } OUString SAL_CALL - ResourceId::getResourceTypePrefix (void) + ResourceId::getResourceTypePrefix() throw (RuntimeException, std::exception) { if (!maResourceURLs.empty() ) @@ -361,7 +361,7 @@ sal_Bool SAL_CALL } Reference<XResourceId> SAL_CALL - ResourceId::clone (void) + ResourceId::clone() throw(RuntimeException, std::exception) { return new ResourceId(maResourceURLs); @@ -492,7 +492,7 @@ bool ResourceId::IsBoundToAnchor ( return true; } -void ResourceId::ParseResourceURL (void) +void ResourceId::ParseResourceURL() { ::osl::Guard< ::osl::Mutex > aGuard (::osl::Mutex::getGlobalMutex()); Reference<util::XURLTransformer> xURLTransformer (mxURLTransformerWeak); diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index 332c8a25b5f6..10142f9b1501 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -27,13 +27,13 @@ using namespace ::com::sun::star::drawing::framework; namespace sd { namespace framework { -UpdateRequest::UpdateRequest (void) +UpdateRequest::UpdateRequest() throw() : UpdateRequestInterfaceBase(MutexOwner::maMutex) { } -UpdateRequest::~UpdateRequest (void) throw() +UpdateRequest::~UpdateRequest() throw() { } @@ -45,7 +45,7 @@ void SAL_CALL UpdateRequest::execute (const Reference<XConfiguration>& rxConfigu // becomes empty. } -OUString SAL_CALL UpdateRequest::getName (void) +OUString SAL_CALL UpdateRequest::getName() throw (RuntimeException, std::exception) { return OUString("UpdateRequest"); diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx index b6461ae31205..cd597028ba91 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.hxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx @@ -50,8 +50,8 @@ class UpdateRequest public UpdateRequestInterfaceBase { public: - UpdateRequest (void) throw(); - virtual ~UpdateRequest (void) throw(); + UpdateRequest() throw(); + virtual ~UpdateRequest() throw(); // XConfigurationChangeOperation @@ -65,7 +65,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 diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index e0e30c7971ae..9d9c7959e0b2 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -81,7 +81,7 @@ class BasicPaneFactory::PaneContainer : public ::std::vector<PaneDescriptor> { public: - PaneContainer (void) {} + PaneContainer() {} }; //===== PaneFactory =========================================================== @@ -96,11 +96,11 @@ BasicPaneFactory::BasicPaneFactory ( { } -BasicPaneFactory::~BasicPaneFactory (void) +BasicPaneFactory::~BasicPaneFactory() { } -void SAL_CALL BasicPaneFactory::disposing (void) +void SAL_CALL BasicPaneFactory::disposing() { Reference<XConfigurationController> xCC (mxConfigurationControllerWeak); if (xCC.is()) @@ -427,7 +427,7 @@ Reference<XResource> BasicPaneFactory::CreateChildWindowPane ( return xPane; } -void BasicPaneFactory::ThrowIfDisposed (void) const +void BasicPaneFactory::ThrowIfDisposed() const throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index b7752de26b68..f5700d706f24 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -67,9 +67,9 @@ class BasicPaneFactory public: BasicPaneFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~BasicPaneFactory (void); + virtual ~BasicPaneFactory(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInitialization @@ -138,7 +138,7 @@ private: css::drawing::framework::XResourceId>& rxPaneId, const PaneDescriptor& rDescriptor); - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 2ac67314ff7a..7ae9508d906a 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -46,16 +46,16 @@ BasicToolBarFactory::BasicToolBarFactory ( (void)rxContext; } -BasicToolBarFactory::~BasicToolBarFactory (void) +BasicToolBarFactory::~BasicToolBarFactory() { } -void SAL_CALL BasicToolBarFactory::disposing (void) +void SAL_CALL BasicToolBarFactory::disposing() { Shutdown(); } -void BasicToolBarFactory::Shutdown (void) +void BasicToolBarFactory::Shutdown() { mpViewShellBase = NULL; Reference<lang::XComponent> xComponent (mxConfigurationController, UNO_QUERY); @@ -161,7 +161,7 @@ void SAL_CALL BasicToolBarFactory::releaseResource ( xComponent->dispose(); } -void BasicToolBarFactory::ThrowIfDisposed (void) const +void BasicToolBarFactory::ThrowIfDisposed() const throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx index 5442f4e19051..024af69fc134 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.hxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.hxx @@ -58,9 +58,9 @@ class BasicToolBarFactory public: BasicToolBarFactory ( const css::uno::Reference<com::sun::star::uno::XComponentContext>& rxContext); - virtual ~BasicToolBarFactory (void); + virtual ~BasicToolBarFactory(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ToolBarFactory @@ -93,9 +93,9 @@ private: css::uno::Reference<css::frame::XController> mxController; ViewShellBase* mpViewShellBase; - void Shutdown (void); + void Shutdown(); - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 10fe98d14b2d..21be69f667a8 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -72,14 +72,14 @@ class BasicViewFactory::ViewShellContainer : public ::std::vector<boost::shared_ptr<ViewDescriptor> > { public: - ViewShellContainer (void) {}; + ViewShellContainer() {}; }; class BasicViewFactory::ViewCache : public ::std::vector<boost::shared_ptr<ViewDescriptor> > { public: - ViewCache (void) {}; + ViewCache() {}; }; //===== ViewFactory =========================================================== @@ -98,11 +98,11 @@ BasicViewFactory::BasicViewFactory ( (void)rxContext; } -BasicViewFactory::~BasicViewFactory (void) +BasicViewFactory::~BasicViewFactory() { } -void SAL_CALL BasicViewFactory::disposing (void) +void SAL_CALL BasicViewFactory::disposing() { // Disconnect from the frame view. if (mpFrameView != NULL) diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx index fa62d325b17d..6d6d89591fa3 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.hxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx @@ -73,9 +73,9 @@ class BasicViewFactory public: BasicViewFactory ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~BasicViewFactory (void); + virtual ~BasicViewFactory(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XViewFactory diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 7e6da77b9cbf..69e79836ba6f 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -88,11 +88,11 @@ ChildWindowPane::ChildWindowPane ( } } -ChildWindowPane::~ChildWindowPane (void) +ChildWindowPane::~ChildWindowPane() { } -void ChildWindowPane::Hide (void) +void ChildWindowPane::Hide() { SfxViewFrame* pViewFrame = mrViewShellBase.GetViewFrame(); if (pViewFrame != NULL) @@ -105,7 +105,7 @@ void ChildWindowPane::Hide (void) mxWindow = NULL; } -void SAL_CALL ChildWindowPane::disposing (void) +void SAL_CALL ChildWindowPane::disposing() { ::osl::MutexGuard aGuard (maMutex); @@ -120,7 +120,7 @@ void SAL_CALL ChildWindowPane::disposing (void) Pane::disposing(); } -::vcl::Window* ChildWindowPane::GetWindow (void) +::vcl::Window* ChildWindowPane::GetWindow() { do { @@ -185,7 +185,7 @@ void SAL_CALL ChildWindowPane::disposing (void) return mpWindow; } -Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow (void) +Reference<awt::XWindow> SAL_CALL ChildWindowPane::getWindow() throw (RuntimeException, std::exception) { if (mpWindow == NULL || ! mxWindow.is()) diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx index a4725002bbdc..ba83dfb53edb 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.hxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx @@ -57,13 +57,13 @@ public: sal_uInt16 nChildWindowId, ViewShellBase& rViewShellBase, ::std::unique_ptr<SfxShell> && pShell); - virtual ~ChildWindowPane (void); + virtual ~ChildWindowPane(); /** Hide the pane. To make the pane visible again, call GetWindow(). */ - void Hide (void); + void Hide(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** This returns the content window when the child window is already visible. Otherwise <NULL/> is returned. In that case a later call @@ -72,13 +72,13 @@ public: Note that GetWindow() may return different Window pointers when Hide() is called in between. */ - virtual vcl::Window* GetWindow (void) SAL_OVERRIDE; + virtual vcl::Window* GetWindow() SAL_OVERRIDE; /** The local getWindow() first calls GetWindow() to provide a valid window pointer before forwarding the call to the base class. */ virtual ::com::sun::star::uno::Reference<com::sun::star::awt::XWindow> - SAL_CALL getWindow (void) + SAL_CALL getWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECLARE_XINTERFACE() diff --git a/sd/source/ui/framework/factories/FrameWindowPane.cxx b/sd/source/ui/framework/factories/FrameWindowPane.cxx index 82af2666733b..c30d5860ed7b 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.cxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.cxx @@ -32,11 +32,11 @@ FrameWindowPane::FrameWindowPane ( { } -FrameWindowPane::~FrameWindowPane (void) throw() +FrameWindowPane::~FrameWindowPane() throw() { } -sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly (void) +sal_Bool SAL_CALL FrameWindowPane::isAnchorOnly() throw (RuntimeException, std::exception) { return false; diff --git a/sd/source/ui/framework/factories/FrameWindowPane.hxx b/sd/source/ui/framework/factories/FrameWindowPane.hxx index 836c2f77929f..cc77ac7f5d28 100644 --- a/sd/source/ui/framework/factories/FrameWindowPane.hxx +++ b/sd/source/ui/framework/factories/FrameWindowPane.hxx @@ -37,13 +37,13 @@ public: const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XResourceId>& rxPaneId, vcl::Window* pWindow); - virtual ~FrameWindowPane (void) throw(); + virtual ~FrameWindowPane() throw(); /** A frame window typically can (and should) exists on its own without children, if only to visualize that something (a view) is missing. Therefore this method always returns <FALSE/>. */ - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index ae8698c4f503..009975465541 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -97,11 +97,11 @@ FullScreenPane::FullScreenPane ( mpWindow->GrabFocus(); } -FullScreenPane::~FullScreenPane (void) throw() +FullScreenPane::~FullScreenPane() throw() { } -void SAL_CALL FullScreenPane::disposing (void) +void SAL_CALL FullScreenPane::disposing() { // We have created the window pointed to by mpWindow, we delete it. if (mpWindow != NULL) @@ -121,7 +121,7 @@ void SAL_CALL FullScreenPane::disposing (void) //----- XPane ----------------------------------------------------------------- -sal_Bool SAL_CALL FullScreenPane::isVisible (void) +sal_Bool SAL_CALL FullScreenPane::isVisible() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -143,7 +143,7 @@ void SAL_CALL FullScreenPane::setVisible (const sal_Bool bIsVisible) mpWorkWindow->Show(bIsVisible); } -Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible (void) +Reference<css::accessibility::XAccessible> SAL_CALL FullScreenPane::getAccessible() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -195,7 +195,7 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent*, pEvent) return 1; } -Reference<rendering::XCanvas> FullScreenPane::CreateCanvas (void) +Reference<rendering::XCanvas> FullScreenPane::CreateCanvas() throw (RuntimeException) { vcl::Window* pWindow = VCLUnoHelper::GetWindow(mxWindow); diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index 1d7c3481ea98..0c2e1afac517 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -52,19 +52,19 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId, const vcl::Window* pViewShellWindow); - virtual ~FullScreenPane (void) throw(); + virtual ~FullScreenPane() throw(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //----- XPane ------------------------------------------------------------- - 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 ( @@ -75,7 +75,7 @@ public: protected: virtual ::com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> - CreateCanvas (void) + CreateCanvas() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index 321692e2e87a..0fd14c668bb2 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -43,17 +43,17 @@ Pane::Pane ( { } -Pane::~Pane (void) +Pane::~Pane() { } -void Pane::disposing (void) +void Pane::disposing() { mxWindow = NULL; mpWindow = NULL; } -::vcl::Window* Pane::GetWindow (void) +::vcl::Window* Pane::GetWindow() { if (mxWindow.is()) return mpWindow; @@ -63,7 +63,7 @@ void Pane::disposing (void) //----- XPane ----------------------------------------------------------------- -Reference<awt::XWindow> SAL_CALL Pane::getWindow (void) +Reference<awt::XWindow> SAL_CALL Pane::getWindow() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -71,7 +71,7 @@ Reference<awt::XWindow> SAL_CALL Pane::getWindow (void) return mxWindow; } -Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void) +Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas() throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard (maMutex); @@ -85,7 +85,7 @@ Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas (void) //----- XPane2 ---------------------------------------------------------------- -sal_Bool SAL_CALL Pane::isVisible (void) +sal_Bool SAL_CALL Pane::isVisible() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -107,7 +107,7 @@ void SAL_CALL Pane::setVisible (sal_Bool bIsVisible) pWindow->Show(bIsVisible); } -Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible (void) +Reference<css::accessibility::XAccessible> SAL_CALL Pane::getAccessible() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -130,7 +130,7 @@ void SAL_CALL Pane::setAccessible ( //----- XResource ------------------------------------------------------------- -Reference<XResourceId> SAL_CALL Pane::getResourceId (void) +Reference<XResourceId> SAL_CALL Pane::getResourceId() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -138,7 +138,7 @@ Reference<XResourceId> SAL_CALL Pane::getResourceId (void) return mxPaneId; } -sal_Bool SAL_CALL Pane::isAnchorOnly (void) +sal_Bool SAL_CALL Pane::isAnchorOnly() throw (RuntimeException, std::exception) { return true; @@ -151,7 +151,7 @@ namespace class thePaneUnoTunnelId : public rtl::Static< UnoTunnelIdInit, thePaneUnoTunnelId > {}; } -const Sequence<sal_Int8>& Pane::getUnoTunnelId (void) +const Sequence<sal_Int8>& Pane::getUnoTunnelId() { return thePaneUnoTunnelId::get().getSeq(); } @@ -170,7 +170,7 @@ sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId) return nResult; } -Reference<rendering::XCanvas> Pane::CreateCanvas (void) +Reference<rendering::XCanvas> Pane::CreateCanvas() throw (RuntimeException) { Reference<rendering::XCanvas> xCanvas; @@ -186,7 +186,7 @@ Reference<rendering::XCanvas> Pane::CreateCanvas (void) return xCanvas; } -void Pane::ThrowIfDisposed (void) const +void Pane::ThrowIfDisposed() const throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index dfe9bf2a0cc0..f8e0322ee7d0 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -47,9 +47,9 @@ class PresentationFactoryProvider { public: PresentationFactoryProvider (const Reference<XComponentContext>& rxContext); - virtual ~PresentationFactoryProvider (void); + virtual ~PresentationFactoryProvider(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInitialization @@ -71,14 +71,14 @@ class PresentationView public: PresentationView (const Reference<XResourceId>& rxViewId) : PresentationViewInterfaceBase(maMutex),mxResourceId(rxViewId) {}; - virtual ~PresentationView (void) {}; + virtual ~PresentationView() {}; // XView - virtual Reference<XResourceId> SAL_CALL getResourceId (void) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual Reference<XResourceId> SAL_CALL getResourceId() throw (RuntimeException, std::exception) SAL_OVERRIDE { return mxResourceId; }; - virtual sal_Bool SAL_CALL isAnchorOnly (void) throw (RuntimeException, std::exception) SAL_OVERRIDE + virtual sal_Bool SAL_CALL isAnchorOnly() throw (RuntimeException, std::exception) SAL_OVERRIDE { return false; } private: @@ -109,11 +109,11 @@ PresentationFactory::PresentationFactory ( } } -PresentationFactory::~PresentationFactory (void) +PresentationFactory::~PresentationFactory() { } -void SAL_CALL PresentationFactory::disposing (void) +void SAL_CALL PresentationFactory::disposing() { } @@ -171,7 +171,7 @@ void SAL_CALL PresentationFactory::disposing ( (void)rEventObject; } -void PresentationFactory::ThrowIfDisposed (void) const +void PresentationFactory::ThrowIfDisposed() const throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -192,11 +192,11 @@ PresentationFactoryProvider::PresentationFactoryProvider ( (void)rxContext; } -PresentationFactoryProvider::~PresentationFactoryProvider (void) +PresentationFactoryProvider::~PresentationFactoryProvider() { } -void PresentationFactoryProvider::disposing (void) +void PresentationFactoryProvider::disposing() { } diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 8d1181d61f1b..ba3361233568 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -67,11 +67,11 @@ ViewShellWrapper::ViewShellWrapper ( { } -ViewShellWrapper::~ViewShellWrapper (void) +ViewShellWrapper::~ViewShellWrapper() { } -void SAL_CALL ViewShellWrapper::disposing (void) +void SAL_CALL ViewShellWrapper::disposing() { ::osl::MutexGuard aGuard( maMutex ); @@ -107,13 +107,13 @@ uno::Any SAL_CALL ViewShellWrapper::queryInterface( const uno::Type & rType ) th //----- XResource ------------------------------------------------------------- -Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId (void) +Reference<XResourceId> SAL_CALL ViewShellWrapper::getResourceId() throw (RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly (void) +sal_Bool SAL_CALL ViewShellWrapper::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -236,7 +236,7 @@ namespace class theViewShellWrapperUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theViewShellWrapperUnoTunnelId> {}; } -const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId (void) +const Sequence<sal_Int8>& ViewShellWrapper::getUnoTunnelId() { return theViewShellWrapperUnoTunnelId::get().getSeq(); } diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index a84ded03f401..a0f2c54f1e9f 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -86,11 +86,11 @@ CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController>& rxC } } -CenterViewFocusModule::~CenterViewFocusModule (void) +CenterViewFocusModule::~CenterViewFocusModule() { } -void SAL_CALL CenterViewFocusModule::disposing (void) +void SAL_CALL CenterViewFocusModule::disposing() { if (mxConfigurationController.is()) mxConfigurationController->removeConfigurationChangeListener(this); diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx index d1ff8eba52e2..af911dbef097 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx @@ -56,9 +56,9 @@ class CenterViewFocusModule public: CenterViewFocusModule ( ::com::sun::star::uno::Reference<com::sun::star::frame::XController>& rxController); - virtual ~CenterViewFocusModule (void); + virtual ~CenterViewFocusModule(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfigurationChangeListener diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 4cce9529c557..8b86fca69008 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -45,7 +45,7 @@ class ModuleController::ResourceToFactoryMap OUStringHash> { public: - ResourceToFactoryMap (void) {} + ResourceToFactoryMap() {} }; class ModuleController::LoadedFactoryContainer @@ -55,7 +55,7 @@ class ModuleController::LoadedFactoryContainer OUStringHash> { public: - LoadedFactoryContainer (void) {} + LoadedFactoryContainer() {} }; //===== ModuleController ====================================================== @@ -76,11 +76,11 @@ ModuleController::ModuleController (const Reference<XComponentContext>& rxContex LoadFactories(rxContext); } -ModuleController::~ModuleController (void) throw() +ModuleController::~ModuleController() throw() { } -void SAL_CALL ModuleController::disposing (void) +void SAL_CALL ModuleController::disposing() { // Break the cyclic reference back to DrawController object mpLoadedFactories.reset(); @@ -142,7 +142,7 @@ void ModuleController::ProcessFactory (const ::std::vector<Any>& rValues) } } -void ModuleController::InstantiateStartupServices (void) +void ModuleController::InstantiateStartupServices() { try { diff --git a/sd/source/ui/framework/module/ResourceManager.cxx b/sd/source/ui/framework/module/ResourceManager.cxx index 14901db3044e..a3255c9fd763 100644 --- a/sd/source/ui/framework/module/ResourceManager.cxx +++ b/sd/source/ui/framework/module/ResourceManager.cxx @@ -42,7 +42,7 @@ class ResourceManager::MainViewContainer : public ::std::set<OUString> { public: - MainViewContainer (void) {} + MainViewContainer() {} }; //===== ResourceManager ======================================================= @@ -80,7 +80,7 @@ ResourceManager::ResourceManager ( } } -ResourceManager::~ResourceManager (void) +ResourceManager::~ResourceManager() { } @@ -96,11 +96,11 @@ bool ResourceManager::IsResourceActive ( return (mpActiveMainViewContainer->find(rsMainViewURL) != mpActiveMainViewContainer->end()); } -void ResourceManager::SaveResourceState (void) +void ResourceManager::SaveResourceState() { } -void SAL_CALL ResourceManager::disposing (void) +void SAL_CALL ResourceManager::disposing() { if (mxConfigurationController.is()) { @@ -165,7 +165,7 @@ void SAL_CALL ResourceManager::notifyConfigurationChange ( } } -void ResourceManager::UpdateForMainViewShell (void) +void ResourceManager::UpdateForMainViewShell() { if (mxConfigurationController.is()) { diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx index 1ce16db74410..e2d31dd49c1a 100644 --- a/sd/source/ui/framework/module/ResourceManager.hxx +++ b/sd/source/ui/framework/module/ResourceManager.hxx @@ -53,16 +53,16 @@ public: ::com::sun::star::frame::XController>& rxController, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::framework::XResourceId>& rxResourceId); - virtual ~ResourceManager (void); + virtual ~ResourceManager(); /** Remember the given URL as one of a center pane view for which to activate the resource managed by the called object. */ void AddActiveMainView (const OUString& rsMainViewURL); bool IsResourceActive (const OUString& rsMainViewURL); - virtual void SaveResourceState (void); + virtual void SaveResourceState(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfigurationChangeListener @@ -101,7 +101,7 @@ private: bool bActivation, const ::com::sun::star::uno::Reference< com::sun::star::drawing::framework::XConfiguration>& rxConfiguration); - void UpdateForMainViewShell (void); + void UpdateForMainViewShell(); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/ShellStackGuard.cxx b/sd/source/ui/framework/module/ShellStackGuard.cxx index 7f2f172d9cef..3e9ef23a51b1 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.cxx +++ b/sd/source/ui/framework/module/ShellStackGuard.cxx @@ -76,11 +76,11 @@ ShellStackGuard::ShellStackGuard (Reference<frame::XController>& rxController) } } -ShellStackGuard::~ShellStackGuard (void) +ShellStackGuard::~ShellStackGuard() { } -void SAL_CALL ShellStackGuard::disposing (void) +void SAL_CALL ShellStackGuard::disposing() { if (mxConfigurationController.is()) mxConfigurationController->removeConfigurationChangeListener(this); @@ -142,7 +142,7 @@ IMPL_LINK(ShellStackGuard, TimeoutHandler, Idle*, pIdle) return 0; } -bool ShellStackGuard::IsPrinting (void) const +bool ShellStackGuard::IsPrinting() const { if (mpBase != NULL) { diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx index 56796f423d09..851687490d1b 100644 --- a/sd/source/ui/framework/module/ShellStackGuard.hxx +++ b/sd/source/ui/framework/module/ShellStackGuard.hxx @@ -65,9 +65,9 @@ class ShellStackGuard { public: ShellStackGuard (css::uno::Reference<css::frame::XController>& rxController); - virtual ~ShellStackGuard (void); + virtual ~ShellStackGuard(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfigurationChangeListener @@ -93,7 +93,7 @@ private: the printer is not printing, or there is no printer, or something else went wrong. */ - bool IsPrinting (void) const; + bool IsPrinting() const; }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index b4a3c430b995..32dc1e79dba5 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -71,11 +71,11 @@ SlideSorterModule::SlideSorterModule ( } } -SlideSorterModule::~SlideSorterModule (void) +SlideSorterModule::~SlideSorterModule() { } -void SlideSorterModule::SaveResourceState (void) +void SlideSorterModule::SaveResourceState() { SvtSlideSorterBarOptions().SetVisibleImpressView(IsResourceActive(FrameworkHelper::msImpressViewURL)); SvtSlideSorterBarOptions().SetVisibleOutlineView(IsResourceActive(FrameworkHelper::msOutlineViewURL)); diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index 906a8ec1b556..349d2f18cadc 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -37,9 +37,9 @@ public: SlideSorterModule ( const css::uno::Reference<css::frame::XController>& rxController, const OUString& rsLeftPaneURL); - virtual ~SlideSorterModule (void); + virtual ~SlideSorterModule(); - virtual void SaveResourceState (void) SAL_OVERRIDE; + virtual void SaveResourceState() SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index a7b88bd06a13..51e4b6ba6254 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -84,11 +84,11 @@ ToolBarModule::ToolBarModule ( } } -ToolBarModule::~ToolBarModule (void) +ToolBarModule::~ToolBarModule() { } -void SAL_CALL ToolBarModule::disposing (void) +void SAL_CALL ToolBarModule::disposing() { if (mxConfigurationController.is()) mxConfigurationController->removeConfigurationChangeListener(this); @@ -133,7 +133,7 @@ void SAL_CALL ToolBarModule::notifyConfigurationChange ( } } -void ToolBarModule::HandleUpdateStart (void) +void ToolBarModule::HandleUpdateStart() { // Lock the ToolBarManager and tell it to lock the ViewShellManager as // well. This way the ToolBarManager can optimize the releasing of @@ -147,7 +147,7 @@ void ToolBarModule::HandleUpdateStart (void) } } -void ToolBarModule::HandleUpdateEnd (void) +void ToolBarModule::HandleUpdateEnd() { if (mbMainViewSwitchUpdatePending) { diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx index 1a309ac66630..36ba62be7144 100644 --- a/sd/source/ui/framework/module/ToolBarModule.hxx +++ b/sd/source/ui/framework/module/ToolBarModule.hxx @@ -56,9 +56,9 @@ public: */ ToolBarModule ( const css::uno::Reference<css::frame::XController>& rxController); - virtual ~ToolBarModule (void); + virtual ~ToolBarModule(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfigurationChangeListener @@ -79,8 +79,8 @@ private: ::boost::scoped_ptr<ToolBarManager::UpdateLock> mpToolBarManagerLock; bool mbMainViewSwitchUpdatePending; - void HandleUpdateStart (void); - void HandleUpdateEnd (void); + void HandleUpdateStart(); + void HandleUpdateEnd(); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/module/ToolPanelModule.cxx b/sd/source/ui/framework/module/ToolPanelModule.cxx index 942e83c5a5aa..617a293862e6 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.cxx +++ b/sd/source/ui/framework/module/ToolPanelModule.cxx @@ -64,11 +64,11 @@ ToolPanelModule::ToolPanelModule ( } } -ToolPanelModule::~ToolPanelModule (void) +ToolPanelModule::~ToolPanelModule() { } -void ToolPanelModule::SaveResourceState (void) +void ToolPanelModule::SaveResourceState() { SvtToolPanelOptions().SetVisibleImpressView(IsResourceActive(FrameworkHelper::msImpressViewURL)); SvtToolPanelOptions().SetVisibleOutlineView(IsResourceActive(FrameworkHelper::msOutlineViewURL)); diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx index 3f22e6efe39a..bbf4ee7c638a 100644 --- a/sd/source/ui/framework/module/ToolPanelModule.hxx +++ b/sd/source/ui/framework/module/ToolPanelModule.hxx @@ -36,9 +36,9 @@ public: ToolPanelModule ( const css::uno::Reference<css::frame::XController>& rxController, const OUString& rsRightPaneURL); - virtual ~ToolPanelModule (void); + virtual ~ToolPanelModule(); - virtual void SaveResourceState (void) SAL_OVERRIDE; + virtual void SaveResourceState() SAL_OVERRIDE; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index bc02e08151f0..ccf08fbabe47 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -77,11 +77,11 @@ ViewTabBarModule::ViewTabBarModule ( } } -ViewTabBarModule::~ViewTabBarModule (void) +ViewTabBarModule::~ViewTabBarModule() { } -void SAL_CALL ViewTabBarModule::disposing (void) +void SAL_CALL ViewTabBarModule::disposing() { if (mxConfigurationController.is()) mxConfigurationController->removeConfigurationChangeListener(this); diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx index b07eef9b0d5e..b8bd19bc4a2d 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.hxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx @@ -59,9 +59,9 @@ public: const css::uno::Reference<css::frame::XController>& rxController, const css::uno::Reference< css::drawing::framework::XResourceId>& rxViewTabBarId); - virtual ~ViewTabBarModule (void); + virtual ~ViewTabBarModule(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XConfigurationChangeListener diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index f775eb2cd972..c666e7017b19 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -91,9 +91,9 @@ public: const OUString& rsEventType, const ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter& rFilter, const ::sd::framework::FrameworkHelper::Callback& rCallback); - virtual ~CallbackCaller (void); + virtual ~CallbackCaller(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing (const lang::EventObject& rEvent) throw (RuntimeException, std::exception) SAL_OVERRIDE; @@ -126,9 +126,9 @@ class LifetimeController { public: explicit LifetimeController (::sd::ViewShellBase& rBase); - virtual ~LifetimeController (void); + virtual ~LifetimeController(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** XEventListener. This method is called when the frame::XController is being destroyed. @@ -149,7 +149,7 @@ private: mbListeningToController members were modified then call this method to either dispose or release the associated FrameworkHelper. */ - void Update (void); + void Update(); }; } // end of anonymous namespace @@ -279,7 +279,7 @@ class FrameworkHelper::ViewURLMap OUStringHash> { public: - ViewURLMap (void) {} + ViewURLMap() {} }; //----- Framework::DiposeListener --------------------------------------------- @@ -296,9 +296,9 @@ class FrameworkHelper::DisposeListener { public: DisposeListener (const ::boost::shared_ptr<FrameworkHelper>& rpHelper); - virtual ~DisposeListener (void); + virtual ~DisposeListener(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) throw(RuntimeException, std::exception) SAL_OVERRIDE; @@ -384,23 +384,23 @@ FrameworkHelper::FrameworkHelper (ViewShellBase& rBase) new LifetimeController(mrBase); } -void FrameworkHelper::Initialize (void) +void FrameworkHelper::Initialize() { mxDisposeListener = new DisposeListener(shared_from_this()); } -FrameworkHelper::~FrameworkHelper (void) +FrameworkHelper::~FrameworkHelper() { } -void FrameworkHelper::Dispose (void) +void FrameworkHelper::Dispose() { if (mxDisposeListener.is()) mxDisposeListener->dispose(); mxConfigurationController = NULL; } -bool FrameworkHelper::IsValid (void) +bool FrameworkHelper::IsValid() { return mxConfigurationController.is(); } @@ -659,7 +659,7 @@ private: bool& mrFlag; }; -void FrameworkHelper::RequestSynchronousUpdate (void) +void FrameworkHelper::RequestSynchronousUpdate() { rtl::Reference<ConfigurationController> pCC ( dynamic_cast<ConfigurationController*>(mxConfigurationController.get())); @@ -689,7 +689,7 @@ void FrameworkHelper::WaitForEvent (const OUString& rsEventType) const } } -void FrameworkHelper::WaitForUpdate (void) const +void FrameworkHelper::WaitForUpdate() const { WaitForEvent(msConfigurationUpdateEndEvent); } @@ -708,7 +708,7 @@ void FrameworkHelper::disposing (const lang::EventObject& rEventObject) mxConfigurationController = NULL; } -void FrameworkHelper::UpdateConfiguration (void) +void FrameworkHelper::UpdateConfiguration() { if (mxConfigurationController.is()) { @@ -784,11 +784,11 @@ FrameworkHelper::DisposeListener::DisposeListener ( xComponent->addEventListener(this); } -FrameworkHelper::DisposeListener::~DisposeListener (void) +FrameworkHelper::DisposeListener::~DisposeListener() { } -void SAL_CALL FrameworkHelper::DisposeListener::disposing (void) +void SAL_CALL FrameworkHelper::DisposeListener::disposing() { Reference<XComponent> xComponent (mpHelper->mxConfigurationController, UNO_QUERY); if (xComponent.is()) @@ -856,11 +856,11 @@ CallbackCaller::CallbackCaller ( } } -CallbackCaller::~CallbackCaller (void) +CallbackCaller::~CallbackCaller() { } -void CallbackCaller::disposing (void) +void CallbackCaller::disposing() { try { @@ -933,12 +933,12 @@ LifetimeController::LifetimeController (::sd::ViewShellBase& rBase) } } -LifetimeController::~LifetimeController (void) +LifetimeController::~LifetimeController() { OSL_ASSERT(!mbListeningToController && !mbListeningToViewShellBase); } -void LifetimeController::disposing (void) +void LifetimeController::disposing() { } @@ -962,7 +962,7 @@ void LifetimeController::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rH } } -void LifetimeController::Update (void) +void LifetimeController::Update() { if (mbListeningToViewShellBase && mbListeningToController) { 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; diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.cxx b/sd/source/ui/presenter/CanvasUpdateRequester.cxx index f460f2bdc493..0f73676fff4b 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.cxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.cxx @@ -68,7 +68,7 @@ CanvasUpdateRequester::CanvasUpdateRequester ( } } -CanvasUpdateRequester::~CanvasUpdateRequester (void) +CanvasUpdateRequester::~CanvasUpdateRequester() { if (mnUserEventId != 0) Application::RemoveUserEvent(mnUserEventId); diff --git a/sd/source/ui/presenter/CanvasUpdateRequester.hxx b/sd/source/ui/presenter/CanvasUpdateRequester.hxx index 4143f4e4e9c2..35085a1e2fc8 100644 --- a/sd/source/ui/presenter/CanvasUpdateRequester.hxx +++ b/sd/source/ui/presenter/CanvasUpdateRequester.hxx @@ -50,7 +50,7 @@ public: private: CanvasUpdateRequester (const css::uno::Reference<css::rendering::XSpriteCanvas>& rxCanvas); - ~CanvasUpdateRequester (void); + ~CanvasUpdateRequester(); class Deleter; friend class Deleter; typedef ::std::vector< diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 908908c7277c..dd38320f3c7c 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -61,8 +61,8 @@ public: const Reference<rendering::XCustomSprite>& rxSprite, const Reference<awt::XWindow>& rxBaseWindow, const css::geometry::RealSize2D& rSpriteSize); - virtual ~PresenterCustomSprite (void); - virtual void SAL_CALL disposing (void) + virtual ~PresenterCustomSprite(); + virtual void SAL_CALL disposing() throw (RuntimeException) SAL_OVERRIDE; // XSprite @@ -84,15 +84,15 @@ public: virtual void SAL_CALL setPriority (double nPriority) throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL show (void) + virtual void SAL_CALL show() throw (RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL hide (void) + virtual void SAL_CALL hide() throw (RuntimeException, std::exception) SAL_OVERRIDE; // XCustomSprite - virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas (void) + virtual Reference<rendering::XCanvas> SAL_CALL getContentCanvas() throw (RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -102,13 +102,13 @@ private: geometry::RealPoint2D maPosition; geometry::RealSize2D maSpriteSize; - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; //===== PresenterCanvas ======================================================= -PresenterCanvas::PresenterCanvas (void) +PresenterCanvas::PresenterCanvas() : PresenterCanvasInterfaceBase(m_aMutex), mxUpdateCanvas(), mxSharedCanvas(), @@ -145,11 +145,11 @@ PresenterCanvas::PresenterCanvas ( mpUpdateRequester = CanvasUpdateRequester::Instance(mxUpdateCanvas); } -PresenterCanvas::~PresenterCanvas (void) +PresenterCanvas::~PresenterCanvas() { } -void SAL_CALL PresenterCanvas::disposing (void) +void SAL_CALL PresenterCanvas::disposing() throw (css::uno::RuntimeException) { if (mxWindow.is()) @@ -234,7 +234,7 @@ css::uno::Sequence<OUString> PresenterCanvas::getSupportedServiceNames() //----- XCanvas --------------------------------------------------------------- -void SAL_CALL PresenterCanvas::clear (void) +void SAL_CALL PresenterCanvas::clear() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -470,7 +470,7 @@ css::uno::Reference<css::rendering::XCachedPrimitive> SAL_CALL } css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL - PresenterCanvas::getDevice (void) + PresenterCanvas::getDevice() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -612,7 +612,7 @@ void SAL_CALL PresenterCanvas::windowHidden (const css::lang::EventObject& rEven //----- XBitmap --------------------------------------------------------------- -geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize (void) +geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -626,7 +626,7 @@ geometry::IntegerSize2D SAL_CALL PresenterCanvas::getSize (void) return geometry::IntegerSize2D(0,0); } -sal_Bool SAL_CALL PresenterCanvas::hasAlpha (void) +sal_Bool SAL_CALL PresenterCanvas::hasAlpha() throw (RuntimeException, std::exception) { Reference<rendering::XBitmap> xBitmap (mxSharedCanvas, UNO_QUERY); @@ -856,7 +856,7 @@ Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip ( return xPolygon; } -void PresenterCanvas::ThrowIfDisposed (void) +void PresenterCanvas::ThrowIfDisposed() throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSharedCanvas.is()) @@ -882,11 +882,11 @@ PresenterCustomSprite::PresenterCustomSprite ( { } -PresenterCustomSprite::~PresenterCustomSprite (void) +PresenterCustomSprite::~PresenterCustomSprite() { } -void SAL_CALL PresenterCustomSprite::disposing (void) +void SAL_CALL PresenterCustomSprite::disposing() throw (RuntimeException) { Reference<XComponent> xComponent (mxSprite, UNO_QUERY); @@ -948,14 +948,14 @@ void SAL_CALL PresenterCustomSprite::setPriority (const double nPriority) mxSprite->setPriority(nPriority); } -void SAL_CALL PresenterCustomSprite::show (void) +void SAL_CALL PresenterCustomSprite::show() throw (RuntimeException, std::exception) { ThrowIfDisposed(); mxSprite->show(); } -void SAL_CALL PresenterCustomSprite::hide (void) +void SAL_CALL PresenterCustomSprite::hide() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -964,14 +964,14 @@ void SAL_CALL PresenterCustomSprite::hide (void) //----- XCustomSprite --------------------------------------------------------- -Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas (void) +Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxSprite->getContentCanvas(); } -void PresenterCustomSprite::ThrowIfDisposed (void) +void PresenterCustomSprite::ThrowIfDisposed() throw (css::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose || ! mxSprite.is()) diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx index d60d41f95c9b..606117caca4e 100644 --- a/sd/source/ui/presenter/PresenterCanvas.hxx +++ b/sd/source/ui/presenter/PresenterCanvas.hxx @@ -70,7 +70,7 @@ public: /** This constructor is used when a PresenterCanvas object is created as a service. */ - PresenterCanvas (void); + PresenterCanvas(); /** This constructor is used when a PresenterCanvas object is created directly, typically by the PresenterCanvasFactory. @@ -105,9 +105,9 @@ public: const css::uno::Reference<css::rendering::XCanvas>& rxSharedCanvas, const css::uno::Reference<css::awt::XWindow>& rxSharedWindow, const css::uno::Reference<css::awt::XWindow>& rxWindow); - virtual ~PresenterCanvas (void); + virtual ~PresenterCanvas(); - virtual void SAL_CALL disposing (void) + virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) SAL_OVERRIDE; css::awt::Point GetOffset (const css::uno::Reference<css::awt::XWindow>& rxBaseWindow); @@ -119,7 +119,7 @@ public: const css::rendering::ViewState& rViewState, const css::awt::Point& raOffset); - css::uno::Reference<css::rendering::XCanvas> GetSharedCanvas (void) const; + css::uno::Reference<css::rendering::XCanvas> GetSharedCanvas() const; /** This method is typically called by CanvasPane objects to set the repaint rectangle of a windowPaint() call as clip rectangle. When @@ -160,7 +160,7 @@ public: // XCanvas - virtual void SAL_CALL clear (void) + virtual void SAL_CALL clear() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL drawPoint ( @@ -305,7 +305,7 @@ public: css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::rendering::XGraphicDevice> SAL_CALL - getDevice (void) + getDevice() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSpriteCanvas @@ -358,10 +358,10 @@ public: // XBitmap - virtual css::geometry::IntegerSize2D SAL_CALL getSize (void) + virtual css::geometry::IntegerSize2D SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasAlpha (void) + virtual sal_Bool SAL_CALL hasAlpha() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::rendering::XBitmap> SAL_CALL getScaledBitmap( @@ -411,7 +411,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/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 8e62792adb37..79d9ef48cad2 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -51,7 +51,7 @@ PresenterHelper::PresenterHelper ( { } -PresenterHelper::~PresenterHelper (void) +PresenterHelper::~PresenterHelper() { } diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index 44bc3fc7b555..4f1625bc919b 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -46,7 +46,7 @@ class PresenterHelper { public: PresenterHelper (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterHelper (void); + virtual ~PresenterHelper(); // XInitialize diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index c4fd99bb1b7e..00406b0759b0 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -35,8 +35,8 @@ namespace sd { namespace presenter { class PresenterPreviewCache::PresenterCacheContext : public CacheContext { public: - PresenterCacheContext (void); - virtual ~PresenterCacheContext (void); + PresenterCacheContext(); + virtual ~PresenterCacheContext(); void SetDocumentSlides ( const Reference<container::XIndexAccess>& rxSlides, @@ -52,12 +52,12 @@ public: virtual void NotifyPreviewCreation ( CacheKey aKey, const Bitmap& rPreview) SAL_OVERRIDE; - virtual bool IsIdle (void) SAL_OVERRIDE; + virtual bool IsIdle() SAL_OVERRIDE; virtual bool IsVisible (CacheKey aKey) SAL_OVERRIDE; virtual const SdrPage* GetPage (CacheKey aKey) SAL_OVERRIDE; virtual ::boost::shared_ptr<std::vector<CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE; virtual sal_Int32 GetPriority (CacheKey aKey) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() SAL_OVERRIDE; private: Reference<container::XIndexAccess> mxSlides; @@ -81,7 +81,7 @@ PresenterPreviewCache::PresenterPreviewCache (const Reference<XComponentContext> (void)rxContext; } -PresenterPreviewCache::~PresenterPreviewCache (void) +PresenterPreviewCache::~PresenterPreviewCache() { } @@ -171,7 +171,7 @@ void SAL_CALL PresenterPreviewCache::removePreviewCreationNotifyListener ( mpCacheContext->RemovePreviewCreationNotifyListener(rxListener); } -void SAL_CALL PresenterPreviewCache::pause (void) +void SAL_CALL PresenterPreviewCache::pause() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -179,7 +179,7 @@ void SAL_CALL PresenterPreviewCache::pause (void) mpCache->Pause(); } -void SAL_CALL PresenterPreviewCache::resume (void) +void SAL_CALL PresenterPreviewCache::resume() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -187,7 +187,7 @@ void SAL_CALL PresenterPreviewCache::resume (void) mpCache->Resume(); } -void PresenterPreviewCache::ThrowIfDisposed (void) +void PresenterPreviewCache::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -199,7 +199,7 @@ void PresenterPreviewCache::ThrowIfDisposed (void) //===== PresenterPreviewCache::PresenterCacheContext ========================== -PresenterPreviewCache::PresenterCacheContext::PresenterCacheContext (void) +PresenterPreviewCache::PresenterCacheContext::PresenterCacheContext() : mxSlides(), mxDocument(), mnFirstVisibleSlideIndex(-1), @@ -208,7 +208,7 @@ PresenterPreviewCache::PresenterCacheContext::PresenterCacheContext (void) { } -PresenterPreviewCache::PresenterCacheContext::~PresenterCacheContext (void) +PresenterPreviewCache::PresenterCacheContext::~PresenterCacheContext() { } @@ -274,7 +274,7 @@ void PresenterPreviewCache::PresenterCacheContext::NotifyPreviewCreation ( CallListeners(nIndex); } -bool PresenterPreviewCache::PresenterCacheContext::IsIdle (void) +bool PresenterPreviewCache::PresenterCacheContext::IsIdle() { return true; } @@ -337,7 +337,7 @@ sal_Int32 PresenterPreviewCache::PresenterCacheContext::GetPriority (CacheKey aK return 0; } -Reference<XInterface> PresenterPreviewCache::PresenterCacheContext::GetModel (void) +Reference<XInterface> PresenterPreviewCache::PresenterCacheContext::GetModel() { return mxDocument; } diff --git a/sd/source/ui/presenter/PresenterPreviewCache.hxx b/sd/source/ui/presenter/PresenterPreviewCache.hxx index 28e7be95957a..fa680c72e0ca 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.hxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.hxx @@ -47,7 +47,7 @@ class PresenterPreviewCache { public: PresenterPreviewCache (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterPreviewCache (void); + virtual ~PresenterPreviewCache(); // XInitialize @@ -87,10 +87,10 @@ public: const css::uno::Reference<css::drawing::XSlidePreviewCacheListener>& rxListener) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL pause (void) + virtual void SAL_CALL pause() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL resume (void) + virtual void SAL_CALL resume() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -103,7 +103,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) throw (css::lang::DisposedException); + void ThrowIfDisposed() throw (css::lang::DisposedException); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index b9fe2662921e..7fde4a4c5e08 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -64,20 +64,20 @@ public: const OUString msTopRelativePropertyName; const OUString msTotalHeightPropertyName; - Implementation (void); - ~Implementation (void); + Implementation(); + ~Implementation(); void SetCanvas (const cppcanvas::CanvasSharedPtr& rCanvas); void SetSize (const Size aSize); void SetBackgroundColor (const Color aColor); void SetTextColor (const Color aColor); void SetFontDescriptor (const awt::FontDescriptor& rFontDescriptor); - sal_Int32 GetTop (void) const { return mnTop;} + sal_Int32 GetTop() const { return mnTop;} void SetTop (const sal_Int32 nTop); void SetText (const OUString& Text); sal_Int32 ParseDistance (const OUString& rsDistance) const; - Reference<rendering::XBitmap> GetBitmap (void); - sal_Int32 GetTotalHeight (void); + Reference<rendering::XBitmap> GetBitmap(); + sal_Int32 GetTotalHeight(); private: Reference<rendering::XBitmap> mxBitmap; @@ -92,9 +92,9 @@ private: sal_Int32 mnTop; sal_Int32 mnTotalHeight; - EditEngine * GetEditEngine (void); - EditEngine* CreateEditEngine (void); - void CheckTop (void); + EditEngine * GetEditEngine(); + EditEngine* CreateEditEngine(); + void CheckTop(); }; // PresenterTextView @@ -105,11 +105,11 @@ PresenterTextView::PresenterTextView (const Reference<XComponentContext>& rxCont (void)rxContext; } -PresenterTextView::~PresenterTextView (void) +PresenterTextView::~PresenterTextView() { } -void SAL_CALL PresenterTextView::disposing (void) +void SAL_CALL PresenterTextView::disposing() { mpImplementation.reset(); } @@ -217,7 +217,7 @@ Any PresenterTextView::SetPropertyValue ( return aOldValue; } -void PresenterTextView::ThrowIfDisposed (void) +void PresenterTextView::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (PresenterTextViewInterfaceBase::rBHelper.bDisposed @@ -230,7 +230,7 @@ void PresenterTextView::ThrowIfDisposed (void) } // PresenterTextView::Implementation -PresenterTextView::Implementation::Implementation (void) +PresenterTextView::Implementation::Implementation() : msTextPropertyName("Text"), msBitmapPropertyName("Bitmap"), msSizePropertyName("Size"), @@ -257,21 +257,21 @@ PresenterTextView::Implementation::Implementation (void) GetEditEngine(); } -PresenterTextView::Implementation::~Implementation (void) +PresenterTextView::Implementation::~Implementation() { delete mpEditEngine; SfxItemPool::Free(mpEditEngineItemPool); delete mpOutputDevice; } -EditEngine * PresenterTextView::Implementation::GetEditEngine (void) +EditEngine * PresenterTextView::Implementation::GetEditEngine() { if (mpEditEngine == NULL) mpEditEngine = CreateEditEngine (); return mpEditEngine; } -EditEngine* PresenterTextView::Implementation::CreateEditEngine (void) +EditEngine* PresenterTextView::Implementation::CreateEditEngine() { EditEngine* pEditEngine = mpEditEngine; if (pEditEngine == NULL) @@ -447,7 +447,7 @@ sal_Int32 PresenterTextView::Implementation::ParseDistance (const OUString& rsDi return nDistance; } -Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void) +Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap() { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); @@ -484,7 +484,7 @@ Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap (void return mxBitmap; } -sal_Int32 PresenterTextView::Implementation::GetTotalHeight (void) +sal_Int32 PresenterTextView::Implementation::GetTotalHeight() { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); @@ -497,7 +497,7 @@ sal_Int32 PresenterTextView::Implementation::GetTotalHeight (void) return mnTotalHeight; } -void PresenterTextView::Implementation::CheckTop (void) +void PresenterTextView::Implementation::CheckTop() { DBG_ASSERT(mpEditEngine!=NULL, "EditEngine missing"); diff --git a/sd/source/ui/presenter/PresenterTextView.hxx b/sd/source/ui/presenter/PresenterTextView.hxx index 21a878dcc698..2927e3831499 100644 --- a/sd/source/ui/presenter/PresenterTextView.hxx +++ b/sd/source/ui/presenter/PresenterTextView.hxx @@ -50,7 +50,7 @@ class PresenterTextView { public: explicit PresenterTextView (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterTextView (void); + virtual ~PresenterTextView(); // XInitialization @@ -58,7 +58,7 @@ public: throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual css::uno::Any GetPropertyValue ( const OUString& rsPropertyName) SAL_OVERRIDE; @@ -73,7 +73,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) throw (css::lang::DisposedException); + void ThrowIfDisposed() throw (css::lang::DisposedException); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index bec55173cf9a..f64f6c515cc0 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -41,11 +41,11 @@ SlideRenderer::SlideRenderer (const Reference<XComponentContext>& rxContext) (void)rxContext; } -SlideRenderer::~SlideRenderer (void) +SlideRenderer::~SlideRenderer() { } -void SAL_CALL SlideRenderer::disposing (void) +void SAL_CALL SlideRenderer::disposing() { } @@ -197,7 +197,7 @@ BitmapEx SlideRenderer::CreatePreview ( } } -void SlideRenderer::ThrowIfDisposed (void) +void SlideRenderer::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (SlideRendererInterfaceBase::rBHelper.bDisposed || SlideRendererInterfaceBase::rBHelper.bInDispose) diff --git a/sd/source/ui/presenter/SlideRenderer.hxx b/sd/source/ui/presenter/SlideRenderer.hxx index 19846faca260..d99459019ab9 100644 --- a/sd/source/ui/presenter/SlideRenderer.hxx +++ b/sd/source/ui/presenter/SlideRenderer.hxx @@ -51,8 +51,8 @@ class SlideRenderer { public: explicit SlideRenderer (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~SlideRenderer (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual ~SlideRenderer(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInitialization @@ -100,7 +100,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) throw (css::lang::DisposedException); + void ThrowIfDisposed() throw (css::lang::DisposedException); }; } } // end of namespace ::sd::presenter diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx index 2bc86be2f671..f166609f1a90 100644 --- a/sd/source/ui/remotecontrol/Listener.cxx +++ b/sd/source/ui/remotecontrol/Listener.cxx @@ -85,12 +85,12 @@ void SAL_CALL Listener::repeat( const css::uno::Reference< //----- XSlideShowListener ---------------------------------------------------- -void SAL_CALL Listener::paused (void) +void SAL_CALL Listener::paused() throw (com::sun::star::uno::RuntimeException, std::exception) { } -void SAL_CALL Listener::resumed (void) +void SAL_CALL Listener::resumed() throw (css::uno::RuntimeException, std::exception) { } @@ -106,7 +106,7 @@ void SAL_CALL Listener::hyperLinkClicked (const OUString &) { } -void SAL_CALL Listener::slideTransitionStarted (void) +void SAL_CALL Listener::slideTransitionStarted() throw (css::uno::RuntimeException, std::exception) { sal_Int32 aSlide = mController->getCurrentSlideIndex(); @@ -122,17 +122,17 @@ void SAL_CALL Listener::slideTransitionStarted (void) } } -void SAL_CALL Listener::slideTransitionEnded (void) +void SAL_CALL Listener::slideTransitionEnded() throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL Listener::slideAnimationsEnded (void) +void SAL_CALL Listener::slideAnimationsEnded() throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL Listener::disposing (void) +void SAL_CALL Listener::disposing() { pTransmitter = NULL; if ( mController.is() ) diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx index 5bcc02d11422..bb89477615d1 100644 --- a/sd/source/ui/remotecontrol/Listener.hxx +++ b/sd/source/ui/remotecontrol/Listener.hxx @@ -55,7 +55,7 @@ public: throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing ( const com::sun::star::lang::EventObject& rEvent) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index d633cfecf978..8e40ef1d0471 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -74,7 +74,7 @@ class AllMasterPagesSelector::SortedMasterPageDescriptorList : public ::std::set<SharedMasterPageDescriptor,MasterPageDescriptorOrder> { public: - SortedMasterPageDescriptorList (void) {} + SortedMasterPageDescriptorList() {} }; MasterPagesSelector* AllMasterPagesSelector::Create ( @@ -113,7 +113,7 @@ AllMasterPagesSelector::AllMasterPagesSelector ( MasterPagesSelector::Fill(); } -AllMasterPagesSelector::~AllMasterPagesSelector (void) +AllMasterPagesSelector::~AllMasterPagesSelector() { } @@ -146,7 +146,7 @@ void AllMasterPagesSelector::NotifyContainerChangeEvent ( } } -void AllMasterPagesSelector::UpdateMasterPageList (void) +void AllMasterPagesSelector::UpdateMasterPageList() { mpSortedMasterPages->clear(); int nTokenCount = mpContainer->GetTokenCount(); diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index e3135871d5ca..11bcb2640f65 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -62,7 +62,7 @@ private: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~AllMasterPagesSelector (void); + virtual ~AllMasterPagesSelector(); void AddTemplate (const TemplateEntry& rEntry); @@ -75,7 +75,7 @@ private: /** Update the internal list of master pages that are to show in the control. */ - void UpdateMasterPageList (void); + void UpdateMasterPageList(); using MasterPagesSelector::Fill; }; diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 5e01b5fa66e4..5e8bdad96b52 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -89,7 +89,7 @@ CurrentMasterPagesSelector::CurrentMasterPagesSelector ( | sd::tools::EventMultiplexerEvent::EID_SHAPE_REMOVED); } -CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void) +CurrentMasterPagesSelector::~CurrentMasterPagesSelector() { if (mrDocument.GetDocSh() != NULL) { @@ -104,7 +104,7 @@ CurrentMasterPagesSelector::~CurrentMasterPagesSelector (void) mrBase.GetEventMultiplexer()->RemoveEventListener(aLink); } -void CurrentMasterPagesSelector::LateInit (void) +void CurrentMasterPagesSelector::LateInit() { MasterPagesSelector::LateInit(); MasterPagesSelector::Fill(); @@ -157,12 +157,12 @@ void CurrentMasterPagesSelector::Fill (ItemList& rItemList) } } -ResId CurrentMasterPagesSelector::GetContextMenuResId (void) const +ResId CurrentMasterPagesSelector::GetContextMenuResId() const { return SdResId(RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP); } -void CurrentMasterPagesSelector::UpdateSelection (void) +void CurrentMasterPagesSelector::UpdateSelection() { // Iterate over all pages and for the selected ones put the name of // their master page into a set. diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx index e5c2932b90be..e9a3cbe5d7d8 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx @@ -44,7 +44,7 @@ public: used by the currently selected page of the document in the center pane. */ - virtual void UpdateSelection (void) SAL_OVERRIDE; + virtual void UpdateSelection() SAL_OVERRIDE; /** Copy all master pages that are to be shown into the given list. */ @@ -53,7 +53,7 @@ public: using MasterPagesSelector::Fill; protected: - virtual ResId GetContextMenuResId (void) const SAL_OVERRIDE; + virtual ResId GetContextMenuResId() const SAL_OVERRIDE; virtual void ProcessPopupMenu (Menu& rMenu) SAL_OVERRIDE; virtual void ExecuteCommand (const sal_Int32 nCommandId) SAL_OVERRIDE; @@ -67,9 +67,9 @@ private: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~CurrentMasterPagesSelector (void); + virtual ~CurrentMasterPagesSelector(); - virtual void LateInit (void) SAL_OVERRIDE; + virtual void LateInit() SAL_OVERRIDE; DECL_LINK(EventMultiplexerListener,sd::tools::EventMultiplexerEvent*); }; diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx index 804b6c143aa7..7f0f2d5c4d69 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -39,7 +39,7 @@ CustomAnimationPanel::CustomAnimationPanel ( #endif } -CustomAnimationPanel::~CustomAnimationPanel (void) +CustomAnimationPanel::~CustomAnimationPanel() { } diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.hxx b/sd/source/ui/sidebar/CustomAnimationPanel.hxx index f9a9d708c8e3..5b42840cb3e3 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.hxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.hxx @@ -32,7 +32,7 @@ public: vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame); - virtual ~CustomAnimationPanel (void); + virtual ~CustomAnimationPanel(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/IDisposable.hxx b/sd/source/ui/sidebar/IDisposable.hxx index 41dc811e0f57..3bad77980735 100644 --- a/sd/source/ui/sidebar/IDisposable.hxx +++ b/sd/source/ui/sidebar/IDisposable.hxx @@ -29,7 +29,7 @@ namespace sd { namespace sidebar { class IDisposable { public: - virtual void Dispose (void) = 0; + virtual void Dispose() = 0; virtual ~IDisposable(); }; diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index b421ac01bf29..1306ffbb8f13 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -192,13 +192,13 @@ void LayoutMenu::implConstruct( DrawDocShell& rDocumentShell ) GetParent()->AddEventListener(aWindowEventHandlerLink); } -LayoutMenu::~LayoutMenu (void) +LayoutMenu::~LayoutMenu() { SAL_INFO("sd.ui", "destroying LayoutMenu at " << this); Dispose(); } -void LayoutMenu::Dispose (void) +void LayoutMenu::Dispose() { if (mbIsDisposed) return; @@ -219,7 +219,7 @@ void LayoutMenu::Dispose (void) GetParent()->RemoveEventListener(aWindowEventHandlerLink); } -AutoLayout LayoutMenu::GetSelectedAutoLayout (void) +AutoLayout LayoutMenu::GetSelectedAutoLayout() { AutoLayout aResult = AUTOLAYOUT_NONE; @@ -266,7 +266,7 @@ void LayoutMenu::Paint (const Rectangle& rRect) ValueSet::Paint (rRect); } -void LayoutMenu::Resize (void) +void LayoutMenu::Resize() { Size aWindowSize = GetOutputSizePixel(); if (IsVisible() && aWindowSize.Width() > 0) @@ -337,7 +337,7 @@ void LayoutMenu::InsertPageWithLayout (AutoLayout aLayout) UpdateSelection(); } -void LayoutMenu::InvalidateContent (void) +void LayoutMenu::InvalidateContent() { // Throw away the current set and fill the menu anew according to the // current settings (this includes the support for vertical writing.) @@ -493,7 +493,7 @@ SfxRequest LayoutMenu::CreateRequest ( return aRequest; } -void LayoutMenu::Fill (void) +void LayoutMenu::Fill() { SvtLanguageOptions aLanguageOptions; bool bVertical = aLanguageOptions.IsVerticalTextEnabled(); @@ -559,7 +559,7 @@ void LayoutMenu::Fill (void) mbSelectionUpdatePending = true; } -void LayoutMenu::Clear (void) +void LayoutMenu::Clear() { for (sal_uInt16 nId=1; nId<=GetItemCount(); nId++) delete static_cast<AutoLayout*>(GetItemData(nId)); @@ -661,7 +661,7 @@ IMPL_LINK(LayoutMenu, OnMenuItemSelected, Menu*, pMenu) return 0; } -void LayoutMenu::UpdateSelection (void) +void LayoutMenu::UpdateSelection() { bool bItemSelected = false; diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 7eb77fc38f46..32c5819f9649 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -72,21 +72,21 @@ public: vcl::Window* pParent, ViewShellBase& rViewShellBase, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~LayoutMenu (void); + virtual ~LayoutMenu(); - void Dispose (void); + void Dispose(); /** Return a numerical value representing the currently selected layout. */ - AutoLayout GetSelectedAutoLayout (void); + AutoLayout GetSelectedAutoLayout(); // From ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; // From vcl::Window virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; /** Show a context menu when the right mouse button is pressed. */ @@ -96,7 +96,7 @@ public: anymore. It will re-assemble this set according to the current settings. */ - void InvalidateContent (void); + void InvalidateContent(); // DragSourceHelper virtual void StartDrag (sal_Int8 nAction, const Point& rPosPixel) SAL_OVERRIDE; @@ -146,11 +146,11 @@ private: /** Fill the value set with the layouts that are applicable to the current main view shell. */ - void Fill (void); + void Fill(); /** Remove all items from the value set. */ - void Clear (void); + void Clear(); /** Assign the given layout to all selected slides of a slide sorter. If no slide sorter is active then this call is ignored. The slide @@ -180,7 +180,7 @@ private: /** Select the layout that is used by the current page. */ - void UpdateSelection (void); + void UpdateSelection(); // internal ctor void implConstruct( DrawDocShell& rDocumentShell ); diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 6ce87fb0019a..0a6c697fa6d1 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -81,12 +81,12 @@ public: static ::boost::weak_ptr<Implementation> mpInstance; MasterPageContainerType maContainer; - static ::boost::shared_ptr<Implementation> Instance (void); + static ::boost::shared_ptr<Implementation> Instance(); - void LateInit (void); + void LateInit(); void AddChangeListener (const Link& rLink); void RemoveChangeListener (const Link& rLink); - void UpdatePreviewSizePixel (void); + void UpdatePreviewSizePixel(); Size GetPreviewSizePixel (PreviewSize eSize) const; bool HasToken (Token aToken) const; @@ -100,8 +100,8 @@ public: PreviewState GetPreviewState (Token aToken) const; bool RequestPreview (Token aToken); - Reference<frame::XModel> GetModel (void); - SdDrawDocument* GetDocument (void); + Reference<frame::XModel> GetModel(); + SdDrawDocument* GetDocument(); void FireContainerChange ( MasterPageContainerChangeEvent::EventType eType, @@ -119,11 +119,11 @@ public: /** Called by the MasterPageContainerFiller to notify that all master pages from template documents have been added. */ - virtual void FillingDone (void) SAL_OVERRIDE; + virtual void FillingDone() SAL_OVERRIDE; private: - Implementation (void); - virtual ~Implementation (void); + Implementation(); + virtual ~Implementation(); class Deleter { public: void operator() (Implementation* pObject) { delete pObject; } @@ -175,7 +175,7 @@ private: Image GetPreviewSubstitution (sal_uInt16 nId, PreviewSize ePreviewSize); - void CleanContainer (void); + void CleanContainer(); }; //===== MasterPageContainer =================================================== @@ -184,7 +184,7 @@ private: MasterPageContainer::Implementation::mpInstance; ::boost::shared_ptr<MasterPageContainer::Implementation> - MasterPageContainer::Implementation::Instance (void) + MasterPageContainer::Implementation::Instance() { ::boost::shared_ptr<MasterPageContainer::Implementation> pInstance; @@ -217,14 +217,14 @@ private: return pInstance; } -MasterPageContainer::MasterPageContainer (void) +MasterPageContainer::MasterPageContainer() : mpImpl(Implementation::Instance()), mePreviewSize(SMALL) { mpImpl->LateInit(); } -MasterPageContainer::~MasterPageContainer (void) +MasterPageContainer::~MasterPageContainer() { } @@ -246,7 +246,7 @@ void MasterPageContainer::SetPreviewSize (PreviewSize eSize) NIL_TOKEN); } -Size MasterPageContainer::GetPreviewSizePixel (void) const +Size MasterPageContainer::GetPreviewSizePixel() const { return mpImpl->GetPreviewSizePixel(mePreviewSize); } @@ -290,7 +290,7 @@ void MasterPageContainer::ReleaseToken (Token aToken) } } -int MasterPageContainer::GetTokenCount (void) const +int MasterPageContainer::GetTokenCount() const { const ::osl::MutexGuard aGuard (mpImpl->maMutex); @@ -483,7 +483,7 @@ bool MasterPageContainer::RequestPreview (Token aToken) //==== Implementation ================================================ -MasterPageContainer::Implementation::Implementation (void) +MasterPageContainer::Implementation::Implementation() : maMutex(), maContainer(), meInitializationState(NOT_INITIALIZED), @@ -505,7 +505,7 @@ MasterPageContainer::Implementation::Implementation (void) UpdatePreviewSizePixel(); } -MasterPageContainer::Implementation::~Implementation (void) +MasterPageContainer::Implementation::~Implementation() { // When the initializer or filler tasks are still running then we have // to stop them now in order to prevent them from calling us back. @@ -527,7 +527,7 @@ MasterPageContainer::Implementation::~Implementation (void) mxModel = NULL; } -void MasterPageContainer::Implementation::LateInit (void) +void MasterPageContainer::Implementation::LateInit() { const ::osl::MutexGuard aGuard (maMutex); @@ -569,7 +569,7 @@ void MasterPageContainer::Implementation::RemoveChangeListener (const Link& rLin maChangeListeners.erase(iListener); } -void MasterPageContainer::Implementation::UpdatePreviewSizePixel (void) +void MasterPageContainer::Implementation::UpdatePreviewSizePixel() { const ::osl::MutexGuard aGuard (maMutex); @@ -835,7 +835,7 @@ bool MasterPageContainer::Implementation::RequestPreview (Token aToken) return false; } -Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void) +Reference<frame::XModel> MasterPageContainer::Implementation::GetModel() { const ::osl::MutexGuard aGuard (maMutex); @@ -887,7 +887,7 @@ Reference<frame::XModel> MasterPageContainer::Implementation::GetModel (void) return mxModel; } -SdDrawDocument* MasterPageContainer::Implementation::GetDocument (void) +SdDrawDocument* MasterPageContainer::Implementation::GetDocument() { GetModel(); return mpDocument; @@ -937,7 +937,7 @@ Image MasterPageContainer::Implementation::GetPreviewSubstitution ( return aPreview; } -void MasterPageContainer::Implementation::CleanContainer (void) +void MasterPageContainer::Implementation::CleanContainer() { // Remove the empty elements at the end of the container. The empty // elements in the middle can not be removed because that would @@ -1031,7 +1031,7 @@ void MasterPageContainer::Implementation::ReleaseDescriptor (Token aToken) } } -void MasterPageContainer::Implementation::FillingDone (void) +void MasterPageContainer::Implementation::FillingDone() { mpRequestQueue->ProcessAllRequests(); } diff --git a/sd/source/ui/sidebar/MasterPageContainer.hxx b/sd/source/ui/sidebar/MasterPageContainer.hxx index 4ed2d90bb6d9..020b6bd2d7fb 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.hxx +++ b/sd/source/ui/sidebar/MasterPageContainer.hxx @@ -58,8 +58,8 @@ public: typedef int Token; static const Token NIL_TOKEN = -1; - MasterPageContainer (void); - virtual ~MasterPageContainer (void); + MasterPageContainer(); + virtual ~MasterPageContainer(); void AddChangeListener (const Link& rLink); void RemoveChangeListener (const Link& rLink); @@ -75,11 +75,11 @@ public: /** Returns the preview size. */ - PreviewSize GetPreviewSize (void) const { return mePreviewSize;} + PreviewSize GetPreviewSize() const { return mePreviewSize;} /** Return the preview size in pixels. */ - Size GetPreviewSizePixel (void) const; + Size GetPreviewSizePixel() const; enum PreviewState { PS_AVAILABLE, PS_CREATABLE, PS_PREPARING, PS_NOT_AVAILABLE }; PreviewState GetPreviewState (Token aToken); @@ -115,7 +115,7 @@ public: /** This and the GetTokenForIndex() methods can be used to iterate over all members of the container. */ - int GetTokenCount (void) const; + int GetTokenCount() const; /** Determine whether the container has a member for the given token. */ diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx index 49fba6dbfc06..f85c72f360e4 100644 --- a/sd/source/ui/sidebar/MasterPageContainerFiller.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerFiller.cxx @@ -51,11 +51,11 @@ MasterPageContainerFiller::MasterPageContainerFiller (ContainerAdapter& rpAdapte mrContainerAdapter.PutMasterPage(pDescriptor); } -MasterPageContainerFiller::~MasterPageContainerFiller (void) +MasterPageContainerFiller::~MasterPageContainerFiller() { } -void MasterPageContainerFiller::RunNextStep (void) +void MasterPageContainerFiller::RunNextStep() { switch (meState) { @@ -95,7 +95,7 @@ void MasterPageContainerFiller::RunNextStep (void) } } -bool MasterPageContainerFiller::HasNextStep (void) +bool MasterPageContainerFiller::HasNextStep() { switch (meState) { @@ -108,7 +108,7 @@ bool MasterPageContainerFiller::HasNextStep (void) } } -MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate (void) +MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate() { State eState (ERROR); @@ -135,7 +135,7 @@ MasterPageContainerFiller::State MasterPageContainerFiller::ScanTemplate (void) return eState; } -MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate (void) +MasterPageContainerFiller::State MasterPageContainerFiller::AddTemplate() { if (mpLastAddedEntry != NULL) { diff --git a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx index d6229edd36bc..2ea39a194ba7 100644 --- a/sd/source/ui/sidebar/MasterPageContainerFiller.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerFiller.hxx @@ -47,25 +47,25 @@ public: /** This method is called when all Impress templates have been added to the container via the PutMasterPage() method. */ - virtual void FillingDone (void) = 0; + virtual void FillingDone() = 0; protected: ~ContainerAdapter() {} }; MasterPageContainerFiller (ContainerAdapter& rContainerAdapter); - virtual ~MasterPageContainerFiller (void); + virtual ~MasterPageContainerFiller(); /** Run the next step of the task. After HasNextStep() returns false this method should ignore further calls. */ - virtual void RunNextStep (void) SAL_OVERRIDE; + virtual void RunNextStep() SAL_OVERRIDE; /** 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) SAL_OVERRIDE; + virtual bool HasNextStep() SAL_OVERRIDE; private: ContainerAdapter& mrContainerAdapter; @@ -81,8 +81,8 @@ private: const TemplateEntry* mpLastAddedEntry; int mnIndex; - State ScanTemplate (void); - State AddTemplate (void); + State ScanTemplate(); + State AddTemplate(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx index c197615666e3..6474735da5e8 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx @@ -40,7 +40,7 @@ namespace sd { namespace sidebar { //===== PagePreviewProvider =================================================== -PagePreviewProvider::PagePreviewProvider (void) +PagePreviewProvider::PagePreviewProvider() { } @@ -65,12 +65,12 @@ Image PagePreviewProvider::operator () ( return aPreview; } -int PagePreviewProvider::GetCostIndex (void) +int PagePreviewProvider::GetCostIndex() { return 5; } -bool PagePreviewProvider::NeedsPageObject (void) +bool PagePreviewProvider::NeedsPageObject() { return true; } @@ -95,12 +95,12 @@ Image TemplatePreviewProvider::operator() ( return Image(ThumbnailView::readThumbnail(msURL)); } -int TemplatePreviewProvider::GetCostIndex (void) +int TemplatePreviewProvider::GetCostIndex() { return 10; } -bool TemplatePreviewProvider::NeedsPageObject (void) +bool TemplatePreviewProvider::NeedsPageObject() { return false; } @@ -163,7 +163,7 @@ SdPage* TemplatePageObjectProvider::operator() (SdDrawDocument* pContainerDocume return PTR_CAST(::sd::DrawDocShell,pShell); } -int TemplatePageObjectProvider::GetCostIndex (void) +int TemplatePageObjectProvider::GetCostIndex() { return 20; } @@ -180,7 +180,7 @@ bool TemplatePageObjectProvider::operator== (const PageObjectProvider& rProvider //===== DefaultPageObjectProvider ============================================== -DefaultPageObjectProvider::DefaultPageObjectProvider (void) +DefaultPageObjectProvider::DefaultPageObjectProvider() { } @@ -203,7 +203,7 @@ SdPage* DefaultPageObjectProvider::operator () (SdDrawDocument* pContainerDocume return pLocalMasterPage; } -int DefaultPageObjectProvider::GetCostIndex (void) +int DefaultPageObjectProvider::GetCostIndex() { return 15; } @@ -227,7 +227,7 @@ SdPage* ExistingPageProvider::operator() (SdDrawDocument* pDocument) return mpPage; } -int ExistingPageProvider::GetCostIndex (void) +int ExistingPageProvider::GetCostIndex() { return 0; } diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx index 7fc367ebe30b..bffab9c3270c 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx @@ -52,7 +52,7 @@ public: immediate return. Positive values stand for higher costs. Negative values are not supported. */ - virtual int GetCostIndex (void) = 0; + virtual int GetCostIndex() = 0; virtual bool operator== (const PageObjectProvider& rProvider) = 0; @@ -83,12 +83,12 @@ public: is the preview creation. Return 0 when the preview is already present and can be returned immediately. */ - virtual int GetCostIndex (void) = 0; + virtual int GetCostIndex() = 0; /** Return whether the page object passed is necessary to create a preview. */ - virtual bool NeedsPageObject (void) = 0; + virtual bool NeedsPageObject() = 0; protected: ~PreviewProvider() {} @@ -99,11 +99,11 @@ protected: class PagePreviewProvider : public PreviewProvider { public: - PagePreviewProvider (void); + PagePreviewProvider(); virtual ~PagePreviewProvider() {} virtual Image operator () (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; - virtual bool NeedsPageObject (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; + virtual bool NeedsPageObject() SAL_OVERRIDE; private: }; @@ -114,9 +114,9 @@ class TemplatePageObjectProvider : public PageObjectProvider { public: TemplatePageObjectProvider (const OUString& rsURL); - virtual ~TemplatePageObjectProvider (void) {}; + virtual ~TemplatePageObjectProvider() {}; virtual SdPage* operator () (SdDrawDocument* pDocument) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; private: OUString msURL; @@ -131,10 +131,10 @@ class TemplatePreviewProvider : public PreviewProvider { public: TemplatePreviewProvider (const OUString& rsURL); - virtual ~TemplatePreviewProvider (void) {}; + virtual ~TemplatePreviewProvider() {}; virtual Image operator() (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; - virtual bool NeedsPageObject (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; + virtual bool NeedsPageObject() SAL_OVERRIDE; private: OUString msURL; }; @@ -144,10 +144,10 @@ private: class DefaultPageObjectProvider : public PageObjectProvider { public: - DefaultPageObjectProvider (void); + DefaultPageObjectProvider(); virtual ~DefaultPageObjectProvider() {} virtual SdPage* operator () (SdDrawDocument* pDocument) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; }; @@ -160,7 +160,7 @@ public: ExistingPageProvider (SdPage* pPage); virtual ~ExistingPageProvider() {} virtual SdPage* operator() (SdDrawDocument* pDocument) SAL_OVERRIDE; - virtual int GetCostIndex (void) SAL_OVERRIDE; + virtual int GetCostIndex() SAL_OVERRIDE; virtual bool operator== (const PageObjectProvider& rProvider) SAL_OVERRIDE; private: SdPage* mpPage; diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index 6841211049b2..0d5b6e46caa4 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -76,7 +76,7 @@ class MasterPageContainerQueue::RequestQueue : public ::std::set<PreviewCreationRequest,PreviewCreationRequest::Compare> { public: - RequestQueue (void) {} + RequestQueue() {} }; //===== MasterPageContainerQueue ============================================== @@ -98,14 +98,14 @@ MasterPageContainerQueue::MasterPageContainerQueue ( { } -MasterPageContainerQueue::~MasterPageContainerQueue (void) +MasterPageContainerQueue::~MasterPageContainerQueue() { maDelayedPreviewCreationTimer.Stop(); while ( ! mpRequestQueue->empty()) mpRequestQueue->erase(mpRequestQueue->begin()); } -void MasterPageContainerQueue::LateInit (void) +void MasterPageContainerQueue::LateInit() { // Set up the timer for the delayed creation of preview bitmaps. maDelayedPreviewCreationTimer.SetTimeout (snDelayedCreationTimeout); @@ -248,12 +248,12 @@ bool MasterPageContainerQueue::HasRequest (MasterPageContainer::Token aToken) co return (iRequest != mpRequestQueue->end()); } -bool MasterPageContainerQueue::IsEmpty (void) const +bool MasterPageContainerQueue::IsEmpty() const { return mpRequestQueue->empty(); } -void MasterPageContainerQueue::ProcessAllRequests (void) +void MasterPageContainerQueue::ProcessAllRequests() { snWaitForMoreRequestsCount = 0; if (mpRequestQueue->size() > 0) diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx index f013acc7da9a..1aa6589c4547 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx @@ -51,7 +51,7 @@ public: static MasterPageContainerQueue* Create ( const ::boost::weak_ptr<ContainerAdapter>& rpContainer); - virtual ~MasterPageContainerQueue (void); + virtual ~MasterPageContainerQueue(); /** This method is typically called for entries in the container for which GetPreviewState() returns OS_CREATABLE. The creation of the @@ -68,14 +68,14 @@ public: /** Return <TRUE/> when there is at least one request in the queue. */ - bool IsEmpty (void) const; + bool IsEmpty() const; /** After this call the queue does not wait anymore for requests with higher priority when only a small number of requests with lower priority are present. This method should be called when all templates are inserted into the MasterPageContainer. */ - void ProcessAllRequests (void); + void ProcessAllRequests(); private: ::boost::weak_ptr<ContainerAdapter> mpWeakContainer; @@ -116,7 +116,7 @@ private: static sal_uInt32 snWaitForMoreRequestsCount; MasterPageContainerQueue (const ::boost::weak_ptr<ContainerAdapter>& rpContainer); - void LateInit (void); + void LateInit(); /** Calculate the priority that defines the order in which requests are processed. diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx index 5ec98d9ff3bb..5c4889d94765 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx @@ -73,7 +73,7 @@ MasterPageDescriptor::MasterPageDescriptor (const MasterPageDescriptor& rDescrip { } -MasterPageDescriptor::~MasterPageDescriptor (void) +MasterPageDescriptor::~MasterPageDescriptor() { } @@ -251,7 +251,7 @@ bool MasterPageDescriptor::UpdatePreview ( return bModified; } -MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassification (void) +MasterPageDescriptor::URLClassification MasterPageDescriptor::GetURLClassification() { if (meURLClassification == URLCLASS_UNDETERMINED) { diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx index c77b2197cda8..7636cf6b4a8d 100644 --- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx +++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx @@ -47,7 +47,7 @@ public: const ::boost::shared_ptr<PageObjectProvider>& rpPageObjectProvider, const ::boost::shared_ptr<PreviewProvider>& rpPreviewProvider); MasterPageDescriptor (const MasterPageDescriptor& rDescriptor); - ~MasterPageDescriptor (void); + ~MasterPageDescriptor(); void SetToken (MasterPageContainer::Token aToken); @@ -137,7 +137,7 @@ public: URLCLASS_UNDETERMINED }; - URLClassification GetURLClassification (void); + URLClassification GetURLClassification(); /** The Token under which the MasterPageContainer gives access to the object. diff --git a/sd/source/ui/sidebar/MasterPageObserver.cxx b/sd/source/ui/sidebar/MasterPageObserver.cxx index 606902ac7ba4..b5b5f4bd4ac5 100644 --- a/sd/source/ui/sidebar/MasterPageObserver.cxx +++ b/sd/source/ui/sidebar/MasterPageObserver.cxx @@ -92,7 +92,7 @@ MasterPageObserver* MasterPageObserver::Implementation::mpInstance = NULL; //===== MasterPageObserver ==================================================== -MasterPageObserver& MasterPageObserver::Instance (void) +MasterPageObserver& MasterPageObserver::Instance() { if (Implementation::mpInstance == NULL) { @@ -138,11 +138,11 @@ void MasterPageObserver::RemoveEventListener (const Link& rEventListener) mpImpl->RemoveEventListener (rEventListener); } -MasterPageObserver::MasterPageObserver (void) +MasterPageObserver::MasterPageObserver() : mpImpl (new Implementation()) {} -MasterPageObserver::~MasterPageObserver (void) +MasterPageObserver::~MasterPageObserver() {} //===== MasterPageObserver::Implementation ==================================== diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 6a0e7b35082b..28d3abde2d9a 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -102,7 +102,7 @@ MasterPagesSelector::MasterPagesSelector ( mpContainer->AddChangeListener(aChangeListener); } -MasterPagesSelector::~MasterPagesSelector (void) +MasterPagesSelector::~MasterPagesSelector() { Clear(); UpdateLocks(ItemList()); @@ -111,7 +111,7 @@ MasterPagesSelector::~MasterPagesSelector (void) mpContainer->RemoveChangeListener(aChangeListener); } -void MasterPagesSelector::LateInit (void) +void MasterPagesSelector::LateInit() { } @@ -149,7 +149,7 @@ void MasterPagesSelector::UpdateLocks (const ItemList& rItemList) maLockedMasterPages.swap(aNewLockList); } -void MasterPagesSelector::Fill (void) +void MasterPagesSelector::Fill() { ::std::unique_ptr<ItemList> pItemList (new ItemList()); @@ -159,7 +159,7 @@ void MasterPagesSelector::Fill (void) UpdateItemList(std::move(pItemList)); } -ResId MasterPagesSelector::GetContextMenuResId (void) const +ResId MasterPagesSelector::GetContextMenuResId() const { return SdResId(RID_TASKPANE_MASTERPAGESSELECTOR_POPUP); } @@ -332,7 +332,7 @@ IMPL_LINK(MasterPagesSelector, ContainerChangeListener, MasterPageContainerChang return 0; } -SdPage* MasterPagesSelector::GetSelectedMasterPage (void) +SdPage* MasterPagesSelector::GetSelectedMasterPage() { const ::osl::MutexGuard aGuard (maMutex); @@ -483,7 +483,7 @@ void MasterPagesSelector::SetUserData (int nIndex, UserData* pData) } } -void MasterPagesSelector::UpdateSelection (void) +void MasterPagesSelector::UpdateSelection() { } @@ -582,7 +582,7 @@ void MasterPagesSelector::InvalidatePreview (const SdPage* pPage) } } -void MasterPagesSelector::UpdateAllPreviews (void) +void MasterPagesSelector::UpdateAllPreviews() { const ::osl::MutexGuard aGuard (maMutex); @@ -602,7 +602,7 @@ void MasterPagesSelector::UpdateAllPreviews (void) PreviewValueSet::Rearrange(true); } -void MasterPagesSelector::ClearPageSet (void) +void MasterPagesSelector::ClearPageSet() { const ::osl::MutexGuard aGuard (maMutex); @@ -633,7 +633,7 @@ sal_Int32 MasterPagesSelector::GetIndexForToken (MasterPageContainer::Token aTok return -1; } -void MasterPagesSelector::Clear (void) +void MasterPagesSelector::Clear() { const ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 46e6f72c95d1..eab38546d57b 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -62,9 +62,9 @@ public: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~MasterPagesSelector (void); + virtual ~MasterPagesSelector(); - virtual void LateInit (void); + virtual void LateInit(); /** Return the height that this control needs to show all of its lines. */ @@ -93,15 +93,15 @@ public: the currently used master pages by default and thus is not influenced by its changes. */ - virtual void UpdateSelection (void); + virtual void UpdateSelection(); - void FillPageSet (void); + void FillPageSet(); /** Make the selector empty. This method clear the value set from any entries. Override this method to add functionality, especially to destroy objects set as data items at the value set. */ - void ClearPageSet (void); + void ClearPageSet(); void SetHelpId( const OString& aId ); @@ -115,7 +115,7 @@ public: */ void InvalidatePreview (const SdPage* pPage); - void UpdateAllPreviews (void); + void UpdateAllPreviews(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; @@ -137,7 +137,7 @@ protected: */ ::std::queue<sal_uInt16> maPreviewUpdateQueue; - SdPage* GetSelectedMasterPage (void); + SdPage* GetSelectedMasterPage(); /** Assign the given master page to all slides of the document. @param pMasterPage @@ -166,7 +166,7 @@ protected: sal_Int32 GetIndexForToken (MasterPageContainer::Token aToken) const; typedef ::std::vector<MasterPageContainer::Token> ItemList; void UpdateItemList (::std::unique_ptr<ItemList> && pList); - void Clear (void); + void Clear(); /** Invalidate the specified item so that on the next Fill() this item is updated. */ @@ -184,14 +184,14 @@ protected: */ void UpdateLocks (const ItemList& rItemList); - void Fill (void); + void Fill(); virtual void Fill (ItemList& rItemList) = 0; /** Give derived classes the opportunity to provide their own context menu. If they do then they probably have to provide their own Execute() and GetState() methods as well. */ - virtual ResId GetContextMenuResId (void) const; + virtual ResId GetContextMenuResId() const; virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/NavigatorWrapper.cxx b/sd/source/ui/sidebar/NavigatorWrapper.cxx index 3197ffcb7daa..6df0a2e01aa6 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.cxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.cxx @@ -47,11 +47,11 @@ NavigatorWrapper::NavigatorWrapper ( maNavigator.Show(); } -NavigatorWrapper::~NavigatorWrapper (void) +NavigatorWrapper::~NavigatorWrapper() { } -void NavigatorWrapper::Resize (void) +void NavigatorWrapper::Resize() { maNavigator.SetSizePixel(GetSizePixel()); } @@ -63,12 +63,12 @@ css::ui::LayoutSize NavigatorWrapper::GetHeightForWidth (const sal_Int32 nWidth) return css::ui::LayoutSize(-1,-1,-1); } -void NavigatorWrapper::UpdateNavigator (void) +void NavigatorWrapper::UpdateNavigator() { maNavigator.InitTreeLB(mrViewShellBase.GetDocument()); } -void NavigatorWrapper::GetFocus (void) +void NavigatorWrapper::GetFocus() { maNavigator.GrabFocus(); } diff --git a/sd/source/ui/sidebar/NavigatorWrapper.hxx b/sd/source/ui/sidebar/NavigatorWrapper.hxx index edc258ffae64..98c95aa72426 100644 --- a/sd/source/ui/sidebar/NavigatorWrapper.hxx +++ b/sd/source/ui/sidebar/NavigatorWrapper.hxx @@ -45,11 +45,11 @@ public: sd::ViewShellBase& rViewShellBase, SfxBindings* pBindings); - virtual ~NavigatorWrapper (void); + virtual ~NavigatorWrapper(); // Control - virtual void Resize (void) SAL_OVERRIDE; - virtual void GetFocus (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; // From ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; @@ -58,7 +58,7 @@ private: ViewShellBase& mrViewShellBase; SdNavigatorWin maNavigator; - void UpdateNavigator (void); + void UpdateNavigator(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index 90c4a49a2907..f0366b7c329d 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -36,14 +36,14 @@ PanelBase::PanelBase ( #endif } -PanelBase::~PanelBase (void) +PanelBase::~PanelBase() { OSL_TRACE("deleting wrapped control at %p", mpWrappedControl.get()); mpWrappedControl.reset(); OSL_TRACE("deleting PanelBase at %p from parent %p", this, GetParent()); } -void PanelBase::Dispose (void) +void PanelBase::Dispose() { OSL_TRACE("PanelBase::DisposeL: deleting wrapped control at %p", mpWrappedControl.get()); mpWrappedControl.reset(); @@ -57,7 +57,7 @@ css::ui::LayoutSize PanelBase::GetHeightForWidth (const sal_Int32 /*nWidth*/) return css::ui::LayoutSize(nHeight,nHeight,nHeight); } -void PanelBase::Resize (void) +void PanelBase::Resize() { if (ProvideWrappedControl()) { @@ -73,7 +73,7 @@ void PanelBase::SetSidebar (const css::uno::Reference<css::ui::XSidebar>& rxSide mxSidebar->requestLayout(); } -bool PanelBase::ProvideWrappedControl (void) +bool PanelBase::ProvideWrappedControl() { if ( ! mpWrappedControl) { diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index 672112fa57d7..dcef4732e521 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -44,12 +44,12 @@ public: PanelBase ( vcl::Window* pParentWindow, ViewShellBase& rViewShellBase); - virtual ~PanelBase (void); + virtual ~PanelBase(); - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; // IDisposable - virtual void Dispose (void) SAL_OVERRIDE; + virtual void Dispose() SAL_OVERRIDE; // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; @@ -67,7 +67,7 @@ private: css::uno::Reference<css::ui::XSidebar> mxSidebar; ViewShellBase& mrViewShellBase; - bool ProvideWrappedControl (void); + bool ProvideWrappedControl(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index 03dbddaa1c49..f10290af8572 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -69,11 +69,11 @@ PanelFactory::PanelFactory( { } -PanelFactory::~PanelFactory (void) +PanelFactory::~PanelFactory() { } -void SAL_CALL PanelFactory::disposing (void) +void SAL_CALL PanelFactory::disposing() { } diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx index 8365a49764f9..6188e3033de1 100644 --- a/sd/source/ui/sidebar/PanelFactory.hxx +++ b/sd/source/ui/sidebar/PanelFactory.hxx @@ -52,15 +52,15 @@ class PanelFactory public PanelFactoryInterfaceBase { public: - static ::rtl::OUString SAL_CALL getImplementationName (void); + static ::rtl::OUString SAL_CALL getImplementationName(); static css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance ( const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory); - static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames (void); + static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames(); PanelFactory (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PanelFactory (void); + virtual ~PanelFactory(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XUIElementFactory diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx index c738b0be64d5..4c199cbb1611 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.cxx +++ b/sd/source/ui/sidebar/PreviewValueSet.cxx @@ -38,7 +38,7 @@ PreviewValueSet::PreviewValueSet (vcl::Window* pParent) SetExtraSpacing (2); } -PreviewValueSet::~PreviewValueSet (void) +PreviewValueSet::~PreviewValueSet() { } @@ -62,7 +62,7 @@ void PreviewValueSet::MouseButtonDown (const MouseEvent& rEvent) } -void PreviewValueSet::Resize (void) +void PreviewValueSet::Resize() { ValueSet::Resize (); diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx b/sd/source/ui/sidebar/PreviewValueSet.hxx index f41f33b2462d..2ce5fc564db0 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.hxx +++ b/sd/source/ui/sidebar/PreviewValueSet.hxx @@ -31,10 +31,10 @@ class PreviewValueSet { public: PreviewValueSet (vcl::Window* pParent); - virtual ~PreviewValueSet (void); + virtual ~PreviewValueSet(); void SetRightMouseClickHandler (const Link& rLink); - virtual void Resize (void) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void SetPreviewSize (const Size& rSize); diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index 002f088746bf..6266e2e25f61 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -66,13 +66,13 @@ RecentMasterPagesSelector::RecentMasterPagesSelector ( { } -RecentMasterPagesSelector::~RecentMasterPagesSelector (void) +RecentMasterPagesSelector::~RecentMasterPagesSelector() { RecentlyUsedMasterPages::Instance().RemoveEventListener ( LINK(this,RecentMasterPagesSelector,MasterPageListListener)); } -void RecentMasterPagesSelector::LateInit (void) +void RecentMasterPagesSelector::LateInit() { MasterPagesSelector::LateInit(); diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx index 0c1c53f67ccd..f690c7875674 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.hxx @@ -64,9 +64,9 @@ private: ViewShellBase& rBase, const ::boost::shared_ptr<MasterPageContainer>& rpContainer, const css::uno::Reference<css::ui::XSidebar>& rxSidebar); - virtual ~RecentMasterPagesSelector (void); + virtual ~RecentMasterPagesSelector(); - virtual void LateInit (void) SAL_OVERRIDE; + virtual void LateInit() SAL_OVERRIDE; }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index 4f7b7577e952..f237da8fd10e 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -63,7 +63,7 @@ namespace sd { namespace sidebar { RecentlyUsedMasterPages* RecentlyUsedMasterPages::mpInstance = NULL; -RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void) +RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance() { if (mpInstance == NULL) { @@ -86,7 +86,7 @@ RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance (void) return *mpInstance; } -RecentlyUsedMasterPages::RecentlyUsedMasterPages (void) +RecentlyUsedMasterPages::RecentlyUsedMasterPages() : maListeners(), mvMasterPages(), mnMaxListSize(8), @@ -94,7 +94,7 @@ RecentlyUsedMasterPages::RecentlyUsedMasterPages (void) { } -RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void) +RecentlyUsedMasterPages::~RecentlyUsedMasterPages() { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); mpContainer->RemoveChangeListener(aLink); @@ -103,7 +103,7 @@ RecentlyUsedMasterPages::~RecentlyUsedMasterPages (void) LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); } -void RecentlyUsedMasterPages::LateInit (void) +void RecentlyUsedMasterPages::LateInit() { Link aLink (LINK(this,RecentlyUsedMasterPages,MasterPageContainerChangeListener)); mpContainer->AddChangeListener(aLink); @@ -113,7 +113,7 @@ void RecentlyUsedMasterPages::LateInit (void) LINK(this,RecentlyUsedMasterPages,MasterPageChangeListener)); } -void RecentlyUsedMasterPages::LoadPersistentValues (void) +void RecentlyUsedMasterPages::LoadPersistentValues() { try { @@ -178,7 +178,7 @@ void RecentlyUsedMasterPages::LoadPersistentValues (void) } } -void RecentlyUsedMasterPages::SavePersistentValues (void) +void RecentlyUsedMasterPages::SavePersistentValues() { try { @@ -257,7 +257,7 @@ void RecentlyUsedMasterPages::RemoveEventListener (const Link& rEventListener) rEventListener)); } -int RecentlyUsedMasterPages::GetMasterPageCount (void) const +int RecentlyUsedMasterPages::GetMasterPageCount() const { return mvMasterPages.size(); } @@ -270,7 +270,7 @@ MasterPageContainer::Token RecentlyUsedMasterPages::GetTokenForIndex (sal_uInt32 return MasterPageContainer::NIL_TOKEN; } -void RecentlyUsedMasterPages::SendEvent (void) +void RecentlyUsedMasterPages::SendEvent() { ::std::vector<Link>::iterator aLink (maListeners.begin()); ::std::vector<Link>::iterator aEnd (maListeners.end()); @@ -361,7 +361,7 @@ void RecentlyUsedMasterPages::AddMasterPage ( } } -void RecentlyUsedMasterPages::ResolveList (void) +void RecentlyUsedMasterPages::ResolveList() { bool bNotify (false); diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx index c4725f678d1b..04fbd5b9c44c 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx @@ -44,12 +44,12 @@ class RecentlyUsedMasterPages public: /** Return the single instance of this class. */ - static RecentlyUsedMasterPages& Instance (void); + static RecentlyUsedMasterPages& Instance(); void AddEventListener (const Link& rEventListener); void RemoveEventListener (const Link& rEventListener); - int GetMasterPageCount (void) const; + int GetMasterPageCount() const; MasterPageContainer::Token GetTokenForIndex (sal_uInt32 nIndex) const; private: @@ -91,18 +91,18 @@ private: unsigned long int mnMaxListSize; ::boost::shared_ptr<MasterPageContainer> mpContainer; - RecentlyUsedMasterPages (void); - virtual ~RecentlyUsedMasterPages (void); + RecentlyUsedMasterPages(); + virtual ~RecentlyUsedMasterPages(); /** Call this method after a new object has been created. */ - void LateInit (void); + void LateInit(); RecentlyUsedMasterPages (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION; RecentlyUsedMasterPages& operator= (const RecentlyUsedMasterPages&) SAL_DELETED_FUNCTION; - void SendEvent (void); + void SendEvent(); DECL_LINK(MasterPageChangeListener, MasterPageObserverEvent*); DECL_LINK(MasterPageContainerChangeListener, MasterPageContainerChangeEvent*); @@ -123,14 +123,14 @@ private: /** Load the list of recently used master pages from the registry where it was saved to make it persistent. */ - void LoadPersistentValues (void); + void LoadPersistentValues(); /** Save the list of recently used master pages to the registry to make it presistent. */ - void SavePersistentValues (void); + void SavePersistentValues(); - void ResolveList (void); + void ResolveList(); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx index 7051d3a957db..2d58b94ac6dc 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -37,7 +37,7 @@ SlideTransitionPanel::SlideTransitionPanel ( #endif } -SlideTransitionPanel::~SlideTransitionPanel (void) +SlideTransitionPanel::~SlideTransitionPanel() { } diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.hxx b/sd/source/ui/sidebar/SlideTransitionPanel.hxx index ab36313cbea6..bd975baf83f9 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.hxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.hxx @@ -32,7 +32,7 @@ public: vcl::Window* pParentWindow, ViewShellBase& rViewShellBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ); - virtual ~SlideTransitionPanel (void); + virtual ~SlideTransitionPanel(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/TableDesignPanel.cxx b/sd/source/ui/sidebar/TableDesignPanel.cxx index f0008cd28a88..30d31ebcac5b 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.cxx +++ b/sd/source/ui/sidebar/TableDesignPanel.cxx @@ -34,7 +34,7 @@ TableDesignPanel::TableDesignPanel ( #endif } -TableDesignPanel::~TableDesignPanel (void) +TableDesignPanel::~TableDesignPanel() { } diff --git a/sd/source/ui/sidebar/TableDesignPanel.hxx b/sd/source/ui/sidebar/TableDesignPanel.hxx index 9d9c5d188c4b..7d52b612460e 100644 --- a/sd/source/ui/sidebar/TableDesignPanel.hxx +++ b/sd/source/ui/sidebar/TableDesignPanel.hxx @@ -30,7 +30,7 @@ public: TableDesignPanel ( vcl::Window* pParentWindow, ViewShellBase& rViewShellBase); - virtual ~TableDesignPanel (void); + virtual ~TableDesignPanel(); // ILayoutableWindow virtual css::ui::LayoutSize GetHeightForWidth (const sal_Int32 nWidth) SAL_OVERRIDE; diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx index 7fb399ef13a0..bcef62055eb3 100644 --- a/sd/source/ui/slideshow/PaneHider.cxx +++ b/sd/source/ui/slideshow/PaneHider.cxx @@ -80,7 +80,7 @@ PaneHider::PaneHider (const ViewShell& rViewShell, SlideshowImpl* pSlideShow) } } -PaneHider::~PaneHider (void) +PaneHider::~PaneHider() { if (mxConfiguration.is() && mxConfigurationController.is()) { diff --git a/sd/source/ui/slideshow/PaneHider.hxx b/sd/source/ui/slideshow/PaneHider.hxx index bfdda992f7a1..6718f819d6bc 100644 --- a/sd/source/ui/slideshow/PaneHider.hxx +++ b/sd/source/ui/slideshow/PaneHider.hxx @@ -42,7 +42,7 @@ public: /** Restore the original visibility of the side panes. */ - ~PaneHider (void); + ~PaneHider(); private: const ViewShell& mrViewShell; diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index a4757d70d76e..cdf9b8401f9d 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -47,7 +47,7 @@ SlideShowRestarter::SlideShowRestarter ( { } -SlideShowRestarter::~SlideShowRestarter (void) +SlideShowRestarter::~SlideShowRestarter() { } @@ -123,7 +123,7 @@ IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation) return 0; } -void SlideShowRestarter::StartPresentation (void) +void SlideShowRestarter::StartPresentation() { //rhbz#1091117 crash because we're exiting the application, and this is //being called during the configuration update event on exit. At this point diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx index 6a216143bd8e..56a23b80030f 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.hxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx @@ -51,7 +51,7 @@ public: SlideShowRestarter ( const ::rtl::Reference<SlideShow>& rpSlideShow, ViewShellBase* pViewShellBase); - virtual ~SlideShowRestarter (void); + virtual ~SlideShowRestarter(); /** Restarting the slide show is an asynchronous multi step process which is started by calling this method. @@ -73,14 +73,14 @@ private: displays has changed and thus whether restarting the slide show is really necessary. */ - sal_Int32 GetDisplayCount (void); + sal_Int32 GetDisplayCount(); DECL_LINK(EndPresentation, void*); /** Restart the presentation on the slide last shown before the restart was initiated. */ - void StartPresentation (void); + void StartPresentation(); }; } // end of namespace sd diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 712a73c5d3f7..29c4031dc20d 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -77,7 +77,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, vc AddEventListener( LINK( this, ShowWindow, EventHdl ) ); } -ShowWindow::~ShowWindow(void) +ShowWindow::~ShowWindow() { maPauseTimer.Stop(); maMouseTimer.Stop(); @@ -621,7 +621,7 @@ void ShowWindow::AddWindowToPaintView() // Override the sd::Window's CreateAccessible to create a different accessible object ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - ShowWindow::CreateAccessible (void) + ShowWindow::CreateAccessible() { ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc = GetAccessible(false); if (xAcc.get()) diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 894938f86043..81bfe0a437c3 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -50,7 +50,7 @@ class ShowWindow public: ShowWindow ( const ::rtl::Reference< ::sd::SlideshowImpl >& xController, vcl::Window* pParent ); - virtual ~ShowWindow (void); + virtual ~ShowWindow(); bool SetEndMode(); bool SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = NULL ); @@ -80,7 +80,7 @@ public: /// Override the sd::Window's CreateAccessible to create a different accessible object virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - CreateAccessible (void) SAL_OVERRIDE; + CreateAccessible() SAL_OVERRIDE; void TerminateShow(); void RestartShow(); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 32f8db4ed6b0..d077853dfc65 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -879,7 +879,7 @@ Reference< XSlideShowController > SAL_CALL SlideShow::getController( ) throw (R // XComponent -void SAL_CALL SlideShow::disposing (void) +void SAL_CALL SlideShow::disposing() { SolarMutexGuard aGuard; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index eac84daaf878..694f43579c3f 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1823,7 +1823,7 @@ IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener) return updateSlideShow(); } -sal_Int32 SlideshowImpl::updateSlideShow (void) +sal_Int32 SlideshowImpl::updateSlideShow() { // prevent me from deletion when recursing (App::EnableYieldMode does) const rtl::Reference<SlideshowImpl> this_(this); diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index b39c4ede6c9a..d9ddffb8a07a 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -316,7 +316,7 @@ private: its return value, wait for a certain amount of time before another call to update() is scheduled. */ - sal_Int32 updateSlideShow (void); + sal_Int32 updateSlideShow(); css::uno::Reference< css::presentation::XSlideShow > mxShow; rtl::Reference<sd::SlideShowView> mxView; diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 7cc55952c95c..eabd8aeb0176 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -40,28 +40,28 @@ class BitmapCache::CacheEntry public: CacheEntry(const Bitmap& rBitmap, sal_Int32 nLastAccessTime, bool bIsPrecious); CacheEntry(sal_Int32 nLastAccessTime, bool bIsPrecious); - ~CacheEntry (void) {}; + ~CacheEntry() {}; inline void Recycle (const CacheEntry& rEntry); - inline sal_Int32 GetMemorySize (void) const; + inline sal_Int32 GetMemorySize() const; void Compress (const ::boost::shared_ptr<BitmapCompressor>& rpCompressor); - inline void Decompress (void); + inline void Decompress(); - bool IsUpToDate (void) const { return mbIsUpToDate; } + bool IsUpToDate() const { return mbIsUpToDate; } void SetUpToDate (bool bIsUpToDate) { mbIsUpToDate = bIsUpToDate; } - sal_Int32 GetAccessTime (void) const { return mnLastAccessTime; } + sal_Int32 GetAccessTime() const { return mnLastAccessTime; } void SetAccessTime (sal_Int32 nAccessTime) { mnLastAccessTime = nAccessTime; } - Bitmap GetPreview (void) const { return maPreview; } + Bitmap GetPreview() const { return maPreview; } inline void SetPreview (const Bitmap& rPreview); - bool HasPreview (void) const; + bool HasPreview() const; - Bitmap GetMarkedPreview (void) const { return maMarkedPreview; } + Bitmap GetMarkedPreview() const { return maMarkedPreview; } inline void SetMarkedPreview (const Bitmap& rMarkePreview); - bool HasReplacement (void) const { return (mpReplacement.get() != NULL); } - inline bool HasLosslessReplacement (void) const; - void Invalidate (void) { mpReplacement.reset(); mpCompressor.reset(); mbIsUpToDate = false; } - bool IsPrecious (void) const { return mbIsPrecious; } + bool HasReplacement() const { return (mpReplacement.get() != NULL); } + inline bool HasLosslessReplacement() const; + void Invalidate() { mpReplacement.reset(); mpCompressor.reset(); mbIsUpToDate = false; } + bool IsPrecious() const { return mbIsPrecious; } void SetPrecious (bool bIsPrecious) { mbIsPrecious = bIsPrecious; } private: @@ -88,7 +88,7 @@ class BitmapCache::CacheBitmapContainer : public std::unordered_map<CacheKey, CacheEntry, CacheHash> { public: - CacheBitmapContainer (void) {} + CacheBitmapContainer() {} }; namespace { @@ -138,12 +138,12 @@ BitmapCache::BitmapCache (const sal_Int32 nMaximalNormalCacheSize) mpCacheCompactor = CacheCompactor::Create(*this,mnMaximalNormalCacheSize); } -BitmapCache::~BitmapCache (void) +BitmapCache::~BitmapCache() { Clear(); } -void BitmapCache::Clear (void) +void BitmapCache::Clear() { ::osl::MutexGuard aGuard (maMutex); @@ -251,7 +251,7 @@ bool BitmapCache::InvalidateBitmap (const CacheKey& rKey) return false; } -void BitmapCache::InvalidateCache (void) +void BitmapCache::InvalidateCache() { ::osl::MutexGuard aGuard (maMutex); @@ -330,7 +330,7 @@ void BitmapCache::SetPrecious (const CacheKey& rKey, bool bIsPrecious) } } -void BitmapCache::ReCalculateTotalCacheSize (void) +void BitmapCache::ReCalculateTotalCacheSize() { ::osl::MutexGuard aGuard (maMutex); @@ -494,7 +494,7 @@ inline void BitmapCache::CacheEntry::Recycle (const CacheEntry& rEntry) } } -inline sal_Int32 BitmapCache::CacheEntry::GetMemorySize (void) const +inline sal_Int32 BitmapCache::CacheEntry::GetMemorySize() const { sal_Int32 nSize (0); nSize += maPreview.GetSizeBytes(); @@ -529,7 +529,7 @@ void BitmapCache::CacheEntry::Compress (const ::boost::shared_ptr<BitmapCompress } } -inline void BitmapCache::CacheEntry::Decompress (void) +inline void BitmapCache::CacheEntry::Decompress() { if (mpReplacement.get()!=NULL && mpCompressor.get()!=NULL && maPreview.IsEmpty()) { @@ -548,7 +548,7 @@ inline void BitmapCache::CacheEntry::SetPreview (const Bitmap& rPreview) mpCompressor.reset(); } -bool BitmapCache::CacheEntry::HasPreview (void) const +bool BitmapCache::CacheEntry::HasPreview() const { return ! maPreview.IsEmpty(); } @@ -558,7 +558,7 @@ inline void BitmapCache::CacheEntry::SetMarkedPreview (const Bitmap& rMarkedPrev maMarkedPreview = rMarkedPreview; } -inline bool BitmapCache::CacheEntry::HasLosslessReplacement (void) const +inline bool BitmapCache::CacheEntry::HasLosslessReplacement() const { return mpReplacement.get()!=NULL && mpCompressor.get()!=NULL diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx index c6165450f101..fe022d4ace48 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.hxx @@ -68,22 +68,22 @@ public: /** The destructor clears the cache and relases all bitmaps still in it. */ - ~BitmapCache (void); + ~BitmapCache(); /** Remove all preview bitmaps from the cache. After this call the cache is empty. */ - void Clear (void); + void Clear(); /** Return <TRUE/> when the cache is full, i.e. the cache compactor had to be run. */ - bool IsFull (void) const { return mbIsFull;} + bool IsFull() const { return mbIsFull;} /** Return the memory size that is occupied by all non-precious bitmaps in the cache. */ - sal_Int32 GetSize (void) { return mnNormalCacheSize;} + sal_Int32 GetSize() { return mnNormalCacheSize;} /** Return <TRUE/> when a preview bitmap exists for the given key. */ @@ -118,7 +118,7 @@ public: /** Mark all preview bitmaps as not being up-to-date anymore. */ - void InvalidateCache (void); + void InvalidateCache(); /** Add or replace a bitmap for the given key. */ @@ -142,7 +142,7 @@ public: the cache size is tracked with each modification of preview bitmaps. */ - void ReCalculateTotalCacheSize (void); + void ReCalculateTotalCacheSize(); /** Use the previews in the given cache to initialize missing previews. */ diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx index dcb3f669731c..c124dc7923d2 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx @@ -39,8 +39,8 @@ public: Size maOriginalSize; DummyReplacement (const Bitmap& rPreview) : maPreview(rPreview) { } - virtual ~DummyReplacement(void) {} - virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE { return maPreview.GetSizeBytes(); } + virtual ~DummyReplacement() {} + virtual sal_Int32 GetMemorySize() const SAL_OVERRIDE { return maPreview.GetSizeBytes(); } }; ::boost::shared_ptr<BitmapReplacement> NoBitmapCompression::Compress (const Bitmap& rBitmap) const @@ -53,7 +53,7 @@ Bitmap NoBitmapCompression::Decompress (const BitmapReplacement& rBitmapData) co return dynamic_cast<const DummyReplacement&>(rBitmapData).maPreview; } -bool NoBitmapCompression::IsLossless (void) const +bool NoBitmapCompression::IsLossless() const { return true; } @@ -72,7 +72,7 @@ Bitmap CompressionByDeletion::Decompress (const BitmapReplacement& ) const return Bitmap(); } -bool CompressionByDeletion::IsLossless (void) const +bool CompressionByDeletion::IsLossless() const { return false; } @@ -88,14 +88,14 @@ public: Size maOriginalSize; virtual ~ResolutionReducedReplacement(); - virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE; + virtual sal_Int32 GetMemorySize() const SAL_OVERRIDE; }; ResolutionReduction::ResolutionReducedReplacement::~ResolutionReducedReplacement() { } -sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize (void) const +sal_Int32 ResolutionReduction::ResolutionReducedReplacement::GetMemorySize() const { return maPreview.GetSizeBytes(); } @@ -133,7 +133,7 @@ Bitmap ResolutionReduction::Decompress (const BitmapReplacement& rBitmapData) co return aResult; } -bool ResolutionReduction::IsLossless (void) const +bool ResolutionReduction::IsLossless() const { return false; } @@ -146,16 +146,16 @@ public: void* mpData; sal_Int32 mnDataSize; Size maImageSize; - PngReplacement (void) + PngReplacement() : mpData(NULL), mnDataSize(0), maImageSize(0,0) {} - virtual ~PngReplacement (void) + virtual ~PngReplacement() { delete [] static_cast<char*>(mpData); } - virtual sal_Int32 GetMemorySize (void) const SAL_OVERRIDE + virtual sal_Int32 GetMemorySize() const SAL_OVERRIDE { return mnDataSize; } @@ -191,7 +191,7 @@ Bitmap PngCompression::Decompress ( return aResult; } -bool PngCompression::IsLossless (void) const +bool PngCompression::IsLossless() const { return true; } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx index 1a218ae831db..6c40c0d4d4c4 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx @@ -53,7 +53,7 @@ public: value is used by the caller of Decompress() to decide whether to use the returned bitmap as is or if a new preview has to be created. */ - virtual bool IsLossless (void) const = 0; + virtual bool IsLossless() const = 0; protected: ~BitmapCompressor() {} @@ -66,7 +66,7 @@ protected: class BitmapReplacement { public: - virtual sal_Int32 GetMemorySize (void) const { return 0; } + virtual sal_Int32 GetMemorySize() const { return 0; } protected: ~BitmapReplacement() {} @@ -84,7 +84,7 @@ public: virtual ~NoBitmapCompression() {} virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rpBitmap) const SAL_OVERRIDE; virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; /** This is another trivial bitmap compressor. Instead of compressing a @@ -99,7 +99,7 @@ public: virtual ~CompressionByDeletion() {} virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const SAL_OVERRIDE; virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; /** Compress a preview bitmap by reducing its resolution. While the aspect @@ -118,7 +118,7 @@ public: /** Scale the replacement bitmap up to the original size. */ virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; /** Compress preview bitmaps using the PNG format. @@ -132,7 +132,7 @@ public: virtual ~PngCompression() {} virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const SAL_OVERRIDE; virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const SAL_OVERRIDE; - virtual bool IsLossless (void) const SAL_OVERRIDE; + virtual bool IsLossless() const SAL_OVERRIDE; }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index d0297df50b7c..14dd577c216b 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -38,12 +38,12 @@ class PageObjectViewObjectContact; namespace sd { namespace slidesorter { namespace cache { -BitmapFactory::BitmapFactory (void) +BitmapFactory::BitmapFactory() : maRenderer(NULL, false) { } -BitmapFactory::~BitmapFactory (void) +BitmapFactory::~BitmapFactory() { } diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx index 9e84e05f8208..80805787be51 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.hxx @@ -34,8 +34,8 @@ namespace sd { namespace slidesorter { namespace cache { class BitmapFactory { public: - BitmapFactory (void); - ~BitmapFactory (void); + BitmapFactory(); + ~BitmapFactory(); Bitmap CreateBitmap ( const SdPage& rPage, diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 1c3af1ba1fbe..55595e165bbd 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -45,10 +45,10 @@ public: : CacheCompactor(rCache, nMaximalCacheSize) {} - virtual void RequestCompaction (void) SAL_OVERRIDE { /* Ignored */ }; + virtual void RequestCompaction() SAL_OVERRIDE { /* Ignored */ }; protected: - virtual void Run (void) SAL_OVERRIDE { /* Do nothing */ }; + virtual void Run() SAL_OVERRIDE { /* Do nothing */ }; }; /** This implementation of the CacheCompactor interface class uses one of @@ -67,7 +67,7 @@ public: const ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor>& rpCompressor); protected: - virtual void Run (void) SAL_OVERRIDE; + virtual void Run() SAL_OVERRIDE; private: ::boost::shared_ptr< ::sd::slidesorter::cache::BitmapCompressor> mpCompressor; @@ -114,7 +114,7 @@ namespace sd { namespace slidesorter { namespace cache { return pCompactor; } -void CacheCompactor::RequestCompaction (void) +void CacheCompactor::RequestCompaction() { if ( ! mbIsCompactionRunning && ! maCompactionTimer.IsActive()) maCompactionTimer.Start(); @@ -166,7 +166,7 @@ CacheCompactionByCompression::CacheCompactionByCompression ( { } -void CacheCompactionByCompression::Run (void) +void CacheCompactionByCompression::Run() { if (mrCache.GetSize() > mnMaximalCacheSize) { diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index aab64e2fea21..481a92165cf2 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx @@ -34,7 +34,7 @@ class BitmapCache; class CacheCompactor { public: - virtual ~CacheCompactor (void) {}; + virtual ~CacheCompactor() {}; /** Create a new instance of the CacheCompactor interface class. The type of compaction algorithm used depends on values from the @@ -59,7 +59,7 @@ public: /** Request a compaction of the off-screen previews in the bitmap cache. This calls via a timer the Run() method. */ - virtual void RequestCompaction (void); + virtual void RequestCompaction(); protected: BitmapCache& mrCache; @@ -72,7 +72,7 @@ protected: /** This method actually tries to reduce the total number of bytes used by the off-screen preview bitmaps. */ - virtual void Run (void) = 0; + virtual void Run() = 0; private: /** This timer is used to collect calles to RequestCompaction() and diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 1c842e8ec5c9..6baa2ef9b122 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -43,7 +43,7 @@ namespace ::boost::weak_ptr<CacheConfiguration> CacheConfiguration::mpWeakInstance; Timer CacheConfiguration::maReleaseTimer; -::boost::shared_ptr<CacheConfiguration> CacheConfiguration::Instance (void) +::boost::shared_ptr<CacheConfiguration> CacheConfiguration::Instance() { SolarMutexGuard aSolarGuard; CacheConfigSharedPtr &rInstancePtr = theInstance::get(); @@ -67,7 +67,7 @@ Timer CacheConfiguration::maReleaseTimer; return rInstancePtr; } -CacheConfiguration::CacheConfiguration (void) +CacheConfiguration::CacheConfiguration() { // Get the cache size from configuration. const OUString sPathToImpressConfigurationRoot("/org.openoffice.Office.Impress/"); diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index 6003e2da39e0..ff6cc9d2ee32 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -38,7 +38,7 @@ public: seconds. Subsequent calls to this function will create a new instance. */ - static ::boost::shared_ptr<CacheConfiguration> Instance (void); + static ::boost::shared_ptr<CacheConfiguration> Instance(); /** Look up the specified value in MultiPaneGUI/SlideSorter/PreviewCache. When the specified value @@ -55,7 +55,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> mxCacheNode; - CacheConfiguration (void); + CacheConfiguration(); DECL_LINK(TimerCallback, void *); }; diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index eae56decc898..fe4a6dda6116 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -47,7 +47,7 @@ GenericPageCache::GenericPageCache ( "This may indicate an error."); } -GenericPageCache::~GenericPageCache (void) +GenericPageCache::~GenericPageCache() { if (mpQueueProcessor.get() != NULL) mpQueueProcessor->Stop(); @@ -59,7 +59,7 @@ GenericPageCache::~GenericPageCache (void) mpBitmapCache.reset(); } -void GenericPageCache::ProvideCacheAndProcessor (void) +void GenericPageCache::ProvideCacheAndProcessor() { if (mpBitmapCache.get() == NULL) mpBitmapCache = PageCacheManager::Instance()->GetCache( @@ -274,14 +274,14 @@ void GenericPageCache::SetPreciousFlag ( mpBitmapCache->SetPrecious(mpCacheContext->GetPage(aKey), bIsPrecious); } -void GenericPageCache::Pause (void) +void GenericPageCache::Pause() { ProvideCacheAndProcessor(); if (mpQueueProcessor.get() != NULL) mpQueueProcessor->Pause(); } -void GenericPageCache::Resume (void) +void GenericPageCache::Resume() { ProvideCacheAndProcessor(); if (mpQueueProcessor.get() != NULL) diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx index 93c9ade141ea..207dceeb531e 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx @@ -48,7 +48,7 @@ public: const bool bDoSuperSampling, const SharedCacheContext& rpCacheContext); - ~GenericPageCache (void); + ~GenericPageCache(); /** Change the size of the preview bitmaps. This may be caused by a resize of the slide sorter window or a change of the number of @@ -124,8 +124,8 @@ public: */ void SetPreciousFlag (const CacheKey aKey, const bool bIsPrecious); - void Pause (void); - void Resume (void); + void Pause(); + void Resume(); private: ::boost::shared_ptr<BitmapCache> mpBitmapCache; @@ -145,7 +145,7 @@ private: /** Both bitmap cache and queue processor are created on demand by this method. */ - void ProvideCacheAndProcessor (void); + void ProvideCacheAndProcessor(); }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index 34da19a50ec7..c369500f9fdf 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -41,7 +41,7 @@ PageCache::PageCache ( { } -PageCache::~PageCache (void) +PageCache::~PageCache() { } @@ -98,12 +98,12 @@ void PageCache::SetPreciousFlag ( mpImplementation->SetPreciousFlag(aKey, bIsPrecious); } -void PageCache::Pause (void) +void PageCache::Pause() { mpImplementation->Pause(); } -void PageCache::Resume (void) +void PageCache::Resume() { mpImplementation->Resume(); } diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 453683e85ca5..9e8624bb3add 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -117,7 +117,7 @@ class PageCacheManager::PageCacheContainer CacheDescriptor::Equal> { public: - PageCacheContainer (void) {} + PageCacheContainer() {} /** Compare entries in the cache container with respect to the cache address only. @@ -162,7 +162,7 @@ public: ::boost::weak_ptr<PageCacheManager> PageCacheManager::mpInstance; -::boost::shared_ptr<PageCacheManager> PageCacheManager::Instance (void) +::boost::shared_ptr<PageCacheManager> PageCacheManager::Instance() { ::boost::shared_ptr<PageCacheManager> pInstance; @@ -180,14 +180,14 @@ public: return pInstance; } -PageCacheManager::PageCacheManager (void) +PageCacheManager::PageCacheManager() : mpPageCaches(new PageCacheContainer()), mpRecentlyUsedPageCaches(new RecentlyUsedPageCaches()), mnMaximalRecentlyCacheCount(2) { } -PageCacheManager::~PageCacheManager (void) +PageCacheManager::~PageCacheManager() { } @@ -368,7 +368,7 @@ void PageCacheManager::InvalidateAllPreviewBitmaps (DocumentKey pDocument) } } -void PageCacheManager::InvalidateAllCaches (void) +void PageCacheManager::InvalidateAllCaches() { // Iterate over all caches that are currently in use and invalidate // them. diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 0391a785c003..61a662f92982 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -62,7 +62,7 @@ QueueProcessor::QueueProcessor ( maTimer.SetTimeout (10); } -QueueProcessor::~QueueProcessor (void) +QueueProcessor::~QueueProcessor() { } @@ -80,18 +80,18 @@ void QueueProcessor::Start (int nPriorityClass) } } -void QueueProcessor::Stop (void) +void QueueProcessor::Stop() { if (maTimer.IsActive()) maTimer.Stop(); } -void QueueProcessor::Pause (void) +void QueueProcessor::Pause() { mbIsPaused = true; } -void QueueProcessor::Resume (void) +void QueueProcessor::Resume() { mbIsPaused = false; if ( ! mrQueue.IsEmpty()) @@ -112,7 +112,7 @@ IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl) return 1; } -void QueueProcessor::ProcessRequests (void) +void QueueProcessor::ProcessRequests() { OSL_ASSERT(mpCacheContext.get()!=NULL); diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index 2044fdbf2056..c472383def83 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -70,9 +70,9 @@ public: of 1.) When the timer is already running it is not modified. */ void Start (int nPriorityClass = 0); - void Stop (void); - void Pause (void); - void Resume (void); + void Stop(); + void Pause(); + void Resume(); void SetPreviewSize ( const Size& rSize, @@ -103,7 +103,7 @@ private: BitmapFactory maBitmapFactory; bool mbIsPaused; - void ProcessRequests (void); + void ProcessRequests(); void ProcessOneRequest ( CacheKey aKey, const RequestPriorityClass ePriorityClass); diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index daacee5be8ff..63f25e5ca932 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -91,7 +91,7 @@ RequestQueue::RequestQueue (const SharedCacheContext& rpCacheContext) { } -RequestQueue::~RequestQueue (void) +RequestQueue::~RequestQueue() { Clear(); } @@ -199,7 +199,7 @@ void RequestQueue::ChangeClass ( } } -CacheKey RequestQueue::GetFront (void) +CacheKey RequestQueue::GetFront() { ::osl::MutexGuard aGuard (maMutex); @@ -210,7 +210,7 @@ CacheKey RequestQueue::GetFront (void) return mpRequestQueue->begin()->maKey; } -RequestPriorityClass RequestQueue::GetFrontPriorityClass (void) +RequestPriorityClass RequestQueue::GetFrontPriorityClass() { ::osl::MutexGuard aGuard (maMutex); @@ -221,7 +221,7 @@ RequestPriorityClass RequestQueue::GetFrontPriorityClass (void) return mpRequestQueue->begin()->meClass; } -void RequestQueue::PopFront (void) +void RequestQueue::PopFront() { ::osl::MutexGuard aGuard (maMutex); @@ -243,13 +243,13 @@ void RequestQueue::PopFront (void) } } -bool RequestQueue::IsEmpty (void) +bool RequestQueue::IsEmpty() { ::osl::MutexGuard aGuard (maMutex); return mpRequestQueue->empty(); } -void RequestQueue::Clear (void) +void RequestQueue::Clear() { ::osl::MutexGuard aGuard (maMutex); diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index be9b5909bb6d..476e21cd2d61 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx @@ -77,27 +77,27 @@ public: /** Get the request with the highest priority int the highest priority class. */ - CacheKey GetFront (void); + CacheKey GetFront(); // For debugging. - RequestPriorityClass GetFrontPriorityClass (void); + RequestPriorityClass GetFrontPriorityClass(); /** Really a synonym for RemoveRequest(GetFront()); */ - void PopFront (void); + void PopFront(); /** Returns <TRUE/> when there is no element in the queue. */ - bool IsEmpty (void); + bool IsEmpty(); /** Remove all requests from the queue. This resets the minimum and maximum priorities to their default values. */ - void Clear (void); + void Clear(); /** Return the mutex that guards the access to the priority queue. */ - ::osl::Mutex& GetMutex (void) { return maMutex;} + ::osl::Mutex& GetMutex() { return maMutex;} /** Ensure we don't hand out a page deleted before anyone got a chance to process it diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index ad76ae766faf..aae8a7eec2b7 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -136,7 +136,7 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) } } -void SlideSorterController::Init (void) +void SlideSorterController::Init() { mpCurrentSlideManager.reset(new CurrentSlideManager(mrSlideSorter)); mpPageSelector.reset(new PageSelector(mrSlideSorter)); @@ -159,7 +159,7 @@ void SlideSorterController::Init (void) GetSelectionManager()->SelectionHasChanged(); } -SlideSorterController::~SlideSorterController (void) +SlideSorterController::~SlideSorterController() { try { @@ -177,7 +177,7 @@ SlideSorterController::~SlideSorterController (void) // to shut down cleanly. } -void SlideSorterController::Dispose (void) +void SlideSorterController::Dispose() { mpInsertionIndicatorHandler->End(Animator::AM_Immediate); mpClipboard.reset(); @@ -214,50 +214,50 @@ model::SharedPageDescriptor SlideSorterController::GetPageAt ( return pDescriptorAtPoint; } -PageSelector& SlideSorterController::GetPageSelector (void) +PageSelector& SlideSorterController::GetPageSelector() { OSL_ASSERT(mpPageSelector.get()!=NULL); return *mpPageSelector.get(); } -FocusManager& SlideSorterController::GetFocusManager (void) +FocusManager& SlideSorterController::GetFocusManager() { OSL_ASSERT(mpFocusManager.get()!=NULL); return *mpFocusManager.get(); } -Clipboard& SlideSorterController::GetClipboard (void) +Clipboard& SlideSorterController::GetClipboard() { OSL_ASSERT(mpClipboard.get()!=NULL); return *mpClipboard.get(); } -ScrollBarManager& SlideSorterController::GetScrollBarManager (void) +ScrollBarManager& SlideSorterController::GetScrollBarManager() { OSL_ASSERT(mpScrollBarManager.get()!=NULL); return *mpScrollBarManager.get(); } -::boost::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager (void) const +::boost::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager() const { OSL_ASSERT(mpCurrentSlideManager.get()!=NULL); return mpCurrentSlideManager; } -::boost::shared_ptr<SlotManager> SlideSorterController::GetSlotManager (void) const +::boost::shared_ptr<SlotManager> SlideSorterController::GetSlotManager() const { OSL_ASSERT(mpSlotManager.get()!=NULL); return mpSlotManager; } -::boost::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager (void) const +::boost::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager() const { OSL_ASSERT(mpSelectionManager.get()!=NULL); return mpSelectionManager; } ::boost::shared_ptr<InsertionIndicatorHandler> - SlideSorterController::GetInsertionIndicatorHandler (void) const + SlideSorterController::GetInsertionIndicatorHandler() const { OSL_ASSERT(mpInsertionIndicatorHandler.get()!=NULL); return mpInsertionIndicatorHandler; @@ -464,12 +464,12 @@ bool SlideSorterController::Command ( return bEventHasBeenHandled; } -void SlideSorterController::LockModelChange (void) +void SlideSorterController::LockModelChange() { mnModelChangeLockCount += 1; } -void SlideSorterController::UnlockModelChange (void) +void SlideSorterController::UnlockModelChange() { mnModelChangeLockCount -= 1; if (mnModelChangeLockCount==0 && mbPostModelChangePending) @@ -478,7 +478,7 @@ void SlideSorterController::UnlockModelChange (void) } } -void SlideSorterController::PreModelChange (void) +void SlideSorterController::PreModelChange() { // Prevent PreModelChange to execute more than once per model lock. if (mbPostModelChangePending) @@ -497,7 +497,7 @@ void SlideSorterController::PreModelChange (void) mbPostModelChangePending = true; } -void SlideSorterController::PostModelChange (void) +void SlideSorterController::PostModelChange() { mbPostModelChangePending = false; mrModel.Resync(); @@ -523,7 +523,7 @@ void SlideSorterController::PostModelChange (void) ViewShellHint(ViewShellHint::HINT_COMPLEX_MODEL_CHANGE_END)); } -void SlideSorterController::HandleModelChange (void) +void SlideSorterController::HandleModelChange() { // Ignore this call when the document is not in a valid state, i.e. has // not the same number of regular and notes pages. @@ -680,7 +680,7 @@ void SlideSorterController::GetAttrState (SfxItemSet& rSet) mpSlotManager->GetAttrState (rSet); } -void SlideSorterController::UpdateAllPages (void) +void SlideSorterController::UpdateAllPages() { // Do a redraw. mrSlideSorter.GetContentWindow()->Invalidate(); @@ -760,13 +760,13 @@ rtl::Reference<FuPoor> SlideSorterController::CreateSelectionFunction (SfxReques return xFunc; } -::rtl::Reference<SelectionFunction> SlideSorterController::GetCurrentSelectionFunction (void) +::rtl::Reference<SelectionFunction> SlideSorterController::GetCurrentSelectionFunction() { rtl::Reference<FuPoor> pFunction (mrSlideSorter.GetViewShell()->GetCurrentFunction()); return ::rtl::Reference<SelectionFunction>(dynamic_cast<SelectionFunction*>(pFunction.get())); } -void SlideSorterController::PrepareEditModeChange (void) +void SlideSorterController::PrepareEditModeChange() { // Before we throw away the page descriptors we prepare for selecting // descriptors in the other mode and for restoring the current @@ -814,7 +814,7 @@ bool SlideSorterController::ChangeEditMode (EditMode eEditMode) return bResult; } -void SlideSorterController::FinishEditModeChange (void) +void SlideSorterController::FinishEditModeChange() { if (mrModel.GetEditMode() == EM_MASTERPAGE) { @@ -912,13 +912,13 @@ void SlideSorterController::SetDocumentSlides (const Reference<container::XIndex } } -VisibleAreaManager& SlideSorterController::GetVisibleAreaManager (void) const +VisibleAreaManager& SlideSorterController::GetVisibleAreaManager() const { OSL_ASSERT(mpVisibleAreaManager); return *mpVisibleAreaManager; } -void SlideSorterController::CheckForMasterPageAssignment (void) +void SlideSorterController::CheckForMasterPageAssignment() { if (mrModel.GetPageCount()%2==0) return; @@ -935,7 +935,7 @@ void SlideSorterController::CheckForMasterPageAssignment (void) } } -void SlideSorterController::CheckForSlideTransitionAssignment (void) +void SlideSorterController::CheckForSlideTransitionAssignment() { if (mrModel.GetPageCount()%2==0) return; @@ -961,12 +961,12 @@ SlideSorterController::ModelChangeLock::ModelChangeLock ( mpController->LockModelChange(); } -SlideSorterController::ModelChangeLock::~ModelChangeLock (void) +SlideSorterController::ModelChangeLock::~ModelChangeLock() { Release(); } -void SlideSorterController::ModelChangeLock::Release (void) +void SlideSorterController::ModelChangeLock::Release() { if (mpController != NULL) { diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 99a838866192..e2f909075953 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -37,7 +37,7 @@ public: const double nGlobalTime, const Animator::AnimationId nAnimationId, const Animator::FinishFunctor& rFinishFunctor); - ~Animation (void); + ~Animation(); /** Run next animation step. If animation has reached its end it is expired. */ @@ -47,8 +47,8 @@ public: Animator::Disposed(). The finish functor is called and the animation is marked as expired to prevent another run. */ - void Expire (void); - bool IsExpired (void) { return mbIsExpired;} + void Expire(); + bool IsExpired() { return mbIsExpired;} Animator::AnimationFunctor maAnimation; Animator::FinishFunctor maFinishFunctor; @@ -72,7 +72,7 @@ Animator::Animator (SlideSorter& rSlideSorter) maIdle.SetIdleHdl(LINK(this,Animator,TimeoutHandler)); } -Animator::~Animator (void) +Animator::~Animator() { if ( ! mbIsDisposed) { @@ -81,7 +81,7 @@ Animator::~Animator (void) } } -void Animator::Dispose (void) +void Animator::Dispose() { mbIsDisposed = true; @@ -154,7 +154,7 @@ void Animator::RemoveAnimation (const Animator::AnimationId nId) } } -void Animator::RemoveAllAnimations (void) +void Animator::RemoveAllAnimations() { ::std::for_each( maAnimations.begin(), @@ -188,7 +188,7 @@ bool Animator::ProcessAnimations (const double nTime) return bExpired; } -void Animator::CleanUpAnimationList (void) +void Animator::CleanUpAnimationList() { OSL_ASSERT( ! mbIsDisposed); if (mbIsDisposed) @@ -256,7 +256,7 @@ Animator::Animation::Animation ( Run(nGlobalTime); } -Animator::Animation::~Animation (void) +Animator::Animation::~Animation() { } @@ -286,7 +286,7 @@ bool Animator::Animation::Run (const double nGlobalTime) return mbIsExpired; } -void Animator::Animation::Expire (void) +void Animator::Animation::Expire() { if ( ! mbIsExpired) { diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 1157b2973e3d..d7898c1a3d9f 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -95,7 +95,7 @@ public: if (mbIsCurrentSlideTrackingActive) mrController.GetVisibleAreaManager().DeactivateCurrentSlideTracking(); } - ~TemporarySlideTrackingDeactivator (void) + ~TemporarySlideTrackingDeactivator() { if (mbIsCurrentSlideTrackingActive) mrController.GetVisibleAreaManager().ActivateCurrentSlideTracking(); @@ -125,7 +125,7 @@ public: } } - ~UndoContext (void) + ~UndoContext() { if (mpDocument!=NULL && mpDocument->IsUndoEnabled()) mpDocument->EndUndo(); @@ -154,7 +154,7 @@ Clipboard::Clipboard (SlideSorter& rSlideSorter) { } -Clipboard::~Clipboard (void) +Clipboard::~Clipboard() { if (mnDragFinishedUserEventId != 0) Application::RemoveUserEvent(mnDragFinishedUserEventId); @@ -795,7 +795,7 @@ bool Clipboard::IsInsertionTrivial ( return mrController.GetInsertionIndicatorHandler()->IsInsertionTrivial(nDndAction); } -void Clipboard::Abort (void) +void Clipboard::Abort() { if (mxSelectionObserverContext) { diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index ab4885a33be1..61973a7e3d71 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -49,7 +49,7 @@ CurrentSlideManager::CurrentSlideManager (SlideSorter& rSlideSorter) maSwitchPageDelayTimer.SetTimeoutHdl(LINK(this,CurrentSlideManager,SwitchPageCallback)); } -CurrentSlideManager::~CurrentSlideManager (void) +CurrentSlideManager::~CurrentSlideManager() { } @@ -85,7 +85,7 @@ void CurrentSlideManager::NotifyCurrentSlideChange (const sal_Int32 nSlideIndex) } } -void CurrentSlideManager::ReleaseCurrentSlide (void) +void CurrentSlideManager::ReleaseCurrentSlide() { if (mpCurrentSlide.get() != NULL) mrSlideSorter.GetView().SetState(mpCurrentSlide, PageDescriptor::ST_Current, false); @@ -94,7 +94,7 @@ void CurrentSlideManager::ReleaseCurrentSlide (void) mnCurrentSlideIndex = -1; } -bool CurrentSlideManager::IsCurrentSlideIsValid (void) +bool CurrentSlideManager::IsCurrentSlideIsValid() { return mnCurrentSlideIndex >= 0 && mnCurrentSlideIndex<mrSlideSorter.GetModel().GetPageCount(); } @@ -224,12 +224,12 @@ void CurrentSlideManager::SetCurrentSlideAtXController (const SharedPageDescript } } -void CurrentSlideManager::PrepareModelChange (void) +void CurrentSlideManager::PrepareModelChange() { mpCurrentSlide.reset(); } -void CurrentSlideManager::HandleModelChange (void) +void CurrentSlideManager::HandleModelChange() { if (mnCurrentSlideIndex >= 0) { diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 3338bfeac24e..3faf316f1dda 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -63,12 +63,12 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter) rSlideSorter.GetController().GetInsertionIndicatorHandler()->UpdateIndicatorIcon(pTransferable); } -DragAndDropContext::~DragAndDropContext (void) +DragAndDropContext::~DragAndDropContext() { SetTargetSlideSorter (NULL, Point(0,0), InsertionIndicatorHandler::UnknownMode, false); } -void DragAndDropContext::Dispose (void) +void DragAndDropContext::Dispose() { mnInsertionIndex = -1; } diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx index 9af4797e3478..c7f6f1ee6c57 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx @@ -43,13 +43,13 @@ public: when provided, the pages in the transferable. */ DragAndDropContext (SlideSorter& rSlideSorter); - ~DragAndDropContext (void); + ~DragAndDropContext(); /** Call this method (for example as reaction to ESC key press) to avoid processing (ie moving or inserting) the substition when the called DragAndDropContext object is destroyed. */ - void Dispose (void); + void Dispose(); /** Move the substitution display by the distance the mouse has travelled since the last call to this method or to diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 1b9a3dc17ef6..b0acdd6ed90f 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -45,7 +45,7 @@ FocusManager::FocusManager (SlideSorter& rSlideSorter) mnPageIndex = 0; } -FocusManager::~FocusManager (void) +FocusManager::~FocusManager() { } @@ -159,13 +159,13 @@ void FocusManager::ShowFocus (const bool bScrollToFocus) ShowFocusIndicator(GetFocusedPageDescriptor(), bScrollToFocus); } -void FocusManager::HideFocus (void) +void FocusManager::HideFocus() { mbPageIsFocused = false; HideFocusIndicator(GetFocusedPageDescriptor()); } -bool FocusManager::ToggleFocus (void) +bool FocusManager::ToggleFocus() { if (mnPageIndex >= 0) { @@ -177,12 +177,12 @@ bool FocusManager::ToggleFocus (void) return mbPageIsFocused; } -bool FocusManager::HasFocus (void) const +bool FocusManager::HasFocus() const { return mrSlideSorter.GetContentWindow()->HasFocus(); } -model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor (void) const +model::SharedPageDescriptor FocusManager::GetFocusedPageDescriptor() const { return mrSlideSorter.GetModel().GetPageDescriptor(mnPageIndex); } @@ -202,12 +202,12 @@ void FocusManager::SetFocusedPage (sal_Int32 nPageIndex) mnPageIndex = nPageIndex; } -void FocusManager::SetFocusedPageToCurrentPage (void) +void FocusManager::SetFocusedPageToCurrentPage() { SetFocusedPage(mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); } -bool FocusManager::IsFocusShowing (void) const +bool FocusManager::IsFocusShowing() const { return HasFocus() && mbPageIsFocused; } @@ -258,7 +258,7 @@ void FocusManager::RemoveFocusChangeListener (const Link& rListener) ::std::find (maFocusChangeListeners.begin(), maFocusChangeListeners.end(), rListener)); } -void FocusManager::NotifyFocusChangeListeners (void) const +void FocusManager::NotifyFocusChangeListeners() const { // Create a copy of the listener list to be safe when that is modified. ::std::vector<Link> aListeners (maFocusChangeListeners); @@ -279,7 +279,7 @@ FocusManager::FocusHider::FocusHider (FocusManager& rManager) mrManager.HideFocus(); } -FocusManager::FocusHider::~FocusHider (void) +FocusManager::FocusHider::~FocusHider() { if (mbFocusVisible) mrManager.ShowFocus(); diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index fd8dcef357da..42b932e640a8 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -47,7 +47,7 @@ InsertionIndicatorHandler::InsertionIndicatorHandler (SlideSorter& rSlideSorter) { } -InsertionIndicatorHandler::~InsertionIndicatorHandler (void) +InsertionIndicatorHandler::~InsertionIndicatorHandler() { } @@ -81,12 +81,12 @@ void InsertionIndicatorHandler::End (const controller::Animator::AnimationMode e mpInsertionIndicatorOverlay.reset(new view::InsertionIndicatorOverlay(mrSlideSorter)); } -void InsertionIndicatorHandler::ForceShow (void) +void InsertionIndicatorHandler::ForceShow() { mbIsForcedShow = true; } -void InsertionIndicatorHandler::ForceEnd (void) +void InsertionIndicatorHandler::ForceEnd() { mbIsForcedShow = false; End(Animator::AM_Immediate); @@ -129,7 +129,7 @@ void InsertionIndicatorHandler::UpdatePosition ( UpdatePosition(rMouseModelPosition, GetModeFromDndAction(nDndAction)); } -sal_Int32 InsertionIndicatorHandler::GetInsertionPageIndex (void) const +sal_Int32 InsertionIndicatorHandler::GetInsertionPageIndex() const { if (mbIsReadOnly) return -1; @@ -171,7 +171,7 @@ void InsertionIndicatorHandler::SetPosition ( } } -::boost::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator (void) +::boost::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator() { if ( ! mpInsertAnimator) mpInsertAnimator.reset(new view::InsertAnimator(mrSlideSorter)); @@ -240,7 +240,7 @@ InsertionIndicatorHandler::ForceShowContext::ForceShowContext ( mpHandler->ForceShow(); } -InsertionIndicatorHandler::ForceShowContext::~ForceShowContext (void) +InsertionIndicatorHandler::ForceShowContext::~ForceShowContext() { mpHandler->ForceEnd(); } diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index b821f77a081e..149edf879839 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -136,13 +136,13 @@ Listener::Listener ( } } -Listener::~Listener (void) +Listener::~Listener() { DBG_ASSERT( !mbListeningToDocument && !mbListeningToUNODocument && !mbListeningToFrame, "sd::Listener::~Listener(), disposing() was not called, ask DBO!" ); } -void Listener::ReleaseListeners (void) +void Listener::ReleaseListeners() { if (mbListeningToDocument) { @@ -196,7 +196,7 @@ void Listener::ReleaseListeners (void) } } -void Listener::ConnectToController (void) +void Listener::ConnectToController() { ViewShell* pShell = mrSlideSorter.GetViewShell(); @@ -241,7 +241,7 @@ void Listener::ConnectToController (void) } } -void Listener::DisconnectFromController (void) +void Listener::DisconnectFromController() { if (mbListeningToController) { @@ -527,12 +527,12 @@ void SAL_CALL Listener::notifyEvent ( { } -void SAL_CALL Listener::disposing (void) +void SAL_CALL Listener::disposing() { ReleaseListeners(); } -void Listener::UpdateEditMode (void) +void Listener::UpdateEditMode() { // When there is a new controller then the edit mode may have changed at // the same time. @@ -631,7 +631,7 @@ void Listener::HandleShapeModification (const SdrPage* pPage) } } -void Listener::ThrowIfDisposed (void) +void Listener::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index fe2d018129ca..c00ce5680014 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -72,7 +72,7 @@ class Listener { public: Listener (SlideSorter& rSlideSorter); - virtual ~Listener (void); + virtual ~Listener(); /** Connect to the current controller of the view shell as listener. This method is called once during initialization and every time a @@ -80,7 +80,7 @@ public: When the connection is successful then the flag mbListeningToController is set to <TRUE/>. */ - void ConnectToController (void); + void ConnectToController(); /** Disconnect from the current controller of the view shell as listener. This method is called once during initialization and @@ -88,7 +88,7 @@ public: exchanged. When this method terminates then mbListeningToController is <FALSE/>. */ - void DisconnectFromController (void); + void DisconnectFromController(); virtual void Notify ( SfxBroadcaster& rBroadcaster, @@ -127,7 +127,7 @@ public: frameAction (const ::com::sun::star::frame::FrameActionEvent& rEvent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: SlideSorter& mrSlideSorter; @@ -153,11 +153,11 @@ private: */ ::boost::shared_ptr<SlideSorterController::ModelChangeLock> mpModelChangeLock; - void ReleaseListeners (void); + void ReleaseListeners(); /** Called when the edit mode has changed. Update model accordingly. */ - void UpdateEditMode (void); + void UpdateEditMode(); /** Handle a change in the order of slides or when the set of slides has changed, i.e. a slide has been created. @@ -173,7 +173,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); DECL_LINK(EventMultiplexerCallback, tools::EventMultiplexerEvent*); diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 3e6e9f9959c0..b9563ae7b814 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -62,7 +62,7 @@ PageSelector::PageSelector (SlideSorter& rSlideSorter) CountSelectedPages (); } -void PageSelector::SelectAllPages (void) +void PageSelector::SelectAllPages() { VisibleAreaManager::TemporaryDisabler aDisabler (mrSlideSorter); PageSelector::UpdateLock aLock (*this); @@ -72,7 +72,7 @@ void PageSelector::SelectAllPages (void) SelectPage(nPageIndex); } -void PageSelector::DeselectAllPages (void) +void PageSelector::DeselectAllPages() { VisibleAreaManager::TemporaryDisabler aDisabler (mrSlideSorter); PageSelector::UpdateLock aLock (*this); @@ -87,7 +87,7 @@ void PageSelector::DeselectAllPages (void) mpSelectionAnchor.reset(); } -void PageSelector::GetCoreSelection (void) +void PageSelector::GetCoreSelection() { PageSelector::UpdateLock aLock (*this); @@ -118,7 +118,7 @@ void PageSelector::GetCoreSelection (void) } } -void PageSelector::SetCoreSelection (void) +void PageSelector::SetCoreSelection() { model::PageEnumeration aAllPages ( model::PageEnumerationProvider::CreateAllPagesEnumeration(mrModel)); @@ -199,7 +199,7 @@ void PageSelector::DeselectPage ( } } -void PageSelector::CheckConsistency (void) const +void PageSelector::CheckConsistency() const { int nSelectionCount (0); for (int nPageIndex=0,nPageCount=mrModel.GetPageCount(); nPageIndex<nPageCount; nPageIndex++) @@ -228,12 +228,12 @@ bool PageSelector::IsPageSelected (int nPageIndex) return false; } -int PageSelector::GetPageCount (void) const +int PageSelector::GetPageCount() const { return mrModel.GetPageCount(); } -void PageSelector::CountSelectedPages (void) +void PageSelector::CountSelectedPages() { mnSelectedPageCount = 0; model::PageEnumeration aSelectedPages ( @@ -245,7 +245,7 @@ void PageSelector::CountSelectedPages (void) } } -void PageSelector::EnableBroadcasting (void) +void PageSelector::EnableBroadcasting() { if (mnBroadcastDisableLevel > 0) mnBroadcastDisableLevel --; @@ -256,12 +256,12 @@ void PageSelector::EnableBroadcasting (void) } } -void PageSelector::DisableBroadcasting (void) +void PageSelector::DisableBroadcasting() { mnBroadcastDisableLevel ++; } -::boost::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection (void) const +::boost::shared_ptr<PageSelector::PageSelection> PageSelector::GetPageSelection() const { ::boost::shared_ptr<PageSelection> pSelection (new PageSelection()); pSelection->reserve(GetSelectedPageCount()); @@ -346,12 +346,12 @@ PageSelector::UpdateLock::UpdateLock (PageSelector& rSelector) ++mpSelector->mnUpdateLockCount; } -PageSelector::UpdateLock::~UpdateLock (void) +PageSelector::UpdateLock::~UpdateLock() { Release(); } -void PageSelector::UpdateLock::Release (void) +void PageSelector::UpdateLock::Release() { if (mpSelector != NULL) { @@ -378,7 +378,7 @@ PageSelector::BroadcastLock::BroadcastLock (PageSelector& rSelector) mrSelector.DisableBroadcasting(); } -PageSelector::BroadcastLock::~BroadcastLock (void) +PageSelector::BroadcastLock::~BroadcastLock() { mrSelector.EnableBroadcasting(); } diff --git a/sd/source/ui/slidesorter/controller/SlsProperties.cxx b/sd/source/ui/slidesorter/controller/SlsProperties.cxx index 5165a5f14de6..a876bd2ae37f 100644 --- a/sd/source/ui/slidesorter/controller/SlsProperties.cxx +++ b/sd/source/ui/slidesorter/controller/SlsProperties.cxx @@ -23,7 +23,7 @@ namespace sd { namespace slidesorter { namespace controller { -Properties::Properties (void) +Properties::Properties() : mbIsHighlightCurrentSlide(false), mbIsShowSelection(true), mbIsShowFocus(true), @@ -41,11 +41,11 @@ Properties::Properties (void) { } -Properties::~Properties (void) +Properties::~Properties() { } -void Properties::HandleDataChangeEvent (void) +void Properties::HandleDataChangeEvent() { maBackgroundColor = Application::GetSettings().GetStyleSettings().GetWindowColor(); maTextColor = Application::GetSettings().GetStyleSettings().GetActiveTextColor(); diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 971c7e75aebb..5fcebfb83746 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -66,11 +66,11 @@ ScrollBarManager::ScrollBarManager (SlideSorter& rSlideSorter) LINK(this, ScrollBarManager, AutoScrollTimeoutHandler)); } -ScrollBarManager::~ScrollBarManager (void) +ScrollBarManager::~ScrollBarManager() { } -void ScrollBarManager::Connect (void) +void ScrollBarManager::Connect() { if (mpVerticalScrollBar != 0) { @@ -84,7 +84,7 @@ void ScrollBarManager::Connect (void) } } -void ScrollBarManager::Disconnect (void) +void ScrollBarManager::Disconnect() { if (mpVerticalScrollBar != 0) { @@ -429,7 +429,7 @@ void ScrollBarManager::SetTopLeft(const Point& rNewTopLeft) mrSlideSorter.GetView().InvalidatePageObjectVisibilities(); } -int ScrollBarManager::GetVerticalScrollBarWidth (void) const +int ScrollBarManager::GetVerticalScrollBarWidth() const { if (mpVerticalScrollBar != 0 && mpVerticalScrollBar->IsVisible()) return mpVerticalScrollBar->GetSizePixel().Width(); @@ -437,7 +437,7 @@ int ScrollBarManager::GetVerticalScrollBarWidth (void) const return 0; } -int ScrollBarManager::GetHorizontalScrollBarHeight (void) const +int ScrollBarManager::GetHorizontalScrollBarHeight() const { if (mpHorizontalScrollBar != 0 && mpHorizontalScrollBar->IsVisible()) return mpHorizontalScrollBar->GetSizePixel().Height(); @@ -501,7 +501,7 @@ void ScrollBarManager::CalcAutoScrollOffset (const Point& rMouseWindowPosition) bool ScrollBarManager::AutoScroll ( const Point& rMouseWindowPosition, - const ::boost::function<void(void)>& rAutoScrollFunctor) + const ::boost::function<void()>& rAutoScrollFunctor) { maAutoScrollFunctor = rAutoScrollFunctor; CalcAutoScrollOffset(rMouseWindowPosition); @@ -512,13 +512,13 @@ bool ScrollBarManager::AutoScroll ( return bResult; } -void ScrollBarManager::StopAutoScroll (void) +void ScrollBarManager::StopAutoScroll() { maAutoScrollTimer.Stop(); mbIsAutoScrollActive = false; } -bool ScrollBarManager::RepeatAutoScroll (void) +bool ScrollBarManager::RepeatAutoScroll() { if (maAutoScrollOffset != Size(0,0)) { @@ -546,7 +546,7 @@ bool ScrollBarManager::RepeatAutoScroll (void) void ScrollBarManager::clearAutoScrollFunctor() { - maAutoScrollFunctor = ::boost::function<void(void)>(); + maAutoScrollFunctor = ::boost::function<void()>(); } IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 64ee5effc7e8..8bef190c0ecf 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -133,7 +133,7 @@ private: whether the selection rectangle is visible or whether the page under the mouse or the one that has the focus is selected. */ - sal_uInt32 EncodeState (void) const; + sal_uInt32 EncodeState() const; }; //===== SelectionFunction::ModeHandler ======================================== @@ -145,10 +145,10 @@ public: SlideSorter& rSlideSorter, SelectionFunction& rSelectionFunction, const bool bIsMouseOverIndicatorAllowed); - virtual ~ModeHandler (void); + virtual ~ModeHandler(); - virtual Mode GetMode (void) const = 0; - virtual void Abort (void) = 0; + virtual Mode GetMode() const = 0; + virtual void Abort() = 0; virtual void ProcessEvent (EventDescriptor& rDescriptor); /** Set the selection to exactly the specified page and also set it as @@ -157,7 +157,7 @@ public: void SetCurrentPage (const model::SharedPageDescriptor& rpDescriptor); /// Deselect all pages. - void DeselectAllPages (void); + void DeselectAllPages(); void SelectOnePage (const model::SharedPageDescriptor& rpDescriptor); /** When the view on which this selection function is working is the @@ -169,7 +169,7 @@ public: const Point& rMousePosition, const InsertionIndicatorHandler::Mode eMode); - bool IsMouseOverIndicatorAllowed (void) const { return mbIsMouseOverIndicatorAllowed;} + bool IsMouseOverIndicatorAllowed() const { return mbIsMouseOverIndicatorAllowed;} protected: SlideSorter& mrSlideSorter; @@ -196,12 +196,12 @@ public: NormalModeHandler ( SlideSorter& rSlideSorter, SelectionFunction& rSelectionFunction); - virtual ~NormalModeHandler (void); + virtual ~NormalModeHandler(); - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; - void ResetButtonDownLocation (void); + void ResetButtonDownLocation(); protected: virtual bool ProcessButtonDownEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; @@ -235,14 +235,14 @@ public: const Point& rMouseModelPosition, const sal_uInt32 nEventCode); #endif - virtual ~MultiSelectionModeHandler (void); + virtual ~MultiSelectionModeHandler(); #ifndef MACOSX void Initialize(const sal_uInt32 nEventCode); #endif - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; virtual void ProcessEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; enum SelectionMode { SM_Normal, SM_Add, SM_Toggle }; @@ -264,7 +264,7 @@ private: sal_Int32 mnSecondIndex; void UpdateModelPosition (const Point& rMouseModelPosition); - void UpdateSelection (void); + void UpdateSelection(); /** Update the rectangle selection so that the given position becomes the new second point of the selection rectangle. @@ -292,14 +292,14 @@ public: const Point& rMousePosition, ::vcl::Window* pWindow); #endif - virtual ~DragAndDropModeHandler (void); + virtual ~DragAndDropModeHandler(); #ifndef MACOSX void Initialize(const Point& rMousePosition, ::vcl::Window* pWindow); #endif - virtual SelectionFunction::Mode GetMode (void) const SAL_OVERRIDE; - virtual void Abort (void) SAL_OVERRIDE; + virtual SelectionFunction::Mode GetMode() const SAL_OVERRIDE; + virtual void Abort() SAL_OVERRIDE; protected: virtual bool ProcessButtonUpEvent (SelectionFunction::EventDescriptor& rDescriptor) SAL_OVERRIDE; @@ -332,7 +332,7 @@ SelectionFunction::SelectionFunction ( { } -SelectionFunction::~SelectionFunction (void) +SelectionFunction::~SelectionFunction() { mpModeHandler.reset(); } @@ -376,7 +376,7 @@ bool SelectionFunction::MouseButtonUp (const MouseEvent& rEvent) return true; } -void SelectionFunction::NotifyDragFinished (void) +void SelectionFunction::NotifyDragFinished() { SwitchToNormalMode(); } @@ -599,7 +599,7 @@ void SelectionFunction::Deactivate() FuPoor::Deactivate(); } -void SelectionFunction::DoCut (void) +void SelectionFunction::DoCut() { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) { @@ -607,12 +607,12 @@ void SelectionFunction::DoCut (void) } } -void SelectionFunction::DoCopy (void) +void SelectionFunction::DoCopy() { mrController.GetClipboard().DoCopy(); } -void SelectionFunction::DoPaste (void) +void SelectionFunction::DoPaste() { if ( ! mrSlideSorter.GetProperties()->IsUIReadOnly()) { @@ -620,7 +620,7 @@ void SelectionFunction::DoPaste (void) } } -bool SelectionFunction::cancel (void) +bool SelectionFunction::cancel() { mrController.GetFocusManager().ToggleFocus(); return true; @@ -694,7 +694,7 @@ bool Match ( return (nEventCode & nPositivePattern)==nPositivePattern; } -void SelectionFunction::SwitchToNormalMode (void) +void SelectionFunction::SwitchToNormalMode() { if (mpModeHandler->GetMode() != NormalMode) SwitchMode(::boost::shared_ptr<ModeHandler>( @@ -756,12 +756,12 @@ void SelectionFunction::SwitchMode (const ::boost::shared_ptr<ModeHandler>& rpHa mpModeHandler = rpHandler; } -void SelectionFunction::ResetShiftKeySelectionAnchor (void) +void SelectionFunction::ResetShiftKeySelectionAnchor() { mnShiftKeySelectionAnchor = -1; } -void SelectionFunction::ResetMouseAnchor (void) +void SelectionFunction::ResetMouseAnchor() { if (mpModeHandler && mpModeHandler->GetMode() == NormalMode) { @@ -866,7 +866,7 @@ sal_uInt32 SelectionFunction::EventDescriptor::EncodeMouseEvent ( return nEventCode; } -sal_uInt32 SelectionFunction::EventDescriptor::EncodeState (void) const +sal_uInt32 SelectionFunction::EventDescriptor::EncodeState() const { sal_uInt32 nEventCode (0); @@ -894,7 +894,7 @@ SelectionFunction::ModeHandler::ModeHandler ( { } -SelectionFunction::ModeHandler::~ModeHandler (void) +SelectionFunction::ModeHandler::~ModeHandler() { } @@ -977,7 +977,7 @@ void SelectionFunction::ModeHandler::SetCurrentPage ( mrSlideSorter.GetController().GetCurrentSlideManager()->SwitchCurrentSlide(rpDescriptor); } -void SelectionFunction::ModeHandler::DeselectAllPages (void) +void SelectionFunction::ModeHandler::DeselectAllPages() { mrSlideSorter.GetController().GetPageSelector().DeselectAllPages(); mrSelectionFunction.ResetShiftKeySelectionAnchor(); @@ -1039,16 +1039,16 @@ NormalModeHandler::NormalModeHandler ( { } -NormalModeHandler::~NormalModeHandler (void) +NormalModeHandler::~NormalModeHandler() { } -SelectionFunction::Mode NormalModeHandler::GetMode (void) const +SelectionFunction::Mode NormalModeHandler::GetMode() const { return SelectionFunction::NormalMode; } -void NormalModeHandler::Abort (void) +void NormalModeHandler::Abort() { } @@ -1259,7 +1259,7 @@ void NormalModeHandler::RangeSelect (const model::SharedPageDescriptor& rpDescri } } -void NormalModeHandler::ResetButtonDownLocation (void) +void NormalModeHandler::ResetButtonDownLocation() { maButtonDownLocation = ::boost::optional<Point>(); } @@ -1294,7 +1294,7 @@ void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode) SetSelectionModeFromModifier(nEventCode); } -MultiSelectionModeHandler::~MultiSelectionModeHandler (void) +MultiSelectionModeHandler::~MultiSelectionModeHandler() { if (mbAutoScrollInstalled) { @@ -1305,12 +1305,12 @@ MultiSelectionModeHandler::~MultiSelectionModeHandler (void) mrSlideSorter.GetContentWindow()->SetPointer(maSavedPointer); } -SelectionFunction::Mode MultiSelectionModeHandler::GetMode (void) const +SelectionFunction::Mode MultiSelectionModeHandler::GetMode() const { return SelectionFunction::MultiSelectionMode; } -void MultiSelectionModeHandler::Abort (void) +void MultiSelectionModeHandler::Abort() { mrSlideSorter.GetView().RequestRepaint(mrSlideSorter.GetModel().RestoreSelection()); } @@ -1470,7 +1470,7 @@ void MultiSelectionModeHandler::UpdateModelPosition (const Point& rMouseModelPos UpdateSelection(); } -void MultiSelectionModeHandler::UpdateSelection (void) +void MultiSelectionModeHandler::UpdateSelection() { view::SlideSorterView::DrawLock aLock (mrSlideSorter); @@ -1533,7 +1533,7 @@ void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::vcl::Wind && pDragTransferable->GetView()==&mrSlideSorter.GetView()); } -DragAndDropModeHandler::~DragAndDropModeHandler (void) +DragAndDropModeHandler::~DragAndDropModeHandler() { if (mpDragAndDropContext) { @@ -1544,12 +1544,12 @@ DragAndDropModeHandler::~DragAndDropModeHandler (void) mrSlideSorter.GetController().GetInsertionIndicatorHandler()->End(Animator::AM_Animated); } -SelectionFunction::Mode DragAndDropModeHandler::GetMode (void) const +SelectionFunction::Mode DragAndDropModeHandler::GetMode() const { return SelectionFunction::DragAndDropMode; } -void DragAndDropModeHandler::Abort (void) +void DragAndDropModeHandler::Abort() { mrSlideSorter.GetController().GetClipboard().Abort(); if (mpDragAndDropContext) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index 13246b7444ec..889e3510c940 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -75,7 +75,7 @@ SelectionManager::SelectionManager (SlideSorter& rSlideSorter) { } -SelectionManager::~SelectionManager (void) +SelectionManager::~SelectionManager() { if (mnAnimationId != Animator::NotAnAnimationId) mrController.GetAnimator()->RemoveAnimation(mnAnimationId); @@ -269,7 +269,7 @@ void SelectionManager::RemoveSelectionChangeListener(const Link&rListener) rListener)); } -sal_Int32 SelectionManager::GetInsertionPosition (void) const +sal_Int32 SelectionManager::GetInsertionPosition() const { sal_Int32 nInsertionPosition (mnInsertionPosition); if (nInsertionPosition < 0) diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index 2af4e0334cbf..9b2f8c9da7c6 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -38,13 +38,13 @@ SelectionObserver::Context::Context (SlideSorter& rSlideSorter) mpSelectionObserver->StartObservation(); } -SelectionObserver::Context::~Context(void) +SelectionObserver::Context::~Context() { if (mpSelectionObserver) mpSelectionObserver->EndObservation(); } -void SelectionObserver::Context::Abort(void) +void SelectionObserver::Context::Abort() { if (mpSelectionObserver) { @@ -63,7 +63,7 @@ SelectionObserver::SelectionObserver (SlideSorter& rSlideSorter) { } -SelectionObserver::~SelectionObserver (void) +SelectionObserver::~SelectionObserver() { } @@ -89,7 +89,7 @@ void SelectionObserver::NotifyPageEvent (const SdrPage* pSdrPage) } } -void SelectionObserver::StartObservation (void) +void SelectionObserver::StartObservation() { OSL_ASSERT(!mbIsOvservationActive); maInsertedPages.clear(); @@ -97,7 +97,7 @@ void SelectionObserver::StartObservation (void) mbIsOvservationActive = true; } -void SelectionObserver::AbortObservation (void) +void SelectionObserver::AbortObservation() { OSL_ASSERT(mbIsOvservationActive); mbIsOvservationActive = false; @@ -105,7 +105,7 @@ void SelectionObserver::AbortObservation (void) maDeletedPages.clear(); } -void SelectionObserver::EndObservation (void) +void SelectionObserver::EndObservation() { OSL_ASSERT(mbIsOvservationActive); mbIsOvservationActive = false; diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index d6ac365ef3fb..17eaee29fd1a 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -117,7 +117,7 @@ SlotManager::SlotManager (SlideSorter& rSlideSorter) { } -SlotManager::~SlotManager (void) +SlotManager::~SlotManager() { } @@ -877,7 +877,7 @@ void SlotManager::ShowSlideShow( SfxRequest& rReq) slideshowhelp::ShowSlideShow(rReq, *mrSlideSorter.GetModel().GetDocument()); } -void SlotManager::RenameSlide (void) +void SlotManager::RenameSlide() { PageKind ePageKind = mrSlideSorter.GetModel().GetPageType(); View* pDrView = &mrSlideSorter.GetView(); @@ -1186,7 +1186,7 @@ void SlotManager::ChangeSlideExclusionState ( mrSlideSorter.GetModel().GetDocument()->SetChanged(); } -sal_Int32 SlotManager::GetInsertionPosition (void) +sal_Int32 SlotManager::GetInsertionPosition() { PageSelector& rSelector (mrSlideSorter.GetController().GetPageSelector()); @@ -1233,7 +1233,7 @@ sal_Int32 SlotManager::GetInsertionPosition (void) } } -void SlotManager::NotifyEditModeChange (void) +void SlotManager::NotifyEditModeChange() { SfxBindings& rBindings (mrSlideSorter.GetViewShell()->GetViewFrame()->GetBindings()); rBindings.Invalidate(SID_PRESENTATION); diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index ea088a0b916d..85777682c4e2 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -62,7 +62,7 @@ TransferableData::TransferableData ( StartListening(*mpViewShell); } -TransferableData::~TransferableData (void) +TransferableData::~TransferableData() { if (mpViewShell != NULL) EndListening(*mpViewShell); diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index 8ccb1106c5e6..4a29df00b43e 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -59,16 +59,16 @@ VisibleAreaManager::VisibleAreaManager (SlideSorter& rSlideSorter) { } -VisibleAreaManager::~VisibleAreaManager (void) +VisibleAreaManager::~VisibleAreaManager() { } -void VisibleAreaManager::ActivateCurrentSlideTracking (void) +void VisibleAreaManager::ActivateCurrentSlideTracking() { mbIsCurrentSlideTrackingActive = true; } -void VisibleAreaManager::DeactivateCurrentSlideTracking (void) +void VisibleAreaManager::DeactivateCurrentSlideTracking() { mbIsCurrentSlideTrackingActive = false; } @@ -92,14 +92,14 @@ void VisibleAreaManager::RequestVisible ( } } -void VisibleAreaManager::RequestCurrentSlideVisible (void) +void VisibleAreaManager::RequestCurrentSlideVisible() { if (mbIsCurrentSlideTrackingActive && mnDisableCount==0) RequestVisible( mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()); } -void VisibleAreaManager::MakeVisible (void) +void VisibleAreaManager::MakeVisible() { if (maVisibleRequests.empty()) return; @@ -146,7 +146,7 @@ void VisibleAreaManager::MakeVisible (void) meRequestedAnimationMode = Animator::AM_Immediate; } -::boost::optional<Point> VisibleAreaManager::GetRequestedTopLeft (void) const +::boost::optional<Point> VisibleAreaManager::GetRequestedTopLeft() const { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if ( ! pWindow) @@ -208,7 +208,7 @@ VisibleAreaManager::TemporaryDisabler::TemporaryDisabler (SlideSorter& rSlideSor ++mrVisibleAreaManager.mnDisableCount; } -VisibleAreaManager::TemporaryDisabler::~TemporaryDisabler (void) +VisibleAreaManager::TemporaryDisabler::~TemporaryDisabler() { --mrVisibleAreaManager.mnDisableCount; } diff --git a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx index 3678648b58be..eb4b40520c6b 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx @@ -54,7 +54,7 @@ public: /** Called to determine whether the system is idle and a preview can be created without annoying the user. */ - virtual bool IsIdle (void) = 0; + virtual bool IsIdle() = 0; /** This method is used to determine whether a page is currently visible or not. It is called when the cache becomes to large and some @@ -89,7 +89,7 @@ public: same model but have different preview sizes may access previews of each other in order to create fast previews of the previews. */ - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void) = 0; + virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() = 0; }; typedef ::boost::shared_ptr<CacheContext> SharedCacheContext; diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx index 62daa10e03b3..27b8e9e35baf 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCache.hxx @@ -77,7 +77,7 @@ public: const bool bDoSuperSampling, const SharedCacheContext& rpCacheContext); - ~PageCache (void); + ~PageCache(); void ChangeSize( const Size& rPreviewSize, @@ -148,8 +148,8 @@ public: */ void SetPreciousFlag (const CacheKey aKey, const bool bIsPrecious); - void Pause (void); - void Resume (void); + void Pause(); + void Resume(); private: ::boost::scoped_ptr<GenericPageCache> mpImplementation; diff --git a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx index 7a730034b98a..e6ed624f6032 100644 --- a/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx +++ b/sd/source/ui/slidesorter/inc/cache/SlsPageCacheManager.hxx @@ -47,7 +47,7 @@ public: /** Return the one instance of the PageCacheManager class. */ - static ::boost::shared_ptr<PageCacheManager> Instance (void); + static ::boost::shared_ptr<PageCacheManager> Instance(); /** Look up the cache for the given model in which the previews have the specified size. If no such cache exists, then one is created. When @@ -96,7 +96,7 @@ public: those that are not. This is used for example when the high contrast mode is turned on or off. */ - void InvalidateAllCaches (void); + void InvalidateAllCaches(); /** Call this method when a page has been deleted and its preview is not needed anymore. @@ -125,8 +125,8 @@ private: */ const sal_uInt32 mnMaximalRecentlyCacheCount; - PageCacheManager (void); - ~PageCacheManager (void); + PageCacheManager(); + ~PageCacheManager(); class Deleter; friend class Deleter; diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index f9ff6ca44e54..3658db1f3854 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -70,11 +70,11 @@ public: /** Late initialization. Call this method once a new new object has been created. */ - void Init (void); + void Init(); - virtual ~SlideSorterController (void); + virtual ~SlideSorterController(); - void Dispose (void); + void Dispose(); /** Place and size the scroll bars and the browser window so that the given rectangle is filled. @@ -106,18 +106,18 @@ public: */ model::SharedPageDescriptor GetPageAt (const Point& rPixelPosition); - PageSelector& GetPageSelector (void); - FocusManager& GetFocusManager (void); - controller::Clipboard& GetClipboard (void); + PageSelector& GetPageSelector(); + FocusManager& GetFocusManager(); + controller::Clipboard& GetClipboard(); /** Return the object that manages the scroll bars. */ - ScrollBarManager& GetScrollBarManager (void); + ScrollBarManager& GetScrollBarManager(); - ::boost::shared_ptr<CurrentSlideManager> GetCurrentSlideManager (void) const; - ::boost::shared_ptr<SlotManager> GetSlotManager (void) const; - ::boost::shared_ptr<SelectionManager> GetSelectionManager (void) const; - ::boost::shared_ptr<InsertionIndicatorHandler> GetInsertionIndicatorHandler (void) const; + ::boost::shared_ptr<CurrentSlideManager> GetCurrentSlideManager() const; + ::boost::shared_ptr<SlotManager> GetSlotManager() const; + ::boost::shared_ptr<SelectionManager> GetSelectionManager() const; + ::boost::shared_ptr<InsertionIndicatorHandler> GetInsertionIndicatorHandler() const; /** This method forwards the call to the SlideSorterView and executes pending operations like moving selected pages into the visible area. @@ -137,7 +137,7 @@ public: void ExecCtrl (SfxRequest& rRequest); void GetAttrState (SfxItemSet& rSet); - bool IsLocked (void) const; + bool IsLocked() const; /** Create an object of this inner class to prevent updates due to model changes. @@ -145,8 +145,8 @@ public: class ModelChangeLock {public: ModelChangeLock (SlideSorterController& rController); - ~ModelChangeLock (void); - void Release (void); + ~ModelChangeLock(); + void Release(); private: SlideSorterController* mpController; }; @@ -158,14 +158,14 @@ public: This method is a convenience function that simply calls PreModelChange() and then PostModelChange(). */ - void HandleModelChange (void); + void HandleModelChange(); DECL_LINK(WindowEventHandler, VclWindowEvent*); /** Update the display of all pages. This involves a redraw and releasing previews and caches. */ - void UpdateAllPages (void); + void UpdateAllPages(); /** This factory method creates a selection function. */ @@ -175,13 +175,13 @@ public: selection function then return a reference to it. Otherwise return an empty reference. */ - ::rtl::Reference<SelectionFunction> GetCurrentSelectionFunction (void); + ::rtl::Reference<SelectionFunction> GetCurrentSelectionFunction(); /** Prepare for a change of the edit mode. Depending on the current edit mode we may save the selection so that it can be restored when later changing back to the current edit mode. */ - void PrepareEditModeChange (void); + void PrepareEditModeChange(); /** Set a new edit mode and return whether the edit mode really has been changed. For proper saving and restoring of the selection @@ -196,7 +196,7 @@ public: /** Finish the change of the edit mode. Here we may select a page or restore a previously saved selection. */ - void FinishEditModeChange (void); + void FinishEditModeChange(); /** Call this method when the name of one of the pages has changed. This is then notified to the accessibility object, when that exists. @@ -215,12 +215,12 @@ public: /** Return an Animator object. */ - ::boost::shared_ptr<Animator> GetAnimator (void) const { return mpAnimator;} + ::boost::shared_ptr<Animator> GetAnimator() const { return mpAnimator;} - VisibleAreaManager& GetVisibleAreaManager (void) const; + VisibleAreaManager& GetVisibleAreaManager() const; - void CheckForMasterPageAssignment (void); - void CheckForSlideTransitionAssignment (void); + void CheckForMasterPageAssignment(); + void CheckForSlideTransitionAssignment(); private: SlideSorter& mrSlideSorter; @@ -295,26 +295,26 @@ private: called. Ciritcal operations like releasing references to pages that do not exist anymore are executed. */ - void LockModelChange (void); + void LockModelChange(); /** Further calls to HandleModelChange() will result in a full featured update of model, view, and controller. When HandleModelChange() has been called since the last LockModelChange() then this is done right away to bring the view up-to-date. */ - void UnlockModelChange (void); + void UnlockModelChange(); /** Prepare for a model change. This method does all the things that need to be done _before_ the model changes, e.g. because they need access to the model data before the change. */ - void PreModelChange (void); + void PreModelChange(); /** Complete a model change. This includes the recreation of data structures that depend on the model and the request for a repaint to show the changes. */ - void PostModelChange (void); + void PostModelChange(); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx index 9bed85a76524..faf620cd9a0e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimator.hxx @@ -47,12 +47,12 @@ public: enum AnimationMode { AM_Animated, AM_Immediate }; Animator (SlideSorter& rSlideSorter); - ~Animator (void); + ~Animator(); /** When disposed the animator will stop its work immediately and not process any timer events anymore. */ - void Dispose (void); + void Dispose(); /** An animation object is called with values between 0 and 1 as single argument to its operator() method. @@ -90,7 +90,7 @@ public: slidesorter when the slide sorter bar is put into a cache due to a change of the edit mode. */ - void RemoveAllAnimations (void); + void RemoveAllAnimations(); private: SlideSorter& mrSlideSorter; @@ -118,7 +118,7 @@ private: /** Remove animations that have expired. */ - void CleanUpAnimationList (void); + void CleanUpAnimationList(); void RequestNextFrame (const double nFrameStart = 0); }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 9421eef2c521..e4ffd2ff006d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -60,7 +60,7 @@ class Clipboard { public: Clipboard (SlideSorter& rSlideSorter); - virtual ~Clipboard (void); + virtual ~Clipboard(); /** Create a slide sorter transferable from the given sd transferable. The returned transferable is set up with all @@ -96,7 +96,7 @@ public: sal_uInt16 nPage = SDRPAGE_NOTFOUND, sal_uInt16 nLayer = SDRPAGE_NOTFOUND); - void Abort (void); + void Abort(); protected: virtual sal_uInt16 DetermineInsertPosition ( diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index 8f767c198a93..87651fcf3f8a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -49,7 +49,7 @@ public: */ CurrentSlideManager (SlideSorter& rSlideSorter); - ~CurrentSlideManager (void); + ~CurrentSlideManager(); /** Call this when the current page of the main view shell has been switched. Use SwitchCurrentSlide() to initiate such a switch. @@ -76,15 +76,15 @@ public: /** Return the page descriptor for the current slide. Note, that when there is no current slide then the returned pointer is empty. */ - model::SharedPageDescriptor GetCurrentSlide (void) { return mpCurrentSlide;} + model::SharedPageDescriptor GetCurrentSlide() { return mpCurrentSlide;} /** Release all references to model data. */ - void PrepareModelChange (void); + void PrepareModelChange(); /** Modify inner state in reaction to a change of the SlideSorterModel. */ - void HandleModelChange (void); + void HandleModelChange(); private: SlideSorter& mrSlideSorter; @@ -95,7 +95,7 @@ private: */ Timer maSwitchPageDelayTimer; - bool IsCurrentSlideIsValid (void); + bool IsCurrentSlideIsValid(); void SetCurrentSlideAtViewShellBase (const model::SharedPageDescriptor& rpSlide); void SetCurrentSlideAtTabControl (const model::SharedPageDescriptor& rpSlide); void SetCurrentSlideAtXController (const model::SharedPageDescriptor& rpSlide); @@ -103,7 +103,7 @@ private: /** When switching from one slide to a new current slide then this method releases all ties to the old slide. */ - void ReleaseCurrentSlide (void); + void ReleaseCurrentSlide(); /** When switching from one slide to a new current slide then this method connects to the new current slide. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx index 12284bae8db3..c67fdf3e74bb 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx @@ -47,7 +47,7 @@ public: */ FocusManager (SlideSorter& rSlideSorter); - ~FocusManager (void); + ~FocusManager(); enum FocusMoveDirection { @@ -83,25 +83,25 @@ public: /** Hide the focus indicator. */ - void HideFocus (void); + void HideFocus(); /** Toggle the focused state of the current slide. @return Returns the focused state of the focus page after the call. */ - bool ToggleFocus (void); + bool ToggleFocus(); /** Return whether the window managed by the called focus manager has the input focus of the application. */ - bool HasFocus (void) const; + bool HasFocus() const; /** Return the descriptor of the page that currently has the focus. @return When there is no page that currently has the focus then NULL is returned. */ - model::SharedPageDescriptor GetFocusedPageDescriptor (void) const; + model::SharedPageDescriptor GetFocusedPageDescriptor() const; /** Return the index of the page that currently has the focus as it is accepted by the slide sorter model. @@ -109,7 +109,7 @@ public: When there is no page that currently has the focus then -1 is returned. */ - sal_Int32 GetFocusedPageIndex (void) const { return mnPageIndex;} + sal_Int32 GetFocusedPageIndex() const { return mnPageIndex;} /** Set the focused page to the one described by the given page descriptor. The visibility of the focus indicator is not modified. @@ -126,7 +126,7 @@ public: */ void SetFocusedPage (sal_Int32 nPageIndex); - void SetFocusedPageToCurrentPage (void); + void SetFocusedPageToCurrentPage(); /** Return <TRUE/> when the focus inidcator is currently shown. A prerequisite is that the window managed by this focus manager has @@ -134,7 +134,7 @@ public: HasFocus(). It is not necessary that the focus indicator is visible. It may have been scrolled outside the visible area. */ - bool IsFocusShowing (void) const; + bool IsFocusShowing() const; /** Add a listener that is called when the focus is shown or hidden or set to another page object. @@ -160,7 +160,7 @@ public: { public: FocusHider (FocusManager&); - ~FocusHider (void); + ~FocusHider(); private: bool mbFocusVisible; FocusManager& mrManager; @@ -211,7 +211,7 @@ private: happened. The focus may be hidden or shown or moved from one page object to another. */ - void NotifyFocusChangeListeners (void) const; + void NotifyFocusChangeListeners() const; }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx index b094c447fee6..d4084e6cc90d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx @@ -42,7 +42,7 @@ class InsertionIndicatorHandler { public: InsertionIndicatorHandler (SlideSorter& rSlideSorter); - ~InsertionIndicatorHandler (void); + ~InsertionIndicatorHandler(); enum Mode { CopyMode, MoveMode, UnknownMode }; static Mode GetModeFromDndAction (const sal_Int8 nDndAction); @@ -63,7 +63,7 @@ public: { public: ForceShowContext (const ::boost::shared_ptr<InsertionIndicatorHandler>& rpHandler); - ~ForceShowContext (void); + ~ForceShowContext(); private: const ::boost::shared_ptr<InsertionIndicatorHandler> mpHandler; }; @@ -84,12 +84,12 @@ public: /** Return whether the insertion marker is active. */ - bool IsActive (void) const { return mbIsActive;} + bool IsActive() const { return mbIsActive;} /** Return the insertion index that corresponds with the current graphical location of the insertion indicator. */ - sal_Int32 GetInsertionPageIndex (void) const; + sal_Int32 GetInsertionPageIndex() const; /** Determine whether moving the current selection to the current position of the insertion marker would alter the document. This @@ -121,7 +121,7 @@ private: void SetPosition ( const Point& rPoint, const Mode eMode); - ::boost::shared_ptr<view::InsertAnimator> GetInsertAnimator (void); + ::boost::shared_ptr<view::InsertAnimator> GetInsertAnimator(); /** Make the insertion indicator visible (that is the show part) and keep it visible, even when the mouse leaves the window (that is the @@ -131,8 +131,8 @@ private: In effect all calls to End() are ignored until ForceEnd() is called. */ - void ForceShow (void); - void ForceEnd (void); + void ForceShow(); + void ForceEnd(); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx index 5db5465be0e7..9f2051cff76e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx @@ -55,19 +55,19 @@ class PageSelector : private ::boost::noncopyable public: PageSelector (SlideSorter& rSlideSorter); - void SelectAllPages (void); - void DeselectAllPages (void); + void SelectAllPages(); + void DeselectAllPages(); /** Update the selection state of all page descriptors to be the same as that of the corresponding pages of the SdPage objects and issue redraw requests where necessary. */ - void GetCoreSelection (void); + void GetCoreSelection(); /** Update the selection state of the SdPage objects to be the same as that of the correspinding page descriptors. */ - void SetCoreSelection (void); + void SetCoreSelection(); /** Select the specified descriptor. The selection state of the other descriptors is not affected. @@ -106,15 +106,15 @@ public: that it is self contained for iterating over all pages to select or deselect them. */ - int GetPageCount (void) const; - int GetSelectedPageCount (void) const { return mnSelectedPageCount;} + int GetPageCount() const; + int GetSelectedPageCount() const { return mnSelectedPageCount;} /** Return the anchor for a range selection. This usually is the first selected page after all pages have been deselected. @return The returned anchor may be NULL. */ - model::SharedPageDescriptor GetSelectionAnchor (void) const { return mpSelectionAnchor;} + model::SharedPageDescriptor GetSelectionAnchor() const { return mpSelectionAnchor;} typedef ::std::vector<SdPage*> PageSelection; @@ -125,7 +125,7 @@ public: even if pages are exchanged a later call to SetPageSelection() is valid. */ - ::boost::shared_ptr<PageSelection> GetPageSelection (void) const; + ::boost::shared_ptr<PageSelection> GetPageSelection() const; /** Restore a page selection according to the given selection object. @param rSelection @@ -148,7 +148,7 @@ public: /** Call this method after the model has changed to set the number of selected pages. */ - void CountSelectedPages (void); + void CountSelectedPages(); /** Use the UpdateLock whenever you do a complex selection, i.e. call more than one method in a row. An active lock prevents intermediate @@ -159,8 +159,8 @@ public: public: UpdateLock (SlideSorter& rSlideSorter); UpdateLock (PageSelector& rPageSelector); - ~UpdateLock (void); - void Release (void); + ~UpdateLock(); + void Release(); private: PageSelector* mpSelector; }; @@ -170,7 +170,7 @@ public: public: BroadcastLock (SlideSorter& rSlideSorter); BroadcastLock (PageSelector& rPageSelector); - ~BroadcastLock (void); + ~BroadcastLock(); private: PageSelector& mrSelector; }; @@ -195,17 +195,17 @@ private: DisableBroadcasting() was called before and the selection has been changed in the mean time, this change will be broadcasted. */ - void EnableBroadcasting (void); + void EnableBroadcasting(); /** Disable the broadcasting of selection change events. Subsequent changes of the selection will set a flag that triggers the sending of events when EnableBroadcasting() is called. */ - void DisableBroadcasting (void); + void DisableBroadcasting(); void UpdateCurrentPage (const bool bUpdateOnlyWhenPending = false); - void CheckConsistency (void) const; + void CheckConsistency() const; }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 5c6f4ed494d4..18aad707f6c6 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -29,32 +29,32 @@ namespace sd { namespace slidesorter { namespace controller { class Properties { public: - Properties (void); - ~Properties (void); + Properties(); + ~Properties(); /** Call this method after receiving a VCLEVENT_APPLICATION_DATACHANGED event. */ - void HandleDataChangeEvent (void); + void HandleDataChangeEvent(); /** When this method returns <TRUE/> then the current slide is highlighted in the view. The default value is <FALSE/>. */ - bool IsHighlightCurrentSlide (void) const { return mbIsHighlightCurrentSlide;} + bool IsHighlightCurrentSlide() const { return mbIsHighlightCurrentSlide;} void SetHighlightCurrentSlide (const bool bIsHighlightCurrentSlide); /** When this method returns <TRUE/> then the selection is indicated in the view (typically by drawing rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowSelection (void) const { return mbIsShowSelection;} + bool IsShowSelection() const { return mbIsShowSelection;} void SetShowSelection (const bool bIsShowSelection); /** When this method returns <TRUE/> then the focusdselection is indicated in the view (typically by drawing dotted rectangles around the selected slides.) The default value is <TRUE/>. */ - bool IsShowFocus (void) const { return mbIsShowFocus;} + bool IsShowFocus() const { return mbIsShowFocus;} void SetShowFocus (const bool bIsShowFocus); /** When this method returns <TRUE/> then on a selection change the @@ -62,54 +62,54 @@ public: centered in the view. This can be used to center the current slide by selecting only the current slide. The default value is <FALSE/>. */ - bool IsCenterSelection (void) const { return mbIsCenterSelection;} + bool IsCenterSelection() const { return mbIsCenterSelection;} void SetCenterSelection (const bool bIsCenterSelection); /** When this mehod returns <TRUE/> then the view may try to change the visible area by scrolling it smoothly on the screen. Experimental. Default value is <FALSE/>. */ - bool IsSmoothSelectionScrolling (void) const { return mbIsSmoothSelectionScrolling;} + bool IsSmoothSelectionScrolling() const { return mbIsSmoothSelectionScrolling;} void SetSmoothSelectionScrolling (const bool bIsSmoothSelectionScrolling); /** When this method returns <TRUE/> then during a full screen presentation the previews in a slide sorter are not updated. Default value is <TRUE/>. */ - bool IsSuspendPreviewUpdatesDuringFullScreenPresentation (void) const { return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;} + bool IsSuspendPreviewUpdatesDuringFullScreenPresentation() const { return mbIsSuspendPreviewUpdatesDuringFullScreenPresentation;} void SetSuspendPreviewUpdatesDuringFullScreenPresentation (const bool bFlag); /** Return the background color. */ - Color GetBackgroundColor (void) const { return maBackgroundColor;} + Color GetBackgroundColor() const { return maBackgroundColor;} void SetBackgroundColor (const Color& rColor); /** Return the text color. */ - Color GetTextColor (void) const { return maTextColor;} + Color GetTextColor() const { return maTextColor;} void SetTextColor (const Color& rColor); /** Return the color in which selections are to be painted. */ - Color GetSelectionColor (void) const { return maSelectionColor;} + Color GetSelectionColor() const { return maSelectionColor;} void SetSelectionColor (const Color& rColor); /** Return the color used for highlighting e.g. the current slide. */ - Color GetHighlightColor (void) const { return maHighlightColor;} + Color GetHighlightColor() const { return maHighlightColor;} void SetHighlightColor (const Color& rColor); /** The UI can be set to be read only indepently from the model status. Used for instance in the presenter view. */ - bool IsUIReadOnly (void) const { return mbIsUIReadOnly;} + bool IsUIReadOnly() const { return mbIsUIReadOnly;} void SetUIReadOnly (const bool bIsUIReadOnly); /** The mouse over effect (and whether a mouse motion starts a multi selection or a drag-and-drop) can be triggered by just the preview area or the whole page object area. */ - bool IsOnlyPreviewTriggersMouseOver (void) const { return mbIsOnlyPreviewTriggersMouseOver;} + bool IsOnlyPreviewTriggersMouseOver() const { return mbIsOnlyPreviewTriggersMouseOver;} private: bool mbIsHighlightCurrentSlide; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 594a415d3784..ca039c316a4f 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -67,19 +67,19 @@ public: */ ScrollBarManager (SlideSorter& rSlideSorter); - ~ScrollBarManager (void); + ~ScrollBarManager(); /** Register listeners at the scroll bars. This method is called after startup of a new slide sorter object or after a reactivation of a slide sorter that for example is taken from a cache. */ - void Connect (void); + void Connect(); /** Remove listeners from the scroll bars. This method is called when the slide sorter is destroyed or when it is suspended, e.g. put into a cache for later reuse. */ - void Disconnect (void); + void Disconnect(); /** Set up the scroll bar, i.e. thumb size and position. Call this method when the content of the browser window changed, i.e. pages @@ -129,7 +129,7 @@ public: Returns 0 when the vertical scroll bar is not shown or does not exist, otherwise its width in pixel is returned. */ - int GetVerticalScrollBarWidth (void) const; + int GetVerticalScrollBarWidth() const; /** Return the height of the horizontal scroll bar, which--when shown--should be fixed in contrast to its width. @@ -137,7 +137,7 @@ public: Returns 0 when the vertical scroll bar is not shown or does not exist, otherwise its height in pixel is returned. */ - int GetHorizontalScrollBarHeight (void) const; + int GetHorizontalScrollBarHeight() const; /** Call this method to scroll a window while the mouse is in dragging a selection. If the mouse is near the window border or is outside the @@ -152,9 +152,9 @@ public: */ bool AutoScroll ( const Point& rMouseWindowPosition, - const ::boost::function<void(void)>& rAutoScrollFunctor); + const ::boost::function<void()>& rAutoScrollFunctor); - void StopAutoScroll (void); + void StopAutoScroll(); void clearAutoScrollFunctor(); @@ -215,7 +215,7 @@ private: */ SharedSdWindow mpContentWindow; - ::boost::function<void(void)> maAutoScrollFunctor; + ::boost::function<void()> maAutoScrollFunctor; void SetWindowOrigin ( double nHorizontalPosition, @@ -250,7 +250,7 @@ private: const Rectangle& rAvailableArea); void CalcAutoScrollOffset (const Point& rMouseWindowPosition); - bool RepeatAutoScroll (void); + bool RepeatAutoScroll(); DECL_LINK(HorizontalScrollBarHandler, ScrollBar*); DECL_LINK(VerticalScrollBarHandler, ScrollBar*); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 6142fdf7f587..bc10d3b39618 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -55,13 +55,13 @@ public: virtual void Deactivate() SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoCut (void) SAL_OVERRIDE; + virtual void DoCut() SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoCopy (void) SAL_OVERRIDE; + virtual void DoCopy() SAL_OVERRIDE; /// Forward to the clipboard manager. - virtual void DoPaste (void) SAL_OVERRIDE; + virtual void DoPaste() SAL_OVERRIDE; /** is called when the current function should be aborted. <p> This is used when a function gets a KEY_ESCAPE but can also @@ -78,12 +78,12 @@ public: /** Turn of substitution display and insertion indicator. */ - void NotifyDragFinished (void); + void NotifyDragFinished(); /** Call when drag-and-drop or multi selection is started or stopped in order to update permission of mouse over indication. */ - void UpdateMouseOverIndicationPermission (void); + void UpdateMouseOverIndicationPermission(); class EventDescriptor; class ModeHandler; @@ -95,17 +95,17 @@ public: DragAndDropMode, ButtonMode }; - void SwitchToNormalMode (void); + void SwitchToNormalMode(); void SwitchToDragAndDropMode(const Point& rMousePosition); void SwitchToMultiSelectionMode (const Point& rMousePosition, const sal_uInt32 nEventCode); - void ResetShiftKeySelectionAnchor (void); + void ResetShiftKeySelectionAnchor(); /** Special case handling for when the context menu is hidden. This method will reinitialize the current mouse position to prevent the mouse motion during the time the context menu is displayed from being interpreted as drag-and-drop start. */ - void ResetMouseAnchor (void); + void ResetMouseAnchor(); protected: SlideSorter& mrSlideSorter; @@ -172,7 +172,7 @@ private: const bool bIsShiftDown, const bool bIsControlDown); - void StopDragAndDrop (void); + void StopDragAndDrop(); void SwitchMode (const ::boost::shared_ptr<ModeHandler>& rpHandler); }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx index 5d5f235fa63e..1d63ead4c585 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx @@ -53,7 +53,7 @@ public: */ SelectionManager (SlideSorter& rSlideSorter); - ~SelectionManager (void); + ~SelectionManager(); /** Delete the currently selected slides. When this method returns the selection is empty. @@ -96,14 +96,14 @@ public: position of the associated insertion marker is stored here and reset the next time the selection changes. */ - sal_Int32 GetInsertionPosition (void) const; + sal_Int32 GetInsertionPosition() const; /** Store an insertion position temporarily. It is reset when the selection changes the next time. */ void SetInsertionPosition (const sal_Int32 nInsertionPosition); - ::boost::shared_ptr<SelectionObserver> GetSelectionObserver (void) const { return mpSelectionObserver;} + ::boost::shared_ptr<SelectionObserver> GetSelectionObserver() const { return mpSelectionObserver;} private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx index 30079a495cbd..6cbeb2804795 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionObserver.hxx @@ -41,12 +41,12 @@ class SelectionObserver { public: SelectionObserver (SlideSorter& rSlideSorter); - virtual ~SelectionObserver (void); + virtual ~SelectionObserver(); void NotifyPageEvent (const SdrPage* pPage); - void StartObservation (void); - void AbortObservation (void); - void EndObservation (void); + void StartObservation(); + void AbortObservation(); + void EndObservation(); /** Use this little class instead of calling StartObservation and EndObservation directly so that EndObservation is not forgotten or @@ -57,8 +57,8 @@ public: { public: Context (SlideSorter& rSlideSorter); - ~Context(void); - void Abort (void); + ~Context(); + void Abort(); private: ::boost::shared_ptr<SelectionObserver> mpSelectionObserver; }; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index b8841a798465..e9db2ce099d7 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -48,7 +48,7 @@ public: */ SlotManager (SlideSorter& rSlideSorter); - ~SlotManager (void); + ~SlotManager(); void FuTemporary (SfxRequest& rRequest); void FuPermanent (SfxRequest& rRequest); @@ -72,7 +72,7 @@ public: /** Call this after a change from normal mode to master mode or back. The affected slots are invalidated. */ - void NotifyEditModeChange (void); + void NotifyEditModeChange(); private: /// The controller for which we manage the slot calls. @@ -88,7 +88,7 @@ private: /** The implementation is a copy of the code for SID_RENAMEPAGE in drviews2.cxx. */ - void RenameSlide (void); + void RenameSlide(); DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog*); bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUString& rName); @@ -101,7 +101,7 @@ private: /** Use one of several ways to determine where to insert a new page. This can be the current selection or the insertion indicator. */ - sal_Int32 GetInsertionPosition (void); + sal_Int32 GetInsertionPosition(); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index 57d51f28ed2e..1e60ac843b4a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -67,13 +67,13 @@ public: TransferableData ( SlideSorterViewShell* pViewShell, const ::std::vector<TransferableData::Representative>& rRepresentatives); - virtual ~TransferableData (void); + virtual ~TransferableData(); - const ::std::vector<Representative>& GetRepresentatives (void) const { return maRepresentatives;} + const ::std::vector<Representative>& GetRepresentatives() const { return maRepresentatives;} /** Return the view shell for which the transferable was created. */ - SlideSorterViewShell* GetSourceViewShell (void) const { return mpViewShell;} + SlideSorterViewShell* GetSourceViewShell() const { return mpViewShell;} private: SlideSorterViewShell* mpViewShell; diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx index b062c7a494c8..56e21137732d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx @@ -34,18 +34,18 @@ class VisibleAreaManager { public: VisibleAreaManager (SlideSorter& rSlideSorter); - ~VisibleAreaManager (void); + ~VisibleAreaManager(); - void ActivateCurrentSlideTracking (void); - void DeactivateCurrentSlideTracking (void); - bool IsCurrentSlideTrackingActive (void) const { return mbIsCurrentSlideTrackingActive;} + void ActivateCurrentSlideTracking(); + void DeactivateCurrentSlideTracking(); + bool IsCurrentSlideTrackingActive() const { return mbIsCurrentSlideTrackingActive;} /** Request the current slide to be moved into the visible area. This request is only obeyed when the current slide tracking is active. @see ActivateCurrentSlideTracking() and DeactivateCurrentSlideTracking() */ - void RequestCurrentSlideVisible (void); + void RequestCurrentSlideVisible(); /** Request to make the specified page object visible. */ @@ -59,7 +59,7 @@ public: { public: TemporaryDisabler (SlideSorter& rSlideSorter); - ~TemporaryDisabler (void); + ~TemporaryDisabler(); private: VisibleAreaManager& mrVisibleAreaManager; }; @@ -82,8 +82,8 @@ private: bool mbIsCurrentSlideTrackingActive; int mnDisableCount; - void MakeVisible (void); - ::boost::optional<Point> GetRequestedTopLeft (void) const; + void MakeVisible(); + ::boost::optional<Point> GetRequestedTopLeft() const; }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index c5a2e73392d5..c963b76a08a0 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -55,13 +55,13 @@ class SlideSorterModel public: SlideSorterModel (SlideSorter& rSlideSorter); - virtual ~SlideSorterModel (void); - void Dispose (void); + virtual ~SlideSorterModel(); + void Dispose(); /** This method is present to let the view create a ShowView for displaying slides. */ - SdDrawDocument* GetDocument (void); + SdDrawDocument* GetDocument(); /** Set a new edit mode and return whether the edit mode really has been changed. When the edit mode is changed then the @@ -76,16 +76,16 @@ public: /** Set the edit mode to that currently used by the controller. */ - bool SetEditModeFromController (void); - EditMode GetEditMode (void) const { return meEditMode;} - PageKind GetPageType (void) const { return mePageKind;} + bool SetEditModeFromController(); + EditMode GetEditMode() const { return meEditMode;} + PageKind GetPageType() const { return mePageKind;} /** Return the number of slides in the document regardless of whether they are visible or not or whether they are hidden or not. The number of slides depends on the set of slides available through the XIndexAccess given to SetDocumentSlides(). */ - sal_Int32 GetPageCount (void) const; + sal_Int32 GetPageCount() const; /** Return a page descriptor for the page with the specified index. Page descriptors are created on demand. The page descriptor is @@ -145,26 +145,26 @@ public: is especially important for previews of complex pages that take some time to create. */ - void Resync (void); + void Resync(); /** Delete all descriptors that currently are in the container. The size of the container, however, is not altered. Use the AdaptSize method for that. */ - void ClearDescriptorList (void); + void ClearDescriptorList(); /** Set the selection of the document to exactly that of the called model. */ - void SynchronizeDocumentSelection (void); + void SynchronizeDocumentSelection(); /** Set the selection of the called model to exactly that of the document. */ - void SynchronizeModelSelection (void); + void SynchronizeModelSelection(); /** Return the mutex so that the caller can lock it and then safely access the model. */ - ::osl::Mutex& GetMutex (void) { return maMutex;} + ::osl::Mutex& GetMutex() { return maMutex;} /** Set the XIndexAccess from which the called SlideSorterModel takes its pages. @@ -177,20 +177,20 @@ public: /** Return the set of pages that is currently displayed by the slide sorter. */ - css::uno::Reference<css::container::XIndexAccess> GetDocumentSlides (void) const; + css::uno::Reference<css::container::XIndexAccess> GetDocumentSlides() const; /** This method is called when the edit mode has changed. It calls SetDocumentSlides() with the set of slides or master pages obtained from the model of the XController. */ - void UpdatePageList (void); + void UpdatePageList(); - bool IsReadOnly (void) const; + bool IsReadOnly() const; /** The current selection is saved by copying the ST_Selected state into ST_WasSelected for slides. */ - void SaveCurrentSelection (void); + void SaveCurrentSelection(); /** The current selection is restored from the ST_WasSelected state from the slides. @@ -198,7 +198,7 @@ public: The returned region has to be repainted to reflect the updated selection states. */ - ::vcl::Region RestoreSelection (void); + ::vcl::Region RestoreSelection(); /** Typically called from controller::Listener this method handles the insertion and deletion of single pages. @@ -220,7 +220,7 @@ private: /** Resize the descriptor container according to current values of page kind and edit mode. */ - void AdaptSize (void); + void AdaptSize(); SdPage* GetPage (const sal_Int32 nCoreIndex) const; void InsertSlide (SdPage* pPage); diff --git a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx index b66a41285d08..5e6f681f23a1 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsEnumeration.hxx @@ -33,12 +33,12 @@ class Enumeration public: virtual ~Enumeration() {} - virtual bool HasMoreElements (void) const = 0; + virtual bool HasMoreElements() const = 0; /** Returns T instead of T& so that it can handle shared pointers. */ - virtual T GetNextElement (void) = 0; - virtual void Rewind (void) = 0; - virtual ::std::unique_ptr<Enumeration<T> > Clone (void) = 0; + virtual T GetNextElement() = 0; + virtual void Rewind() = 0; + virtual ::std::unique_ptr<Enumeration<T> > Clone() = 0; }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 3638af33dd86..412971e995c6 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -64,26 +64,26 @@ public: SdPage* pPage, const sal_Int32 nIndex); - ~PageDescriptor (void); + ~PageDescriptor(); /** Return the page that is represented by the descriptor as SdPage pointer . */ - SdPage* GetPage (void) const { return mpPage;} + SdPage* GetPage() const { return mpPage;} /** Return the page that is represented by the descriptor as XDrawPage reference. */ - css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage (void) const { return mxPage;} + css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage() const { return mxPage;} /** Returns the index of the page as it is displayed in the view as page number. The value may differ from the index returned by the XDrawPage when there are hidden slides and the XIndexAccess used to access the model filters them out. */ - sal_Int32 GetPageIndex (void) const { return mnIndex;} + sal_Int32 GetPageIndex() const { return mnIndex;} void SetPageIndex (const sal_Int32 nIndex); - bool UpdateMasterPage (void); - bool UpdateTransitionFlag (void); + bool UpdateMasterPage(); + bool UpdateTransitionFlag(); enum State { ST_Visible, ST_Selected, ST_WasSelected, ST_Focused, ST_MouseOver, ST_Current, ST_Excluded }; @@ -101,16 +101,16 @@ public: returned. When they were the same this method returns <FALSE/>. */ - bool GetCoreSelection (void); + bool GetCoreSelection(); /** Set the selection flags of the SdPage objects to the corresponding selection states of the page descriptors. */ - void SetCoreSelection (void); + void SetCoreSelection(); - VisualState& GetVisualState (void) { return maVisualState;} + VisualState& GetVisualState() { return maVisualState;} - Rectangle GetBoundingBox (void) const; + Rectangle GetBoundingBox() const; Point GetLocation (const bool bIgnoreLocation = false) const; void SetBoundingBox (const Rectangle& rBoundingBox); diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx index 959f9276dad9..247bfe25a515 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx @@ -80,26 +80,26 @@ public: /** Create and return an exact copy of the called object. */ - virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone (void) SAL_OVERRIDE; + virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone() SAL_OVERRIDE; PageEnumeration& operator= (const PageEnumeration& rEnumeration); /** Return <TRUE/> when the enumeration has more elements, i.e. it is save to call GetNextElement() at least one more time. */ - virtual bool HasMoreElements (void) const SAL_OVERRIDE; + virtual bool HasMoreElements() const SAL_OVERRIDE; /** Return the next element of the enumeration. Call the HasMoreElements() before to make sure that there exists at least one more element. Calling this method with HasMoreElements() returning <FALSE/> is an error. */ - virtual SharedPageDescriptor GetNextElement (void) SAL_OVERRIDE; + virtual SharedPageDescriptor GetNextElement() SAL_OVERRIDE; /** Rewind the enumeration so that the next call to GetNextElement() will return its first element. */ - virtual void Rewind (void) SAL_OVERRIDE; + virtual void Rewind() SAL_OVERRIDE; private: /// Implementation object. @@ -111,7 +111,7 @@ private: PageEnumeration (::std::unique_ptr<Enumeration<SharedPageDescriptor> > && pImpl); // Default constructor not implemented. - PageEnumeration (void); + PageEnumeration(); }; } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx index de9ef2103fba..0df22fa48819 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx @@ -42,13 +42,13 @@ public: VS_None }; VisualState (const sal_Int32 nPageId); - ~VisualState (void); + ~VisualState(); void SetVisualState (const State eState); void UpdateVisualState (const PageDescriptor& rDescriptor); - Point GetLocationOffset (void) const { return maLocationOffset;} + Point GetLocationOffset() const { return maLocationOffset;} bool SetLocationOffset (const Point& rPoint); sal_Int32 mnPageId; // For debugging diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index e9ac85896ea0..88402e727395 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -74,23 +74,23 @@ public: */ SlideSorterView (SlideSorter& rSlideSorter); - void Init (void); + void Init(); - virtual ~SlideSorterView (void); - void Dispose (void); + virtual ~SlideSorterView(); + void Dispose(); /** Set the general way of layouting the page objects. Note that this method does not trigger any repaints or layouts. */ bool SetOrientation (const Layouter::Orientation eOrientation); - Layouter::Orientation GetOrientation (void) const { return meOrientation;} + Layouter::Orientation GetOrientation() const { return meOrientation;} - void RequestRepaint (void); + void RequestRepaint(); void RequestRepaint (const model::SharedPageDescriptor& rDescriptor); void RequestRepaint (const Rectangle& rRepaintBox); void RequestRepaint (const ::vcl::Region& rRepaintRegion); - Rectangle GetModelArea (void); + Rectangle GetModelArea(); /** Return the index of the page that is rendered at the given position. @param rPosition @@ -101,9 +101,9 @@ public: */ sal_Int32 GetPageIndexAtPoint (const Point& rPosition) const; - view::Layouter& GetLayouter (void); + view::Layouter& GetLayouter(); - virtual void ModelHasChanged (void) SAL_OVERRIDE; + virtual void ModelHasChanged() SAL_OVERRIDE; /** This method is typically called before a model change takes place. All references to model data are released. PostModelChange() has to @@ -111,22 +111,22 @@ public: calls to Pre- and PostModelChange() are very close to each other you may call HandleModelChange() instead. */ - void PreModelChange (void); + void PreModelChange(); /** This method is typically called after a model change took place. References to model data are re-allocated. Call this method only after PreModelChange() has been called. */ - void PostModelChange (void); + void PostModelChange(); /** This method is a convenience function that simply calls PreModelChange() and then PostModelChange(). */ - void HandleModelChange (void); + void HandleModelChange(); - void HandleDrawModeChange (void); + void HandleDrawModeChange(); - void Resize (void); + void Resize(); virtual void CompleteRedraw ( OutputDevice* pDevice, const ::vcl::Region& rPaintArea, @@ -137,19 +137,19 @@ public: utl::ConfigurationBroadcaster* pBroadcaster, sal_uInt32 nHint) SAL_OVERRIDE; - void HandleDataChangeEvent (void); + void HandleDataChangeEvent(); - void Layout (void); + void Layout(); /** This tells the view that it has to re-determine the visibility of the page objects before painting them the next time. */ - void InvalidatePageObjectVisibilities (void); + void InvalidatePageObjectVisibilities(); /** Return the window to which this view renders its output. */ - // ::boost::shared_ptr<sd::Window> GetWindow (void) const; + // ::boost::shared_ptr<sd::Window> GetWindow() const; - ::boost::shared_ptr<cache::PageCache> GetPreviewCache (void); + ::boost::shared_ptr<cache::PageCache> GetPreviewCache(); /** Set the bounding box of the insertion marker in model coordinates. @@ -177,7 +177,7 @@ public: The returned pair of page object indices is empty when the second index is lower than the first. */ - Pair GetVisiblePageRange (void); + Pair GetVisiblePageRange(); /** Add a shape to the page. Typically used from inside PostModelChange(). @@ -211,26 +211,26 @@ public: const model::PageDescriptor::State eState, const bool bStateValue); - void UpdateOrientation (void); + void UpdateOrientation(); - ::boost::shared_ptr<PageObjectPainter> GetPageObjectPainter (void); - ::boost::shared_ptr<LayeredDevice> GetLayeredDevice (void) const { return mpLayeredDevice;} + ::boost::shared_ptr<PageObjectPainter> GetPageObjectPainter(); + ::boost::shared_ptr<LayeredDevice> GetLayeredDevice() const { return mpLayeredDevice;} class DrawLock { public: DrawLock (SlideSorter& rSlideSorter); - ~DrawLock (void); + ~DrawLock(); /** When the DrawLock is disposed then it will not request a repaint on destruction. */ - void Dispose (void); + void Dispose(); private: view::SlideSorterView& mrView; SharedSdWindow mpWindow; }; - ToolTip& GetToolTip (void) const; + ToolTip& GetToolTip() const; virtual void DragFinished (sal_Int8 nDropAction) SAL_OVERRIDE; @@ -263,11 +263,11 @@ private: /** Determine the visibility of all page objects. */ - void DeterminePageObjectVisibilities (void); + void DeterminePageObjectVisibilities(); - void UpdatePreciousFlags (void); - void RequestRearrange (void); - void Rearrange (void); + void UpdatePreciousFlags(); + void RequestRearrange(); + void Rearrange(); }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx index d901f8353a71..6f51d058ea84 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsFontProvider.hxx @@ -41,14 +41,14 @@ public: /** Return the single instance of this class. Throws a RuntimeException when no instance can be created. */ - static FontProvider& Instance (void); + static FontProvider& Instance(); /** Call this method to tell an object to release its currently used font. The next call to GetFont() will then create a new one. Typically called after a DataChange event when for instance a system font has been modified. */ - void Invalidate (void); + void Invalidate(); private: static FontProvider* mpInstance; @@ -62,8 +62,8 @@ private: */ MapMode maMapMode; - FontProvider (void); - virtual ~FontProvider (void); + FontProvider(); + virtual ~FontProvider(); FontProvider (const FontProvider&) SAL_DELETED_FUNCTION; FontProvider& operator= (const FontProvider&) SAL_DELETED_FUNCTION; diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 6424c027232c..5f604726a172 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx @@ -54,7 +54,7 @@ class InsertionIndicatorOverlay { public: InsertionIndicatorOverlay (SlideSorter& rSlideSorter); - virtual ~InsertionIndicatorOverlay (void); + virtual ~InsertionIndicatorOverlay(); virtual void SetLayerInvalidator (const SharedILayerInvalidator& rpInvalidator) SAL_OVERRIDE; @@ -66,17 +66,17 @@ public: */ void SetLocation (const Point& rPosition); - Size GetSize (void) const; + Size GetSize() const; virtual void Paint ( OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE; - bool IsVisible (void) const { return mbIsVisible;} - void Hide (void); - void Show (void); + bool IsVisible() const { return mbIsVisible;} + void Hide(); + void Show(); - Rectangle GetBoundingBox (void) const; + Rectangle GetBoundingBox() const; private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 4402129fc36f..eeba70945715 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -66,9 +66,9 @@ public: Layouter ( const SharedSdWindow& rpWindow, const ::boost::shared_ptr<Theme>& rpTheme); - ~Layouter (void); + ~Layouter(); - ::boost::shared_ptr<PageObjectLayouter> GetPageObjectLayouter (void) const; + ::boost::shared_ptr<PageObjectLayouter> GetPageObjectLayouter() const; /** Set the interval of valid column counts. When nMinimalColumnCount <= nMaximalColumnCount is not fulfilled then the call is ignored. @param nMinimalColumnCount @@ -107,16 +107,16 @@ public: /** Return the number of columns. */ - sal_Int32 GetColumnCount (void) const; + sal_Int32 GetColumnCount() const; sal_Int32 GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) const; /** Return the scale factor that can be set at the map mode of the output window. */ - Fraction GetScaleFactor (void) const; + Fraction GetScaleFactor() const; - Size GetPageObjectSize (void) const; + Size GetPageObjectSize() const; /** Return the bounding box in window coordinates of the nIndex-th page object. @@ -128,7 +128,7 @@ public: /** Return the bounding box in model coordinates of the page that contains the given amount of page objects. */ - Rectangle GetTotalBoundingBox (void) const; + Rectangle GetTotalBoundingBox() const; /** Return the index of the first fully or partially visible page object. This takes into account only the vertical dimension. @@ -185,8 +185,8 @@ public: const Size& rIndicatorSize, model::SlideSorterModel& rModel) const; - Range GetValidHorizontalSizeRange (void) const; - Range GetValidVerticalSizeRange (void) const; + Range GetValidHorizontalSizeRange() const; + Range GetValidVerticalSizeRange() const; class Implementation; @@ -201,7 +201,7 @@ private: class InsertPosition { public: - InsertPosition (void); + InsertPosition(); InsertPosition& operator= (const InsertPosition& rInsertPosition); bool operator== (const InsertPosition& rInsertPosition) const; bool operator!= (const InsertPosition& rInsertPosition) const; @@ -218,15 +218,15 @@ public: const Point& rLeadingOffset, const Point& rTrailingOffset); - sal_Int32 GetRow (void) const { return mnRow; } - sal_Int32 GetColumn (void) const { return mnColumn; } - sal_Int32 GetIndex (void) const { return mnIndex; } - Point GetLocation (void) const { return maLocation; } - Point GetLeadingOffset (void) const { return maLeadingOffset; } - Point GetTrailingOffset (void) const { return maTrailingOffset; } - bool IsAtRunStart (void) const { return mbIsAtRunStart; } - bool IsAtRunEnd (void) const { return mbIsAtRunEnd; } - bool IsExtraSpaceNeeded (void) const { return mbIsExtraSpaceNeeded; } + sal_Int32 GetRow() const { return mnRow; } + sal_Int32 GetColumn() const { return mnColumn; } + sal_Int32 GetIndex() const { return mnIndex; } + Point GetLocation() const { return maLocation; } + Point GetLeadingOffset() const { return maLeadingOffset; } + Point GetTrailingOffset() const { return maTrailingOffset; } + bool IsAtRunStart() const { return mbIsAtRunStart; } + bool IsAtRunEnd() const { return mbIsAtRunEnd; } + bool IsExtraSpaceNeeded() const { return mbIsExtraSpaceNeeded; } private: sal_Int32 mnRow; diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index 56d38036cf46..426e36c830fb 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -50,7 +50,7 @@ public: const Size& rPreviewModelSize, const SharedSdWindow& rpWindow, const sal_Int32 nPageCount); - ~PageObjectLayouter(void); + ~PageObjectLayouter(); enum Part { // The focus indicator is painted outside the actual page object. @@ -115,8 +115,8 @@ public: /// the maximum size of each tile, also position independent Size GetGridMaxSize(const CoordinateSystem eCoordinateSystem); - Image GetTransitionEffectIcon (void) const { return maTransitionEffectIcon;} - Image GetCustomAnimationEffectIcon (void) const { return maCustomAnimationEffectIcon;} + Image GetTransitionEffectIcon() const { return maTransitionEffectIcon;} + Image GetCustomAnimationEffectIcon() const { return maCustomAnimationEffectIcon;} private: Rectangle GetBoundingBox ( diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index de7d76f5fb9e..4058c063dddb 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -40,7 +40,7 @@ class PageObjectPainter { public: PageObjectPainter (const SlideSorter& rSlideSorter); - ~PageObjectPainter (void); + ~PageObjectPainter(); void PaintPageObject ( OutputDevice& rDevice, @@ -124,7 +124,7 @@ private: one owned by the general layouter. Return <TRUE/> when after the call we have a valid page object layouter. */ - bool UpdatePageObjectLayouter (void); + bool UpdatePageObjectLayouter(); }; } } } // end of namespace sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx index 58666fb8a7b9..568086a58b88 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx @@ -52,7 +52,7 @@ public: void Update ( const ::boost::shared_ptr<controller::Properties>& rpProperties); - // BitmapEx GetInsertIndicatorIcon (void) const; + // BitmapEx GetInsertIndicatorIcon() const; enum FontType { Font_PageNumber, diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index ab04aba70efe..c24484b0c3cd 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -35,7 +35,7 @@ class ToolTip { public: ToolTip (SlideSorter& rSlideSorter); - ~ToolTip (void); + ~ToolTip(); /** Set a new page. This modifies the default help text. After a page change a timer is started to delay the display of the tool tip for @@ -50,7 +50,7 @@ public: Returns whether the tool tip was visible at the time this method was called. */ - bool Hide (void); + bool Hide(); private: SlideSorter& mrSlideSorter; @@ -66,7 +66,7 @@ private: is shown after a short delay. */ void Show (const bool bForce); - void DoShow (void); + void DoShow(); DECL_LINK(DelayTrigger, void*); }; diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 8d0c14be2c43..9a02c8870196 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -110,17 +110,17 @@ SlideSorterModel::SlideSorterModel (SlideSorter& rSlideSorter) { } -SlideSorterModel::~SlideSorterModel (void) +SlideSorterModel::~SlideSorterModel() { ClearDescriptorList (); } -void SlideSorterModel::Dispose (void) +void SlideSorterModel::Dispose() { ClearDescriptorList (); } -SdDrawDocument* SlideSorterModel::GetDocument (void) +SdDrawDocument* SlideSorterModel::GetDocument() { if (mrSlideSorter.GetViewShellBase() != NULL) return mrSlideSorter.GetViewShellBase()->GetDocument(); @@ -140,7 +140,7 @@ bool SlideSorterModel::SetEditMode (EditMode eEditMode) return bEditModeChanged; } -sal_Int32 SlideSorterModel::GetPageCount (void) const +sal_Int32 SlideSorterModel::GetPageCount() const { return maPageDescriptors.size(); } @@ -273,7 +273,7 @@ sal_uInt16 SlideSorterModel::GetCoreIndex (const sal_Int32 nIndex) const document: pages may have been deleted and others may have been created at the exact same memory locations. */ -void SlideSorterModel::Resync (void) +void SlideSorterModel::Resync() { ::osl::MutexGuard aGuard (maMutex); @@ -311,7 +311,7 @@ void SlideSorterModel::Resync (void) CheckModel(*this); } -void SlideSorterModel::ClearDescriptorList (void) +void SlideSorterModel::ClearDescriptorList() { DescriptorContainer aDescriptors; @@ -340,7 +340,7 @@ void SlideSorterModel::ClearDescriptorList (void) } } -void SlideSorterModel::SynchronizeDocumentSelection (void) +void SlideSorterModel::SynchronizeDocumentSelection() { ::osl::MutexGuard aGuard (maMutex); @@ -353,7 +353,7 @@ void SlideSorterModel::SynchronizeDocumentSelection (void) } } -void SlideSorterModel::SynchronizeModelSelection (void) +void SlideSorterModel::SynchronizeModelSelection() { ::osl::MutexGuard aGuard (maMutex); @@ -423,13 +423,13 @@ void SlideSorterModel::SetDocumentSlides ( mrSlideSorter.GetController().GetSlotManager()->NotifyEditModeChange(); } -Reference<container::XIndexAccess> SlideSorterModel::GetDocumentSlides (void) const +Reference<container::XIndexAccess> SlideSorterModel::GetDocumentSlides() const { ::osl::MutexGuard aGuard (maMutex); return mxSlides; } -void SlideSorterModel::UpdatePageList (void) +void SlideSorterModel::UpdatePageList() { ::osl::MutexGuard aGuard (maMutex); @@ -475,7 +475,7 @@ void SlideSorterModel::UpdatePageList (void) mrSlideSorter.GetController().SetDocumentSlides(xPages); } -void SlideSorterModel::AdaptSize (void) +void SlideSorterModel::AdaptSize() { if (mxSlides.is()) maPageDescriptors.resize(mxSlides->getCount()); @@ -483,7 +483,7 @@ void SlideSorterModel::AdaptSize (void) maPageDescriptors.resize(0); } -bool SlideSorterModel::IsReadOnly (void) const +bool SlideSorterModel::IsReadOnly() const { if (mrSlideSorter.GetViewShellBase() != NULL && mrSlideSorter.GetViewShellBase()->GetDocShell()) @@ -492,7 +492,7 @@ bool SlideSorterModel::IsReadOnly (void) const return true; } -void SlideSorterModel::SaveCurrentSelection (void) +void SlideSorterModel::SaveCurrentSelection() { PageEnumeration aPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); while (aPages.HasMoreElements()) @@ -504,7 +504,7 @@ void SlideSorterModel::SaveCurrentSelection (void) } } -vcl::Region SlideSorterModel::RestoreSelection (void) +vcl::Region SlideSorterModel::RestoreSelection() { vcl::Region aRepaintRegion; PageEnumeration aPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index e8e377c7e026..e84b4cd22eb5 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -61,7 +61,7 @@ PageDescriptor::PageDescriptor ( } } -PageDescriptor::~PageDescriptor (void) +PageDescriptor::~PageDescriptor() { } @@ -71,7 +71,7 @@ void PageDescriptor::SetPageIndex (const sal_Int32 nNewIndex) maVisualState.mnPageId = nNewIndex; } -bool PageDescriptor::UpdateMasterPage (void) +bool PageDescriptor::UpdateMasterPage() { const SdrPage* pMaster = NULL; if (mpPage!=NULL && mpPage->TRG_HasMasterPage()) @@ -85,7 +85,7 @@ bool PageDescriptor::UpdateMasterPage (void) return false; } -bool PageDescriptor::UpdateTransitionFlag (void) +bool PageDescriptor::UpdateTransitionFlag() { bool bHasSlideTransition (false); if (mpPage != NULL) @@ -188,7 +188,7 @@ bool PageDescriptor::SetState (const State eState, const bool bNewStateValue) return bModified; } -bool PageDescriptor::GetCoreSelection (void) +bool PageDescriptor::GetCoreSelection() { if (mpPage!=NULL && mpPage->IsSelected() != mbIsSelected) return SetState(ST_Selected, !mbIsSelected); @@ -196,7 +196,7 @@ bool PageDescriptor::GetCoreSelection (void) return false; } -void PageDescriptor::SetCoreSelection (void) +void PageDescriptor::SetCoreSelection() { if (mpPage != NULL) if (HasState(ST_Selected)) @@ -209,7 +209,7 @@ void PageDescriptor::SetCoreSelection (void) } } -Rectangle PageDescriptor::GetBoundingBox (void) const +Rectangle PageDescriptor::GetBoundingBox() const { Rectangle aBox (maBoundingBox); const Point aOffset (maVisualState.GetLocationOffset()); diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx index b769ce736919..2292ec75ef32 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx @@ -38,14 +38,14 @@ public: inline PageEnumerationImpl ( const SlideSorterModel& rModel, const PageEnumeration::PagePredicate& rPredicate); - virtual ~PageEnumerationImpl (void); + virtual ~PageEnumerationImpl(); /** Create a copy of the called enumeration object. */ - virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone (void) SAL_OVERRIDE; + virtual ::std::unique_ptr<Enumeration<SharedPageDescriptor> > Clone() SAL_OVERRIDE; - virtual bool HasMoreElements (void) const SAL_OVERRIDE; - virtual SharedPageDescriptor GetNextElement (void) SAL_OVERRIDE; - virtual void Rewind (void) SAL_OVERRIDE; + virtual bool HasMoreElements() const SAL_OVERRIDE; + virtual SharedPageDescriptor GetNextElement() SAL_OVERRIDE; + virtual void Rewind() SAL_OVERRIDE; private: const SlideSorterModel& mrModel; @@ -64,7 +64,7 @@ private: /** Skip all elements that do not fulfill Predicate starting with the one pointed to by mnIndex. */ - inline void AdvanceToNextValidElement (void); + inline void AdvanceToNextValidElement(); }; } // end of anonymouse namespace @@ -106,7 +106,7 @@ PageEnumeration::PageEnumeration (const PageEnumeration& rEnumeration ) mpImpl = rEnumeration.mpImpl->Clone(); } -PageEnumeration::~PageEnumeration (void) +PageEnumeration::~PageEnumeration() { } @@ -117,23 +117,23 @@ PageEnumeration& PageEnumeration::operator= ( return *this; } -::std::unique_ptr<Enumeration<SharedPageDescriptor> > PageEnumeration::Clone (void) +::std::unique_ptr<Enumeration<SharedPageDescriptor> > PageEnumeration::Clone() { return ::std::unique_ptr<Enumeration<SharedPageDescriptor> >( new PageEnumeration (*this, true)); } -bool PageEnumeration::HasMoreElements (void) const +bool PageEnumeration::HasMoreElements() const { return mpImpl->HasMoreElements(); } -SharedPageDescriptor PageEnumeration::GetNextElement (void) +SharedPageDescriptor PageEnumeration::GetNextElement() { return mpImpl->GetNextElement(); } -void PageEnumeration::Rewind (void) +void PageEnumeration::Rewind() { return mpImpl->Rewind(); } @@ -162,23 +162,23 @@ PageEnumerationImpl::PageEnumerationImpl ( { } -PageEnumerationImpl::~PageEnumerationImpl (void) +PageEnumerationImpl::~PageEnumerationImpl() { } ::std::unique_ptr<Enumeration<SharedPageDescriptor> > - PageEnumerationImpl::Clone (void) + PageEnumerationImpl::Clone() { return ::std::unique_ptr<Enumeration<SharedPageDescriptor> >( new PageEnumerationImpl(mrModel,maPredicate,mnIndex)); } -bool PageEnumerationImpl::HasMoreElements (void) const +bool PageEnumerationImpl::HasMoreElements() const { return (mnIndex < mrModel.GetPageCount()); } -SharedPageDescriptor PageEnumerationImpl::GetNextElement (void) +SharedPageDescriptor PageEnumerationImpl::GetNextElement() { SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(mnIndex)); @@ -189,14 +189,14 @@ SharedPageDescriptor PageEnumerationImpl::GetNextElement (void) return pDescriptor; } -void PageEnumerationImpl::Rewind (void) +void PageEnumerationImpl::Rewind() { // Go to first valid element. mnIndex = 0; AdvanceToNextValidElement(); } -void PageEnumerationImpl::AdvanceToNextValidElement (void) +void PageEnumerationImpl::AdvanceToNextValidElement() { while (mnIndex < mrModel.GetPageCount()) { diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx index ef3a58708723..9accd0e2336c 100644 --- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx +++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx @@ -33,7 +33,7 @@ VisualState::VisualState (const sal_Int32 nPageId) { } -VisualState::~VisualState (void) +VisualState::~VisualState() { if (mnStateAnimationId != controller::Animator::NotAnAnimationId || mnLocationAnimationId != controller::Animator::NotAnAnimationId) diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 9790dbc33b18..a49035773b2b 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -51,7 +51,7 @@ class ContentWindow : public ::sd::Window { public: ContentWindow(::vcl::Window& rParent, SlideSorter& rSlideSorter); - virtual ~ContentWindow (void); + virtual ~ContentWindow(); void SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; @@ -147,7 +147,7 @@ SlideSorter::SlideSorter ( { } -void SlideSorter::Init (void) +void SlideSorter::Init() { if (mpViewShellBase != NULL) mxControllerWeak = mpViewShellBase->GetController(); @@ -191,7 +191,7 @@ void SlideSorter::Init (void) } } -SlideSorter::~SlideSorter (void) +SlideSorter::~SlideSorter() { mbIsValid = false; @@ -225,25 +225,25 @@ SlideSorter::~SlideSorter (void) mpContentWindow.reset(); } -model::SlideSorterModel& SlideSorter::GetModel (void) const +model::SlideSorterModel& SlideSorter::GetModel() const { OSL_ASSERT(mpSlideSorterModel.get()!=NULL); return *mpSlideSorterModel; } -view::SlideSorterView& SlideSorter::GetView (void) const +view::SlideSorterView& SlideSorter::GetView() const { OSL_ASSERT(mpSlideSorterView.get()!=NULL); return *mpSlideSorterView; } -controller::SlideSorterController& SlideSorter::GetController (void) const +controller::SlideSorterController& SlideSorter::GetController() const { OSL_ASSERT(mpSlideSorterController.get()!=NULL); return *mpSlideSorterController; } -Reference<frame::XController> SlideSorter::GetXController (void) const +Reference<frame::XController> SlideSorter::GetXController() const { Reference<frame::XController> xController(mxControllerWeak); return xController; @@ -261,7 +261,7 @@ void SlideSorter::SetupControls (::vcl::Window* ) GetVerticalScrollBar()->Show(); } -void SlideSorter::SetupListeners (void) +void SlideSorter::SetupListeners() { SharedSdWindow pWindow (GetContentWindow()); if (pWindow) @@ -288,7 +288,7 @@ void SlideSorter::SetupListeners (void) mpSlideSorterController->GetScrollBarManager().Connect(); } -void SlideSorter::ReleaseListeners (void) +void SlideSorter::ReleaseListeners() { mpSlideSorterController->GetScrollBarManager().Disconnect(); @@ -313,7 +313,7 @@ void SlideSorter::ReleaseListeners (void) WindowEventHandler)); } -void SlideSorter::CreateModelViewController (void) +void SlideSorter::CreateModelViewController() { mpSlideSorterModel.reset(CreateModel()); DBG_ASSERT (mpSlideSorterModel.get()!=NULL, @@ -333,7 +333,7 @@ void SlideSorter::CreateModelViewController (void) mpSlideSorterView->Init(); } -model::SlideSorterModel* SlideSorter::CreateModel (void) +model::SlideSorterModel* SlideSorter::CreateModel() { // Get pointers to the document. ViewShellBase* pViewShellBase = GetViewShellBase(); @@ -347,12 +347,12 @@ model::SlideSorterModel* SlideSorter::CreateModel (void) return NULL; } -view::SlideSorterView* SlideSorter::CreateView (void) +view::SlideSorterView* SlideSorter::CreateView() { return new view::SlideSorterView (*this); } -controller::SlideSorterController* SlideSorter::CreateController (void) +controller::SlideSorterController* SlideSorter::CreateController() { controller::SlideSorterController* pController = new controller::SlideSorterController (*this); @@ -431,13 +431,13 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) } } -::boost::shared_ptr<controller::Properties> SlideSorter::GetProperties (void) const +::boost::shared_ptr<controller::Properties> SlideSorter::GetProperties() const { OSL_ASSERT(mpProperties); return mpProperties; } -::boost::shared_ptr<view::Theme> SlideSorter::GetTheme (void) const +::boost::shared_ptr<view::Theme> SlideSorter::GetTheme() const { OSL_ASSERT(mpTheme); return mpTheme; @@ -458,7 +458,7 @@ ContentWindow::ContentWindow( SetStyle(GetStyle() | WB_NOPOINTERFOCUS); } -ContentWindow::~ContentWindow (void) +ContentWindow::~ContentWindow() { } diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index a595bf1c8bcb..d1e138e60a84 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -63,11 +63,11 @@ SlideSorterService::SlideSorterService (const Reference<XComponentContext>& rxCo (void)rxContext; } -SlideSorterService::~SlideSorterService (void) +SlideSorterService::~SlideSorterService() { } -void SAL_CALL SlideSorterService::disposing (void) +void SAL_CALL SlideSorterService::disposing() { mpSlideSorter.reset(); @@ -129,13 +129,13 @@ void SAL_CALL SlideSorterService::initialize (const Sequence<Any>& rArguments) //----- XView ----------------------------------------------------------------- -Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId (void) +Reference<XResourceId> SAL_CALL SlideSorterService::getResourceId() throw (RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL SlideSorterService::isAnchorOnly (void) +sal_Bool SAL_CALL SlideSorterService::isAnchorOnly() throw (RuntimeException, std::exception) { return sal_False; @@ -193,7 +193,7 @@ void SAL_CALL SlideSorterService::setCurrentPage(const Reference<drawing::XDrawP mpSlideSorter->GetModel().GetIndex(rxSlide)); } -Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -205,7 +205,7 @@ Reference<drawing::XDrawPage> SAL_CALL SlideSorterService::getCurrentPage (void) //----- attributes ------------------------------------------------------------ -Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlides (void) +Reference<container::XIndexAccess> SAL_CALL SlideSorterService::getDocumentSlides() throw (RuntimeException, std::exception) { return mpSlideSorter->GetModel().GetDocumentSlides(); @@ -220,7 +220,7 @@ void SAL_CALL SlideSorterService::setDocumentSlides ( mpSlideSorter->GetController().SetDocumentSlides(rxSlides); } -sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide (void) +sal_Bool SAL_CALL SlideSorterService::getIsHighlightCurrentSlide() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -242,7 +242,7 @@ void SAL_CALL SlideSorterService::setIsHighlightCurrentSlide (sal_Bool bValue) } } -sal_Bool SAL_CALL SlideSorterService::getIsShowSelection (void) +sal_Bool SAL_CALL SlideSorterService::getIsShowSelection() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -260,7 +260,7 @@ void SAL_CALL SlideSorterService::setIsShowSelection (sal_Bool bValue) mpSlideSorter->GetProperties()->SetShowSelection(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsShowFocus (void) +sal_Bool SAL_CALL SlideSorterService::getIsShowFocus() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -278,7 +278,7 @@ void SAL_CALL SlideSorterService::setIsShowFocus (sal_Bool bValue) mpSlideSorter->GetProperties()->SetShowFocus(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection (void) +sal_Bool SAL_CALL SlideSorterService::getIsCenterSelection() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -296,7 +296,7 @@ void SAL_CALL SlideSorterService::setIsCenterSelection (sal_Bool bValue) mpSlideSorter->GetProperties()->SetCenterSelection(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) +sal_Bool SAL_CALL SlideSorterService::getIsSuspendPreviewUpdatesDuringFullScreenPresentation() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -317,7 +317,7 @@ void SAL_CALL SlideSorterService::setIsSuspendPreviewUpdatesDuringFullScreenPres ->SetSuspendPreviewUpdatesDuringFullScreenPresentation(bValue); } -sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical (void) +sal_Bool SAL_CALL SlideSorterService::getIsOrientationVertical() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -337,7 +337,7 @@ void SAL_CALL SlideSorterService::setIsOrientationVertical (sal_Bool bValue) : Layouter::HORIZONTAL); } -sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling (void) +sal_Bool SAL_CALL SlideSorterService::getIsSmoothScrolling() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -355,7 +355,7 @@ void SAL_CALL SlideSorterService::setIsSmoothScrolling (sal_Bool bValue) mpSlideSorter->GetProperties()->SetSmoothSelectionScrolling(bValue); } -util::Color SAL_CALL SlideSorterService::getBackgroundColor (void) +util::Color SAL_CALL SlideSorterService::getBackgroundColor() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -374,7 +374,7 @@ void SAL_CALL SlideSorterService::setBackgroundColor (util::Color aBackgroundCol mpSlideSorter->GetProperties()->SetBackgroundColor(Color(aBackgroundColor)); } -util::Color SAL_CALL SlideSorterService::getTextColor (void) +util::Color SAL_CALL SlideSorterService::getTextColor() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -393,7 +393,7 @@ void SAL_CALL SlideSorterService::setTextColor (util::Color aTextColor) mpSlideSorter->GetProperties()->SetTextColor(Color(aTextColor)); } -util::Color SAL_CALL SlideSorterService::getSelectionColor (void) +util::Color SAL_CALL SlideSorterService::getSelectionColor() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -412,7 +412,7 @@ void SAL_CALL SlideSorterService::setSelectionColor (util::Color aSelectionColor mpSlideSorter->GetProperties()->SetSelectionColor(Color(aSelectionColor)); } -util::Color SAL_CALL SlideSorterService::getHighlightColor (void) +util::Color SAL_CALL SlideSorterService::getHighlightColor() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -431,7 +431,7 @@ void SAL_CALL SlideSorterService::setHighlightColor (util::Color aHighlightColor mpSlideSorter->GetProperties()->SetHighlightColor(Color(aHighlightColor)); } -sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly (void) +sal_Bool SAL_CALL SlideSorterService::getIsUIReadOnly() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -449,7 +449,7 @@ void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly) mpSlideSorter->GetProperties()->SetUIReadOnly(bIsUIReadOnly); } -void SlideSorterService::Resize (void) +void SlideSorterService::Resize() { if (mxParentWindow.is()) { @@ -460,7 +460,7 @@ void SlideSorterService::Resize (void) } } -void SlideSorterService::ThrowIfDisposed (void) +void SlideSorterService::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || SlideSorterServiceInterfaceBase::rBHelper.bInDispose) diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index 4ce1b5281681..7b79b55a2dcd 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -55,8 +55,8 @@ class SlideSorterService public: explicit SlideSorterService ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~SlideSorterService (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual ~SlideSorterService(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XInitialization @@ -65,10 +65,10 @@ public: // XResourceId - css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - sal_Bool SAL_CALL isAnchorOnly (void) + sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener @@ -95,86 +95,86 @@ public: const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) 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; // Attributes - virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides (void) + virtual css::uno::Reference<css::container::XIndexAccess> SAL_CALL getDocumentSlides() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDocumentSlides ( const css::uno::Reference<css::container::XIndexAccess >& rxSlides) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide (void) + virtual sal_Bool SAL_CALL getIsHighlightCurrentSlide() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsHighlightCurrentSlide (sal_Bool bIsHighlightCurrentSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsShowSelection (void) + virtual sal_Bool SAL_CALL getIsShowSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsShowSelection (sal_Bool bIsShowSelection) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsCenterSelection (void) + virtual sal_Bool SAL_CALL getIsCenterSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsCenterSelection (sal_Bool bIsCenterSelection) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation (void) + virtual sal_Bool SAL_CALL getIsSuspendPreviewUpdatesDuringFullScreenPresentation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsSuspendPreviewUpdatesDuringFullScreenPresentation ( sal_Bool bIsSuspendPreviewUpdatesDuringFullScreenPresentation) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsOrientationVertical (void) + virtual sal_Bool SAL_CALL getIsOrientationVertical() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsOrientationVertical (sal_Bool bIsOrientationVertical) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsSmoothScrolling (void) + virtual sal_Bool SAL_CALL getIsSmoothScrolling() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsSmoothScrolling (sal_Bool bIsOrientationVertical) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getBackgroundColor (void) + virtual css::util::Color SAL_CALL getBackgroundColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setBackgroundColor (css::util::Color aBackgroundColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getTextColor (void) + virtual css::util::Color SAL_CALL getTextColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTextColor (css::util::Color aTextColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getSelectionColor (void) + virtual css::util::Color SAL_CALL getSelectionColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSelectionColor (css::util::Color aSelectionColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::util::Color SAL_CALL getHighlightColor (void) + virtual css::util::Color SAL_CALL getHighlightColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setHighlightColor (css::util::Color aHighlightColor) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsUIReadOnly (void) + virtual sal_Bool SAL_CALL getIsUIReadOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsUIReadOnly (sal_Bool bIsUIReadOnly) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL getIsShowFocus (void) + virtual sal_Bool SAL_CALL getIsShowFocus() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setIsShowFocus (sal_Bool bIsShowFocus) @@ -186,12 +186,12 @@ private: css::uno::Reference<css::awt::XWindow> mxParentWindow; ::boost::scoped_ptr<cppu::IPropertyArrayHelper> mpPropertyArrayHelper; - void Resize (void); + void Resize(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) throw (css::lang::DisposedException); + void ThrowIfDisposed() throw (css::lang::DisposedException); }; } } // end of namespace ::sd::slidesorter diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 8f74250d4c48..cbb9c3731875 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -137,7 +137,7 @@ SlideSorterViewShell::SlideSorterViewShell ( pParentWindow->SetStyle(pParentWindow->GetStyle() | WB_DIALOGCONTROL); } -SlideSorterViewShell::~SlideSorterViewShell (void) +SlideSorterViewShell::~SlideSorterViewShell() { DisposeFunctions(); @@ -161,7 +161,7 @@ SlideSorterViewShell::~SlideSorterViewShell (void) GetFrameView()->Disconnect(); } -void SlideSorterViewShell::Initialize (void) +void SlideSorterViewShell::Initialize() { mpSlideSorter = SlideSorter::CreateSlideSorter( *this, @@ -230,7 +230,7 @@ SlideSorterViewShell* SlideSorterViewShell::GetSlideSorter (ViewShellBase& rBase return pViewShell; } -Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController (void) +Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController() { Reference<drawing::XDrawSubController> xSubController; @@ -286,7 +286,7 @@ void SlideSorterViewShell::SwitchViewFireFocus(::com::sun::star::uno::Reference< } } -SlideSorter& SlideSorterViewShell::GetSlideSorter (void) const +SlideSorter& SlideSorterViewShell::GetSlideSorter() const { OSL_ASSERT(mpSlideSorter.get()!=NULL); return *mpSlideSorter; @@ -307,7 +307,7 @@ bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow) return bSuccess; } -::svl::IUndoManager* SlideSorterViewShell::ImpGetUndoManager (void) const +::svl::IUndoManager* SlideSorterViewShell::ImpGetUndoManager() const { SfxShell* pObjectBar = GetViewShellBase().GetViewShellManager()->GetTopShell(); if (pObjectBar != NULL) @@ -325,7 +325,7 @@ bool SlideSorterViewShell::RelocateToParentWindow (::vcl::Window* pParentWindow) } } -SdPage* SlideSorterViewShell::getCurrentPage(void) const +SdPage* SlideSorterViewShell::getCurrentPage() const { // since SlideSorterViewShell::GetActualPage() currently also // returns master pages, which is a wrong behaviour for GetActualPage(), @@ -333,7 +333,7 @@ SdPage* SlideSorterViewShell::getCurrentPage(void) const return const_cast<SlideSorterViewShell*>(this)->GetActualPage(); } -SdPage* SlideSorterViewShell::GetActualPage (void) +SdPage* SlideSorterViewShell::GetActualPage() { SdPage* pCurrentPage = NULL; @@ -453,7 +453,7 @@ void SlideSorterViewShell::Paint ( mpSlideSorter->GetController().Paint(rBBox,pWindow); } -void SlideSorterViewShell::ArrangeGUIElements (void) +void SlideSorterViewShell::ArrangeGUIElements() { if (IsActive()) { @@ -552,7 +552,7 @@ void SlideSorterViewShell::ReadFrameViewData (FrameView* pFrameView) } } -void SlideSorterViewShell::WriteFrameViewData (void) +void SlideSorterViewShell::WriteFrameViewData() { OSL_ASSERT(mpSlideSorter.get()!=NULL); if (mpFrameView != NULL) @@ -629,7 +629,7 @@ void SlideSorterViewShell::SetZoomRect (const Rectangle& rZoomRect) GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER ); } -void SlideSorterViewShell::UpdateScrollBars (void) +void SlideSorterViewShell::UpdateScrollBars() { // Do not call the overwritten method of the base class: We do all the // scroll bar setup by ourselves. @@ -679,7 +679,7 @@ sal_Int8 SlideSorterViewShell::ExecuteDrop ( } ::boost::shared_ptr<SlideSorterViewShell::PageSelection> - SlideSorterViewShell::GetPageSelection (void) const + SlideSorterViewShell::GetPageSelection() const { OSL_ASSERT(mpSlideSorter.get()!=NULL); return mpSlideSorter->GetController().GetPageSelector().GetPageSelection(); diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 7b60a294f2a6..d4839971f2cc 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -89,7 +89,7 @@ namespace { { public: Painter (SlideSorterView& rView) : mrView(rView) {} - virtual ~Painter (void) {} + virtual ~Painter() {} virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE { @@ -109,7 +109,7 @@ class BackgroundPainter { public: BackgroundPainter (const Color& rBackgroundColor) : maBackgroundColor(rBackgroundColor) {} - virtual ~BackgroundPainter (void) {} + virtual ~BackgroundPainter() {} virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE { @@ -176,7 +176,7 @@ SlideSorterView::SlideSorterView (SlideSorter& rSlideSorter) mpLayeredDevice->RegisterPainter(pPainter, 1); } -SlideSorterView::~SlideSorterView (void) +SlideSorterView::~SlideSorterView() { if ( ! mbIsDisposed) { @@ -185,12 +185,12 @@ SlideSorterView::~SlideSorterView (void) } } -void SlideSorterView::Init (void) +void SlideSorterView::Init() { HandleModelChange(); } -void SlideSorterView::Dispose (void) +void SlideSorterView::Dispose() { mpSelectionPainter.reset(); @@ -229,24 +229,24 @@ sal_Int32 SlideSorterView::GetPageIndexAtPoint (const Point& rWindowPosition) co return nIndex; } -Layouter& SlideSorterView::GetLayouter (void) +Layouter& SlideSorterView::GetLayouter() { return *mpLayouter.get(); } -void SlideSorterView::ModelHasChanged (void) +void SlideSorterView::ModelHasChanged() { // Ignore this call. Rely on hints sent by the model to get informed of // model changes. } -void SlideSorterView::PreModelChange (void) +void SlideSorterView::PreModelChange() { // Reset the slide under the mouse. It will be re-set in PostModelChange(). SetPageUnderMouse(SharedPageDescriptor()); } -void SlideSorterView::PostModelChange (void) +void SlideSorterView::PostModelChange() { // In PreModelChange() the page objects have been released. Here we // create new ones. @@ -265,13 +265,13 @@ void SlideSorterView::PostModelChange (void) describe the type of change so that existing page objects can be reused. */ -void SlideSorterView::HandleModelChange (void) +void SlideSorterView::HandleModelChange() { PreModelChange (); PostModelChange(); } -void SlideSorterView::HandleDrawModeChange (void) +void SlideSorterView::HandleDrawModeChange() { // Replace the preview cache with a new and empty one. The // PreviewRenderer that is used by the cache is replaced by this as @@ -282,7 +282,7 @@ void SlideSorterView::HandleDrawModeChange (void) RequestRepaint(); } -void SlideSorterView::HandleDataChangeEvent (void) +void SlideSorterView::HandleDataChangeEvent() { GetPageObjectPainter()->SetTheme(mrSlideSorter.GetTheme()); @@ -295,7 +295,7 @@ void SlideSorterView::HandleDataChangeEvent (void) RequestRepaint(); } -void SlideSorterView::Resize (void) +void SlideSorterView::Resize() { UpdateOrientation(); @@ -303,13 +303,13 @@ void SlideSorterView::Resize (void) RequestRearrange(); } -void SlideSorterView::RequestRearrange (void) +void SlideSorterView::RequestRearrange() { mbIsRearrangePending = true; Rearrange(); } -void SlideSorterView::Rearrange (void) +void SlideSorterView::Rearrange() { if ( ! mbIsRearrangePending) return; @@ -338,7 +338,7 @@ void SlideSorterView::Rearrange (void) } } -void SlideSorterView::UpdateOrientation (void) +void SlideSorterView::UpdateOrientation() { // The layout of slides depends on whether the slide sorter is // displayed in the center or the side pane. @@ -443,12 +443,12 @@ void SlideSorterView::Layout () InvalidatePageObjectVisibilities (); } -void SlideSorterView::InvalidatePageObjectVisibilities (void) +void SlideSorterView::InvalidatePageObjectVisibilities() { mbPageObjectVisibilitiesValid = false; } -void SlideSorterView::DeterminePageObjectVisibilities (void) +void SlideSorterView::DeterminePageObjectVisibilities() { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow) @@ -502,7 +502,7 @@ void SlideSorterView::DeterminePageObjectVisibilities (void) } } -void SlideSorterView::UpdatePreciousFlags (void) +void SlideSorterView::UpdatePreciousFlags() { if (mbPreciousFlagUpdatePending) { @@ -545,7 +545,7 @@ bool SlideSorterView::SetOrientation (const Layouter::Orientation eOrientation) return false; } -void SlideSorterView::RequestRepaint (void) +void SlideSorterView::RequestRepaint() { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow) @@ -584,7 +584,7 @@ void SlideSorterView::RequestRepaint (const vcl::Region& rRepaintRegion) } } -Rectangle SlideSorterView::GetModelArea (void) +Rectangle SlideSorterView::GetModelArea() { return mpLayouter->GetTotalBoundingBox(); } @@ -698,7 +698,7 @@ void SlideSorterView::ConfigurationChanged ( } -::boost::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache (void) +::boost::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache() { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow && mpPreviewCache.get() == NULL) @@ -713,7 +713,7 @@ void SlideSorterView::ConfigurationChanged ( return mpPreviewCache; } -Pair SlideSorterView::GetVisiblePageRange (void) +Pair SlideSorterView::GetVisiblePageRange() { if ( ! mbPageObjectVisibilitiesValid) DeterminePageObjectVisibilities(); @@ -740,7 +740,7 @@ void SlideSorterView::RemoveVisibilityChangeListener(const Link&rListener) rListener)); } -ToolTip& SlideSorterView::GetToolTip (void) const +ToolTip& SlideSorterView::GetToolTip() const { OSL_ASSERT(mpToolTip); return *mpToolTip; @@ -841,7 +841,7 @@ bool SlideSorterView::SetState ( return bModified; } -::boost::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter (void) +::boost::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter() { if ( ! mpPageObjectPainter) mpPageObjectPainter.reset(new PageObjectPainter(mrSlideSorter)); @@ -859,7 +859,7 @@ SlideSorterView::DrawLock::DrawLock (SlideSorter& rSlideSorter) ++mrView.mnLockRedrawSmph; } -SlideSorterView::DrawLock::~DrawLock (void) +SlideSorterView::DrawLock::~DrawLock() { OSL_ASSERT(mrView.mnLockRedrawSmph>0); --mrView.mnLockRedrawSmph; @@ -871,7 +871,7 @@ SlideSorterView::DrawLock::~DrawLock (void) } } -void SlideSorterView::DrawLock::Dispose (void) +void SlideSorterView::DrawLock::Dispose() { mpWindow.reset(); } diff --git a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx index 120d428085eb..cc44e487f18a 100644 --- a/sd/source/ui/slidesorter/view/SlsFontProvider.cxx +++ b/sd/source/ui/slidesorter/view/SlsFontProvider.cxx @@ -31,7 +31,7 @@ namespace sd { namespace slidesorter { namespace view { FontProvider* FontProvider::mpInstance = NULL; -FontProvider& FontProvider::Instance (void) +FontProvider& FontProvider::Instance() { if (mpInstance == NULL) { @@ -62,17 +62,17 @@ FontProvider& FontProvider::Instance (void) return *mpInstance; } -FontProvider::FontProvider (void) +FontProvider::FontProvider() : maFont(), maMapMode() { } -FontProvider::~FontProvider (void) +FontProvider::~FontProvider() { } -void FontProvider::Invalidate (void) +void FontProvider::Invalidate() { maFont.reset(); } diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index 07e9d2865e06..dd0c03fcdcfc 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -49,7 +49,7 @@ FramePainter::FramePainter (const BitmapEx& rShadowBitmap) } } -FramePainter::~FramePainter (void) +FramePainter::~FramePainter() { } diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx index b0f1b55168fe..cc3a93cd17cb 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.hxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.hxx @@ -28,7 +28,7 @@ class FramePainter { public: FramePainter (const BitmapEx& rBitmap); - ~FramePainter (void); + ~FramePainter(); /** Paint a border around the given box by using a set of bitmaps for the corners and sides. diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 8fb9eba6deab..980487e7d4e1 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -40,10 +40,10 @@ class AnimatorAccess public: virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0; virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0; - virtual model::SlideSorterModel& GetModel (void) const = 0; - virtual view::SlideSorterView& GetView (void) const = 0; - virtual ::boost::shared_ptr<controller::Animator> GetAnimator (void) = 0; - virtual SharedSdWindow GetContentWindow (void) = 0; + virtual model::SlideSorterModel& GetModel() const = 0; + virtual view::SlideSorterView& GetView() const = 0; + virtual ::boost::shared_ptr<controller::Animator> GetAnimator() = 0; + virtual SharedSdWindow GetContentWindow() = 0; protected: ~AnimatorAccess() {} @@ -60,7 +60,7 @@ public: const sal_Int32 nRunIndex, const sal_Int32 nStartIndex, const sal_Int32 nEndIndex); - ~PageObjectRun (void); + ~PageObjectRun(); void operator () (const double nTime); @@ -99,7 +99,7 @@ private: AnimatorAccess& mrAnimatorAccess; ::boost::function<double(double)> maAccelerationFunction; - void RestartAnimation (void); + void RestartAnimation(); }; typedef ::boost::shared_ptr<PageObjectRun> SharedPageObjectRun; @@ -116,7 +116,7 @@ class InsertAnimator::Implementation : public AnimatorAccess { public: Implementation (SlideSorter& rSlideSorter); - virtual ~Implementation (void); + virtual ~Implementation(); void SetInsertPosition ( const InsertPosition& rInsertPosition, @@ -125,10 +125,10 @@ public: virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE; virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE; - virtual model::SlideSorterModel& GetModel (void) const SAL_OVERRIDE { return mrModel; } - virtual view::SlideSorterView& GetView (void) const SAL_OVERRIDE { return mrView; } - virtual ::boost::shared_ptr<controller::Animator> GetAnimator (void) SAL_OVERRIDE { return mpAnimator; } - virtual SharedSdWindow GetContentWindow (void) SAL_OVERRIDE { return mrSlideSorter.GetContentWindow(); } + virtual model::SlideSorterModel& GetModel() const SAL_OVERRIDE { return mrModel; } + virtual view::SlideSorterView& GetView() const SAL_OVERRIDE { return mrView; } + virtual ::boost::shared_ptr<controller::Animator> GetAnimator() SAL_OVERRIDE { return mpAnimator; } + virtual SharedSdWindow GetContentWindow() SAL_OVERRIDE { return mrSlideSorter.GetContentWindow(); } private: model::SlideSorterModel& mrModel; @@ -175,7 +175,7 @@ InsertAnimator::Implementation::Implementation (SlideSorter& rSlideSorter) { } -InsertAnimator::Implementation::~Implementation (void) +InsertAnimator::Implementation::~Implementation() { SetInsertPosition(InsertPosition(), controller::Animator::AM_Immediate); } @@ -321,7 +321,7 @@ PageObjectRun::PageObjectRun ( maEndOffset.resize(nEndIndex - nStartIndex + 1); } -PageObjectRun::~PageObjectRun (void) +PageObjectRun::~PageObjectRun() { } @@ -385,7 +385,7 @@ void PageObjectRun::ResetOffsets (const controller::Animator::AnimationMode eMod mrAnimatorAccess.RemoveRun(shared_from_this()); } -void PageObjectRun::RestartAnimation (void) +void PageObjectRun::RestartAnimation() { // Stop the current animation. if (mnAnimationId != controller::Animator::NotAnAnimationId) diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 6862a69dccd1..2675746f4306 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -75,7 +75,7 @@ InsertionIndicatorOverlay::InsertionIndicatorOverlay (SlideSorter& rSlideSorter) { } -InsertionIndicatorOverlay::~InsertionIndicatorOverlay (void) +InsertionIndicatorOverlay::~InsertionIndicatorOverlay() { Hide(); } @@ -319,7 +319,7 @@ void InsertionIndicatorOverlay::SetLayerInvalidator (const SharedILayerInvalidat mpLayerInvalidator->Invalidate(GetBoundingBox()); } -void InsertionIndicatorOverlay::Show (void) +void InsertionIndicatorOverlay::Show() { if ( ! mbIsVisible) { @@ -336,7 +336,7 @@ void InsertionIndicatorOverlay::Show (void) } } -void InsertionIndicatorOverlay::Hide (void) +void InsertionIndicatorOverlay::Hide() { if (mbIsVisible) { @@ -353,12 +353,12 @@ void InsertionIndicatorOverlay::Hide (void) } } -Rectangle InsertionIndicatorOverlay::GetBoundingBox (void) const +Rectangle InsertionIndicatorOverlay::GetBoundingBox() const { return Rectangle(maLocation, maIcon.GetSizePixel()); } -Size InsertionIndicatorOverlay::GetSize (void) const +Size InsertionIndicatorOverlay::GetSize() const { return Size( maIcon.GetSizePixel().Width() + 10, diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index 0916912ef48e..ffbd7d686c64 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -104,8 +104,8 @@ void ForAllRectangles (const vcl::Region& rRegion, ::boost::function<void(const class Layer : private ::boost::noncopyable { public: - Layer (void); - ~Layer (void); + Layer(); + ~Layer(); void Initialize (const SharedSdWindow& rpTargetWindow); void InvalidateRectangle (const Rectangle& rInvalidationBox); @@ -117,8 +117,8 @@ public: void Resize (const Size& rSize); void AddPainter (const SharedILayerPainter& rpPainter); void RemovePainter (const SharedILayerPainter& rpPainter); - bool HasPainter (void) const; - void Dispose (void); + bool HasPainter() const; + void Dispose(); private: ::boost::shared_ptr<VirtualDevice> mpLayerDevice; @@ -168,7 +168,7 @@ LayeredDevice::LayeredDevice (const SharedSdWindow& rpTargetWindow) mpBackBuffer->SetOutputSizePixel(mpTargetWindow->GetSizePixel()); } -LayeredDevice::~LayeredDevice (void) +LayeredDevice::~LayeredDevice() { } @@ -290,20 +290,20 @@ void LayeredDevice::RepaintRectangle (const Rectangle& rRepaintRectangle) } } -void LayeredDevice::Resize (void) +void LayeredDevice::Resize() { const Size aSize (mpTargetWindow->GetSizePixel()); mpBackBuffer->SetOutputSizePixel(aSize); ::std::for_each(mpLayers->begin(), mpLayers->end(), ::boost::bind(&Layer::Resize, _1, aSize)); } -void LayeredDevice::Dispose (void) +void LayeredDevice::Dispose() { ::std::for_each(mpLayers->begin(), mpLayers->end(), ::boost::bind(&Layer::Dispose, _1)); mpLayers->clear(); } -bool LayeredDevice::HandleMapModeChange (void) +bool LayeredDevice::HandleMapModeChange() { const MapMode& rMapMode (mpTargetWindow->GetMapMode()); if (maSavedMapMode == rMapMode) @@ -368,14 +368,14 @@ bool LayeredDevice::HandleMapModeChange (void) //===== Layer ================================================================= -Layer::Layer (void) +Layer::Layer() : mpLayerDevice(), maPainters(), maInvalidationRegion() { } -Layer::~Layer (void) +Layer::~Layer() { } @@ -485,12 +485,12 @@ void Layer::RemovePainter (const SharedILayerPainter& rpPainter) } } -bool Layer::HasPainter (void) const +bool Layer::HasPainter() const { return !maPainters.empty(); } -void Layer::Dispose (void) +void Layer::Dispose() { maPainters.clear(); } diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx index 454074376fce..4cbbf5b22d59 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx @@ -46,7 +46,7 @@ class LayeredDevice { public: LayeredDevice (const SharedSdWindow& rpTargetWindow); - ~LayeredDevice (void); + ~LayeredDevice(); void Invalidate ( const Rectangle& rInvalidationBox, @@ -64,12 +64,12 @@ public: const SharedILayerPainter& rPainter, const sal_Int32 nLayer); - bool HandleMapModeChange (void); + bool HandleMapModeChange(); void Repaint (const vcl::Region& rRepaintRegion); - void Resize (void); + void Resize(); - void Dispose (void); + void Dispose(); private: SharedSdWindow mpTargetWindow; diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 155652f3d487..fd85c1c61b9f 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -78,7 +78,7 @@ public: const Implementation& rImplementation, const Layouter::Orientation eOrientation); - virtual Layouter::Orientation GetOrientation (void) const = 0; + virtual Layouter::Orientation GetOrientation() const = 0; bool Rearrange ( const Size& rWindowSize, @@ -172,8 +172,8 @@ public: model::SlideSorterModel& rModel, const sal_Int32 nIndex) const; - Range GetValidHorizontalSizeRange (void) const; - Range GetValidVerticalSizeRange (void) const; + Range GetValidHorizontalSizeRange() const; + Range GetValidVerticalSizeRange() const; Range GetRangeOfVisiblePageObjects (const Rectangle& aVisibleArea) const; sal_Int32 GetIndex ( @@ -194,9 +194,9 @@ public: const sal_Int32 nRow, const sal_Int32 nColumn) const; - Rectangle GetTotalBoundingBox (void) const; + Rectangle GetTotalBoundingBox() const; - virtual ~Implementation (void); + virtual ~Implementation(); protected: Implementation ( @@ -227,7 +227,7 @@ class VerticalImplementation : public Layouter::Implementation public: VerticalImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; + virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, @@ -249,7 +249,7 @@ class HorizontalImplementation : public Layouter::Implementation public: HorizontalImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; + virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, @@ -275,7 +275,7 @@ public: const ::boost::shared_ptr<view::Theme>& rpTheme); GridImplementation (const Implementation& rImplementation); - virtual Layouter::Orientation GetOrientation (void) const SAL_OVERRIDE; + virtual Layouter::Orientation GetOrientation() const SAL_OVERRIDE; void CalculateLogicalInsertPosition ( const Point& rModelPosition, @@ -299,11 +299,11 @@ Layouter::Layouter ( { } -Layouter::~Layouter (void) +Layouter::~Layouter() { } -::boost::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter (void) const +::boost::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter() const { return mpImplementation->mpPageObjectLayouter; } @@ -333,7 +333,7 @@ bool Layouter::Rearrange ( return mpImplementation->Rearrange(rWindowSize, rPageSize, nPageCount); } -sal_Int32 Layouter::GetColumnCount (void) const +sal_Int32 Layouter::GetColumnCount() const { return mpImplementation->mnColumnCount; } @@ -343,7 +343,7 @@ sal_Int32 Layouter::GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) con return mpImplementation->GetIndex(nRow,nColumn,true); } -Size Layouter::GetPageObjectSize (void) const +Size Layouter::GetPageObjectSize() const { return mpImplementation->maPageObjectSize; } @@ -355,7 +355,7 @@ Rectangle Layouter::GetPageObjectBox ( return mpImplementation->GetPageObjectBox(nIndex, bIncludeBorderAndGap); } -Rectangle Layouter::GetTotalBoundingBox (void) const +Rectangle Layouter::GetTotalBoundingBox() const { return mpImplementation->GetTotalBoundingBox(); } @@ -377,12 +377,12 @@ InsertPosition Layouter::GetInsertPosition ( return aPosition; } -Range Layouter::GetValidHorizontalSizeRange (void) const +Range Layouter::GetValidHorizontalSizeRange() const { return mpImplementation->GetValidHorizontalSizeRange(); } -Range Layouter::GetValidVerticalSizeRange (void) const +Range Layouter::GetValidVerticalSizeRange() const { return mpImplementation->GetValidVerticalSizeRange(); } @@ -484,7 +484,7 @@ Layouter::Implementation::Implementation (const Implementation& rImplementation) { } -Layouter::Implementation::~Implementation (void) +Layouter::Implementation::~Implementation() { } @@ -813,14 +813,14 @@ Rectangle Layouter::Implementation::GetInnerBoundingBox ( PageObjectLayouter::ModelCoordinateSystem, true); } -Range Layouter::Implementation::GetValidHorizontalSizeRange (void) const +Range Layouter::Implementation::GetValidHorizontalSizeRange() const { return Range( mnLeftBorder + maMinimalSize.Width() + mnRightBorder, mnLeftBorder + maMaximalSize.Width() + mnRightBorder); } -Range Layouter::Implementation::GetValidVerticalSizeRange (void) const +Range Layouter::Implementation::GetValidVerticalSizeRange() const { return Range( mnTopBorder + maMinimalSize.Height() + mnBottomBorder, @@ -962,7 +962,7 @@ Rectangle Layouter::Implementation::AddBorderAndGap ( return aBoundingBox; } -Rectangle Layouter::Implementation::GetTotalBoundingBox (void) const +Rectangle Layouter::Implementation::GetTotalBoundingBox() const { sal_Int32 nHorizontalSize = 0; sal_Int32 nVerticalSize = 0; @@ -1012,7 +1012,7 @@ HorizontalImplementation::HorizontalImplementation (const Implementation& rImple { } -Layouter::Orientation HorizontalImplementation::GetOrientation (void) const +Layouter::Orientation HorizontalImplementation::GetOrientation() const { return Layouter::HORIZONTAL; } @@ -1063,7 +1063,7 @@ VerticalImplementation::VerticalImplementation (const Implementation& rImplement { } -Layouter::Orientation VerticalImplementation::GetOrientation (void) const +Layouter::Orientation VerticalImplementation::GetOrientation() const { return Layouter::VERTICAL; } @@ -1113,7 +1113,7 @@ GridImplementation::GridImplementation (const Implementation& rImplementation) { } -Layouter::Orientation GridImplementation::GetOrientation (void) const +Layouter::Orientation GridImplementation::GetOrientation() const { return Layouter::GRID; } @@ -1186,7 +1186,7 @@ void GridImplementation::CalculateLogicalInsertPosition ( //===== InsertPosition ======================================================== -InsertPosition::InsertPosition (void) +InsertPosition::InsertPosition() : mnRow(-1), mnColumn(-1), mnIndex(-1), diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx index 7d82198d722e..7a32476deb43 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx @@ -91,7 +91,7 @@ PageObjectLayouter::PageObjectLayouter ( aIconSize); } -PageObjectLayouter::~PageObjectLayouter(void) +PageObjectLayouter::~PageObjectLayouter() { } diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index bb1d48e73b9b..d5b9d8a92b36 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -61,7 +61,7 @@ PageObjectPainter::PageObjectPainter ( mpFocusBorderPainter->AdaptColor(aColor, true); } -PageObjectPainter::~PageObjectPainter (void) +PageObjectPainter::~PageObjectPainter() { } @@ -87,7 +87,7 @@ void PageObjectPainter::PaintPageObject ( } } -bool PageObjectPainter::UpdatePageObjectLayouter (void) +bool PageObjectPainter::UpdatePageObjectLayouter() { // The page object layouter is quite volatile. It may have been replaced // since the last call. Update it now. diff --git a/sd/source/ui/slidesorter/view/SlsResource.hxx b/sd/source/ui/slidesorter/view/SlsResource.hxx index 9869e0339b3e..6695c00fc322 100644 --- a/sd/source/ui/slidesorter/view/SlsResource.hxx +++ b/sd/source/ui/slidesorter/view/SlsResource.hxx @@ -30,7 +30,7 @@ class LocalResource : public Resource { public: LocalResource (const sal_uInt16 nResourceId) : Resource(SdResId(nResourceId)){} - ~LocalResource (void) { FreeResource(); } + ~LocalResource() { FreeResource(); } }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 954052c0b3e7..16ba566729be 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -44,7 +44,7 @@ ToolTip::ToolTip (SlideSorter& rSlideSorter) maHiddenTimer.SetTimeout(rHelpSettings.GetTipDelay()); } -ToolTip::~ToolTip (void) +ToolTip::~ToolTip() { maShowTimer.Stop(); maHiddenTimer.Stop(); @@ -100,7 +100,7 @@ void ToolTip::Show (const bool bNoDelay) maShowTimer.Start(); } -void ToolTip::DoShow (void) +void ToolTip::DoShow() { if (maShowTimer.IsActive()) { @@ -142,7 +142,7 @@ void ToolTip::DoShow (void) } } -bool ToolTip::Hide (void) +bool ToolTip::Hide() { if (mnHelpWindowHandle>0) { diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx index ba109d64aa16..e4f99d20a654 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx @@ -41,7 +41,7 @@ ViewCacheContext::ViewCacheContext (SlideSorter& rSlideSorter) { } -ViewCacheContext::~ViewCacheContext (void) +ViewCacheContext::~ViewCacheContext() { } @@ -63,7 +63,7 @@ void ViewCacheContext::NotifyPreviewCreation ( } } -bool ViewCacheContext::IsIdle (void) +bool ViewCacheContext::IsIdle() { sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrSlideSorter.GetContentWindow().get())); if (nIdleState == tools::IdleDetection::IDET_IDLE) @@ -112,7 +112,7 @@ model::SharedPageDescriptor ViewCacheContext::GetDescriptor (cache::CacheKey aKe return mrModel.GetPageDescriptor(nPageIndex); } -::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ViewCacheContext::GetModel (void) +::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ViewCacheContext::GetModel() { if (mrModel.GetDocument() == NULL) return NULL; diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx index 14ee3ca65fa2..19b814a73879 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.hxx @@ -40,14 +40,14 @@ class ViewCacheContext : public cache::CacheContext { public: ViewCacheContext (SlideSorter& rSlideSorter); - virtual ~ViewCacheContext (void); + virtual ~ViewCacheContext(); virtual void NotifyPreviewCreation (cache::CacheKey aKey, const Bitmap& rPreview) SAL_OVERRIDE; - virtual bool IsIdle (void) SAL_OVERRIDE; + virtual bool IsIdle() SAL_OVERRIDE; virtual bool IsVisible (cache::CacheKey aKey) SAL_OVERRIDE; virtual const SdrPage* GetPage (cache::CacheKey aKey) SAL_OVERRIDE; virtual ::boost::shared_ptr<std::vector<cache::CacheKey> > GetEntryList (bool bVisible) SAL_OVERRIDE; virtual sal_Int32 GetPriority (cache::CacheKey aKey) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel (void) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetModel() SAL_OVERRIDE; private: model::SlideSorterModel& mrModel; diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx index b62a4f63236e..2fd290ae9383 100644 --- a/sd/source/ui/table/tableobjectbar.hxx +++ b/sd/source/ui/table/tableobjectbar.hxx @@ -46,7 +46,7 @@ private: public: TableObjectBar( ::sd::ViewShell* pSdViewShell, ::sd::View* pSdView); - virtual ~TableObjectBar (void); + virtual ~TableObjectBar(); void GetState( SfxItemSet& rSet ); void GetAttrState( SfxItemSet& rSet ); diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx index 13b890406291..1a3639409570 100644 --- a/sd/source/ui/tools/AsynchronousCall.cxx +++ b/sd/source/ui/tools/AsynchronousCall.cxx @@ -23,7 +23,7 @@ namespace sd { namespace tools { -AsynchronousCall::AsynchronousCall (void) +AsynchronousCall::AsynchronousCall() : maTimer(), mpFunction() { @@ -31,7 +31,7 @@ AsynchronousCall::AsynchronousCall (void) maTimer.SetTimeoutHdl(aCallback); } -AsynchronousCall::~AsynchronousCall (void) +AsynchronousCall::~AsynchronousCall() { mpFunction.reset(); maTimer.Stop(); diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index eb22a2f663a6..565a152e3135 100644 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx @@ -123,7 +123,7 @@ Any ConfigurationAccess::GetConfigurationNode ( return Any(); } -void ConfigurationAccess::CommitChanges (void) +void ConfigurationAccess::CommitChanges() { Reference<util::XChangesBatch> xConfiguration (mxRoot, UNO_QUERY); if (xConfiguration.is()) diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index ede1c01f2abb..f23d9fd0a267 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -65,7 +65,7 @@ class EventMultiplexer::Implementation { public: Implementation (ViewShellBase& rBase); - virtual ~Implementation (void); + virtual ~Implementation(); void AddEventListener ( Link& rCallback, @@ -111,7 +111,7 @@ public: const ::com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: virtual void Notify ( @@ -140,10 +140,10 @@ private: ::com::sun::star::drawing::framework::XConfigurationController> mxConfigurationControllerWeak; - void ReleaseListeners (void); + void ReleaseListeners(); - void ConnectToController (void); - void DisconnectFromController (void); + void ConnectToController(); + void DisconnectFromController(); void CallListeners ( EventMultiplexerEvent::EventId eId, @@ -152,7 +152,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException); DECL_LINK(SlideSorterSelectionChangeListener, void*); @@ -169,7 +169,7 @@ EventMultiplexer::EventMultiplexer (ViewShellBase& rBase) mpImpl->acquire(); } -EventMultiplexer::~EventMultiplexer (void) +EventMultiplexer::~EventMultiplexer() { try { @@ -278,13 +278,13 @@ EventMultiplexer::Implementation::Implementation (ViewShellBase& rBase) } } -EventMultiplexer::Implementation::~Implementation (void) +EventMultiplexer::Implementation::~Implementation() { DBG_ASSERT( !mbListeningToFrame, "sd::EventMultiplexer::Implementation::~Implementation(), disposing was not called!" ); } -void EventMultiplexer::Implementation::ReleaseListeners (void) +void EventMultiplexer::Implementation::ReleaseListeners() { if (mbListeningToFrame) { @@ -359,7 +359,7 @@ void EventMultiplexer::Implementation::RemoveEventListener ( } } -void EventMultiplexer::Implementation::ConnectToController (void) +void EventMultiplexer::Implementation::ConnectToController() { // Just in case that we missed some event we now disconnect from the old // controller. @@ -421,7 +421,7 @@ void EventMultiplexer::Implementation::ConnectToController (void) } } -void EventMultiplexer::Implementation::DisconnectFromController (void) +void EventMultiplexer::Implementation::DisconnectFromController() { if (mbListeningToController) { @@ -629,13 +629,13 @@ void SAL_CALL EventMultiplexer::Implementation::notifyConfigurationChange ( } -void SAL_CALL EventMultiplexer::Implementation::disposing (void) +void SAL_CALL EventMultiplexer::Implementation::disposing() { CallListeners (EventMultiplexerEvent::EID_DISPOSING); ReleaseListeners(); } -void EventMultiplexer::Implementation::ThrowIfDisposed (void) +void EventMultiplexer::Implementation::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/tools/IconCache.cxx b/sd/source/ui/tools/IconCache.cxx index ae895876c912..54563201282f 100644 --- a/sd/source/ui/tools/IconCache.cxx +++ b/sd/source/ui/tools/IconCache.cxx @@ -65,7 +65,7 @@ Image IconCache::Implementation::GetIcon (sal_uInt16 nResourceId) //===== IconCache ============================================================= //static -IconCache& IconCache::Instance (void) +IconCache& IconCache::Instance() { if (Implementation::mpInstance == NULL) { @@ -95,12 +95,12 @@ Image IconCache::GetIcon (sal_uInt16 nResourceId) return mpImpl->GetIcon (nResourceId); } -IconCache::IconCache (void) +IconCache::IconCache() : mpImpl (new Implementation()) { } -IconCache::~IconCache (void) +IconCache::~IconCache() { // empty } diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index df7c23e337f1..ed16b2f92a3a 100644 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx @@ -41,7 +41,7 @@ sal_Int32 IdleDetection::GetIdleState (const vcl::Window* pWindow) return nResult; } -sal_Int32 IdleDetection::CheckInputPending (void) +sal_Int32 IdleDetection::CheckInputPending() { if (Application::AnyInput(VclInputFlags::MOUSE | VclInputFlags::KEYBOARD | VclInputFlags::PAINT)) return IDET_SYSTEM_EVENT_PENDING; @@ -49,7 +49,7 @@ sal_Int32 IdleDetection::CheckInputPending (void) return IDET_IDLE; } -sal_Int32 IdleDetection::CheckSlideShowRunning (void) +sal_Int32 IdleDetection::CheckSlideShowRunning() { sal_Int32 eResult (IDET_IDLE); diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index a43b9966c42b..bff275971dde 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -51,8 +51,8 @@ namespace { class ViewRedirector : public ::sdr::contact::ViewObjectContactRedirector { public: - ViewRedirector (void); - virtual ~ViewRedirector (void); + ViewRedirector(); + virtual ~ViewRedirector(); virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE; @@ -81,7 +81,7 @@ PreviewRenderer::PreviewRenderer ( } } -PreviewRenderer::~PreviewRenderer (void) +PreviewRenderer::~PreviewRenderer() { if (mpDocShellOfView != NULL) EndListening (*mpDocShellOfView); @@ -282,7 +282,7 @@ bool PreviewRenderer::Initialize ( return true; } -void PreviewRenderer::Cleanup (void) +void PreviewRenderer::Cleanup() { mpView->HideSdrPage(); } @@ -352,7 +352,7 @@ void PreviewRenderer::PaintSubstitutionText (const OUString& rSubstitutionText) } } -void PreviewRenderer::PaintFrame (void) +void PreviewRenderer::PaintFrame() { if (mbHasFrame) { @@ -505,11 +505,11 @@ void PreviewRenderer::Notify(SfxBroadcaster&, const SfxHint& rHint) namespace { -ViewRedirector::ViewRedirector (void) +ViewRedirector::ViewRedirector() { } -ViewRedirector::~ViewRedirector (void) +ViewRedirector::~ViewRedirector() { } diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx index 66fecd19a58f..eb7c06d0b0fa 100644 --- a/sd/source/ui/tools/PropertySet.cxx +++ b/sd/source/ui/tools/PropertySet.cxx @@ -26,23 +26,23 @@ using namespace ::com::sun::star::uno; namespace sd { namespace tools { -PropertySet::PropertySet (void) +PropertySet::PropertySet() : PropertySetInterfaceBase(m_aMutex), mpChangeListeners(new ChangeListenerContainer()) { } -PropertySet::~PropertySet (void) +PropertySet::~PropertySet() { } -void SAL_CALL PropertySet::disposing (void) +void SAL_CALL PropertySet::disposing() { } //----- XPropertySet ---------------------------------------------------------- -Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo (void) +Reference<beans::XPropertySetInfo> SAL_CALL PropertySet::getPropertySetInfo() throw(RuntimeException, std::exception) { return NULL; @@ -173,7 +173,7 @@ void PropertySet::CallListeners ( } } -void PropertySet::ThrowIfDisposed (void) +void PropertySet::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx index 7bc31789a6c9..88eab7dd0518 100644 --- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx +++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx @@ -51,7 +51,7 @@ private: }; // static -SdGlobalResourceContainer& SdGlobalResourceContainer::Instance (void) +SdGlobalResourceContainer& SdGlobalResourceContainer::Instance() { DBG_ASSERT(Implementation::mpInstance!=NULL, "SdGlobalResourceContainer::Instance(): instance has been deleted"); @@ -125,13 +125,13 @@ void SdGlobalResourceContainer::AddResource (const Reference<XInterface>& rxReso } } -SdGlobalResourceContainer::SdGlobalResourceContainer (void) +SdGlobalResourceContainer::SdGlobalResourceContainer() : mpImpl (new SdGlobalResourceContainer::Implementation()) { Implementation::mpInstance = this; } -SdGlobalResourceContainer::~SdGlobalResourceContainer (void) +SdGlobalResourceContainer::~SdGlobalResourceContainer() { ::osl::MutexGuard aGuard (mpImpl->maMutex); diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index 1091a34dc4d8..017ff5e215ec 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -44,7 +44,7 @@ SlotStateListener::SlotStateListener ( ObserveSlot(rSlotName); } -SlotStateListener::~SlotStateListener (void) +SlotStateListener::~SlotStateListener() { ReleaseListeners(); } @@ -86,7 +86,7 @@ void SlotStateListener::ObserveSlot (const OUString& rSlotName) } } -void SlotStateListener::disposing (void) +void SlotStateListener::disposing() { ReleaseListeners(); mxDispatchProviderWeak = uno::WeakReference<frame::XDispatchProvider>(NULL); @@ -126,7 +126,7 @@ void SlotStateListener::statusChanged ( maCallback.Call(&sSlotName); } -void SlotStateListener::ReleaseListeners (void) +void SlotStateListener::ReleaseListeners() { if ( ! maRegisteredURLList.empty()) { @@ -151,7 +151,7 @@ void SAL_CALL SlotStateListener::disposing ( { } -void SlotStateListener::ThrowIfDisposed (void) +void SlotStateListener::ThrowIfDisposed() throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index 4525b36be635..03335f7e06e4 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -52,7 +52,7 @@ public: return pExecution; } -void TimerBasedTaskExecution::Release (void) +void TimerBasedTaskExecution::Release() { maTimer.Stop(); mpSelf.reset(); @@ -94,7 +94,7 @@ TimerBasedTaskExecution::TimerBasedTaskExecution ( maTimer.Start(); } -TimerBasedTaskExecution::~TimerBasedTaskExecution (void) +TimerBasedTaskExecution::~TimerBasedTaskExecution() { maTimer.Stop(); } diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 71c1cc5b8904..f38f68e7ff48 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -81,7 +81,7 @@ DrawController::DrawController (ViewShellBase& rBase) throw() ProvideFrameworkControllers(); } -DrawController::~DrawController (void) throw() +DrawController::~DrawController() throw() { } @@ -106,7 +106,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( // XTypeProvider -Sequence<Type> SAL_CALL DrawController::getTypes (void) +Sequence<Type> SAL_CALL DrawController::getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -127,7 +127,7 @@ IMPLEMENT_GET_IMPLEMENTATION_ID(DrawController); // XComponent -void SAL_CALL DrawController::dispose (void) +void SAL_CALL DrawController::dispose() throw( RuntimeException, std::exception ) { if( !mbDisposing ) @@ -219,7 +219,7 @@ sal_Bool SAL_CALL DrawController::supportsService (const OUString& rsServiceName return cppu::supportsService(this, rsServiceName); } -Sequence<OUString> SAL_CALL DrawController::getSupportedServiceNames (void) +Sequence<OUString> SAL_CALL DrawController::getSupportedServiceNames() throw(RuntimeException, std::exception) { ThrowIfDisposed(); @@ -325,7 +325,7 @@ void SAL_CALL DrawController::setCurrentPage( const Reference< drawing::XDrawPag mxSubController->setCurrentPage(xPage); } -Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage (void) +Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage() throw(RuntimeException, std::exception) { ThrowIfDisposed(); @@ -510,7 +510,7 @@ void DrawController::FirePropertyChange ( } -void DrawController::BroadcastContextChange (void) const +void DrawController::BroadcastContextChange() const { ::boost::shared_ptr<ViewShell> pViewShell (mpBase->GetMainViewShell()); if ( ! pViewShell) @@ -553,7 +553,7 @@ void DrawController::BroadcastContextChange (void) const ContextChangeEventMultiplexer::NotifyContextChange(mpBase, eContext); } -void DrawController::ReleaseViewShellBase (void) +void DrawController::ReleaseViewShellBase() { DisposeFrameworkControllers(); mpBase = NULL; @@ -562,7 +562,7 @@ void DrawController::ReleaseViewShellBase (void) //===== XControllerManager ============================================================== Reference<XConfigurationController> SAL_CALL - DrawController::getConfigurationController (void) + DrawController::getConfigurationController() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -571,7 +571,7 @@ Reference<XConfigurationController> SAL_CALL } Reference<XModuleController> SAL_CALL - DrawController::getModuleController (void) + DrawController::getModuleController() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -586,7 +586,7 @@ namespace class theDrawControllerUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theDrawControllerUnoTunnelId> {}; } -const Sequence<sal_Int8>& DrawController::getUnoTunnelId (void) +const Sequence<sal_Int8>& DrawController::getUnoTunnelId() { return theDrawControllerUnoTunnelId::get().getSeq(); } @@ -825,7 +825,7 @@ void DrawController::getFastPropertyValue ( } } -void DrawController::ProvideFrameworkControllers (void) +void DrawController::ProvideFrameworkControllers() { SolarMutexGuard aGuard; try @@ -847,7 +847,7 @@ void DrawController::ProvideFrameworkControllers (void) } } -void DrawController::DisposeFrameworkControllers (void) +void DrawController::DisposeFrameworkControllers() { Reference<XComponent> xComponent (mxModuleController, UNO_QUERY); if (xComponent.is()) @@ -858,7 +858,7 @@ void DrawController::DisposeFrameworkControllers (void) xComponent->dispose(); } -void DrawController::ThrowIfDisposed (void) const +void DrawController::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose || mbDisposing) diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx index c073db21d60e..88b478774ad9 100644 --- a/sd/source/ui/unoidl/SdUnoDrawView.cxx +++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx @@ -63,7 +63,7 @@ SdUnoDrawView::~SdUnoDrawView() throw() { } -bool SdUnoDrawView::getMasterPageMode(void) const throw() +bool SdUnoDrawView::getMasterPageMode() const throw() { return (mrDrawViewShell.GetEditMode() == EM_MASTERPAGE); } @@ -78,7 +78,7 @@ void SdUnoDrawView::setMasterPageMode (bool bMasterPageMode) throw() } } -bool SdUnoDrawView::getLayerMode(void) const throw() +bool SdUnoDrawView::getLayerMode() const throw() { return mrDrawViewShell.IsLayerModeActive(); } @@ -93,7 +93,7 @@ void SdUnoDrawView::setLayerMode (bool bLayerMode) throw() } } -Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer (void) throw () +Reference<drawing::XLayer> SdUnoDrawView::getActiveLayer() throw () { Reference<drawing::XLayer> xCurrentLayer; @@ -456,7 +456,7 @@ Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage() return xPage; } -sal_Int16 SdUnoDrawView::GetZoom(void) const +sal_Int16 SdUnoDrawView::GetZoom() const { if (mrDrawViewShell.GetActiveWindow() ) { @@ -533,7 +533,7 @@ void SdUnoDrawView::SetZoomType ( sal_Int16 nType ) } } -SdXImpressDocument* SdUnoDrawView::GetModel (void) const throw() +SdXImpressDocument* SdUnoDrawView::GetModel() const throw() { if (mrView.GetDocSh()!=NULL) { diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx index edc40f63c5e1..6068012cca77 100644 --- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx +++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx @@ -43,11 +43,11 @@ SdUnoOutlineView::SdUnoOutlineView( { } -SdUnoOutlineView::~SdUnoOutlineView (void) throw() +SdUnoOutlineView::~SdUnoOutlineView() throw() { } -void SAL_CALL SdUnoOutlineView::disposing (void) +void SAL_CALL SdUnoOutlineView::disposing() { } @@ -94,7 +94,7 @@ void SAL_CALL SdUnoOutlineView::setCurrentPage ( mrOutlineViewShell.SetCurrentPage(pSdPage); } -Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage (void) +Reference< drawing::XDrawPage > SAL_CALL SdUnoOutlineView::getCurrentPage() throw(RuntimeException, std::exception) { Reference<drawing::XDrawPage> xPage; diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx index dc11cc2ad6a5..cd3a8b2f570e 100644 --- a/sd/source/ui/unoidl/SdUnoSlideView.cxx +++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx @@ -44,7 +44,7 @@ SdUnoSlideView::SdUnoSlideView ( { } -SdUnoSlideView::~SdUnoSlideView (void) throw() +SdUnoSlideView::~SdUnoSlideView() throw() { } @@ -84,7 +84,7 @@ sal_Bool SAL_CALL SdUnoSlideView::select (const Any& aSelection) return bOk; } -Any SAL_CALL SdUnoSlideView::getSelection (void) +Any SAL_CALL SdUnoSlideView::getSelection() throw(RuntimeException, std::exception) { Any aResult; @@ -141,7 +141,7 @@ void SAL_CALL SdUnoSlideView::setCurrentPage ( } css::uno::Reference<css::drawing::XDrawPage > SAL_CALL - SdUnoSlideView::getCurrentPage (void) + SdUnoSlideView::getCurrentPage() throw(css::uno::RuntimeException, std::exception) { return mrSlideSorter.GetController().GetCurrentSlideManager()->GetCurrentSlide()->GetXDrawPage(); diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 05ca4eae7b1d..0a553f9222d8 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -47,7 +47,7 @@ typedef std::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap; namespace { static ::boost::shared_ptr<FactoryMap> spFactoryMap; -::boost::shared_ptr<FactoryMap> GetFactoryMap (void) +::boost::shared_ptr<FactoryMap> GetFactoryMap() { if (spFactoryMap.get() == NULL) { diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx index 05a460f967b2..3b4d83308cf0 100644 --- a/sd/source/ui/unoidl/randomnode.cxx +++ b/sd/source/ui/unoidl/randomnode.cxx @@ -89,7 +89,7 @@ public: // XServiceInfo OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; // XAnimationNode @@ -559,7 +559,7 @@ sal_Bool RandomAnimationNode::supportsService(const OUString& ServiceName) throw } // XServiceInfo -Sequence< OUString > RandomAnimationNode::getSupportedServiceNames(void) throw(std::exception) +Sequence< OUString > RandomAnimationNode::getSupportedServiceNames() throw(std::exception) { Sequence< OUString > aSeq( 2 ); aSeq[0] = "com.sun.star.animations.ParallelTimeContainer"; diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx index 802fe7e99e51..f4e294818d14 100644 --- a/sd/source/ui/unoidl/unolayer.cxx +++ b/sd/source/ui/unoidl/unolayer.cxx @@ -388,7 +388,7 @@ void SdLayer::set( LayerAttribute what, bool flag ) throw() } // ::com::sun::star::container::XChild -uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent (void) +uno::Reference<uno::XInterface> SAL_CALL SdLayer::getParent() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index 5a72e6691027..989790d0fb42 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -67,7 +67,7 @@ FormShellManager::FormShellManager (ViewShellBase& rBase) RegisterAtCenterPane(); } -FormShellManager::~FormShellManager (void) +FormShellManager::~FormShellManager() { SetFormShell(NULL); UnregisterAtCenterPane(); @@ -126,7 +126,7 @@ void FormShellManager::SetFormShell (FmFormShell* pFormShell) } } -void FormShellManager::RegisterAtCenterPane (void) +void FormShellManager::RegisterAtCenterPane() { ViewShell* pShell = mrBase.GetMainViewShell().get(); if (pShell == NULL) @@ -156,7 +156,7 @@ void FormShellManager::RegisterAtCenterPane (void) mrBase.GetViewShellManager()->ActivateSubShell(*pShell, RID_FORMLAYER_TOOLBOX); } -void FormShellManager::UnregisterAtCenterPane (void) +void FormShellManager::UnregisterAtCenterPane() { if (mpMainViewShellWindow != NULL) { diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index de893a1c45c4..02dee459801b 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -61,7 +61,7 @@ GraphicViewShellBase::GraphicViewShellBase ( { } -GraphicViewShellBase::~GraphicViewShellBase (void) +GraphicViewShellBase::~GraphicViewShellBase() { } @@ -93,7 +93,7 @@ void GraphicViewShellBase::Execute (SfxRequest& rRequest) } -void GraphicViewShellBase::InitializeFramework (void) +void GraphicViewShellBase::InitializeFramework() { com::sun::star::uno::Reference<com::sun::star::frame::XController> xController (GetController()); diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index 3bb4d592e285..531a0c8b8e9c 100644 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -63,7 +63,7 @@ ImpressViewShellBase::ImpressViewShellBase ( MasterPageObserver::Instance().RegisterDocument (*GetDocShell()->GetDoc()); } -ImpressViewShellBase::~ImpressViewShellBase (void) +ImpressViewShellBase::~ImpressViewShellBase() { MasterPageObserver::Instance().UnregisterDocument (*GetDocShell()->GetDoc()); } @@ -86,7 +86,7 @@ void ImpressViewShellBase::Execute (SfxRequest& rRequest) } } -void ImpressViewShellBase::InitializeFramework (void) +void ImpressViewShellBase::InitializeFramework() { ::com::sun::star::uno::Reference<com::sun::star::frame::XController> xController (GetController()); diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx index 5eae3be98e9f..625de08c2de6 100644 --- a/sd/source/ui/view/OutlineViewShellBase.cxx +++ b/sd/source/ui/view/OutlineViewShellBase.cxx @@ -59,7 +59,7 @@ OutlineViewShellBase::OutlineViewShellBase ( { } -OutlineViewShellBase::~OutlineViewShellBase (void) +OutlineViewShellBase::~OutlineViewShellBase() { } diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 469d1f82905f..1a08634b5851 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -89,13 +89,13 @@ public: */ EditMode meOriginalEditMode; - Implementation (void); - ~Implementation (void); + Implementation(); + ~Implementation(); /** Return the OutlinerView that was provided by the last call to ProvideOutlinerView() (or NULL when there was no such call.) */ - OutlinerView* GetOutlinerView (void) { return mpOutlineView;} + OutlinerView* GetOutlinerView() { return mpOutlineView;} /** Provide in the member mpOutlineView an instance of OutlinerView that is either taken from the ViewShell, when it is an OutlineViewShell, @@ -108,7 +108,7 @@ public: /** This method is called when the OutlinerView is no longer used. */ - void ReleaseOutlinerView (void); + void ReleaseOutlinerView(); private: /** Flag that specifies whether we own the outline view pointed to by @@ -221,7 +221,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode ) } /// Nothing spectecular in the destructor. -Outliner::~Outliner (void) +Outliner::~Outliner() { mpImpl.reset(); } @@ -246,7 +246,7 @@ Outliner::~Outliner (void) directly operate on it. No switching into other views takes place.</li> </ol> */ -void Outliner::PrepareSpelling (void) +void Outliner::PrepareSpelling() { mbPrepareSpellingPending = false; @@ -277,7 +277,7 @@ void Outliner::PrepareSpelling (void) ClearModifyFlag(); } -void Outliner::StartSpelling (void) +void Outliner::StartSpelling() { meMode = SPELL; mbDirectionIsForward = true; @@ -293,7 +293,7 @@ void Outliner::StartSpelling(EditView& rView, unsigned char c) /** Free all resources acquired during the search/spell check. After a spell check the start position is restored here. */ -void Outliner::EndSpelling (void) +void Outliner::EndSpelling() { // Keep old view shell alive until we release the outliner view. ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); @@ -390,7 +390,7 @@ bool Outliner::SpellNextDocument() /** * check next text object */ -::svx::SpellPortions Outliner::GetNextSpellSentence (void) +::svx::SpellPortions Outliner::GetNextSpellSentence() { ::svx::SpellPortions aResult; @@ -580,7 +580,7 @@ void Outliner::Initialize (bool bDirectionIsForward) maLastValidPosition = *::sd::outliner::OutlinerContainer(this).current(); } -bool Outliner::SearchAndReplaceAll (void) +bool Outliner::SearchAndReplaceAll() { // Save the current position to be restored after having replaced all // matches. @@ -628,7 +628,7 @@ bool Outliner::SearchAndReplaceAll (void) return true; } -bool Outliner::SearchAndReplaceOnce (void) +bool Outliner::SearchAndReplaceOnce() { DetectChange (); @@ -722,7 +722,7 @@ bool Outliner::SearchAndReplaceOnce (void) /** Try to detect whether the document or the view (shell) has changed since the last time <member>StartSearchAndReplace()</member> has been called. */ -void Outliner::DetectChange (void) +void Outliner::DetectChange() { ::sd::outliner::IteratorPosition aPosition (maCurrentPosition); @@ -929,7 +929,7 @@ void Outliner::RestoreStartPosition() expressed by setting one of the flags <member>mbFoundObject</member> or <member>mbEndOfSearch</member> to <TRUE/>. */ -void Outliner::ProvideNextTextObject (void) +void Outliner::ProvideNextTextObject() { mbEndOfSearch = false; mbFoundObject = false; @@ -998,7 +998,7 @@ void Outliner::ProvideNextTextObject (void) while ( ! (mbFoundObject || mbEndOfSearch)); } -void Outliner::EndOfSearch (void) +void Outliner::EndOfSearch() { ::boost::shared_ptr<ViewShell> pViewShell (mpWeakViewShell.lock()); if ( ! pViewShell) @@ -1048,7 +1048,7 @@ void Outliner::EndOfSearch (void) } } -void Outliner::ShowEndOfSearchDialog (void) +void Outliner::ShowEndOfSearchDialog() { OUString aString; if (meMode == SEARCH) @@ -1075,7 +1075,7 @@ void Outliner::ShowEndOfSearchDialog (void) mbWholeDocumentProcessed = true; } -bool Outliner::ShowWrapArroundDialog (void) +bool Outliner::ShowWrapArroundDialog() { bool bDoWrapArround = false; @@ -1148,7 +1148,7 @@ void Outliner::PutTextIntoOutliner() } } -void Outliner::PrepareSpellCheck (void) +void Outliner::PrepareSpellCheck() { EESpellState eState = HasSpellErrors(); DBG_ASSERT(eState != EE_SPELL_NOSPELLER, "No SpellChecker"); @@ -1181,7 +1181,7 @@ void Outliner::PrepareSpellCheck (void) } } -void Outliner::PrepareSearchAndReplace (void) +void Outliner::PrepareSearchAndReplace() { if (HasText( *mpSearchItem )) { @@ -1326,7 +1326,7 @@ IMPL_LINK_INLINE_START( Outliner, SpellError, void *, nLang ) } IMPL_LINK_INLINE_END( Outliner, SpellError, void *, nLang ) -ESelection Outliner::GetSearchStartPosition (void) +ESelection Outliner::GetSearchStartPosition() { ESelection aPosition; if (mbDirectionIsForward) @@ -1352,7 +1352,7 @@ ESelection Outliner::GetSearchStartPosition (void) return aPosition; } -bool Outliner::HasNoPreviousMatch (void) +bool Outliner::HasNoPreviousMatch() { OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); @@ -1363,7 +1363,7 @@ bool Outliner::HasNoPreviousMatch (void) return pOutlinerView->GetSelection().IsEqual(GetSearchStartPosition ()); } -bool Outliner::HandleFailedSearch (void) +bool Outliner::HandleFailedSearch() { bool bContinueSearch = false; @@ -1429,7 +1429,7 @@ void Outliner::SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell) } } -void Outliner::HandleChangedSelection (void) +void Outliner::HandleChangedSelection() { maMarkListCopy.clear(); mbRestrictSearchToSelection = mpView->AreObjectsMarked(); @@ -1482,7 +1482,7 @@ void Outliner::StartConversion( sal_Int16 nSourceLanguage, sal_Int16 nTargetLan /** Prepare to do a text conversion on the current text object. This includes putting it into edit mode. */ -void Outliner::PrepareConversion (void) +void Outliner::PrepareConversion() { SetUpdateMode(true); if( HasConvertibleTextPortion( mnConversionLanguage ) ) @@ -1503,7 +1503,7 @@ void Outliner::PrepareConversion (void) } } -void Outliner::BeginConversion (void) +void Outliner::BeginConversion() { SetRefDevice( SD_MOD()->GetRefDevice( *mpDrawDocument->GetDocSh() ) ); @@ -1617,14 +1617,14 @@ sal_uInt16 Outliner::ShowModalMessageBox (Dialog& rMessageBox) //===== Outliner::Implementation ============================================== -Outliner::Implementation::Implementation (void) +Outliner::Implementation::Implementation() : meOriginalEditMode(EM_PAGE), mbOwnOutlineView(false), mpOutlineView(NULL) { } -Outliner::Implementation::~Implementation (void) +Outliner::Implementation::~Implementation() { if (mbOwnOutlineView && mpOutlineView!=NULL) { @@ -1698,7 +1698,7 @@ void Outliner::Implementation::ProvideOutlinerView ( } } -void Outliner::Implementation::ReleaseOutlinerView (void) +void Outliner::Implementation::ReleaseOutlinerView() { if (mbOwnOutlineView) { diff --git a/sd/source/ui/view/OutlinerIterator.cxx b/sd/source/ui/view/OutlinerIterator.cxx index d755b92277ba..2fcd500b986f 100644 --- a/sd/source/ui/view/OutlinerIterator.cxx +++ b/sd/source/ui/view/OutlinerIterator.cxx @@ -36,7 +36,7 @@ namespace sd { namespace outliner { //===== IteratorPosition ====================================================== -IteratorPosition::IteratorPosition (void) +IteratorPosition::IteratorPosition() : mnText(0) , mnPageIndex(-1) , mePageKind(PK_STANDARD) @@ -53,7 +53,7 @@ IteratorPosition::IteratorPosition (const IteratorPosition& aPosition) { } -IteratorPosition::~IteratorPosition (void) +IteratorPosition::~IteratorPosition() { } @@ -145,7 +145,7 @@ bool Iterator::operator!= (const Iterator& rIterator) return ! operator==(rIterator); } -void Iterator::Reverse (void) +void Iterator::Reverse() { if (mpIterator != NULL) mpIterator->Reverse(); @@ -158,17 +158,17 @@ OutlinerContainer::OutlinerContainer (Outliner* pOutliner) { } -Iterator OutlinerContainer::begin (void) +Iterator OutlinerContainer::begin() { return CreateIterator (BEGIN); } -Iterator OutlinerContainer::end (void) +Iterator OutlinerContainer::end() { return CreateIterator (END); } -Iterator OutlinerContainer::current (void) +Iterator OutlinerContainer::current() { return CreateIterator (CURRENT); } @@ -398,7 +398,7 @@ IteratorImplBase::IteratorImplBase( SdDrawDocument* pDocument, maPosition.meEditMode = eEditMode; } -IteratorImplBase::~IteratorImplBase (void) +IteratorImplBase::~IteratorImplBase() {} bool IteratorImplBase::operator== (const IteratorImplBase& rIterator) const @@ -414,7 +414,7 @@ bool IteratorImplBase::IsEqual (const IteratorImplBase& rIterator, IteratorType return maPosition == rIterator.maPosition; } -const IteratorPosition& IteratorImplBase::GetPosition (void) +const IteratorPosition& IteratorImplBase::GetPosition() { return maPosition; } @@ -431,7 +431,7 @@ IteratorImplBase* IteratorImplBase::Clone (IteratorImplBase* pObject) const return pObject; } -void IteratorImplBase::Reverse (void) +void IteratorImplBase::Reverse() { mbDirectionIsForward = ! mbDirectionIsForward; } @@ -450,7 +450,7 @@ SelectionIteratorImpl::SelectionIteratorImpl ( { } -SelectionIteratorImpl::~SelectionIteratorImpl (void) +SelectionIteratorImpl::~SelectionIteratorImpl() {} IteratorImplBase* SelectionIteratorImpl::Clone (IteratorImplBase* pObject) const @@ -462,7 +462,7 @@ IteratorImplBase* SelectionIteratorImpl::Clone (IteratorImplBase* pObject) const return pIterator; } -void SelectionIteratorImpl::GotoNextText (void) +void SelectionIteratorImpl::GotoNextText() { SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mrObjectList.at(mnObjectIndex).get() ); if (mbDirectionIsForward) @@ -510,7 +510,7 @@ void SelectionIteratorImpl::GotoNextText (void) } } -const IteratorPosition& SelectionIteratorImpl::GetPosition (void) +const IteratorPosition& SelectionIteratorImpl::GetPosition() { maPosition.mxObject = mrObjectList.at(mnObjectIndex); @@ -567,7 +567,7 @@ ViewIteratorImpl::ViewIteratorImpl ( SetPage (nPageIndex); } -ViewIteratorImpl::~ViewIteratorImpl (void) +ViewIteratorImpl::~ViewIteratorImpl() { } @@ -596,7 +596,7 @@ IteratorImplBase* ViewIteratorImpl::Clone (IteratorImplBase* pObject) const return pIterator; } -void ViewIteratorImpl::GotoNextText(void) +void ViewIteratorImpl::GotoNextText() { SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( maPosition.mxObject.get() ); if( pTextObj ) @@ -700,7 +700,7 @@ void ViewIteratorImpl::SetPage (sal_Int32 nPageIndex) } -void ViewIteratorImpl::Reverse (void) +void ViewIteratorImpl::Reverse() { IteratorImplBase::Reverse (); @@ -740,7 +740,7 @@ DocumentIteratorImpl::DocumentIteratorImpl ( mnPageCount = pDocument->GetMasterSdPageCount(ePageKind); } -DocumentIteratorImpl::~DocumentIteratorImpl (void) +DocumentIteratorImpl::~DocumentIteratorImpl() {} IteratorImplBase* DocumentIteratorImpl::Clone (IteratorImplBase* pObject) const @@ -754,7 +754,7 @@ IteratorImplBase* DocumentIteratorImpl::Clone (IteratorImplBase* pObject) const return ViewIteratorImpl::Clone (pIterator); } -void DocumentIteratorImpl::GotoNextText (void) +void DocumentIteratorImpl::GotoNextText() { bool bSetToOnePastLastPage = false; bool bViewChanged = false; diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index 00b0f73deb5d..a5173da3a559 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -80,11 +80,11 @@ PresentationViewShellBase::PresentationViewShellBase ( } } -PresentationViewShellBase::~PresentationViewShellBase (void) +PresentationViewShellBase::~PresentationViewShellBase() { } -void PresentationViewShellBase::InitializeFramework (void) +void PresentationViewShellBase::InitializeFramework() { com::sun::star::uno::Reference<com::sun::star::frame::XController> xController (GetController()); diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx index 97fa71d43f75..21a26baf0163 100644 --- a/sd/source/ui/view/SlideSorterViewShellBase.cxx +++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx @@ -61,7 +61,7 @@ SlideSorterViewShellBase::SlideSorterViewShellBase ( { } -SlideSorterViewShellBase::~SlideSorterViewShellBase (void) +SlideSorterViewShellBase::~SlideSorterViewShellBase() { } diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 69dfe86f9a7c..3b5b281b13de 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -61,7 +61,7 @@ class LayouterLock { public: LayouterLock (const Reference<frame::XLayoutManager>& rxLayouter); - ~LayouterLock (void); + ~LayouterLock(); private: Reference<frame::XLayoutManager> mxLayouter; }; @@ -74,7 +74,7 @@ typedef ::std::vector<OUString> NameList; class ToolBarList { public: - ToolBarList (void); + ToolBarList(); void ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup); void AddToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName); @@ -85,7 +85,7 @@ public: void MarkToolBarAsActive (const OUString& rsName); void MarkToolBarAsNotActive (const OUString& rsName); - void MarkAllToolBarsAsNotActive (void); + void MarkAllToolBarsAsNotActive(); private: typedef ::std::map<sd::ToolBarManager::ToolBarGroup,NameList> Groups; @@ -116,7 +116,7 @@ public: /** Create a new object with an empty current list and an empty requested list. */ - ToolBarShellList (void); + ToolBarShellList(); /** Remove all shells from a group. Calling this method should normally not be necessary because after the construction or after a call to @@ -247,12 +247,12 @@ public: const ::boost::shared_ptr<sd::tools::EventMultiplexer>& rpMultiplexer, const ::boost::shared_ptr<ViewShellManager>& rpViewShellManager, const ::boost::shared_ptr<ToolBarManager>& rpToolBarManager); - ~Implementation (void); + ~Implementation(); void SetValid (bool bValid); void ResetToolBars (ToolBarGroup eGroup); - void ResetAllToolBars (void); + void ResetAllToolBars(); void AddToolBar (ToolBarGroup eGroup, const OUString& rsToolBarName); void AddToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId); void RemoveToolBar (ToolBarGroup eGroup, const OUString& rsToolBarName); @@ -263,14 +263,14 @@ public: shells are destroyed anyway and without calling this method they would still be referenced. */ - void ReleaseAllToolBarShells (void); + void ReleaseAllToolBarShells(); - void ToolBarsDestroyed(void); + void ToolBarsDestroyed(); - void RequestUpdate (void); + void RequestUpdate(); - void PreUpdate (void); - void PostUpdate (void); + void PreUpdate(); + void PostUpdate(); /** Tell the XLayoutManager about the tool bars that we would like to be shown. @param rpLayouterLock @@ -285,16 +285,16 @@ public: public: UpdateLockImplementation (Implementation& rImplementation) : mrImplementation(rImplementation) { mrImplementation.LockUpdate(); } - ~UpdateLockImplementation (void) { mrImplementation.UnlockUpdate(); } + ~UpdateLockImplementation() { mrImplementation.UnlockUpdate(); } private: Implementation& mrImplementation; }; - void LockViewShellManager (void); - void LockUpdate (void); - void UnlockUpdate (void); + void LockViewShellManager(); + void LockUpdate(); + void UnlockUpdate(); - ToolBarRules& GetToolBarRules (void) { return maToolBarRules;} + ToolBarRules& GetToolBarRules() { return maToolBarRules;} private: const static OUString msToolBarResourcePrefix; @@ -358,16 +358,16 @@ const OUString ToolBarManager::msTableObjectBar("tableobjectbar"); return pManager; } -ToolBarManager::ToolBarManager (void) +ToolBarManager::ToolBarManager() : mpImpl() { } -ToolBarManager::~ToolBarManager (void) +ToolBarManager::~ToolBarManager() { } -void ToolBarManager::Shutdown (void) +void ToolBarManager::Shutdown() { if (mpImpl.get() != NULL) mpImpl.reset(); @@ -382,7 +382,7 @@ void ToolBarManager::ResetToolBars (ToolBarGroup eGroup) } } -void ToolBarManager::ResetAllToolBars (void) +void ToolBarManager::ResetAllToolBars() { if (mpImpl.get() != NULL) { @@ -448,31 +448,31 @@ void ToolBarManager::SetToolBarShell ( } } -void ToolBarManager::PreUpdate (void) +void ToolBarManager::PreUpdate() { if (mpImpl.get()!=NULL) mpImpl->PreUpdate(); } -void ToolBarManager::RequestUpdate (void) +void ToolBarManager::RequestUpdate() { if (mpImpl.get()!=NULL) mpImpl->RequestUpdate(); } -void ToolBarManager::LockViewShellManager (void) +void ToolBarManager::LockViewShellManager() { if (mpImpl.get() != NULL) mpImpl->LockViewShellManager(); } -void ToolBarManager::LockUpdate (void) +void ToolBarManager::LockUpdate() { if (mpImpl.get()!=NULL) mpImpl->LockUpdate(); } -void ToolBarManager::UnlockUpdate (void) +void ToolBarManager::UnlockUpdate() { if (mpImpl.get()!=NULL) mpImpl->UnlockUpdate(); @@ -504,7 +504,7 @@ void ToolBarManager::SelectionHasChanged ( mpImpl->GetToolBarRules().SelectionHasChanged(rViewShell,rView); } -void ToolBarManager::ToolBarsDestroyed(void) +void ToolBarManager::ToolBarsDestroyed() { if (mpImpl.get() != NULL) mpImpl->ToolBarsDestroyed(); @@ -548,7 +548,7 @@ ToolBarManager::Implementation::Implementation ( First unregister listeners, which may post user events. Then remove pending user events. */ -ToolBarManager::Implementation::~Implementation (void) +ToolBarManager::Implementation::~Implementation() { // Unregister at broadcasters. Link aLink (LINK(this,ToolBarManager::Implementation,EventMultiplexerCallback)); @@ -561,7 +561,7 @@ ToolBarManager::Implementation::~Implementation (void) Application::RemoveUserEvent(mnPendingSetValidCall); } -void ToolBarManager::Implementation::ToolBarsDestroyed(void) +void ToolBarManager::Implementation::ToolBarsDestroyed() { maToolBarList.MarkAllToolBarsAsNotActive(); } @@ -610,7 +610,7 @@ void ToolBarManager::Implementation::ResetToolBars (ToolBarGroup eGroup) mbPreUpdatePending = true; } -void ToolBarManager::Implementation::ResetAllToolBars (void) +void ToolBarManager::Implementation::ResetAllToolBars() { SAL_INFO("sd.view", OSL_THIS_FUNC << ": resetting all tool bars"); for (int i=TBG__FIRST; i<=TBG__LAST; ++i) @@ -659,13 +659,13 @@ void ToolBarManager::Implementation::AddToolBarShell ( } } -void ToolBarManager::Implementation::ReleaseAllToolBarShells (void) +void ToolBarManager::Implementation::ReleaseAllToolBarShells() { maToolBarShellList.ReleaseAllShells(GetToolBarRules()); maToolBarShellList.UpdateShells(mrBase.GetMainViewShell(), mrBase.GetViewShellManager()); } -void ToolBarManager::Implementation::RequestUpdate (void) +void ToolBarManager::Implementation::RequestUpdate() { if (mnPendingUpdateCall == 0) { @@ -674,7 +674,7 @@ void ToolBarManager::Implementation::RequestUpdate (void) } } -void ToolBarManager::Implementation::PreUpdate (void) +void ToolBarManager::Implementation::PreUpdate() { ::osl::MutexGuard aGuard(maMutex); @@ -706,7 +706,7 @@ void ToolBarManager::Implementation::PreUpdate (void) } } -void ToolBarManager::Implementation::PostUpdate (void) +void ToolBarManager::Implementation::PostUpdate() { ::osl::MutexGuard aGuard(maMutex); @@ -737,14 +737,14 @@ void ToolBarManager::Implementation::PostUpdate (void) } } -void ToolBarManager::Implementation::LockViewShellManager (void) +void ToolBarManager::Implementation::LockViewShellManager() { if (mpViewShellManagerLock.get() == NULL) mpViewShellManagerLock.reset( new ViewShellManager::UpdateLock(mrBase.GetViewShellManager())); } -void ToolBarManager::Implementation::LockUpdate (void) +void ToolBarManager::Implementation::LockUpdate() { SAL_INFO("sd.view", OSL_THIS_FUNC << ": LockUpdate " << mnLockCount); ::osl::MutexGuard aGuard(maMutex); @@ -759,7 +759,7 @@ void ToolBarManager::Implementation::LockUpdate (void) ++mnLockCount; } -void ToolBarManager::Implementation::UnlockUpdate (void) +void ToolBarManager::Implementation::UnlockUpdate() { SAL_INFO("sd.view", OSL_THIS_FUNC << ": UnlockUpdate " << mnLockCount); ::osl::MutexGuard aGuard(maMutex); @@ -951,7 +951,7 @@ LayouterLock::LayouterLock (const Reference<frame::XLayoutManager>& rxLayouter) mxLayouter->lock(); } -LayouterLock::~LayouterLock (void) +LayouterLock::~LayouterLock() { SAL_INFO("sd.view", OSL_THIS_FUNC << ": ~LayouterLock " << (mxLayouter.is() ? 1 :0)); if (mxLayouter.is()) @@ -1204,7 +1204,7 @@ void ToolBarRules::SubShellRemoved ( //===== ToolBarList =========================================================== -ToolBarList::ToolBarList (void) +ToolBarList::ToolBarList() : maGroups(), maActiveToolBars() { @@ -1316,7 +1316,7 @@ void ToolBarList::MarkToolBarAsNotActive (const OUString& rsName) ::std::find(maActiveToolBars.begin(),maActiveToolBars.end(), rsName)); } -void ToolBarList::MarkAllToolBarsAsNotActive (void) +void ToolBarList::MarkAllToolBarsAsNotActive() { maActiveToolBars.clear(); } @@ -1331,7 +1331,7 @@ ToolBarShellList::ShellDescriptor::ShellDescriptor ( { } -ToolBarShellList::ToolBarShellList (void) +ToolBarShellList::ToolBarShellList() : maNewList() , maCurrentList() { diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx index a699cfdc3635..063dfaf69ff0 100644 --- a/sd/source/ui/view/ViewClipboard.cxx +++ b/sd/source/ui/view/ViewClipboard.cxx @@ -41,7 +41,7 @@ ViewClipboard::ViewClipboard (::sd::View& rView) { } -ViewClipboard::~ViewClipboard (void) +ViewClipboard::~ViewClipboard() { } diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 1f175917e4da..7f55add6c3fd 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -146,9 +146,9 @@ public: ::boost::shared_ptr<FormShellManager> mpFormShellManager; Implementation (ViewShellBase& rBase); - ~Implementation (void); + ~Implementation(); - void LateInit (void); + void LateInit(); /** Show or hide the ViewTabBar. @param bShow @@ -182,7 +182,7 @@ public: void GetSlotState (SfxItemSet& rSet); - void ProcessRestoreEditingViewSlot (void); + void ProcessRestoreEditingViewSlot(); private: ViewShellBase& mrBase; @@ -203,7 +203,7 @@ class FocusForwardingWindow : public vcl::Window { public: FocusForwardingWindow (vcl::Window& rParentWindow, ViewShellBase& rBase); - virtual ~FocusForwardingWindow (void); + virtual ~FocusForwardingWindow(); virtual void KeyInput (const KeyEvent& rEvent) SAL_OVERRIDE; virtual void Command (const CommandEvent& rEvent) SAL_OVERRIDE; @@ -262,7 +262,7 @@ ViewShellBase::ViewShellBase ( (and/or being prepared to being destroyed) is important. Change it only when you know what you are doing. */ -ViewShellBase::~ViewShellBase (void) +ViewShellBase::~ViewShellBase() { // Tell the controller that the ViewShellBase is not available anymore. if (mpImpl->mpController.get() != NULL) @@ -360,12 +360,12 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView) } } -::boost::shared_ptr<ViewShellManager> ViewShellBase::GetViewShellManager (void) const +::boost::shared_ptr<ViewShellManager> ViewShellBase::GetViewShellManager() const { return mpImpl->mpViewShellManager; } -::boost::shared_ptr<ViewShell> ViewShellBase::GetMainViewShell (void) const +::boost::shared_ptr<ViewShell> ViewShellBase::GetMainViewShell() const { ::boost::shared_ptr<ViewShell> pMainViewShell ( framework::FrameworkHelper::Instance(*const_cast<ViewShellBase*>(this)) @@ -418,7 +418,7 @@ void ViewShellBase::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) } } -void ViewShellBase::InitializeFramework (void) +void ViewShellBase::InitializeFramework() { } @@ -465,7 +465,7 @@ void ViewShellBase::OuterResizePixel (const Point& rOrigin, const Size &rSize) mpImpl->ResizePixel (rOrigin, rSize, true); } -void ViewShellBase::Rearrange (void) +void ViewShellBase::Rearrange() { OSL_ASSERT(GetViewFrame()!=NULL); @@ -497,7 +497,7 @@ ErrCode ViewShellBase::DoVerb (long nVerb) return aResult; } -Reference<view::XRenderable> ViewShellBase::GetRenderable (void) +Reference<view::XRenderable> ViewShellBase::GetRenderable() { // Create a new DocumentRenderer on every call. It observes the life // time of this ViewShellBase object. @@ -782,7 +782,7 @@ void ViewShellBase::ReadUserData (const OUString& rString, bool bBrowse) pShell->ReadUserData (rString); } -SdrView* ViewShellBase::GetDrawView (void) const +SdrView* ViewShellBase::GetDrawView() const { // Forward call to main sub shell. ViewShell* pShell = GetMainViewShell().get(); @@ -841,7 +841,7 @@ void ViewShellBase::ShowUIControls (bool bVisible) Rearrange(); } -OUString ViewShellBase::GetInitialViewShellType (void) +OUString ViewShellBase::GetInitialViewShellType() { OUString sRequestedView (FrameworkHelper::msImpressViewURL); @@ -912,7 +912,7 @@ void ViewShellBase::StartPresentation() GetViewFrame()->GetDispatcher()->Execute(SID_PRESENTATION, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); } -::boost::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer (void) +::boost::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer() { OSL_ASSERT(mpImpl.get()!=NULL); OSL_ASSERT(mpImpl->mpEventMultiplexer.get()!=NULL); @@ -920,12 +920,12 @@ void ViewShellBase::StartPresentation() return mpImpl->mpEventMultiplexer; } -const Rectangle& ViewShellBase::getClientRectangle (void) const +const Rectangle& ViewShellBase::getClientRectangle() const { return mpImpl->maClientArea; } -::boost::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager (void) const +::boost::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager() const { OSL_ASSERT(mpImpl.get()!=NULL); OSL_ASSERT(mpImpl->mpToolBarManager.get()!=NULL); @@ -933,7 +933,7 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const return mpImpl->mpToolBarManager; } -::boost::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager (void) const +::boost::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager() const { OSL_ASSERT(mpImpl.get()!=NULL); OSL_ASSERT(mpImpl->mpFormShellManager.get()!=NULL); @@ -941,7 +941,7 @@ const Rectangle& ViewShellBase::getClientRectangle (void) const return mpImpl->mpFormShellManager; } -DrawController& ViewShellBase::GetDrawController (void) const +DrawController& ViewShellBase::GetDrawController() const { OSL_ASSERT(mpImpl.get()!=NULL); @@ -955,7 +955,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB mpImpl->mpViewTabBar = rViewTabBar; } -::vcl::Window* ViewShellBase::GetViewWindow (void) +::vcl::Window* ViewShellBase::GetViewWindow() { OSL_ASSERT(mpImpl.get()!=NULL); @@ -1023,7 +1023,7 @@ ViewShellBase::Implementation::Implementation (ViewShellBase& rBase) { } -ViewShellBase::Implementation::~Implementation (void) +ViewShellBase::Implementation::~Implementation() { mpController = NULL; mpViewTabBar = NULL; @@ -1031,12 +1031,12 @@ ViewShellBase::Implementation::~Implementation (void) mpToolBarManager.reset(); } -void ViewShellBase::Implementation::LateInit (void) +void ViewShellBase::Implementation::LateInit() { mpController = new DrawController(mrBase); } -void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void) +void ViewShellBase::Implementation::ProcessRestoreEditingViewSlot() { ViewShell* pViewShell = mrBase.GetMainViewShell().get(); if (pViewShell != NULL) @@ -1383,7 +1383,7 @@ FocusForwardingWindow::FocusForwardingWindow ( SAL_INFO("sd.view", "created FocusForwardingWindow at " << this); } -FocusForwardingWindow::~FocusForwardingWindow (void) +FocusForwardingWindow::~FocusForwardingWindow() { SAL_INFO("sd.view", "destroyed FocusForwardingWindow at " << this); } diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index b7e5f322d03d..727b7c7b801b 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -73,7 +73,7 @@ ViewShell::Implementation::Implementation (ViewShell& rViewShell) { } -ViewShell::Implementation::~Implementation (void) +ViewShell::Implementation::~Implementation() { if ( ! mpUpdateLockForMouse.expired()) { @@ -281,7 +281,7 @@ void ViewShell::Implementation::AssignLayout ( SfxRequest& rRequest, PageKind eP } } -sal_uInt16 ViewShell::Implementation::GetViewId (void) +sal_uInt16 ViewShell::Implementation::GetViewId() { switch (mrViewShell.GetShellType()) { @@ -312,7 +312,7 @@ sal_uInt16 ViewShell::Implementation::GetViewId (void) } } -SvxIMapDlg* ViewShell::Implementation::GetImageMapDialog (void) +SvxIMapDlg* ViewShell::Implementation::GetImageMapDialog() { SvxIMapDlg* pDialog = NULL; SfxChildWindow* pChildWindow = SfxViewFrame::Current()->GetChildWindow( @@ -376,7 +376,7 @@ void ViewShell::Implementation::ToolBarManagerLock::Release (bool bForce) } } -ViewShell::Implementation::ToolBarManagerLock::~ToolBarManagerLock (void) +ViewShell::Implementation::ToolBarManagerLock::~ToolBarManagerLock() { mpLock.reset(); } diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 4587c0550e27..f6e3b11be435 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -58,8 +58,8 @@ public: ShellDescriptor (SfxShell* pShell, ShellId nId); ShellDescriptor (const ShellDescriptor& rDescriptor); ShellDescriptor& operator= (const ShellDescriptor& rDescriptor); - bool IsMainViewShell (void) const; - ::vcl::Window* GetWindow (void) const; + bool IsMainViewShell() const; + ::vcl::Window* GetWindow() const; }; /** This functor can be used to search for a shell in an STL container when the @@ -96,7 +96,7 @@ public: Implementation ( ViewShellManager& rManager, ViewShellBase& rBase); - ~Implementation (void); + ~Implementation(); void AddShellFactory ( const SfxShell* pViewShell, @@ -115,9 +115,9 @@ public: void DeactivateSubShell (const SfxShell& rParentShell, ShellId nId); void MoveToTop (const SfxShell& rParentShell); SfxShell* GetShell (ShellId nId) const; - SfxShell* GetTopShell (void) const; - SfxShell* GetTopViewShell (void) const; - void Shutdown (void); + SfxShell* GetTopShell() const; + SfxShell* GetTopViewShell() const; + void Shutdown(); void InvalidateAllSubShells (const SfxShell* pParentShell); /** Remove all shells from the SFX stack above and including the given @@ -129,7 +129,7 @@ public: { public: UpdateLock (Implementation& rImpl) : mrImpl(rImpl) {mrImpl.LockUpdate();} - ~UpdateLock (void) {mrImpl.UnlockUpdate();}; + ~UpdateLock() {mrImpl.UnlockUpdate();}; private: Implementation& mrImpl; }; @@ -140,13 +140,13 @@ public: to the shell stack to prevent multiple rebuilds of the shell stack and resulting broadcasts. */ - void LockUpdate (void); + void LockUpdate(); /** Allow updates of the shell stack. This method has to be called the same number of times as LockUpdate() to really allow a rebuild of the shell stack. */ - void UnlockUpdate (void); + void UnlockUpdate(); private: ViewShellBase& mrBase; @@ -195,9 +195,9 @@ private: SfxShell* mpTopViewShell; - void UpdateShellStack (void); + void UpdateShellStack(); - void CreateShells (void); + void CreateShells(); /** This method rebuilds the stack of shells that are stacked upon the view shell base. @@ -208,7 +208,7 @@ private: #if OSL_DEBUG_LEVEL >= 2 void DumpShellStack (const ShellStack& rStack); - void DumpSfxShellStack (void); + void DumpSfxShellStack(); #endif /** To be called before a shell is taken fom the SFX shell stack. This @@ -237,7 +237,7 @@ ViewShellManager::ViewShellManager (ViewShellBase& rBase) { } -ViewShellManager::~ViewShellManager (void) +ViewShellManager::~ViewShellManager() { } @@ -322,7 +322,7 @@ SfxShell* ViewShellManager::GetShell (ShellId nId) const return NULL; } -SfxShell* ViewShellManager::GetTopShell (void) const +SfxShell* ViewShellManager::GetTopShell() const { if (mbValid) return mpImpl->GetTopShell(); @@ -330,7 +330,7 @@ SfxShell* ViewShellManager::GetTopShell (void) const return NULL; } -SfxShell* ViewShellManager::GetTopViewShell (void) const +SfxShell* ViewShellManager::GetTopViewShell() const { if (mbValid) return mpImpl->GetTopViewShell(); @@ -338,7 +338,7 @@ SfxShell* ViewShellManager::GetTopViewShell (void) const return NULL; } -void ViewShellManager::Shutdown (void) +void ViewShellManager::Shutdown() { if (mbValid) { @@ -347,12 +347,12 @@ void ViewShellManager::Shutdown (void) } } -void ViewShellManager::LockUpdate (void) +void ViewShellManager::LockUpdate() { mpImpl->LockUpdate(); } -void ViewShellManager::UnlockUpdate (void) +void ViewShellManager::UnlockUpdate() { mpImpl->UnlockUpdate(); } @@ -378,7 +378,7 @@ ViewShellManager::Implementation::Implementation ( (void)rManager; } -ViewShellManager::Implementation::~Implementation (void) +ViewShellManager::Implementation::~Implementation() { Shutdown(); } @@ -712,23 +712,23 @@ SfxShell* ViewShellManager::Implementation::GetShell (ShellId nId) const return pShell; } -SfxShell* ViewShellManager::Implementation::GetTopShell (void) const +SfxShell* ViewShellManager::Implementation::GetTopShell() const { OSL_ASSERT(mpTopShell == mrBase.GetSubShell(0)); return mpTopShell; } -SfxShell* ViewShellManager::Implementation::GetTopViewShell (void) const +SfxShell* ViewShellManager::Implementation::GetTopViewShell() const { return mpTopViewShell; } -void ViewShellManager::Implementation::LockUpdate (void) +void ViewShellManager::Implementation::LockUpdate() { mnUpdateLockCount++; } -void ViewShellManager::Implementation::UnlockUpdate (void) +void ViewShellManager::Implementation::UnlockUpdate() { ::osl::MutexGuard aGuard (maMutex); @@ -753,7 +753,7 @@ void ViewShellManager::Implementation::UnlockUpdate (void) 6. Push all shells of the internal stack on the SFX shell stack that are not already present on the later. */ -void ViewShellManager::Implementation::UpdateShellStack (void) +void ViewShellManager::Implementation::UpdateShellStack() { ::osl::MutexGuard aGuard (maMutex); @@ -916,7 +916,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe #endif } -void ViewShellManager::Implementation::CreateShells (void) +void ViewShellManager::Implementation::CreateShells() { ::osl::MutexGuard aGuard (maMutex); @@ -1115,7 +1115,7 @@ void ViewShellManager::Implementation::InvalidateAllSubShells (const SfxShell* p } } -void ViewShellManager::Implementation::Shutdown (void) +void ViewShellManager::Implementation::Shutdown() { ::osl::MutexGuard aGuard (maMutex); @@ -1161,7 +1161,7 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack) SAL_INFO("sd.view", OSL_THIS_FUNC << " null"); } -void ViewShellManager::Implementation::DumpSfxShellStack (void) +void ViewShellManager::Implementation::DumpSfxShellStack() { ShellStack aSfxShellStack; sal_uInt16 nIndex (0); @@ -1212,7 +1212,7 @@ void ViewShellManager::Implementation::SetFormShell ( namespace { -ShellDescriptor::ShellDescriptor (void) +ShellDescriptor::ShellDescriptor() : mpShell(NULL), mnId(0), mpFactory(), @@ -1250,7 +1250,7 @@ ShellDescriptor& ShellDescriptor::operator= (const ShellDescriptor& rDescriptor) return *this; } -bool ShellDescriptor::IsMainViewShell (void) const +bool ShellDescriptor::IsMainViewShell() const { ViewShell* pViewShell = dynamic_cast<ViewShell*>(mpShell); if (pViewShell != NULL) @@ -1259,7 +1259,7 @@ bool ShellDescriptor::IsMainViewShell (void) const return false; } -vcl::Window* ShellDescriptor::GetWindow (void) const +vcl::Window* ShellDescriptor::GetWindow() const { ViewShell* pViewShell = dynamic_cast<ViewShell*>(mpShell); if (pViewShell != NULL) diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 1cc8abaecd88..f8ca2e57aae2 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -71,7 +71,7 @@ public: vcl::Window* pParentWindow, const ::rtl::Reference<ViewTabBar>& rpViewTabBar); virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; - virtual void ActivatePage (void) SAL_OVERRIDE; + virtual void ActivatePage() SAL_OVERRIDE; private: ::rtl::Reference<ViewTabBar> mpViewTabBar; }; @@ -134,11 +134,11 @@ ViewTabBar::ViewTabBar ( } } -ViewTabBar::~ViewTabBar (void) +ViewTabBar::~ViewTabBar() { } -void ViewTabBar::disposing (void) +void ViewTabBar::disposing() { if (mpViewShellBase != NULL && mxViewTabBarId->isBoundToURL( @@ -295,7 +295,7 @@ sal_Bool SAL_CALL ViewTabBar::hasTabBarButton (const TabBarButton& rButton) return HasTabBarButton(rButton); } -Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons (void) +Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons() throw (::com::sun::star::uno::RuntimeException, std::exception) { const SolarMutexGuard aSolarGuard; @@ -304,13 +304,13 @@ Sequence<TabBarButton> SAL_CALL ViewTabBar::getTabBarButtons (void) //----- XResource ------------------------------------------------------------- -Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId (void) +Reference<XResourceId> SAL_CALL ViewTabBar::getResourceId() throw (RuntimeException, std::exception) { return mxViewTabBarId; } -sal_Bool SAL_CALL ViewTabBar::isAnchorOnly (void) +sal_Bool SAL_CALL ViewTabBar::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -323,7 +323,7 @@ namespace class theViewTabBarUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theViewTabBarUnoTunnelId > {}; } -const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId (void) +const Sequence<sal_Int8>& ViewTabBar::getUnoTunnelId() { return theViewTabBarUnoTunnelId::get().getSeq(); } @@ -342,7 +342,7 @@ sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId) return nResult; } -bool ViewTabBar::ActivatePage (void) +bool ViewTabBar::ActivatePage() { try { @@ -395,7 +395,7 @@ bool ViewTabBar::ActivatePage (void) return false; } -int ViewTabBar::GetHeight (void) +int ViewTabBar::GetHeight() { int nHeight (0); @@ -499,7 +499,7 @@ bool ViewTabBar::HasTabBarButton ( } ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> - ViewTabBar::GetTabBarButtons (void) + ViewTabBar::GetTabBarButtons() { sal_uInt32 nCount (maTabBarButtons.size()); ::com::sun::star::uno::Sequence<com::sun::star::drawing::framework::TabBarButton> @@ -511,7 +511,7 @@ bool ViewTabBar::HasTabBarButton ( return aList; } -void ViewTabBar::UpdateActiveButton (void) +void ViewTabBar::UpdateActiveButton() { Reference<XView> xView; if (mpViewShellBase != NULL) @@ -532,7 +532,7 @@ void ViewTabBar::UpdateActiveButton (void) } } -void ViewTabBar::UpdateTabBarButtons (void) +void ViewTabBar::UpdateTabBarButtons() { TabBarButtonList::const_iterator iTab; sal_uInt16 nPageCount (mpTabControl->GetPageCount()); @@ -584,7 +584,7 @@ void TabBarControl::Paint (const Rectangle& rRect) SetLineColor (aOriginalLineColor); } -void TabBarControl::ActivatePage (void) +void TabBarControl::ActivatePage() { if (mpViewTabBar->ActivatePage()) { diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 1c308f21652d..4a2e0aa0f6aa 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -32,14 +32,14 @@ namespace sd { -WindowUpdater::WindowUpdater (void) +WindowUpdater::WindowUpdater() : mpViewShell (NULL), mpDocument (NULL) { maCTLOptions.AddListener(this); } -WindowUpdater::~WindowUpdater (void) throw () +WindowUpdater::~WindowUpdater() throw () { maCTLOptions.RemoveListener(this); } diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 606fae612bfe..d275d61076f9 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -156,7 +156,7 @@ namespace * Called, if state of selection of view is changed */ -void DrawViewShell::SelectionHasChanged (void) +void DrawViewShell::SelectionHasChanged() { Invalidate(); diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index e3e184be7b29..9fbdf055e37a 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -85,7 +85,7 @@ void DrawViewShell::ModelHasChanged() } } -void DrawViewShell::Resize (void) +void DrawViewShell::Resize() { ViewShell::Resize(); @@ -101,7 +101,7 @@ void DrawViewShell::Resize (void) } } -void DrawViewShell::ArrangeGUIElements (void) +void DrawViewShell::ArrangeGUIElements() { // Retrieve the current size (thickness) of the scroll bars. That is // the width of the vertical and the height of the horizontal scroll @@ -564,7 +564,7 @@ void DrawViewShell::VisAreaChanged(const Rectangle& rRect) return ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>(); } -int DrawViewShell::GetActiveTabLayerIndex (void) const +int DrawViewShell::GetActiveTabLayerIndex() const { const LayerTabBar* pBar = const_cast<DrawViewShell*>(this)->GetLayerTabControl (); @@ -594,12 +594,12 @@ void DrawViewShell::SetActiveTabLayerIndex (int nIndex) } } -LayerTabBar* DrawViewShell::GetLayerTabControl (void) +LayerTabBar* DrawViewShell::GetLayerTabControl() { return mpLayerTabBar.get(); } -int DrawViewShell::GetTabLayerCount (void) const +int DrawViewShell::GetTabLayerCount() const { const LayerTabBar* pBar = const_cast<DrawViewShell*>(this)->GetLayerTabControl (); diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 420a884012b0..6b66f374e1ae 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -387,7 +387,7 @@ void DrawViewShell::Init (bool bIsMainViewShell) StartListening (*GetDocSh()); } -void DrawViewShell::Shutdown (void) +void DrawViewShell::Shutdown() { ViewShell::Shutdown(); @@ -398,7 +398,7 @@ void DrawViewShell::Shutdown (void) } } -css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubController (void) +css::uno::Reference<css::drawing::XDrawSubController> DrawViewShell::CreateSubController() { css::uno::Reference<css::drawing::XDrawSubController> xSubController; @@ -799,7 +799,7 @@ void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet ) mpAnnotationManager->GetAnnotationState( rItemSet ); } -::rtl::OUString DrawViewShell::GetSidebarContextName (void) const +::rtl::OUString DrawViewShell::GetSidebarContextName() const { ::svx::sidebar::SelectionAnalyzer::ViewType eViewType (::svx::sidebar::SelectionAnalyzer::VT_Standard); switch (mePageKind) diff --git a/sd/source/ui/view/grviewsh.cxx b/sd/source/ui/view/grviewsh.cxx index 1f94f01bd8a8..751fb19e92e6 100644 --- a/sd/source/ui/view/grviewsh.cxx +++ b/sd/source/ui/view/grviewsh.cxx @@ -44,11 +44,11 @@ GraphicViewShell::GraphicViewShell ( ConstructGraphicViewShell(); } -GraphicViewShell::~GraphicViewShell (void) +GraphicViewShell::~GraphicViewShell() { } -void GraphicViewShell::ConstructGraphicViewShell(void) +void GraphicViewShell::ConstructGraphicViewShell() { meShellType = ST_DRAW; @@ -69,7 +69,7 @@ void GraphicViewShell::ChangeEditMode ( DrawViewShell::ChangeEditMode (eMode, true); } -void GraphicViewShell::ArrangeGUIElements (void) +void GraphicViewShell::ArrangeGUIElements() { if (mpLayerTabBar.get()!=NULL && mpLayerTabBar->IsVisible()) { diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 850a9f99fbc9..fe3ff77142c4 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -168,7 +168,7 @@ void OutlineViewShell::Construct(DrawDocShell* ) GetActiveWindow()->SetUniqueId( HID_SDOUTLINEVIEWSHELL ); } -Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController (void) +Reference<drawing::XDrawSubController> OutlineViewShell::CreateSubController() { Reference<drawing::XDrawSubController> xSubController; @@ -231,7 +231,7 @@ OutlineViewShell::~OutlineViewShell() } } -void OutlineViewShell::Shutdown (void) +void OutlineViewShell::Shutdown() { ViewShell::Shutdown(); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 483de85d82eb..669106eb9e56 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -202,7 +202,7 @@ OutlineView::~OutlineView() } } -void OutlineView::ConnectToApplication (void) +void OutlineView::ConnectToApplication() { // When the mode is switched to outline the main view shell grabs focus. // This is done for getting cut/copy/paste commands on slides in the left @@ -216,7 +216,7 @@ void OutlineView::ConnectToApplication (void) Application::AddEventListener(LINK(this, OutlineView, AppEventListenerHdl)); } -void OutlineView::DisconnectFromApplication (void) +void OutlineView::DisconnectFromApplication() { Application::RemoveEventListener(LINK(this, OutlineView, AppEventListenerHdl)); } diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx index ba4305394cc6..7182979fb944 100644 --- a/sd/source/ui/view/presvish.cxx +++ b/sd/source/ui/view/presvish.cxx @@ -84,7 +84,7 @@ PresentationViewShell::PresentationViewShell( SfxViewFrame* pFrame, ViewShellBas meShellType = ST_PRESENTATION; } -PresentationViewShell::~PresentationViewShell (void) +PresentationViewShell::~PresentationViewShell() { if( GetDocSh() && GetDocSh()->GetCreateMode() == SfxObjectCreateMode::EMBEDDED && !maOldVisArea.IsEmpty() ) GetDocSh()->SetVisArea( maOldVisArea ); @@ -148,7 +148,7 @@ void PresentationViewShell::Paint( const Rectangle& rRect, ::sd::Window* ) xSlideShow->paint(rRect); } -void PresentationViewShell::Resize (void) +void PresentationViewShell::Resize() { ViewShell::Resize(); // do not call DrawViewShell here! diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 8506ec0d492e..2165faaa8355 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -92,7 +92,7 @@ Window::Window(vcl::Window* pParent) EnableRTL(false); } -Window::~Window (void) +Window::~Window() { if (mpViewShell != NULL) { @@ -178,7 +178,7 @@ void Window::SetMaxZoom (long int nMax) mnMaxZoom = (sal_uInt16) nMax; } -long Window::GetZoom (void) const +long Window::GetZoom() const { if( GetMapMode().GetScaleX().GetDenominator() ) { @@ -567,7 +567,7 @@ void Window::UpdateMapOrigin(bool bInvalidate) Invalidate(); } -void Window::UpdateMapMode (void) +void Window::UpdateMapMode() { maWinPos -= maViewOrigin; Size aPix(maWinPos.X(), maWinPos.Y()); @@ -943,7 +943,7 @@ void Window::DropScroll(const Point& rMousePos) ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> - Window::CreateAccessible (void) + Window::CreateAccessible() { // If current viewshell is PresentationViewShell, just return empty because the correct ShowWin will be created later. if (mpViewShell && mpViewShell->ISA(PresentationViewShell)) diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 194d065e6eb3..908e3e570905 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -351,13 +351,13 @@ bool TabControl::DeactivatePage() return pDrViewSh->IsSwitchPageAllowed(); } -void TabControl::SendActivatePageEvent (void) +void TabControl::SendActivatePageEvent() { CallEventListeners (VCLEVENT_TABBAR_PAGEACTIVATED, reinterpret_cast<void*>(GetCurPageId())); } -void TabControl::SendDeactivatePageEvent (void) +void TabControl::SendDeactivatePageEvent() { CallEventListeners (VCLEVENT_TABBAR_PAGEDEACTIVATED, reinterpret_cast<void*>(GetCurPageId())); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 4e51b2e883d6..c55978711639 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -93,7 +93,7 @@ class ViewShellObjectBarFactory { public: ViewShellObjectBarFactory (::sd::ViewShell& rViewShell); - virtual ~ViewShellObjectBarFactory (void); + virtual ~ViewShellObjectBarFactory(); virtual SfxShell* CreateShell ( ::sd::ShellId nId, vcl::Window* pParentWindow, @@ -111,13 +111,13 @@ private: namespace sd { -bool ViewShell::IsPageFlipMode(void) const +bool ViewShell::IsPageFlipMode() const { return this->ISA(DrawViewShell) && mpContentWindow.get() != NULL && mpContentWindow->GetVisibleHeight() >= 1.0; } -SfxViewFrame* ViewShell::GetViewFrame (void) const +SfxViewFrame* ViewShell::GetViewFrame() const { const SfxViewShell* pViewShell = GetViewShell(); if (pViewShell != NULL) @@ -170,7 +170,7 @@ ViewShell::~ViewShell() /** * common initialization part of both constructors */ -void ViewShell::construct(void) +void ViewShell::construct() { mbHasRulers = false; mpActiveWindow = 0; @@ -237,7 +237,7 @@ void ViewShell::construct(void) GetViewShellBase().GetViewShellManager()->AddSubShellFactory(this,mpImpl->mpSubShellFactory); } -void ViewShell::doShow(void) +void ViewShell::doShow() { mpContentWindow->Show(); static_cast< vcl::Window*>(mpContentWindow.get())->Resize(); @@ -270,7 +270,7 @@ void ViewShell::Init (bool bIsMainViewShell) SetActiveWindow (mpContentWindow.get()); } -void ViewShell::Exit (void) +void ViewShell::Exit() { sd::View* pView = GetView(); if (pView!=NULL && pView->IsTextEdit()) @@ -394,7 +394,7 @@ void ViewShell::Deactivate(bool bIsMDIActivate) SfxShell::Deactivate(bIsMDIActivate); } -void ViewShell::Shutdown (void) +void ViewShell::Shutdown() { Exit (); } @@ -778,7 +778,7 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi return bDone; } -void ViewShell::SetupRulers (void) +void ViewShell::SetupRulers() { if(mbHasRulers && (mpContentWindow.get() != NULL) && !SlideShow::IsRunning(GetViewShellBase())) { @@ -887,7 +887,7 @@ const SfxPoolItem* ViewShell::GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& return pTmpItem; } -void ViewShell::Resize (void) +void ViewShell::Resize() { SetupRulers (); @@ -946,7 +946,7 @@ SvBorder ViewShell::GetBorder (bool ) return aBorder; } -void ViewShell::ArrangeGUIElements (void) +void ViewShell::ArrangeGUIElements() { if (mpImpl->mbArrangeActive) return; @@ -1090,7 +1090,7 @@ void ViewShell::UpdatePreview (SdPage*, bool ) // useful is still done. } -::svl::IUndoManager* ViewShell::ImpGetUndoManager (void) const +::svl::IUndoManager* ViewShell::ImpGetUndoManager() const { const ViewShell* pMainViewShell = GetViewShellBase().GetMainViewShell().get(); @@ -1329,27 +1329,27 @@ ViewShell::CreateAccessibleDocumentView (::sd::Window* ) ::com::sun::star::accessibility::XAccessible> (); } -::sd::WindowUpdater* ViewShell::GetWindowUpdater (void) const +::sd::WindowUpdater* ViewShell::GetWindowUpdater() const { return mpWindowUpdater.get(); } -ViewShellBase& ViewShell::GetViewShellBase (void) const +ViewShellBase& ViewShell::GetViewShellBase() const { return *static_cast<ViewShellBase*>(GetViewShell()); } -ViewShell::ShellType ViewShell::GetShellType (void) const +ViewShell::ShellType ViewShell::GetShellType() const { return meShellType; } -DrawDocShell* ViewShell::GetDocSh (void) const +DrawDocShell* ViewShell::GetDocSh() const { return GetViewShellBase().GetDocShell(); } -SdDrawDocument* ViewShell::GetDoc (void) const +SdDrawDocument* ViewShell::GetDoc() const { return GetViewShellBase().GetDocument(); } @@ -1430,7 +1430,7 @@ void ViewShell::DisposeFunctions() } } -bool ViewShell::IsMainViewShell (void) const +bool ViewShell::IsMainViewShell() const { return mpImpl->mbIsMainViewShell; } @@ -1545,7 +1545,7 @@ ViewShellObjectBarFactory::ViewShellObjectBarFactory ( { } -ViewShellObjectBarFactory::~ViewShellObjectBarFactory (void) +ViewShellObjectBarFactory::~ViewShellObjectBarFactory() { for (ShellCache::iterator aI(maShellCache.begin()); aI!=maShellCache.end(); |