diff options
Diffstat (limited to 'sdext/source/presenter')
60 files changed, 720 insertions, 720 deletions
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 148e5661a371..18136b1e792d 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -70,16 +70,16 @@ public: const css::lang::Locale& rLocale, const sal_Int16 nRole, const OUString& rsName); - void LateInitialization (void); + void LateInitialization(); - virtual ~AccessibleObject (void); + virtual ~AccessibleObject(); virtual void SetWindow ( const css::uno::Reference<css::awt::XWindow>& rxContentWindow, const css::uno::Reference<css::awt::XWindow>& rxBorderWindow); void SetAccessibleParent (const css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleParent); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void AddChild (const ::rtl::Reference<AccessibleObject>& rpChild); void RemoveChild (const ::rtl::Reference<AccessibleObject>& rpChild); @@ -92,7 +92,7 @@ public: const css::uno::Any& rOldValue, const css::uno::Any& rNewValue); - void UpdateStateSet (void); + void UpdateStateSet(); //----- XComponent --------------------------------------------------- @@ -106,42 +106,42 @@ public: //----- XAccessible ------------------------------------------------------- virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) + getAccessibleContext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleContext ---------------------------------------------- - virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) + virtual css::uno::Reference< css::accessibility::XAccessible> SAL_CALL getAccessibleParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int16 SAL_CALL getAccessibleRole (void) + virtual sal_Int16 SAL_CALL getAccessibleRole() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleDescription (void) + virtual OUString SAL_CALL getAccessibleDescription() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName (void) + virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet (void) + getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::lang::Locale SAL_CALL getLocale (void) + virtual css::lang::Locale SAL_CALL getLocale() throw (css::uno::RuntimeException, css::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; @@ -156,25 +156,25 @@ public: const css::awt::Point& aPoint) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Rectangle SAL_CALL getBounds (void) + virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Point SAL_CALL getLocation (void) + virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Point SAL_CALL getLocationOnScreen (void) + virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::awt::Size SAL_CALL getSize (void) + virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL grabFocus (void) + virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getForeground (void) + virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getBackground (void) + virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleEventBroadcaster -------------------------------------- @@ -218,9 +218,9 @@ protected: ::std::vector<rtl::Reference<AccessibleObject> > maChildren; ::std::vector<Reference<XAccessibleEventListener> > maListeners; - virtual awt::Point GetRelativeLocation (void); - virtual awt::Size GetSize (void); - virtual awt::Point GetAbsoluteParentLocation (void); + virtual awt::Point GetRelativeLocation(); + virtual awt::Size GetSize(); + virtual awt::Point GetAbsoluteParentLocation(); virtual bool GetWindowState (const sal_Int16 nType) const; @@ -246,13 +246,13 @@ class AccessibleStateSet { public: AccessibleStateSet (const sal_Int32 nStateSet); - virtual ~AccessibleStateSet (void); + virtual ~AccessibleStateSet(); static sal_uInt32 GetStateMask (const sal_Int16 nType); //----- XAccessibleStateSet ----------------------------------------------- - virtual sal_Bool SAL_CALL isEmpty (void) + virtual sal_Bool SAL_CALL isEmpty() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL contains (sal_Int16 nState) @@ -261,7 +261,7 @@ public: virtual sal_Bool SAL_CALL containsAll (const css::uno::Sequence<sal_Int16>& rStateSet) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates (void) + virtual css::uno::Sequence<sal_Int16> SAL_CALL getStates() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -281,8 +281,8 @@ class AccessibleRelationSet public AccessibleRelationSetInterfaceBase { public: - AccessibleRelationSet (void); - virtual ~AccessibleRelationSet (void); + AccessibleRelationSet(); + virtual ~AccessibleRelationSet(); void AddRelation ( const sal_Int16 nRelationType, @@ -290,7 +290,7 @@ public: //----- XAccessibleRelationSet -------------------------------------------- - virtual sal_Int32 SAL_CALL getRelationCount (void) + virtual sal_Int32 SAL_CALL getRelationCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual AccessibleRelation SAL_CALL getRelation (sal_Int32 nIndex) @@ -326,17 +326,17 @@ public: const SharedPresenterTextParagraph& rpParagraph, const sal_Int32 nParagraphIndex); - virtual ~AccessibleParagraph (void); + virtual ~AccessibleParagraph(); //----- XAccessibleContext ------------------------------------------------ virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet (void) + getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XAccessibleText --------------------------------------------------- - virtual sal_Int32 SAL_CALL getCaretPosition (void) + virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setCaretPosition (sal_Int32 nIndex) @@ -354,25 +354,25 @@ public: virtual css::awt::Rectangle SAL_CALL getCharacterBounds (sal_Int32 nIndex) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getCharacterCount (void) + virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getIndexAtPoint (const css::awt::Point& rPoint) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getSelectedText (void) + virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSelectionStart (void) + virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSelectionEnd (void) + virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setSelection (sal_Int32 nStartIndex, sal_Int32 nEndIndex) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getText (void) + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTextRange ( @@ -405,9 +405,9 @@ public: throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual awt::Point GetRelativeLocation (void) SAL_OVERRIDE; - virtual awt::Size GetSize (void) SAL_OVERRIDE; - virtual awt::Point GetAbsoluteParentLocation (void) SAL_OVERRIDE; + virtual awt::Point GetRelativeLocation() SAL_OVERRIDE; + virtual awt::Size GetSize() SAL_OVERRIDE; + virtual awt::Point GetAbsoluteParentLocation() SAL_OVERRIDE; virtual bool GetWindowState (const sal_Int16 nType) const SAL_OVERRIDE; private: @@ -507,7 +507,7 @@ private: const sal_Int32 nOldCharacterIndex, const sal_Int32 nNewParagraphIndex, const sal_Int32 nNewCharacterIndex); - void HandleTextChange (void); + void HandleTextChange(); }; //===== AccessibleFocusManager ================================================ @@ -518,7 +518,7 @@ private: class AccessibleFocusManager { public: - static ::boost::shared_ptr<AccessibleFocusManager> Instance (void); + static ::boost::shared_ptr<AccessibleFocusManager> Instance(); void AddFocusableObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject); void RemoveFocusableObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject); @@ -529,7 +529,7 @@ private: static ::boost::shared_ptr<AccessibleFocusManager> mpInstance; ::std::vector<rtl::Reference<PresenterAccessible::AccessibleObject> > maFocusableObjects; - AccessibleFocusManager (void); + AccessibleFocusManager(); }; //===== PresenterAccessible =================================================== @@ -557,11 +557,11 @@ PresenterAccessible::PresenterAccessible ( mxMainPane->setAccessible(this); } -PresenterAccessible::~PresenterAccessible (void) +PresenterAccessible::~PresenterAccessible() { } -PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane (void) const +PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane() const { PresenterPaneContainer::SharedPaneDescriptor pPreviewPane; @@ -583,7 +583,7 @@ PresenterPaneContainer::SharedPaneDescriptor PresenterAccessible::GetPreviewPane return pPreviewPane; } -void PresenterAccessible::UpdateAccessibilityHierarchy (void) +void PresenterAccessible::UpdateAccessibilityHierarchy() { if ( ! mpPresenterController.is()) return; @@ -712,7 +712,7 @@ void PresenterAccessible::NotifyCurrentSlideChange ( AccessibleFocusManager::Instance()->FocusObject(mpAccessiblePreview); } -void SAL_CALL PresenterAccessible::disposing (void) +void SAL_CALL PresenterAccessible::disposing() { UpdateAccessibilityHierarchy( NULL, @@ -737,7 +737,7 @@ void SAL_CALL PresenterAccessible::disposing (void) //----- XAccessible ----------------------------------------------------------- -Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext (void) +Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext() throw (css::uno::RuntimeException, std::exception) { if ( ! mpAccessibleConsole.is()) @@ -820,12 +820,12 @@ PresenterAccessible::AccessibleObject::AccessibleObject ( { } -void PresenterAccessible::AccessibleObject::LateInitialization (void) +void PresenterAccessible::AccessibleObject::LateInitialization() { AccessibleFocusManager::Instance()->AddFocusableObject(this); } -PresenterAccessible::AccessibleObject::~AccessibleObject (void) +PresenterAccessible::AccessibleObject::~AccessibleObject() { } @@ -860,7 +860,7 @@ void PresenterAccessible::AccessibleObject::SetAccessibleParent ( mxParentAccessible = rxAccessibleParent; } -void SAL_CALL PresenterAccessible::AccessibleObject::disposing (void) +void SAL_CALL PresenterAccessible::AccessibleObject::disposing() { AccessibleFocusManager::Instance()->RemoveFocusableObject(this); SetWindow(NULL, NULL); @@ -869,7 +869,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::disposing (void) //----- XAccessible ------------------------------------------------------- Reference<XAccessibleContext> SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleContext (void) + PresenterAccessible::AccessibleObject::getAccessibleContext() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -879,7 +879,7 @@ Reference<XAccessibleContext> SAL_CALL //----- XAccessibleContext ---------------------------------------------- -sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getAccessibleChildCount() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -902,7 +902,7 @@ Reference<XAccessible> SAL_CALL } Reference<XAccessible> SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleParent (void) + PresenterAccessible::AccessibleObject::getAccessibleParent() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -911,7 +911,7 @@ Reference<XAccessible> SAL_CALL } sal_Int32 SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleIndexInParent (void) + PresenterAccessible::AccessibleObject::getAccessibleIndexInParent() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -933,7 +933,7 @@ sal_Int32 SAL_CALL } sal_Int16 SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleRole (void) + PresenterAccessible::AccessibleObject::getAccessibleRole() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -942,7 +942,7 @@ sal_Int16 SAL_CALL } OUString SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleDescription (void) + PresenterAccessible::AccessibleObject::getAccessibleDescription() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -951,7 +951,7 @@ OUString SAL_CALL } OUString SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleName (void) + PresenterAccessible::AccessibleObject::getAccessibleName() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -960,7 +960,7 @@ OUString SAL_CALL } Reference<XAccessibleRelationSet> SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleRelationSet (void) + PresenterAccessible::AccessibleObject::getAccessibleRelationSet() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -969,7 +969,7 @@ Reference<XAccessibleRelationSet> SAL_CALL } Reference<XAccessibleStateSet> SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleStateSet (void) + PresenterAccessible::AccessibleObject::getAccessibleStateSet() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -978,7 +978,7 @@ Reference<XAccessibleStateSet> SAL_CALL } lang::Locale SAL_CALL - PresenterAccessible::AccessibleObject::getLocale (void) + PresenterAccessible::AccessibleObject::getLocale() throw (RuntimeException, IllegalAccessibleComponentStateException, std::exception) { @@ -1023,7 +1023,7 @@ Reference<XAccessible> SAL_CALL return Reference<XAccessible>(); } -awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void) +awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1036,7 +1036,7 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleObject::getBounds (void) return awt::Rectangle (aLocation.X, aLocation.Y, aSize.Width, aSize.Height); } -awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void) +awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1046,7 +1046,7 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocation (void) return aLocation; } -awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen (void) +awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1059,7 +1059,7 @@ awt::Point SAL_CALL PresenterAccessible::AccessibleObject::getLocationOnScreen ( aRelativeLocation.Y + aParentLocationOnScreen.Y); } -awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void) +awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1069,7 +1069,7 @@ awt::Size SAL_CALL PresenterAccessible::AccessibleObject::getSize (void) return aSize; } -void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void) +void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1079,7 +1079,7 @@ void SAL_CALL PresenterAccessible::AccessibleObject::grabFocus (void) mxContentWindow->setFocus(); } -sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1087,7 +1087,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getForeground (void) return 0x00ffffff; } -sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleObject::getBackground() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1205,7 +1205,7 @@ bool PresenterAccessible::AccessibleObject::GetWindowState (const sal_Int16 nTyp } } -void PresenterAccessible::AccessibleObject::UpdateStateSet (void) +void PresenterAccessible::AccessibleObject::UpdateStateSet() { UpdateState(AccessibleStateType::FOCUSABLE, true); UpdateState(AccessibleStateType::VISIBLE, true); @@ -1372,7 +1372,7 @@ AccessibleStateSet::AccessibleStateSet (const sal_Int32 nStateSet) { } -AccessibleStateSet::~AccessibleStateSet (void) +AccessibleStateSet::~AccessibleStateSet() { } @@ -1388,7 +1388,7 @@ sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState) //----- XAccessibleStateSet --------------------------------------------------- -sal_Bool SAL_CALL AccessibleStateSet::isEmpty (void) +sal_Bool SAL_CALL AccessibleStateSet::isEmpty() throw (css::uno::RuntimeException, std::exception) { return mnStateSet==0; @@ -1411,7 +1411,7 @@ sal_Bool SAL_CALL AccessibleStateSet::containsAll (const css::uno::Sequence<sal_ return sal_True; } -css::uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates (void) +css::uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates() throw (css::uno::RuntimeException, std::exception) { ::std::vector<sal_Int16> aStates; @@ -1424,13 +1424,13 @@ css::uno::Sequence<sal_Int16> SAL_CALL AccessibleStateSet::getStates (void) //===== AccessibleRelationSet ================================================= -AccessibleRelationSet::AccessibleRelationSet (void) +AccessibleRelationSet::AccessibleRelationSet() : AccessibleRelationSetInterfaceBase(m_aMutex), maRelations() { } -AccessibleRelationSet::~AccessibleRelationSet (void) +AccessibleRelationSet::~AccessibleRelationSet() { } @@ -1446,7 +1446,7 @@ void AccessibleRelationSet::AddRelation ( //----- XAccessibleRelationSet ------------------------------------------------ -sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount (void) +sal_Int32 SAL_CALL AccessibleRelationSet::getRelationCount() throw (css::uno::RuntimeException, std::exception) { return maRelations.size(); @@ -1501,14 +1501,14 @@ PresenterAccessible::AccessibleParagraph::AccessibleParagraph ( { } -PresenterAccessible::AccessibleParagraph::~AccessibleParagraph (void) +PresenterAccessible::AccessibleParagraph::~AccessibleParagraph() { } //----- XAccessibleContext ---------------------------------------------------- Reference<XAccessibleRelationSet> SAL_CALL - PresenterAccessible::AccessibleParagraph::getAccessibleRelationSet (void) + PresenterAccessible::AccessibleParagraph::getAccessibleRelationSet() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1537,7 +1537,7 @@ Reference<XAccessibleRelationSet> SAL_CALL //----- XAccessibleText ------------------------------------------------------- -sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCaretPosition() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1628,7 +1628,7 @@ awt::Rectangle SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterBo return aCharacterBox; } -sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1653,7 +1653,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( return nIndex; } -OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (void) +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1661,7 +1661,7 @@ OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectedText (voi return getTextRange(getSelectionStart(), getSelectionEnd()); } -sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1669,7 +1669,7 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionStart ( return getCaretPosition(); } -sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd (void) +sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1688,7 +1688,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( return setCaretPosition(nStartIndex); } -OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText (void) +OUString SAL_CALL PresenterAccessible::AccessibleParagraph::getText() throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); @@ -1783,7 +1783,7 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText ( //----- protected ------------------------------------------------------------- -awt::Point PresenterAccessible::AccessibleParagraph::GetRelativeLocation (void) +awt::Point PresenterAccessible::AccessibleParagraph::GetRelativeLocation() { awt::Point aLocation (AccessibleObject::GetRelativeLocation()); if (mpParagraph) @@ -1796,7 +1796,7 @@ awt::Point PresenterAccessible::AccessibleParagraph::GetRelativeLocation (void) return aLocation; } -awt::Size PresenterAccessible::AccessibleParagraph::GetSize (void) +awt::Size PresenterAccessible::AccessibleParagraph::GetSize() { if (mpParagraph) return mpParagraph->GetSize(); @@ -1804,7 +1804,7 @@ awt::Size PresenterAccessible::AccessibleParagraph::GetSize (void) return AccessibleObject::GetSize(); } -awt::Point PresenterAccessible::AccessibleParagraph::GetAbsoluteParentLocation (void) +awt::Point PresenterAccessible::AccessibleParagraph::GetAbsoluteParentLocation() { if (mxParentAccessible.is()) { @@ -1889,7 +1889,7 @@ void AccessibleNotes::SetTextView ( mpTextView->GetCaret()->SetCaretMotionBroadcaster( ::boost::function<void(sal_Int32,sal_Int32,sal_Int32,sal_Int32)>()); mpTextView->SetTextChangeBroadcaster( - ::boost::function<void(void)>()); + ::boost::function<void()>()); } mpTextView = rpTextView; @@ -1999,7 +1999,7 @@ void AccessibleNotes::NotifyCaretChange ( } } -void AccessibleNotes::HandleTextChange (void) +void AccessibleNotes::HandleTextChange() { SetTextView(mpTextView); } @@ -2008,7 +2008,7 @@ void AccessibleNotes::HandleTextChange (void) ::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::mpInstance; -::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::Instance (void) +::boost::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::Instance() { if ( ! mpInstance) { @@ -2017,7 +2017,7 @@ void AccessibleNotes::HandleTextChange (void) return mpInstance; } -AccessibleFocusManager::AccessibleFocusManager (void) +AccessibleFocusManager::AccessibleFocusManager() : maFocusableObjects() { } diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index 58317e73afa7..c3c429ffb755 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -62,22 +62,22 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController, const css::uno::Reference<css::drawing::framework::XPane>& rxMainPane); - virtual ~PresenterAccessible (void); + virtual ~PresenterAccessible(); void SetAccessibleParent (const css::uno::Reference<css::accessibility::XAccessible>& rxAccessibleParent); - void UpdateAccessibilityHierarchy (void); + void UpdateAccessibilityHierarchy(); void NotifyCurrentSlideChange ( const sal_Int32 nCurrentSlideIndex, const sal_Int32 nSlideCount); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; //----- XAccessible ------------------------------------------------------- virtual css::uno::Reference<css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext (void) + getAccessibleContext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //----- XFocusListener ---------------------------------------------------- @@ -123,7 +123,7 @@ private: const css::uno::Reference<css::awt::XWindow>& rxNotesContentWindow, const css::uno::Reference<css::awt::XWindow>& rxNotesBorderWindow, const ::boost::shared_ptr<PresenterTextView>& rpNotesTextView); - PresenterPaneContainer::SharedPaneDescriptor GetPreviewPane (void) const; + PresenterPaneContainer::SharedPaneDescriptor GetPreviewPane() const; }; } } // end of namespace ::sd::presenter diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index afc5d24f5f4f..c8e7ac92ce87 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -96,7 +96,7 @@ void PresenterBitmapContainer::Initialize ( } } -PresenterBitmapContainer::~PresenterBitmapContainer (void) +PresenterBitmapContainer::~PresenterBitmapContainer() { maIconContainer.clear(); } @@ -280,7 +280,7 @@ PresenterBitmapContainer::BitmapDescriptor::TexturingMode //===== PresenterBitmapContainer::BitmapSet =================================== -PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor (void) +PresenterBitmapContainer::BitmapDescriptor::BitmapDescriptor() : mnWidth(0), mnHeight(0), mnXOffset(0), diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index 05092f59c4b2..22349efa1e29 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -49,7 +49,7 @@ public: class BitmapDescriptor { public: - BitmapDescriptor (void); + BitmapDescriptor(); BitmapDescriptor (const ::boost::shared_ptr<BitmapDescriptor>& rpDefault); enum Mode {Normal, MouseOver, ButtonDown, Disabled, Mask}; @@ -99,7 +99,7 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper = NULL); - ~PresenterBitmapContainer (void); + ~PresenterBitmapContainer(); void Initialize ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext); diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index c7696bb8cd32..a4c23d28dcff 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -144,11 +144,11 @@ PresenterButton::PresenterButton ( } } -PresenterButton::~PresenterButton (void) +PresenterButton::~PresenterButton() { } -void SAL_CALL PresenterButton::disposing (void) +void SAL_CALL PresenterButton::disposing() { if (mxCanvas.is()) { @@ -222,7 +222,7 @@ void PresenterButton::SetCanvas ( } } -css::geometry::IntegerSize2D PresenterButton::GetSize (void) +css::geometry::IntegerSize2D PresenterButton::GetSize() { if (maButtonSize.Width < 0) CalculateButtonSize(); @@ -363,7 +363,7 @@ void SAL_CALL PresenterButton::disposing (const css::lang::EventObject& rEvent) -css::geometry::IntegerSize2D PresenterButton::CalculateButtonSize (void) +css::geometry::IntegerSize2D PresenterButton::CalculateButtonSize() { if (mpFont.get()!=NULL && !mpFont->mxFont.is() && mxCanvas.is()) mpFont->PrepareFont(mxCanvas); @@ -421,7 +421,7 @@ void PresenterButton::RenderButton ( aRenderState); } -void PresenterButton::Invalidate (void) +void PresenterButton::Invalidate() { mpPresenterController->GetPaintManager()->Invalidate(mxWindow); } @@ -439,7 +439,7 @@ Reference<rendering::XBitmap> PresenterButton::GetBitmap ( } } -void PresenterButton::SetupButtonBitmaps (void) +void PresenterButton::SetupButtonBitmaps() { if ( ! mxCanvas.is()) return; @@ -503,7 +503,7 @@ Reference<beans::XPropertySet> PresenterButton::GetConfigurationProperties ( UNO_QUERY); } -void PresenterButton::ThrowIfDisposed (void) const +void PresenterButton::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index eb9a60af3b67..5af832883ddc 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -64,15 +64,15 @@ public: const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas, const OUString& rsConfigurationName); - virtual ~PresenterButton (void); + virtual ~PresenterButton(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void SetCenter (const css::geometry::RealPoint2D& rLocation); void SetCanvas ( const css::uno::Reference<css::rendering::XCanvas>& rxParentCanvas, const css::uno::Reference<css::awt::XWindow>& rxParentWindow); - css::geometry::IntegerSize2D GetSize (void); + css::geometry::IntegerSize2D GetSize(); // XWindowListener @@ -152,17 +152,17 @@ private: const SharedBitmapDescriptor& rpLeft, const SharedBitmapDescriptor& rpCenter, const SharedBitmapDescriptor& rpRight); - css::geometry::IntegerSize2D CalculateButtonSize (void); - void Invalidate (void); + css::geometry::IntegerSize2D CalculateButtonSize(); + void Invalidate(); static css::uno::Reference<css::rendering::XBitmap> GetBitmap ( const SharedBitmapDescriptor& mpIcon, const PresenterBitmapDescriptor::Mode eMode); - void SetupButtonBitmaps (void); + void SetupButtonBitmaps(); static css::uno::Reference<css::beans::XPropertySet> GetConfigurationProperties ( const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext, const OUString& rsConfgurationName); - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx index 596fda71237c..dc07dafd84d6 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.cxx +++ b/sdext/source/presenter/PresenterCanvasHelper.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::uno; namespace sdext { namespace presenter { -PresenterCanvasHelper::PresenterCanvasHelper (void) +PresenterCanvasHelper::PresenterCanvasHelper() : maDefaultViewState( geometry::AffineMatrix2D(1,0,0, 0,1,0), NULL), @@ -42,7 +42,7 @@ PresenterCanvasHelper::PresenterCanvasHelper (void) { } -PresenterCanvasHelper::~PresenterCanvasHelper (void) +PresenterCanvasHelper::~PresenterCanvasHelper() { } diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx index 6b20cc7c841d..35a813e95532 100644 --- a/sdext/source/presenter/PresenterCanvasHelper.hxx +++ b/sdext/source/presenter/PresenterCanvasHelper.hxx @@ -38,8 +38,8 @@ class PresenterCanvasHelper : ::boost::noncopyable { public: - PresenterCanvasHelper (void); - ~PresenterCanvasHelper (void); + PresenterCanvasHelper(); + ~PresenterCanvasHelper(); void Paint ( const SharedBitmapDescriptor& rpBitmap, diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx index 641fa4d20f45..16914a9e917b 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.cxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx @@ -83,11 +83,11 @@ PresenterConfigurationAccess::PresenterConfigurationAccess ( } } -PresenterConfigurationAccess::~PresenterConfigurationAccess (void) +PresenterConfigurationAccess::~PresenterConfigurationAccess() { } -bool PresenterConfigurationAccess::IsValid (void) const +bool PresenterConfigurationAccess::IsValid() const { return mxRoot.is(); } @@ -176,7 +176,7 @@ Reference<beans::XPropertySet> PresenterConfigurationAccess::GetNodeProperties ( return Reference<beans::XPropertySet>(GetConfigurationNode(rxNode, rsPathToNode), UNO_QUERY); } -void PresenterConfigurationAccess::CommitChanges (void) +void PresenterConfigurationAccess::CommitChanges() { Reference<util::XChangesBatch> xConfiguration (mxRoot, UNO_QUERY); if (xConfiguration.is()) diff --git a/sdext/source/presenter/PresenterConfigurationAccess.hxx b/sdext/source/presenter/PresenterConfigurationAccess.hxx index 9add5205a348..ef2a6b443057 100644 --- a/sdext/source/presenter/PresenterConfigurationAccess.hxx +++ b/sdext/source/presenter/PresenterConfigurationAccess.hxx @@ -67,7 +67,7 @@ public: const OUString& rsRootName, WriteMode eMode); - ~PresenterConfigurationAccess (void); + ~PresenterConfigurationAccess(); /** Return a configuration node below the root of the called object. @param rsPathToNode @@ -81,7 +81,7 @@ public: GoToChild() left the called PresenterConfigurationAccess object in a valid state. */ - bool IsValid (void) const; + bool IsValid() const; /** Move the focused node to the (possibly indirect) child specified by the given path. */ @@ -119,7 +119,7 @@ public: This call is ignored when the called ConfigurationAccess object was not create with read-write mode. */ - void CommitChanges (void); + void CommitChanges(); typedef ::boost::function<void( const OUString&, diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index e416a732c870..180e2fdfc043 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -187,11 +187,11 @@ PresenterController::PresenterController ( } } -PresenterController::~PresenterController (void) +PresenterController::~PresenterController() { } -void PresenterController::disposing (void) +void PresenterController::disposing() { maInstances.erase(mxController->getFrame()); @@ -320,7 +320,7 @@ void PresenterController::GetSlides (const sal_Int32 nOffset) } } -void PresenterController::UpdatePaneTitles (void) +void PresenterController::UpdatePaneTitles() { if ( ! mxSlideShowController.is()) return; @@ -415,7 +415,7 @@ void PresenterController::UpdatePaneTitles (void) } } -void PresenterController::UpdateViews (void) +void PresenterController::UpdateViews() { // Tell all views about the slides they should display. PresenterPaneContainer::PaneList::const_iterator iPane; @@ -449,43 +449,43 @@ PresenterTheme::SharedFontDescriptor return PresenterTheme::SharedFontDescriptor(); } -::boost::shared_ptr<PresenterTheme> PresenterController::GetTheme (void) const +::boost::shared_ptr<PresenterTheme> PresenterController::GetTheme() const { return mpTheme; } -::rtl::Reference<PresenterWindowManager> PresenterController::GetWindowManager (void) const +::rtl::Reference<PresenterWindowManager> PresenterController::GetWindowManager() const { return mpWindowManager; } Reference<presentation::XSlideShowController> - PresenterController::GetSlideShowController(void) const + PresenterController::GetSlideShowController() const { return mxSlideShowController; } -rtl::Reference<PresenterPaneContainer> PresenterController::GetPaneContainer (void) const +rtl::Reference<PresenterPaneContainer> PresenterController::GetPaneContainer() const { return mpPaneContainer; } -::rtl::Reference<PresenterPaneBorderPainter> PresenterController::GetPaneBorderPainter (void) const +::rtl::Reference<PresenterPaneBorderPainter> PresenterController::GetPaneBorderPainter() const { return mpPaneBorderPainter; } -::boost::shared_ptr<PresenterCanvasHelper> PresenterController::GetCanvasHelper (void) const +::boost::shared_ptr<PresenterCanvasHelper> PresenterController::GetCanvasHelper() const { return mpCanvasHelper; } -Reference<drawing::XPresenterHelper> PresenterController::GetPresenterHelper (void) const +Reference<drawing::XPresenterHelper> PresenterController::GetPresenterHelper() const { return mxPresenterHelper; } -::boost::shared_ptr<PresenterPaintManager> PresenterController::GetPaintManager (void) const +::boost::shared_ptr<PresenterPaintManager> PresenterController::GetPaintManager() const { return mpPaintManager; } @@ -568,12 +568,12 @@ util::URL PresenterController::CreateURLFromString (const OUString& rsURL) const } Reference<drawing::framework::XConfigurationController> - PresenterController::GetConfigurationController (void) const + PresenterController::GetConfigurationController() const { return mxConfigurationController; } -Reference<drawing::XDrawPage> PresenterController::GetCurrentSlide (void) const +Reference<drawing::XDrawPage> PresenterController::GetCurrentSlide() const { return mxCurrentSlide; } @@ -1142,7 +1142,7 @@ void PresenterController::LoadTheme (const Reference<XPane>& rxPane) mpTheme.reset(new PresenterTheme(mxComponentContext, OUString(), rxPane->getCanvas())); } -double PresenterController::GetSlideAspectRatio (void) const +double PresenterController::GetSlideAspectRatio() const { double nSlideAspectRatio (28.0/21.0); @@ -1203,7 +1203,7 @@ void PresenterController::UpdatePendingSlideNumber (const sal_Int32 nPendingSlid 0)); } -void PresenterController::ThrowIfDisposed (void) const +void PresenterController::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -1214,7 +1214,7 @@ void PresenterController::ThrowIfDisposed (void) const } } -void PresenterController::SwitchMonitors (void) +void PresenterController::SwitchMonitors() { Reference<lang::XEventListener> xScreen( mxScreen ); if (!xScreen.is()) diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx index ff2eac9258f8..88d3d3ad1ca7 100644 --- a/sdext/source/presenter/PresenterController.hxx +++ b/sdext/source/presenter/PresenterController.hxx @@ -87,9 +87,9 @@ public: const css::uno::Reference<css::presentation::XSlideShowController>& rxSlideShowController, const rtl::Reference<PresenterPaneContainer>& rpPaneContainer, const css::uno::Reference<css::drawing::framework::XResourceId>& rxMainPaneId); - virtual ~PresenterController (void); + virtual ~PresenterController(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void UpdateCurrentSlide (const sal_Int32 nOffset); @@ -97,34 +97,34 @@ public: GetViewBackground (const OUString& rsViewURL) const; PresenterTheme::SharedFontDescriptor GetViewFont (const OUString& rsViewURL) const; - ::boost::shared_ptr<PresenterTheme> GetTheme (void) const; - ::rtl::Reference<PresenterWindowManager> GetWindowManager (void) const; + ::boost::shared_ptr<PresenterTheme> GetTheme() const; + ::rtl::Reference<PresenterWindowManager> GetWindowManager() const; css::uno::Reference<css::presentation::XSlideShowController> - GetSlideShowController (void) const; - rtl::Reference<PresenterPaneContainer> GetPaneContainer (void) const; - ::rtl::Reference<PresenterPaneBorderPainter> GetPaneBorderPainter (void) const; - ::boost::shared_ptr<PresenterCanvasHelper> GetCanvasHelper (void) const; - css::uno::Reference<css::drawing::XPresenterHelper> GetPresenterHelper (void) const; - ::boost::shared_ptr<PresenterPaintManager> GetPaintManager (void) const; - void HideSlideSorter (void); - double GetSlideAspectRatio (void) const; + GetSlideShowController() const; + rtl::Reference<PresenterPaneContainer> GetPaneContainer() const; + ::rtl::Reference<PresenterPaneBorderPainter> GetPaneBorderPainter() const; + ::boost::shared_ptr<PresenterCanvasHelper> GetCanvasHelper() const; + css::uno::Reference<css::drawing::XPresenterHelper> GetPresenterHelper() const; + ::boost::shared_ptr<PresenterPaintManager> GetPaintManager() const; + void HideSlideSorter(); + double GetSlideAspectRatio() const; void ShowView (const OUString& rsViewURL); void HideView (const OUString& rsViewURL); - void SwitchMonitors (void); + void SwitchMonitors(); void DispatchUnoCommand (const OUString& rsCommand) const; css::uno::Reference<css::frame::XDispatch> GetDispatch ( const css::util::URL& rURL) const; css::util::URL CreateURLFromString (const OUString& rsURL) const; css::uno::Reference<css::drawing::framework::XConfigurationController> - GetConfigurationController (void) const; - css::uno::Reference<css::drawing::XDrawPage> GetCurrentSlide (void) const; + GetConfigurationController() const; + css::uno::Reference<css::drawing::XDrawPage> GetCurrentSlide() const; static bool HasTransition (css::uno::Reference<css::drawing::XDrawPage>& rxPage); static bool HasCustomAnimation (css::uno::Reference<css::drawing::XDrawPage>& rxPage); void SetAccessibilityActiveState (const bool bIsActive); - bool IsAccessibilityActive (void) const { return mbIsAccessibilityActive;} + bool IsAccessibilityActive() const { return mbIsAccessibilityActive;} void HandleMouseClick (const css::awt::MouseEvent& rEvent); - void UpdatePaneTitles (void); + void UpdatePaneTitles(); /** Request activation or deactivation of (some of) the views according to the given parameters. @@ -218,10 +218,10 @@ private: ::rtl::Reference<PresenterAccessible> mpAccessibleObject; bool mbIsAccessibilityActive; - void InitializePresenterScreen (void); + void InitializePresenterScreen(); void InitializeSlideShowView (const css::uno::Reference<css::uno::XInterface>& rxView); void GetSlides (const sal_Int32 nOffset); - void UpdateViews (void); + void UpdateViews(); void InitializeMainPane (const css::uno::Reference<css::drawing::framework::XPane>& rxPane); void LoadTheme (const css::uno::Reference<css::drawing::framework::XPane>& rxPane); void UpdatePendingSlideNumber (const sal_Int32 nPendingSlideNumber); @@ -238,7 +238,7 @@ private: */ void HandleNumericKeyPress (const sal_Int32 nKey, const sal_Int32 nModifiers); - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; } } // end of namespace ::sdext::presenter diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx index 664f460056fd..4ee448c91e1a 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx @@ -45,11 +45,11 @@ PresenterCurrentSlideObserver::PresenterCurrentSlideObserver ( } } -PresenterCurrentSlideObserver::~PresenterCurrentSlideObserver (void) +PresenterCurrentSlideObserver::~PresenterCurrentSlideObserver() { } -void SAL_CALL PresenterCurrentSlideObserver::disposing (void) +void SAL_CALL PresenterCurrentSlideObserver::disposing() { // Disconnect form the slide show controller. if(mxSlideShowController.is()) @@ -83,12 +83,12 @@ void SAL_CALL PresenterCurrentSlideObserver::repeat ( (void)rNode; } -void SAL_CALL PresenterCurrentSlideObserver::paused (void) +void SAL_CALL PresenterCurrentSlideObserver::paused() throw (com::sun::star::uno::RuntimeException, std::exception) { } -void SAL_CALL PresenterCurrentSlideObserver::resumed (void) +void SAL_CALL PresenterCurrentSlideObserver::resumed() throw (css::uno::RuntimeException, std::exception) { } @@ -110,19 +110,19 @@ void SAL_CALL PresenterCurrentSlideObserver::hyperLinkClicked (const OUString &) { } -void SAL_CALL PresenterCurrentSlideObserver::slideTransitionStarted (void) +void SAL_CALL PresenterCurrentSlideObserver::slideTransitionStarted() throw (css::uno::RuntimeException, std::exception) { if( mpPresenterController.is() ) mpPresenterController->UpdateCurrentSlide(0); } -void SAL_CALL PresenterCurrentSlideObserver::slideTransitionEnded (void) +void SAL_CALL PresenterCurrentSlideObserver::slideTransitionEnded() throw (css::uno::RuntimeException, std::exception) { } -void SAL_CALL PresenterCurrentSlideObserver::slideAnimationsEnded (void) +void SAL_CALL PresenterCurrentSlideObserver::slideAnimationsEnded() throw (css::uno::RuntimeException, std::exception) { } diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx index a13ae02018f1..1e9848269222 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx @@ -52,9 +52,9 @@ public: PresenterCurrentSlideObserver ( const ::rtl::Reference<PresenterController>& rxPresenterController, const css::uno::Reference<css::presentation::XSlideShowController>& rxSlideShowController); - virtual ~PresenterCurrentSlideObserver (void); + virtual ~PresenterCurrentSlideObserver(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XSlideShowListener virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx index 6bb3a8d9fe0a..b3dc3859a58d 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.cxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx @@ -60,7 +60,7 @@ PresenterFrameworkObserver::PresenterFrameworkObserver ( } } -PresenterFrameworkObserver::~PresenterFrameworkObserver (void) +PresenterFrameworkObserver::~PresenterFrameworkObserver() { } @@ -75,19 +75,19 @@ void PresenterFrameworkObserver::RunOnUpdateEnd ( rAction); } -bool PresenterFrameworkObserver::True (void) +bool PresenterFrameworkObserver::True() { return true; } -void SAL_CALL PresenterFrameworkObserver::disposing (void) +void SAL_CALL PresenterFrameworkObserver::disposing() { if ( ! maAction.empty()) maAction(false); Shutdown(); } -void PresenterFrameworkObserver::Shutdown (void) +void PresenterFrameworkObserver::Shutdown() { maAction = Action(); maPredicate = Predicate(); diff --git a/sdext/source/presenter/PresenterFrameworkObserver.hxx b/sdext/source/presenter/PresenterFrameworkObserver.hxx index c9df45487355..3ebc2cb59140 100644 --- a/sdext/source/presenter/PresenterFrameworkObserver.hxx +++ b/sdext/source/presenter/PresenterFrameworkObserver.hxx @@ -42,14 +42,14 @@ class PresenterFrameworkObserver public PresenterFrameworkObserverInterfaceBase { public: - typedef ::boost::function<bool(void)> Predicate; + typedef ::boost::function<bool()> Predicate; typedef ::boost::function<void(bool)> Action; static void RunOnUpdateEnd ( const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController, const Action& rAction); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyConfigurationChange ( @@ -77,13 +77,13 @@ private: const OUString& rsEventName, const Predicate& rPredicate, const Action& rAction); - virtual ~PresenterFrameworkObserver (void); + virtual ~PresenterFrameworkObserver(); - void Shutdown (void); + void Shutdown(); /** Predicate that always returns true. */ - static bool True (void); + static bool True(); }; } } // end of namespace ::sdext::presenter diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index d0d22bfc6250..c2cb2e0e0864 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -51,11 +51,11 @@ namespace { class LineDescriptor { public: - LineDescriptor(void); + LineDescriptor(); void AddPart ( const OUString& rsLine, const css::uno::Reference<css::rendering::XCanvasFont>& rxFont); - bool IsEmpty (void) const; + bool IsEmpty() const; OUString msLine; geometry::RealSize2D maSize; @@ -83,7 +83,7 @@ namespace { const rendering::ViewState& rViewState, rendering::RenderState& rRenderState, const css::uno::Reference<css::rendering::XCanvasFont>& rxFont) const; - double GetHeight (void) const; + double GetHeight() const; private: const OUString msText; @@ -182,11 +182,11 @@ PresenterHelpView::PresenterHelpView ( } } -PresenterHelpView::~PresenterHelpView (void) +PresenterHelpView::~PresenterHelpView() { } -void SAL_CALL PresenterHelpView::disposing (void) +void SAL_CALL PresenterHelpView::disposing() { mxViewId = NULL; @@ -353,7 +353,7 @@ void PresenterHelpView::Paint (const awt::Rectangle& rUpdateBox) xSpriteCanvas->updateScreen(sal_False); } -void PresenterHelpView::ReadHelpStrings (void) +void PresenterHelpView::ReadHelpStrings() { mpTextContainer.reset(new TextContainer()); PresenterConfigurationAccess aConfiguration ( @@ -383,7 +383,7 @@ void PresenterHelpView::ProcessString ( new Block(sLeftText, sRightText, mpFont->mxFont, mnMaximalWidth))); } -void PresenterHelpView::CheckFontSize (void) +void PresenterHelpView::CheckFontSize() { if (mpFont.get() == NULL) return; @@ -449,14 +449,14 @@ void PresenterHelpView::CheckFontSize (void) //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterHelpView::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterHelpView::getResourceId() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxViewId; } -sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -464,7 +464,7 @@ sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly (void) -void PresenterHelpView::ProvideCanvas (void) +void PresenterHelpView::ProvideCanvas() { if ( ! mxCanvas.is() && mxPane.is()) { @@ -480,7 +480,7 @@ void PresenterHelpView::ProvideCanvas (void) } } -void PresenterHelpView::Resize (void) +void PresenterHelpView::Resize() { if (mpCloseButton.get() != NULL && mxWindow.is()) { @@ -499,7 +499,7 @@ void PresenterHelpView::Resize (void) } } -void PresenterHelpView::ThrowIfDisposed (void) +void PresenterHelpView::ThrowIfDisposed() throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -514,7 +514,7 @@ void PresenterHelpView::ThrowIfDisposed (void) namespace { -LineDescriptor::LineDescriptor (void) +LineDescriptor::LineDescriptor() : msLine(), maSize(0,0), mnVerticalOffset(0) @@ -530,7 +530,7 @@ void LineDescriptor::AddPart ( CalculateSize(rxFont); } -bool LineDescriptor::IsEmpty (void) const +bool LineDescriptor::IsEmpty() const { return msLine.isEmpty(); } @@ -610,7 +610,7 @@ double LineDescriptorList::Paint( return nY - rBBox.Y1; } -double LineDescriptorList::GetHeight (void) const +double LineDescriptorList::GetHeight() const { double nHeight (0); vector<LineDescriptor>::const_iterator iLine (mpLineDescriptors->begin()); diff --git a/sdext/source/presenter/PresenterHelpView.hxx b/sdext/source/presenter/PresenterHelpView.hxx index 1b4e4887d1d1..7792d79389b9 100644 --- a/sdext/source/presenter/PresenterHelpView.hxx +++ b/sdext/source/presenter/PresenterHelpView.hxx @@ -55,9 +55,9 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterHelpView (void); + virtual ~PresenterHelpView(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // lang::XEventListener @@ -86,10 +86,10 @@ public: // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: @@ -107,22 +107,22 @@ private: sal_Int32 mnSeparatorY; sal_Int32 mnMaximalWidth; - void ProvideCanvas (void); - void Resize (void); + void ProvideCanvas(); + void Resize(); void Paint (const css::awt::Rectangle& rRedrawArea); - void ReadHelpStrings (void); + void ReadHelpStrings(); void ProcessString ( const css::uno::Reference<css::beans::XPropertySet>& rsProperties); /** Find a font size, so that all text can be displayed at the same time. */ - void CheckFontSize (void); + void CheckFontSize(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 26191735870c..8bb5a0458b7e 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -133,11 +133,11 @@ PresenterNotesView::PresenterNotesView ( } } -PresenterNotesView::~PresenterNotesView (void) +PresenterNotesView::~PresenterNotesView() { } -void SAL_CALL PresenterNotesView::disposing (void) +void SAL_CALL PresenterNotesView::disposing() { if (mxParentWindow.is()) { @@ -332,13 +332,13 @@ void SAL_CALL PresenterNotesView::windowPaint (const awt::PaintEvent& rEvent) //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterNotesView::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterNotesView::getResourceId() throw (RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL PresenterNotesView::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterNotesView::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -364,7 +364,7 @@ void SAL_CALL PresenterNotesView::setCurrentPage (const Reference<drawing::XDraw SetSlide(mxCurrentNotesPage); } -Reference<drawing::XDrawPage> SAL_CALL PresenterNotesView::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL PresenterNotesView::getCurrentPage() throw (RuntimeException, std::exception) { return NULL; @@ -422,7 +422,7 @@ void SAL_CALL PresenterNotesView::keyReleased (const awt::KeyEvent& rEvent) -void PresenterNotesView::Layout (void) +void PresenterNotesView::Layout() { if ( ! mxParentWindow.is()) return; @@ -604,7 +604,7 @@ void PresenterNotesView::PaintText (const awt::Rectangle& rUpdateBox) xSpriteCanvas->updateScreen(sal_False); } -void PresenterNotesView::Invalidate (void) +void PresenterNotesView::Invalidate() { mpPresenterController->GetPaintManager()->Invalidate( mxParentWindow, @@ -674,12 +674,12 @@ void PresenterNotesView::ChangeFontSize (const sal_Int32 nSizeChange) } } -::boost::shared_ptr<PresenterTextView> PresenterNotesView::GetTextView (void) const +::boost::shared_ptr<PresenterTextView> PresenterNotesView::GetTextView() const { return mpTextView; } -void PresenterNotesView::UpdateScrollBar (void) +void PresenterNotesView::UpdateScrollBar() { if (mpScrollBar.get() != NULL) { @@ -700,7 +700,7 @@ void PresenterNotesView::UpdateScrollBar (void) } } -void PresenterNotesView::ThrowIfDisposed (void) +void PresenterNotesView::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx index 1489455f9856..16a8e949e917 100644 --- a/sdext/source/presenter/PresenterNotesView.hxx +++ b/sdext/source/presenter/PresenterNotesView.hxx @@ -70,9 +70,9 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterNotesView (void); + virtual ~PresenterNotesView(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; /** Typically called from setCurrentSlide() with the notes page that is associed with the slide given to setCurrentSlide(). @@ -85,7 +85,7 @@ public: void ChangeFontSize (const sal_Int32 nSizeChange); - ::boost::shared_ptr<PresenterTextView> GetTextView (void) const; + ::boost::shared_ptr<PresenterTextView> GetTextView() const; // lang::XEventListener @@ -114,10 +114,10 @@ public: // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView @@ -126,7 +126,7 @@ 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; // XKeyListener @@ -158,20 +158,20 @@ private: void CreateToolBar ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController); - void Layout (void); + void Layout(); void Paint (const css::awt::Rectangle& rUpdateBox); void PaintToolBar (const css::awt::Rectangle& rUpdateBox); void PaintText (const css::awt::Rectangle& rUpdateBox); - void Invalidate (void); + void Invalidate(); void Scroll (const double nDistance); void SetTop (const double nTop); - void UpdateScrollBar (void); + void UpdateScrollBar(); void MoveCaret (const sal_Int32 nDistance); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index 18a099e6ab49..6c1ccd37744c 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -49,20 +49,20 @@ PresenterPane::PresenterPane ( UNO_QUERY_THROW); } -PresenterPane::~PresenterPane (void) +PresenterPane::~PresenterPane() { } //----- XPane ----------------------------------------------------------------- -Reference<awt::XWindow> SAL_CALL PresenterPane::getWindow (void) +Reference<awt::XWindow> SAL_CALL PresenterPane::getWindow() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxContentWindow; } -Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas (void) +Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -175,7 +175,7 @@ void PresenterPane::Invalidate (const css::awt::Rectangle& rRepaintBox) mpPresenterController->GetPaintManager()->Invalidate(mxParentWindow, rRepaintBox); } -void PresenterPane::UpdateBoundingBox (void) +void PresenterPane::UpdateBoundingBox() { if (mxBorderWindow.is() && IsVisible()) maBoundingBox = mxBorderWindow->getPosSize(); diff --git a/sdext/source/presenter/PresenterPane.hxx b/sdext/source/presenter/PresenterPane.hxx index 1a534372e0ba..eb93173bfa81 100644 --- a/sdext/source/presenter/PresenterPane.hxx +++ b/sdext/source/presenter/PresenterPane.hxx @@ -47,19 +47,19 @@ public: PresenterPane ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterPane (void); + virtual ~PresenterPane(); - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); // XPane - css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow (void) + css::uno::Reference<css::awt::XWindow> SAL_CALL getWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas (void) + css::uno::Reference<css::rendering::XCanvas> SAL_CALL getCanvas() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener @@ -93,7 +93,7 @@ private: void Invalidate ( const css::awt::Rectangle& rRepaintBox); - void UpdateBoundingBox (void); + void UpdateBoundingBox(); }; } } // end of namespace ::sd::presenter diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index 2cd5c1d5709f..0195c66b827c 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -63,11 +63,11 @@ PresenterPaneBase::PresenterPaneBase ( mxPresenterHelper = mpPresenterController->GetPresenterHelper(); } -PresenterPaneBase::~PresenterPaneBase (void) +PresenterPaneBase::~PresenterPaneBase() { } -void PresenterPaneBase::disposing (void) +void PresenterPaneBase::disposing() { if (mxBorderWindow.is()) { @@ -116,13 +116,13 @@ void PresenterPaneBase::SetTitle (const OUString& rsTitle) mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow); } -OUString PresenterPaneBase::GetTitle (void) const +OUString PresenterPaneBase::GetTitle() const { return msTitle; } Reference<drawing::framework::XPaneBorderPainter> - PresenterPaneBase::GetPaneBorderPainter (void) const + PresenterPaneBase::GetPaneBorderPainter() const { return mxBorderPainter; } @@ -156,7 +156,7 @@ void PresenterPaneBase::SetCalloutAnchor (const css::awt::Point& rCalloutAnchor) mpPresenterController->GetPaintManager()->Invalidate(mxBorderWindow); } -awt::Point PresenterPaneBase::GetCalloutAnchor (void) const +awt::Point PresenterPaneBase::GetCalloutAnchor() const { return maCalloutAnchor; } @@ -260,14 +260,14 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments) //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterPaneBase::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterPaneBase::getResourceId() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxPaneId; } -sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly() throw (RuntimeException, std::exception) { return true; @@ -338,12 +338,12 @@ void PresenterPaneBase::CreateWindows ( } } -Reference<awt::XWindow> PresenterPaneBase::GetBorderWindow (void) const +Reference<awt::XWindow> PresenterPaneBase::GetBorderWindow() const { return mxBorderWindow; } -void PresenterPaneBase::ToTop (void) +void PresenterPaneBase::ToTop() { if (mxPresenterHelper.is()) mxPresenterHelper->toTop(mxContentWindow); @@ -411,7 +411,7 @@ void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox) } } -void PresenterPaneBase::LayoutContextWindow (void) +void PresenterPaneBase::LayoutContextWindow() { OSL_ASSERT(mxPaneId.is()); OSL_ASSERT(mxBorderWindow.is()); @@ -432,7 +432,7 @@ void PresenterPaneBase::LayoutContextWindow (void) } } -bool PresenterPaneBase::IsVisible (void) const +bool PresenterPaneBase::IsVisible() const { Reference<awt::XWindow2> xWindow2 (mxBorderPainter, UNO_QUERY); if (xWindow2.is()) @@ -441,7 +441,7 @@ bool PresenterPaneBase::IsVisible (void) const return false; } -void PresenterPaneBase::ThrowIfDisposed (void) +void PresenterPaneBase::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index fec447bb4a0e..700c440c78bd 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -67,17 +67,17 @@ public: PresenterPaneBase ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterPaneBase (void); + virtual ~PresenterPaneBase(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - css::uno::Reference<css::awt::XWindow> GetBorderWindow (void) const; + css::uno::Reference<css::awt::XWindow> GetBorderWindow() const; void SetBackground (const SharedBitmapDescriptor& rpBackground); void SetTitle (const OUString& rsTitle); - OUString GetTitle (void) const; - css::uno::Reference<css::drawing::framework::XPaneBorderPainter> GetPaneBorderPainter (void) const; + OUString GetTitle() const; + css::uno::Reference<css::drawing::framework::XPaneBorderPainter> GetPaneBorderPainter() const; void SetCalloutAnchor (const css::awt::Point& rAnchorPosition); - css::awt::Point GetCalloutAnchor (void) const; + css::awt::Point GetCalloutAnchor() const; // XInitialization @@ -86,10 +86,10 @@ public: // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::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; // XWindowListener @@ -138,14 +138,14 @@ protected: const css::awt::Rectangle& rCenterBox, const css::awt::Rectangle& rUpdateBox); void PaintBorder (const css::awt::Rectangle& rUpdateRectangle); - void ToTop (void); - void LayoutContextWindow (void); - bool IsVisible (void) const; + void ToTop(); + void LayoutContextWindow(); + bool IsVisible() const; /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx index 4ddaa937f3e9..b5a09797f278 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.cxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx @@ -43,12 +43,12 @@ namespace sdext { namespace presenter { //===== Service =============================================================== -OUString PresenterPaneBorderManager::getImplementationName_static (void) +OUString PresenterPaneBorderManager::getImplementationName_static() { return OUString("com.sun.star.comp.Draw.PresenterPaneBorderManager"); } -Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static (void) +Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static() { static const OUString sServiceName( "com.sun.star.drawing.PresenterPaneBorderManager"); @@ -91,11 +91,11 @@ PresenterPaneBorderManager::PresenterPaneBorderManager ( } } -PresenterPaneBorderManager::~PresenterPaneBorderManager (void) +PresenterPaneBorderManager::~PresenterPaneBorderManager() { } -void PresenterPaneBorderManager::disposing (void) +void PresenterPaneBorderManager::disposing() { WindowList::const_iterator iDescriptor; for (iDescriptor=maWindowList.begin(); iDescriptor!=maWindowList.end(); ++iDescriptor) @@ -491,7 +491,7 @@ void PresenterPaneBorderManager::ReleaseMouse (const Reference<awt::XWindow>& rx mxPresenterHelper->releaseMouse(rxWindow); } -void PresenterPaneBorderManager::ThrowIfDisposed (void) +void PresenterPaneBorderManager::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterPaneBorderManager.hxx b/sdext/source/presenter/PresenterPaneBorderManager.hxx index 94472dcba718..d69cbc1f709f 100644 --- a/sdext/source/presenter/PresenterPaneBorderManager.hxx +++ b/sdext/source/presenter/PresenterPaneBorderManager.hxx @@ -66,12 +66,12 @@ public: PresenterPaneBorderManager ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterPaneBorderManager (void); + virtual ~PresenterPaneBorderManager(); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing(); - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); @@ -141,7 +141,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/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 8e3378f9ef91..b40434d32b59 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -49,7 +49,7 @@ namespace { class BorderSize { public: - BorderSize (void); + BorderSize(); sal_Int32 mnLeft; sal_Int32 mnTop; sal_Int32 mnRight; @@ -92,7 +92,7 @@ namespace { BorderSize maTotalBorderSize; enum Side { Left, Top, Right, Bottom }; private: - void UpdateBorderSizes (void); + void UpdateBorderSizes(); SharedBitmapDescriptor GetBitmap( const ::boost::shared_ptr<PresenterTheme>& rpTheme, const OUString& rsStyleName, @@ -106,7 +106,7 @@ public: Renderer ( const Reference<XComponentContext>& rxContext, const ::boost::shared_ptr<PresenterTheme>& rpTheme); - ~Renderer (void); + ~Renderer(); void SetCanvas (const Reference<rendering::XCanvas>& rxCanvas); void PaintBorder ( @@ -163,7 +163,7 @@ PresenterPaneBorderPainter::PresenterPaneBorderPainter ( { } -PresenterPaneBorderPainter::~PresenterPaneBorderPainter (void) +PresenterPaneBorderPainter::~PresenterPaneBorderPainter() { } @@ -325,7 +325,7 @@ bool PresenterPaneBorderPainter::ProvideTheme (const Reference<rendering::XCanva return bModified; } -bool PresenterPaneBorderPainter::ProvideTheme (void) +bool PresenterPaneBorderPainter::ProvideTheme() { if (mpTheme.get() == NULL) { @@ -375,7 +375,7 @@ awt::Rectangle PresenterPaneBorderPainter::RemoveBorder ( return rOuterBox; } -void PresenterPaneBorderPainter::ThrowIfDisposed (void) const +void PresenterPaneBorderPainter::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -414,7 +414,7 @@ PresenterPaneBorderPainter::Renderer::Renderer ( } } -PresenterPaneBorderPainter::Renderer::~Renderer (void) +PresenterPaneBorderPainter::Renderer::~Renderer() { } @@ -783,7 +783,7 @@ namespace { //===== BorderSize ============================================================ -BorderSize::BorderSize (void) +BorderSize::BorderSize() : mnLeft(0), mnTop(0), mnRight(0), @@ -932,7 +932,7 @@ const Reference<rendering::XCanvasFont> RendererPaneStyle::GetFont ( return mpFont->mxFont; } -void RendererPaneStyle::UpdateBorderSizes (void) +void RendererPaneStyle::UpdateBorderSizes() { maTotalBorderSize.mnLeft = maInnerBorderSize.mnLeft + maOuterBorderSize.mnLeft; maTotalBorderSize.mnTop = maInnerBorderSize.mnTop + maOuterBorderSize.mnTop; diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index 028e0182e37e..79d4a3dd3e4f 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -55,7 +55,7 @@ class PresenterPaneBorderPainter public: PresenterPaneBorderPainter ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterPaneBorderPainter (void); + virtual ~PresenterPaneBorderPainter(); /** Transform the bounding box of the window content to the outer bounding box of the border that is painted around it. @@ -136,9 +136,9 @@ private: */ bool ProvideTheme ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); - bool ProvideTheme (void); + bool ProvideTheme(); - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx index c271cdb51b23..74dfb1c288f2 100644 --- a/sdext/source/presenter/PresenterPaneContainer.cxx +++ b/sdext/source/presenter/PresenterPaneContainer.cxx @@ -47,7 +47,7 @@ PresenterPaneContainer::PresenterPaneContainer ( } } -PresenterPaneContainer::~PresenterPaneContainer (void) +PresenterPaneContainer::~PresenterPaneContainer() { } @@ -101,7 +101,7 @@ void PresenterPaneContainer::PreparePane ( } } -void SAL_CALL PresenterPaneContainer::disposing (void) +void SAL_CALL PresenterPaneContainer::disposing() { PaneList::iterator iPane (maPanes.begin()); PaneList::const_iterator iEnd (maPanes.end()); diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx index de4254129df0..d12913c042c9 100644 --- a/sdext/source/presenter/PresenterPaneContainer.hxx +++ b/sdext/source/presenter/PresenterPaneContainer.hxx @@ -61,9 +61,9 @@ class PresenterPaneContainer public: PresenterPaneContainer ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterPaneContainer (void); + virtual ~PresenterPaneContainer(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; typedef ::boost::function1<void, const css::uno::Reference<css::drawing::framework::XView>&> ViewInitializationFunction; diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 956a5b4c3666..6eee8bd1d7cc 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -111,11 +111,11 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont } } -PresenterPaneFactory::~PresenterPaneFactory (void) +PresenterPaneFactory::~PresenterPaneFactory() { } -void SAL_CALL PresenterPaneFactory::disposing (void) +void SAL_CALL PresenterPaneFactory::disposing() throw (RuntimeException) { Reference<XConfigurationController> xCC (mxConfigurationControllerWeak); @@ -321,7 +321,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane ( return Reference<XResource>(static_cast<XWeak*>(xPane.get()), UNO_QUERY_THROW); } -void PresenterPaneFactory::ThrowIfDisposed (void) const +void PresenterPaneFactory::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterPaneFactory.hxx b/sdext/source/presenter/PresenterPaneFactory.hxx index 9a55a8e3646e..0d7106ac4cce 100644 --- a/sdext/source/presenter/PresenterPaneFactory.hxx +++ b/sdext/source/presenter/PresenterPaneFactory.hxx @@ -71,14 +71,14 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterPaneFactory (void); + virtual ~PresenterPaneFactory(); - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual void SAL_CALL disposing (void) + virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) SAL_OVERRIDE; // XResourceFactory @@ -119,7 +119,7 @@ private: const css::uno::Reference<css::drawing::framework::XPane>& rxParentPane, const bool bIsSpritePane); - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; } } diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 60a762632aef..8d5d3be89e78 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -49,9 +49,9 @@ namespace { { public: virtual ~Command() {} - virtual void Execute (void) = 0; - virtual bool IsEnabled (void) const { return true; } - virtual Any GetState (void) const { return Any(sal_False); } + virtual void Execute() = 0; + virtual bool IsEnabled() const { return true; } + virtual Any GetState() const { return Any(sal_False); } }; class GotoPreviousSlideCommand : public Command @@ -59,9 +59,9 @@ namespace { public: GotoPreviousSlideCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~GotoPreviousSlideCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; - virtual bool IsEnabled (void) const SAL_OVERRIDE; + virtual ~GotoPreviousSlideCommand() {} + virtual void Execute() SAL_OVERRIDE; + virtual bool IsEnabled() const SAL_OVERRIDE; private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -71,12 +71,12 @@ namespace { public: GotoNextSlideCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~GotoNextSlideCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; + virtual ~GotoNextSlideCommand() {} + virtual void Execute() SAL_OVERRIDE; // The next slide command is always enabled, even when the current slide // is the last slide: from the last slide it goes to the pause slide, // and from there it ends the slide show. - virtual bool IsEnabled (void) const SAL_OVERRIDE { return true; } + virtual bool IsEnabled() const SAL_OVERRIDE { return true; } private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -86,8 +86,8 @@ namespace { public: GotoNextEffectCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~GotoNextEffectCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; + virtual ~GotoNextEffectCommand() {} + virtual void Execute() SAL_OVERRIDE; private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -97,8 +97,8 @@ namespace { public: SwitchMonitorCommand ( const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SwitchMonitorCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; + virtual ~SwitchMonitorCommand() {} + virtual void Execute() SAL_OVERRIDE; private: rtl::Reference<PresenterController> mpPresenterController; }; @@ -109,9 +109,9 @@ namespace { SetNotesViewCommand ( const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SetNotesViewCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; - virtual Any GetState (void) const SAL_OVERRIDE; + virtual ~SetNotesViewCommand() {} + virtual void Execute() SAL_OVERRIDE; + virtual Any GetState() const SAL_OVERRIDE; private: bool mbOn; rtl::Reference<PresenterController> mpPresenterController; @@ -124,9 +124,9 @@ namespace { SetSlideSorterCommand ( const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SetSlideSorterCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; - virtual Any GetState (void) const SAL_OVERRIDE; + virtual ~SetSlideSorterCommand() {} + virtual void Execute() SAL_OVERRIDE; + virtual Any GetState() const SAL_OVERRIDE; private: bool mbOn; rtl::Reference<PresenterController> mpPresenterController; @@ -138,9 +138,9 @@ namespace { SetHelpViewCommand ( const bool bOn, const rtl::Reference<PresenterController>& rpPresenterController); - virtual ~SetHelpViewCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; - virtual Any GetState (void) const SAL_OVERRIDE; + virtual ~SetHelpViewCommand() {} + virtual void Execute() SAL_OVERRIDE; + virtual Any GetState() const SAL_OVERRIDE; private: bool mbOn; rtl::Reference<PresenterController> mpPresenterController; @@ -152,11 +152,11 @@ namespace { NotesFontSizeCommand( const rtl::Reference<PresenterController>& rpPresenterController, const sal_Int32 nSizeChange); - virtual ~NotesFontSizeCommand (void) {} - virtual void Execute (void) SAL_OVERRIDE; - virtual Any GetState (void) const SAL_OVERRIDE; + virtual ~NotesFontSizeCommand() {} + virtual void Execute() SAL_OVERRIDE; + virtual Any GetState() const SAL_OVERRIDE; protected: - ::rtl::Reference<PresenterNotesView> GetNotesView (void) const; + ::rtl::Reference<PresenterNotesView> GetNotesView() const; private: rtl::Reference<PresenterController> mpPresenterController; const sal_Int32 mnSizeChange; @@ -185,7 +185,7 @@ public: const OUString& rsURLPath, const ::rtl::Reference<PresenterController>& rpPresenterController); - void SAL_CALL disposing (void) SAL_OVERRIDE; + void SAL_CALL disposing() SAL_OVERRIDE; static Command* CreateCommand ( const OUString& rsURLPath, const ::rtl::Reference<PresenterController>& rpPresenterController); @@ -227,19 +227,19 @@ private: Dispatch ( const OUString& rsURLPath, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~Dispatch (void); + virtual ~Dispatch(); - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; //----- Service --------------------------------------------------------------- -OUString PresenterProtocolHandler::getImplementationName_static (void) +OUString PresenterProtocolHandler::getImplementationName_static() { return OUString("org.libreoffice.comp.PresenterScreenProtocolHandler"); } -Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static (void) +Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static() { static const OUString sServiceName("com.sun.star.frame.ProtocolHandler"); return Sequence<OUString>(&sServiceName, 1); @@ -259,11 +259,11 @@ PresenterProtocolHandler::PresenterProtocolHandler (const Reference<XComponentCo (void)rxContext; } -PresenterProtocolHandler::~PresenterProtocolHandler (void) +PresenterProtocolHandler::~PresenterProtocolHandler() { } -void SAL_CALL PresenterProtocolHandler::disposing (void) +void SAL_CALL PresenterProtocolHandler::disposing() { } @@ -342,7 +342,7 @@ Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryD -void PresenterProtocolHandler::ThrowIfDisposed (void) const +void PresenterProtocolHandler::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -419,11 +419,11 @@ Command* PresenterProtocolHandler::Dispatch::CreateCommand ( return NULL; } -PresenterProtocolHandler::Dispatch::~Dispatch (void) +PresenterProtocolHandler::Dispatch::~Dispatch() { } -void PresenterProtocolHandler::Dispatch::disposing (void) +void PresenterProtocolHandler::Dispatch::disposing() { if (mbIsListeningToWindowManager) { @@ -498,7 +498,7 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::removeStatusListener ( throw RuntimeException(); } -void PresenterProtocolHandler::Dispatch::ThrowIfDisposed (void) const +void PresenterProtocolHandler::Dispatch::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -538,7 +538,7 @@ GotoPreviousSlideCommand::GotoPreviousSlideCommand ( { } -void GotoPreviousSlideCommand::Execute (void) +void GotoPreviousSlideCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -549,7 +549,7 @@ void GotoPreviousSlideCommand::Execute (void) mpPresenterController->GetSlideShowController()->gotoPreviousSlide(); } -bool GotoPreviousSlideCommand::IsEnabled (void) const +bool GotoPreviousSlideCommand::IsEnabled() const { if ( ! mpPresenterController.is()) return false; @@ -568,7 +568,7 @@ GotoNextEffectCommand::GotoNextEffectCommand ( { } -void GotoNextEffectCommand::Execute (void) +void GotoNextEffectCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -587,7 +587,7 @@ GotoNextSlideCommand::GotoNextSlideCommand ( { } -void GotoNextSlideCommand::Execute (void) +void GotoNextSlideCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -606,7 +606,7 @@ SwitchMonitorCommand::SwitchMonitorCommand ( { } -void SwitchMonitorCommand::Execute (void) +void SwitchMonitorCommand::Execute() { mpPresenterController->SwitchMonitors(); } @@ -621,7 +621,7 @@ SetNotesViewCommand::SetNotesViewCommand ( { } -void SetNotesViewCommand::Execute (void) +void SetNotesViewCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -637,7 +637,7 @@ void SetNotesViewCommand::Execute (void) pWindowManager->SetViewMode(PresenterWindowManager::VM_Standard); } -Any SetNotesViewCommand::GetState (void) const +Any SetNotesViewCommand::GetState() const { if ( ! mpPresenterController.is()) return Any(false); @@ -666,7 +666,7 @@ SetSlideSorterCommand::SetSlideSorterCommand ( { } -void SetSlideSorterCommand::Execute (void) +void SetSlideSorterCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -679,7 +679,7 @@ void SetSlideSorterCommand::Execute (void) pWindowManager->SetSlideSorterState(mbOn); } -Any SetSlideSorterCommand::GetState (void) const +Any SetSlideSorterCommand::GetState() const { if ( ! mpPresenterController.is()) return Any(false); @@ -702,7 +702,7 @@ SetHelpViewCommand::SetHelpViewCommand ( { } -void SetHelpViewCommand::Execute (void) +void SetHelpViewCommand::Execute() { if ( ! mpPresenterController.is()) return; @@ -715,7 +715,7 @@ void SetHelpViewCommand::Execute (void) pWindowManager->SetHelpViewState(mbOn); } -Any SetHelpViewCommand::GetState (void) const +Any SetHelpViewCommand::GetState() const { if ( ! mpPresenterController.is()) return Any(false); @@ -738,7 +738,7 @@ NotesFontSizeCommand::NotesFontSizeCommand( { } -::rtl::Reference<PresenterNotesView> NotesFontSizeCommand::GetNotesView (void) const +::rtl::Reference<PresenterNotesView> NotesFontSizeCommand::GetNotesView() const { if (mpPresenterController.get() == NULL) return NULL; @@ -752,14 +752,14 @@ NotesFontSizeCommand::NotesFontSizeCommand( return dynamic_cast<PresenterNotesView*>(pDescriptor->mxView.get()); } -void NotesFontSizeCommand::Execute (void) +void NotesFontSizeCommand::Execute() { ::rtl::Reference<PresenterNotesView> pView (GetNotesView()); if (pView.is()) pView->ChangeFontSize(mnSizeChange); } -Any NotesFontSizeCommand::GetState (void) const +Any NotesFontSizeCommand::GetState() const { return Any(); } diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index ecae6661329c..81121fe6b10f 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -47,12 +47,12 @@ class PresenterProtocolHandler { public: PresenterProtocolHandler (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterProtocolHandler (void); + virtual ~PresenterProtocolHandler(); - void SAL_CALL disposing (void) SAL_OVERRIDE; + void SAL_CALL disposing() SAL_OVERRIDE; - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); @@ -89,7 +89,7 @@ private: class Dispatch; ::rtl::Reference<PresenterController> mpPresenterController; - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; } } diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 022dcb80cabb..11cae1cdffeb 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -67,10 +67,10 @@ namespace { PresenterScreenListener ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::frame::XModel2>& rxModel); - virtual ~PresenterScreenListener (void); + virtual ~PresenterScreenListener(); - void Initialize (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + void Initialize(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // document::XEventListener @@ -85,18 +85,18 @@ namespace { css::uno::Reference<css::uno::XComponentContext> mxComponentContext; rtl::Reference<PresenterScreen> mpPresenterScreen; - void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException); + void ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException); }; } //----- Service --------------------------------------------------------------- -OUString PresenterScreenJob::getImplementationName_static (void) +OUString PresenterScreenJob::getImplementationName_static() { return OUString("org.libreoffice.comp.PresenterScreenJob"); } -Sequence<OUString> PresenterScreenJob::getSupportedServiceNames_static (void) +Sequence<OUString> PresenterScreenJob::getSupportedServiceNames_static() { return Sequence<OUString>(); } @@ -114,11 +114,11 @@ PresenterScreenJob::PresenterScreenJob (const Reference<XComponentContext>& rxCo { } -PresenterScreenJob::~PresenterScreenJob (void) +PresenterScreenJob::~PresenterScreenJob() { } -void SAL_CALL PresenterScreenJob::disposing (void) +void SAL_CALL PresenterScreenJob::disposing() { mxComponentContext = NULL; } @@ -182,7 +182,7 @@ PresenterScreenListener::PresenterScreenListener ( { } -void PresenterScreenListener::Initialize (void) +void PresenterScreenListener::Initialize() { Reference< document::XEventListener > xDocListener( static_cast< document::XEventListener* >(this), UNO_QUERY); @@ -191,11 +191,11 @@ void PresenterScreenListener::Initialize (void) xDocBroadcaster->addEventListener(xDocListener); } -PresenterScreenListener::~PresenterScreenListener (void) +PresenterScreenListener::~PresenterScreenListener() { } -void SAL_CALL PresenterScreenListener::disposing (void) +void SAL_CALL PresenterScreenListener::disposing() { Reference< document::XEventBroadcaster > xDocBroadcaster( mxModel, UNO_QUERY ); if( xDocBroadcaster.is() ) @@ -246,7 +246,7 @@ void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject& } } -void PresenterScreenListener::ThrowIfDisposed (void) const throw ( +void PresenterScreenListener::ThrowIfDisposed() const throw ( ::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -282,7 +282,7 @@ PresenterScreen::PresenterScreen ( { } -PresenterScreen::~PresenterScreen (void) +PresenterScreen::~PresenterScreen() { } @@ -297,7 +297,7 @@ bool PresenterScreen::isPresenterScreenEnabled(const css::uno::Reference<css::un >>= dEnablePresenterScreen; return dEnablePresenterScreen; } -void SAL_CALL PresenterScreen::disposing (void) +void SAL_CALL PresenterScreen::disposing() { Reference<XConfigurationController> xCC (mxConfigurationControllerWeak); if (xCC.is() && mxSavedConfiguration.is()) @@ -327,7 +327,7 @@ void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/) -void PresenterScreen::InitializePresenterScreen (void) +void PresenterScreen::InitializePresenterScreen() { try { @@ -567,7 +567,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId ( + OUString::number(nScreen)); } -void PresenterScreen::RequestShutdownPresenterScreen (void) +void PresenterScreen::RequestShutdownPresenterScreen() { // Restore the configuration that was active before the presenter screen // has been activated. Now, that the presenter screen is displayed in @@ -593,7 +593,7 @@ void PresenterScreen::RequestShutdownPresenterScreen (void) } } -void PresenterScreen::ShutdownPresenterScreen (void) +void PresenterScreen::ShutdownPresenterScreen() { Reference<lang::XComponent> xViewFactoryComponent (mxViewFactory, UNO_QUERY); if (xViewFactoryComponent.is()) diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx index 3c7088910e40..44931fbbcfaf 100644 --- a/sdext/source/presenter/PresenterScreen.hxx +++ b/sdext/source/presenter/PresenterScreen.hxx @@ -60,12 +60,12 @@ class PresenterScreenJob public PresenterScreenJobInterfaceBase { public: - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XJob @@ -77,7 +77,7 @@ public: private: PresenterScreenJob (const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterScreenJob (void); + virtual ~PresenterScreenJob(); css::uno::Reference<css::uno::XComponentContext> mxComponentContext; }; @@ -102,25 +102,25 @@ public: PresenterScreen ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::frame::XModel2>& rxModel); - virtual ~PresenterScreen (void); + virtual ~PresenterScreen(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; static bool isPresenterScreenEnabled( const css::uno::Reference<css::uno::XComponentContext>& rxContext); /** Make the presenter screen visible. */ - void InitializePresenterScreen (void); + void InitializePresenterScreen(); /** Do not call ShutdownPresenterScreen() directly. Call RequestShutdownPresenterScreen() instead. It will issue an asynchronous call to ShutdownPresenterScreen() when that is safe. */ - void RequestShutdownPresenterScreen (void); + void RequestShutdownPresenterScreen(); /** Switch / converse monitors between presenter view and slide output */ - void SwitchMonitors (void); + void SwitchMonitors(); // XEventListener @@ -155,7 +155,7 @@ private: typedef ::std::map<OUString,ViewDescriptor> ViewDescriptorContainer; ViewDescriptorContainer maViewDescriptors; - void ShutdownPresenterScreen (void); + void ShutdownPresenterScreen(); /** Create and initialize the factory for presenter view specific panes. */ diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 4b147a844d1c..bfcccdc62607 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -50,14 +50,14 @@ class PresenterScrollBar::MousePressRepeater { public: MousePressRepeater (const ::rtl::Reference<PresenterScrollBar>& rpScrollBar); - void Dispose (void); + void Dispose(); void Start (const PresenterScrollBar::Area& reArea); - void Stop (void); + void Stop(); void SetMouseArea (const PresenterScrollBar::Area& reArea); private: void Callback (const TimeValue& rCurrentTime); - void Execute (void); + void Execute(); sal_Int32 mnMousePressRepeaterTaskId; ::rtl::Reference<PresenterScrollBar> mpScrollBar; @@ -139,11 +139,11 @@ PresenterScrollBar::PresenterScrollBar ( } } -PresenterScrollBar::~PresenterScrollBar (void) +PresenterScrollBar::~PresenterScrollBar() { } -void SAL_CALL PresenterScrollBar::disposing (void) +void SAL_CALL PresenterScrollBar::disposing() { mpMousePressRepeater->Dispose(); @@ -280,7 +280,7 @@ void PresenterScrollBar::SetBackground (const SharedBitmapDescriptor& rpBackgrou mpBackgroundBitmap = rpBackgroundBitmap; } -void PresenterScrollBar::CheckValues (void) +void PresenterScrollBar::CheckValues() { mnThumbPosition = ValidateThumbPosition(mnThumbPosition); } @@ -540,7 +540,7 @@ void PresenterScrollBar::PaintBitmap( } } -void PresenterScrollBar::NotifyThumbPositionChange (void) +void PresenterScrollBar::NotifyThumbPositionChange() { if ( ! mbIsNotificationActive) { @@ -636,7 +636,7 @@ PresenterVerticalScrollBar::PresenterVerticalScrollBar ( { } -PresenterVerticalScrollBar::~PresenterVerticalScrollBar (void) +PresenterVerticalScrollBar::~PresenterVerticalScrollBar() { } @@ -669,7 +669,7 @@ void PresenterVerticalScrollBar::UpdateDragAnchor (const double nDragDistance) maDragAnchor.Y += nDragDistance * nPagerHeight / mnTotalSize; } -sal_Int32 PresenterVerticalScrollBar::GetSize (void) const +sal_Int32 PresenterVerticalScrollBar::GetSize() const { return mnScrollBarWidth; } @@ -686,7 +686,7 @@ double PresenterVerticalScrollBar::GetMinor (const double nX, const double nY) c return nX; } -void PresenterVerticalScrollBar::UpdateBorders (void) +void PresenterVerticalScrollBar::UpdateBorders() { const awt::Rectangle aWindowBox (mxWindow->getPosSize()); double nBottom = aWindowBox.Height; @@ -752,7 +752,7 @@ void PresenterVerticalScrollBar::UpdateBorders (void) maBox[Pager]); } -void PresenterVerticalScrollBar::UpdateBitmaps (void) +void PresenterVerticalScrollBar::UpdateBitmaps() { if (mpBitmaps.get() != NULL) { @@ -816,7 +816,7 @@ PresenterScrollBar::MousePressRepeater::MousePressRepeater ( { } -void PresenterScrollBar::MousePressRepeater::Dispose (void) +void PresenterScrollBar::MousePressRepeater::Dispose() { Stop(); mpScrollBar = NULL; @@ -843,7 +843,7 @@ void PresenterScrollBar::MousePressRepeater::Start (const PresenterScrollBar::Ar } } -void PresenterScrollBar::MousePressRepeater::Stop (void) +void PresenterScrollBar::MousePressRepeater::Stop() { if (mnMousePressRepeaterTaskId != PresenterTimer::NotAValidTaskId) { @@ -877,7 +877,7 @@ void PresenterScrollBar::MousePressRepeater::Callback (const TimeValue& rCurrent Execute(); } -void PresenterScrollBar::MousePressRepeater::Execute (void) +void PresenterScrollBar::MousePressRepeater::Execute() { const double nThumbPosition (mpScrollBar->GetThumbPosition()); switch (meMouseArea) diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 543d81d2086b..e9b3992273ac 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -56,9 +56,9 @@ class PresenterScrollBar { public: typedef ::boost::function<void(double)> ThumbMotionListener; - virtual ~PresenterScrollBar (void); + virtual ~PresenterScrollBar(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void SetVisible (const bool bIsVisible); @@ -75,7 +75,7 @@ public: double nPosition, const bool bAsynchronousRepaint); - double GetThumbPosition (void) const { return mnThumbPosition;} + double GetThumbPosition() const { return mnThumbPosition;} /** Set the upper border of the slider range. */ @@ -86,10 +86,10 @@ public: A value not larger than the last value given to SetTotalSize(). */ void SetThumbSize (const double nThumbSize); - double GetThumbSize (void) const { return mnThumbSize;} + double GetThumbSize() const { return mnThumbSize;} void SetLineHeight (const double nLineHeight); - double GetLineHeight (void) const { return mnLineHeight;} + double GetLineHeight() const { return mnLineHeight;} /** Set the canvas that is used for painting the scroll bar. */ @@ -100,7 +100,7 @@ public: /** Call this after changing total size or thumb position or size to move the thumb to a valid position. */ - void CheckValues (void); + void CheckValues(); /** On some occasions it is necessary to trigger the painting of a scrollbar from the outside. @@ -109,7 +109,7 @@ public: const css::awt::Rectangle& rUpdateBox, bool bNoClip = false); - virtual sal_Int32 GetSize (void) const = 0; + virtual sal_Int32 GetSize() const = 0; // XWindowListener @@ -193,8 +193,8 @@ protected: virtual void UpdateDragAnchor (const double nDragDistance) = 0; virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const = 0; virtual double GetMinor (const double nX, const double nY) const = 0; - virtual void UpdateBorders (void) = 0; - virtual void UpdateBitmaps (void) = 0; + virtual void UpdateBorders() = 0; + virtual void UpdateBitmaps() = 0; virtual void PaintComposite( const css::awt::Rectangle& rRepaintBox, const Area eArea, @@ -217,7 +217,7 @@ protected: const css::awt::Rectangle& rRepaintBox, const Area eArea, const SharedBitmapDescriptor& rpBitmaps); - void NotifyThumbPositionChange (void); + void NotifyThumbPositionChange(); void UpdateWidthOrHeight (sal_Int32& rSize, const SharedBitmapDescriptor& rpDescriptor); css::uno::Reference<css::rendering::XBitmap> GetBitmap ( @@ -252,16 +252,16 @@ public: const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager, const ::boost::function<void(double)>& rThumbMotionListener); - virtual ~PresenterVerticalScrollBar (void); - virtual sal_Int32 GetSize (void) const SAL_OVERRIDE; + virtual ~PresenterVerticalScrollBar(); + virtual sal_Int32 GetSize() const SAL_OVERRIDE; protected: virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const SAL_OVERRIDE; virtual void UpdateDragAnchor (const double nDragDistance) SAL_OVERRIDE; virtual css::geometry::RealPoint2D GetPoint (const double nMajor, const double nMinor) const SAL_OVERRIDE; virtual double GetMinor (const double nX, const double nY) const SAL_OVERRIDE; - virtual void UpdateBorders (void) SAL_OVERRIDE; - virtual void UpdateBitmaps (void) SAL_OVERRIDE; + virtual void UpdateBorders() SAL_OVERRIDE; + virtual void UpdateBitmaps() SAL_OVERRIDE; virtual void PaintComposite( const css::awt::Rectangle& rRepaintBox, const Area eArea, diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 75817bf10924..2610348377bd 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -105,11 +105,11 @@ PresenterSlidePreview::PresenterSlidePreview ( Resize(); } -PresenterSlidePreview::~PresenterSlidePreview (void) +PresenterSlidePreview::~PresenterSlidePreview() { } -void SAL_CALL PresenterSlidePreview::disposing (void) +void SAL_CALL PresenterSlidePreview::disposing() { if (mxWindow.is()) { @@ -126,13 +126,13 @@ void SAL_CALL PresenterSlidePreview::disposing (void) //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterSlidePreview::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterSlidePreview::getResourceId() throw (RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -209,7 +209,7 @@ void SAL_CALL PresenterSlidePreview::setCurrentPage (const Reference<drawing::XD SetSlide(rxSlide); } -Reference<drawing::XDrawPage> SAL_CALL PresenterSlidePreview::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL PresenterSlidePreview::getCurrentPage() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -365,7 +365,7 @@ void PresenterSlidePreview::Paint (const awt::Rectangle& rBoundingBox) xSpriteCanvas->updateScreen(sal_False); } -void PresenterSlidePreview::Resize (void) +void PresenterSlidePreview::Resize() { if (mxPreviewRenderer.is() && mxPreview.is()) { @@ -386,7 +386,7 @@ void PresenterSlidePreview::Resize (void) SetSlide(mxCurrentSlide); } -void PresenterSlidePreview::ThrowIfDisposed (void) +void PresenterSlidePreview::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (PresenterSlidePreviewInterfaceBase::rBHelper.bDisposed || PresenterSlidePreviewInterfaceBase::rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterSlidePreview.hxx b/sdext/source/presenter/PresenterSlidePreview.hxx index 2a983fb51c27..f3b2c8432083 100644 --- a/sdext/source/presenter/PresenterSlidePreview.hxx +++ b/sdext/source/presenter/PresenterSlidePreview.hxx @@ -66,15 +66,15 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::drawing::framework::XPane>& rxAnchorPane, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterSlidePreview (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual ~PresenterSlidePreview(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener @@ -106,7 +106,7 @@ 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; protected: @@ -146,12 +146,12 @@ private: /** React to a resize of the anchor pane. */ - 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::presenter diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index b01338d4672b..b3308e2b221c 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -91,7 +91,7 @@ PresenterSlideShowView::PresenterSlideShowView ( } } -void PresenterSlideShowView::LateInit (void) +void PresenterSlideShowView::LateInit() { mxSlideShow = Reference<presentation::XSlideShow> ( mxSlideShowController->getSlideShow(), UNO_QUERY_THROW); @@ -175,11 +175,11 @@ void PresenterSlideShowView::LateInit (void) >>= msClickToExitPresentationTitle; } -PresenterSlideShowView::~PresenterSlideShowView (void) +PresenterSlideShowView::~PresenterSlideShowView() { } -void PresenterSlideShowView::disposing (void) +void PresenterSlideShowView::disposing() { // Tell all listeners that we are disposed. lang::EventObject aEvent; @@ -296,7 +296,7 @@ void SAL_CALL PresenterSlideShowView::setCurrentPage ( } } -css::uno::Reference<css::drawing::XDrawPage> SAL_CALL PresenterSlideShowView::getCurrentPage (void) +css::uno::Reference<css::drawing::XDrawPage> SAL_CALL PresenterSlideShowView::getCurrentPage() throw (css::uno::RuntimeException, std::exception) { return mxCurrentSlide; @@ -304,7 +304,7 @@ css::uno::Reference<css::drawing::XDrawPage> SAL_CALL PresenterSlideShowView::ge //----- CachablePresenterView ------------------------------------------------- -void PresenterSlideShowView::ReleaseView (void) +void PresenterSlideShowView::ReleaseView() { if (mxSlideShow.is() && mbIsViewAdded) { @@ -315,7 +315,7 @@ void PresenterSlideShowView::ReleaseView (void) //----- XSlideShowView -------------------------------------------------------- -Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas (void) +Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -323,7 +323,7 @@ Reference<rendering::XSpriteCanvas> SAL_CALL PresenterSlideShowView::getCanvas ( return Reference<rendering::XSpriteCanvas>(mxViewCanvas, UNO_QUERY); } -void SAL_CALL PresenterSlideShowView::clear (void) +void SAL_CALL PresenterSlideShowView::clear() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -351,7 +351,7 @@ void SAL_CALL PresenterSlideShowView::clear (void) } } -geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation (void) +geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -378,7 +378,7 @@ geometry::AffineMatrix2D SAL_CALL PresenterSlideShowView::getTransformation (voi } } -geometry::IntegerSize2D SAL_CALL PresenterSlideShowView::getTranslationOffset(void) +geometry::IntegerSize2D SAL_CALL PresenterSlideShowView::getTranslationOffset() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -655,13 +655,13 @@ void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEv //----- XView ----------------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterSlideShowView::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterSlideShowView::getResourceId() throw(RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL PresenterSlideShowView::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterSlideShowView::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -669,7 +669,7 @@ sal_Bool SAL_CALL PresenterSlideShowView::isAnchorOnly (void) //----- CachablePresenterView ------------------------------------------------- -void PresenterSlideShowView::ActivatePresenterView (void) +void PresenterSlideShowView::ActivatePresenterView() { if (mxSlideShow.is() && ! mbIsViewAdded) { @@ -678,7 +678,7 @@ void PresenterSlideShowView::ActivatePresenterView (void) } } -void PresenterSlideShowView::DeactivatePresenterView (void) +void PresenterSlideShowView::DeactivatePresenterView() { if (mxSlideShow.is() && mbIsViewAdded) { @@ -877,7 +877,7 @@ Reference<rendering::XCanvas> PresenterSlideShowView::CreateViewCanvas ( rxViewWindow); } -void PresenterSlideShowView::Resize (void) +void PresenterSlideShowView::Resize() { if ( ! mxWindow.is() || ! mxViewWindow.is()) return; @@ -933,7 +933,7 @@ void PresenterSlideShowView::Resize (void) mbIsForcedPaintPending = true; } -void PresenterSlideShowView::ForceRepaint (void) +void PresenterSlideShowView::ForceRepaint() { if (mxSlideShow.is() && mbIsViewAdded) { @@ -942,7 +942,7 @@ void PresenterSlideShowView::ForceRepaint (void) } } -void PresenterSlideShowView::CreateBackgroundPolygons (void) +void PresenterSlideShowView::CreateBackgroundPolygons() { const awt::Rectangle aWindowBox (mxWindow->getPosSize()); const awt::Rectangle aViewWindowBox (mxViewWindow->getPosSize()); @@ -989,7 +989,7 @@ void PresenterSlideShowView::CreateBackgroundPolygons (void) } } -void PresenterSlideShowView::ThrowIfDisposed (void) +void PresenterSlideShowView::ThrowIfDisposed() throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx index 4aeb637572b5..36b527f97e16 100644 --- a/sdext/source/presenter/PresenterSlideShowView.hxx +++ b/sdext/source/presenter/PresenterSlideShowView.hxx @@ -69,28 +69,28 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterSlideShowView (void); + virtual ~PresenterSlideShowView(); - void LateInit (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + void LateInit(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // CachablePresenterView - virtual void ReleaseView (void) SAL_OVERRIDE; + virtual void ReleaseView() SAL_OVERRIDE; // XSlideShowView virtual css::uno::Reference< - css::rendering::XSpriteCanvas > SAL_CALL getCanvas (void) + css::rendering::XSpriteCanvas > SAL_CALL getCanvas() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL clear (void) + virtual void SAL_CALL clear() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation (void) + virtual css::geometry::AffineMatrix2D SAL_CALL getTransformation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset(void) + virtual css::geometry::IntegerSize2D SAL_CALL getTranslationOffset() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addTransformationChangedListener( @@ -185,10 +185,10 @@ public: // XView virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL - getResourceId (void) + getResourceId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView @@ -197,14 +197,14 @@ 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; // CachablePresenterView - virtual void ActivatePresenterView (void) SAL_OVERRIDE; + virtual void ActivatePresenterView() SAL_OVERRIDE; - virtual void DeactivatePresenterView (void) SAL_OVERRIDE; + virtual void DeactivatePresenterView() SAL_OVERRIDE; private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; @@ -253,7 +253,7 @@ private: css::uno::Reference<css::rendering::XCanvas> CreateViewCanvas ( const css::uno::Reference<css::awt::XWindow>& rxWindow) const; - void Resize (void); + void Resize(); void PaintOuterWindow (const css::awt::Rectangle& rRepaintBox); void PaintInnerWindow (const css::awt::PaintEvent& rEvent); @@ -265,14 +265,14 @@ private: Call this method when the back buffer may have changed its content, like when the window has been moved but not resized. */ - void ForceRepaint (void); + void ForceRepaint(); - void CreateBackgroundPolygons (void); + void CreateBackgroundPolygons(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); void impl_addAndConfigureView(); diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 098e85dfc972..c1024c600706 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -86,8 +86,8 @@ public: Layout (const ::rtl::Reference<PresenterScrollBar>& rpVerticalScrollBar); void Update (const geometry::RealRectangle2D& rBoundingBox, const double nSlideAspectRatio); - void SetupVisibleArea (void); - void UpdateScrollBars (void); + void SetupVisibleArea(); + void UpdateScrollBars(); bool IsScrollBarNeeded (const sal_Int32 nSlideCount); geometry::RealPoint2D GetLocalPosition (const geometry::RealPoint2D& rWindowPoint) const; geometry::RealPoint2D GetWindowPosition(const geometry::RealPoint2D& rLocalPoint) const; @@ -102,8 +102,8 @@ public: const sal_Int32 nRelativeVerticalPosition) const; css::awt::Rectangle GetBoundingBox (const sal_Int32 nSlideIndex) const; void ForAllVisibleSlides (const ::boost::function<void(sal_Int32)>& rAction); - sal_Int32 GetFirstVisibleSlideIndex (void) const; - sal_Int32 GetLastVisibleSlideIndex (void) const; + sal_Int32 GetFirstVisibleSlideIndex() const; + sal_Int32 GetLastVisibleSlideIndex() const; bool SetHorizontalOffset (const double nOffset); bool SetVerticalOffset (const double nOffset); @@ -143,7 +143,7 @@ public: const ::boost::shared_ptr<PresenterTheme>& rpTheme, const Reference<awt::XWindow>& rxInvalidateTarget, const ::boost::shared_ptr<PresenterPaintManager>& rpPaintManager); - ~MouseOverManager (void); + ~MouseOverManager(); void Paint ( const sal_Int32 nSlideIndex, @@ -176,7 +176,7 @@ private: Reference<rendering::XBitmap> CreateBitmap ( const OUString& rsText, const sal_Int32 nMaximalWidth) const; - void Invalidate (void); + void Invalidate(); geometry::IntegerSize2D CalculateLabelSize ( const OUString& rsText) const; OUString GetFittingText (const OUString& rsText, const double nMaximalWidth) const; @@ -193,7 +193,7 @@ public: CurrentSlideFrameRenderer ( const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); - ~CurrentSlideFrameRenderer (void); + ~CurrentSlideFrameRenderer(); void PaintCurrentSlideFrame ( const awt::Rectangle& rSlideBoundingBox, @@ -365,11 +365,11 @@ PresenterSlideSorter::PresenterSlideSorter ( } } -PresenterSlideSorter::~PresenterSlideSorter (void) +PresenterSlideSorter::~PresenterSlideSorter() { } -void SAL_CALL PresenterSlideSorter::disposing (void) +void SAL_CALL PresenterSlideSorter::disposing() { mxComponentContext = NULL; mxViewId = NULL; @@ -606,14 +606,14 @@ void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent& rE //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterSlideSorter::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterSlideSorter::getResourceId() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxViewId; } -sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -674,7 +674,7 @@ void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDr } } -Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -683,7 +683,7 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage (voi -void PresenterSlideSorter::UpdateLayout (void) +void PresenterSlideSorter::UpdateLayout() { if ( ! mxWindow.is()) return; @@ -842,7 +842,7 @@ void PresenterSlideSorter::ClearBackground ( awt::Rectangle()); } -double PresenterSlideSorter::GetSlideAspectRatio (void) const +double PresenterSlideSorter::GetSlideAspectRatio() const { double nSlideAspectRatio (28.0/21.0); @@ -1094,7 +1094,7 @@ void PresenterSlideSorter::GotoSlide (const sal_Int32 nSlideIndex) mxSlideShowController->gotoSlideIndex(nSlideIndex); } -bool PresenterSlideSorter::ProvideCanvas (void) +bool PresenterSlideSorter::ProvideCanvas() { if ( ! mxCanvas.is()) { @@ -1113,7 +1113,7 @@ bool PresenterSlideSorter::ProvideCanvas (void) return mxCanvas.is(); } -void PresenterSlideSorter::ThrowIfDisposed (void) +void PresenterSlideSorter::ThrowIfDisposed() throw (lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -1245,7 +1245,7 @@ void PresenterSlideSorter::Layout::Update ( / 2); } -void PresenterSlideSorter::Layout::SetupVisibleArea (void) +void PresenterSlideSorter::Layout::SetupVisibleArea() { geometry::RealPoint2D aPoint (GetLocalPosition( geometry::RealPoint2D(maBoundingBox.X1, maBoundingBox.Y1))); @@ -1408,12 +1408,12 @@ void PresenterSlideSorter::Layout::ForAllVisibleSlides (const ::boost::function< } } -sal_Int32 PresenterSlideSorter::Layout::GetFirstVisibleSlideIndex (void) const +sal_Int32 PresenterSlideSorter::Layout::GetFirstVisibleSlideIndex() const { return GetIndex(mnFirstVisibleRow, mnFirstVisibleColumn); } -sal_Int32 PresenterSlideSorter::Layout::GetLastVisibleSlideIndex (void) const +sal_Int32 PresenterSlideSorter::Layout::GetLastVisibleSlideIndex() const { return ::std::min( GetIndex(mnLastVisibleRow, mnLastVisibleColumn), @@ -1446,7 +1446,7 @@ bool PresenterSlideSorter::Layout::SetVerticalOffset (const double nOffset) return false; } -void PresenterSlideSorter::Layout::UpdateScrollBars (void) +void PresenterSlideSorter::Layout::UpdateScrollBars() { sal_Int32 nTotalRowCount (0); nTotalRowCount = sal_Int32(ceil(double(mnSlideCount) / double(mnColumnCount))); @@ -1514,7 +1514,7 @@ PresenterSlideSorter::MouseOverManager::MouseOverManager ( } } -PresenterSlideSorter::MouseOverManager::~MouseOverManager (void) +PresenterSlideSorter::MouseOverManager::~MouseOverManager() { } @@ -1768,7 +1768,7 @@ void PresenterSlideSorter::MouseOverManager::PaintButtonBackground ( xRightLabelBitmap); } -void PresenterSlideSorter::MouseOverManager::Invalidate (void) +void PresenterSlideSorter::MouseOverManager::Invalidate() { if (mpPaintManager.get() != NULL) mpPaintManager->Invalidate(mxInvalidateTarget, maSlideBoundingBox, true); @@ -1850,7 +1850,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer ( } } -PresenterSlideSorter::CurrentSlideFrameRenderer::~CurrentSlideFrameRenderer (void) +PresenterSlideSorter::CurrentSlideFrameRenderer::~CurrentSlideFrameRenderer() { } diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx index 53128fbc84ed..abbe11c9c06f 100644 --- a/sdext/source/presenter/PresenterSlideSorter.hxx +++ b/sdext/source/presenter/PresenterSlideSorter.hxx @@ -70,9 +70,9 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterSlideSorter (void); + virtual ~PresenterSlideSorter(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; static void SetActiveState (const bool bIsActive); @@ -125,10 +125,10 @@ public: // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyChangeListener @@ -149,7 +149,7 @@ 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; private: @@ -179,7 +179,7 @@ private: ::boost::shared_ptr<CurrentSlideFrameRenderer> mpCurrentSlideFrameRenderer; css::uno::Reference<css::rendering::XPolyPolygon2D> mxPreviewFrame; - void UpdateLayout (void); + void UpdateLayout(); css::geometry::RealRectangle2D PlaceScrollBars ( const css::geometry::RealRectangle2D& rUpperBox); void PlaceCloseButton ( @@ -189,7 +189,7 @@ private: void ClearBackground ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const css::awt::Rectangle& rRedrawArea); - double GetSlideAspectRatio (void) const; + double GetSlideAspectRatio() const; css::uno::Reference<css::rendering::XBitmap> GetPreview (const sal_Int32 nSlideIndex); void PaintPreview ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, @@ -199,12 +199,12 @@ private: void SetHorizontalOffset (const double nXOffset); void SetVerticalOffset (const double nYOffset); void GotoSlide (const sal_Int32 nSlideIndex); - bool ProvideCanvas (void); + bool ProvideCanvas(); /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) + void ThrowIfDisposed() throw (css::lang::DisposedException); }; diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx index f66bcddd35ed..64949d0c7c18 100644 --- a/sdext/source/presenter/PresenterSprite.cxx +++ b/sdext/source/presenter/PresenterSprite.cxx @@ -30,7 +30,7 @@ using ::com::sun::star::uno::UNO_QUERY; namespace sdext { namespace presenter { -PresenterSprite::PresenterSprite (void) +PresenterSprite::PresenterSprite() : mxSpriteFactory(), mxSprite(), maSize(0,0), @@ -41,7 +41,7 @@ PresenterSprite::PresenterSprite (void) { } -PresenterSprite::~PresenterSprite (void) +PresenterSprite::~PresenterSprite() { if (mxSprite.is()) { @@ -65,7 +65,7 @@ void PresenterSprite::SetFactory ( } } -css::uno::Reference<css::rendering::XCanvas> PresenterSprite::GetCanvas (void) +css::uno::Reference<css::rendering::XCanvas> PresenterSprite::GetCanvas() { ProvideSprite(); if (mxSprite.is()) @@ -74,7 +74,7 @@ css::uno::Reference<css::rendering::XCanvas> PresenterSprite::GetCanvas (void) return NULL; } -void PresenterSprite::Show (void) +void PresenterSprite::Show() { mbIsVisible = true; if (mxSprite.is()) @@ -83,7 +83,7 @@ void PresenterSprite::Show (void) ProvideSprite(); } -void PresenterSprite::Hide (void) +void PresenterSprite::Hide() { mbIsVisible = false; if (mxSprite.is()) @@ -116,13 +116,13 @@ void PresenterSprite::MoveTo (const css::geometry::RealPoint2D& rLocation) ); } -void PresenterSprite::Update (void) +void PresenterSprite::Update() { if (mxSpriteFactory.is()) mxSpriteFactory->updateScreen(sal_False); } -void PresenterSprite::ProvideSprite (void) +void PresenterSprite::ProvideSprite() { if ( ! mxSprite.is() && mxSpriteFactory.is() @@ -150,7 +150,7 @@ void PresenterSprite::ProvideSprite (void) } } -void PresenterSprite::DisposeSprite (void) +void PresenterSprite::DisposeSprite() { if (mxSprite.is()) { diff --git a/sdext/source/presenter/PresenterSprite.hxx b/sdext/source/presenter/PresenterSprite.hxx index 3eeeb6bc7d28..594caa6e7757 100644 --- a/sdext/source/presenter/PresenterSprite.hxx +++ b/sdext/source/presenter/PresenterSprite.hxx @@ -37,8 +37,8 @@ class PresenterSprite : private ::boost::noncopyable { public: - PresenterSprite (void); - virtual ~PresenterSprite (void); + PresenterSprite(); + virtual ~PresenterSprite(); /** The given sprite canvas is used as factory to create the sprite that is wrapped by objects of this class. @@ -47,15 +47,15 @@ public: void SetFactory ( const css::uno::Reference<css::rendering::XSpriteCanvas>& rxSpriteFactory); - css::uno::Reference<css::rendering::XCanvas> GetCanvas (void); + css::uno::Reference<css::rendering::XCanvas> GetCanvas(); - void Show (void); - void Hide (void); + void Show(); + void Hide(); void Resize (const css::geometry::RealSize2D& rSize); void MoveTo (const css::geometry::RealPoint2D& rLocation); - void Update (void); + void Update(); private: css::uno::Reference<css::rendering::XSpriteCanvas> mxSpriteFactory; @@ -66,8 +66,8 @@ private: double mnPriority; double mnAlpha; - void ProvideSprite (void); - void DisposeSprite (void); + void ProvideSprite(); + void DisposeSprite(); }; } } diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index ed7df848670a..a12015e0076f 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -47,11 +47,11 @@ PresenterSpritePane::PresenterSpritePane (const Reference<XComponentContext>& rx UNO_QUERY_THROW); } -PresenterSpritePane::~PresenterSpritePane (void) +PresenterSpritePane::~PresenterSpritePane() { } -void PresenterSpritePane::disposing (void) +void PresenterSpritePane::disposing() { mpSprite->SetFactory(NULL); mxParentWindow = NULL; @@ -61,14 +61,14 @@ void PresenterSpritePane::disposing (void) //----- XPane ----------------------------------------------------------------- -Reference<awt::XWindow> SAL_CALL PresenterSpritePane::getWindow (void) +Reference<awt::XWindow> SAL_CALL PresenterSpritePane::getWindow() throw (RuntimeException, std::exception) { ThrowIfDisposed(); return mxContentWindow; } -Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas (void) +Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas() throw (RuntimeException, std::exception) { ThrowIfDisposed(); @@ -148,12 +148,12 @@ void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent) -::boost::shared_ptr<PresenterSprite> PresenterSpritePane::GetSprite (void) +::boost::shared_ptr<PresenterSprite> PresenterSpritePane::GetSprite() { return mpSprite; } -void PresenterSpritePane::UpdateCanvases (void) +void PresenterSpritePane::UpdateCanvases() { Reference<XComponent> xContentCanvasComponent (mxContentCanvas, UNO_QUERY); if (xContentCanvasComponent.is()) diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 7a6ab95fe78f..6ce7e3235ae6 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -139,7 +139,7 @@ void PresenterTextView::SetText (const Reference<text::XText>& rxText) } void PresenterTextView::SetTextChangeBroadcaster ( - const ::boost::function<void(void)>& rBroadcaster) + const ::boost::function<void()>& rBroadcaster) { maTextChangeBroadcaster = rBroadcaster; } @@ -166,7 +166,7 @@ void PresenterTextView::SetSize (const css::geometry::RealSize2D& rSize) RequestFormat(); } -double PresenterTextView::GetTotalTextHeight (void) +double PresenterTextView::GetTotalTextHeight() { double nTotalHeight (0); @@ -394,7 +394,7 @@ void PresenterTextView::Paint ( } } -SharedPresenterTextCaret PresenterTextView::GetCaret (void) const +SharedPresenterTextCaret PresenterTextView::GetCaret() const { return mpCaret; } @@ -413,12 +413,12 @@ awt::Rectangle PresenterTextView::GetCaretBounds ( //----- private --------------------------------------------------------------- -void PresenterTextView::RequestFormat (void) +void PresenterTextView::RequestFormat() { mbIsFormatPending = true; } -void PresenterTextView::Format (void) +void PresenterTextView::Format() { mbIsFormatPending = false; @@ -437,7 +437,7 @@ void PresenterTextView::Format (void) maTextChangeBroadcaster(); } -sal_Int32 PresenterTextView::GetParagraphCount (void) const +sal_Int32 PresenterTextView::GetParagraphCount() const { return maParagraphs.size(); } @@ -668,7 +668,7 @@ sal_Int32 PresenterTextParagraph::GetWordBoundary( return maWordBoundaries[nIndex]; } -sal_Int32 PresenterTextParagraph::GetCaretPosition (void) const +sal_Int32 PresenterTextParagraph::GetCaretPosition() const { if (mpCaret && mpCaret->GetParagraphIndex()==mnParagraphIndex) return mpCaret->GetCharacterIndex(); @@ -688,14 +688,14 @@ void PresenterTextParagraph::SetOrigin (const double nXOrigin, const double nYOr mnYOrigin = nYOrigin; } -awt::Point PresenterTextParagraph::GetRelativeLocation (void) const +awt::Point PresenterTextParagraph::GetRelativeLocation() const { return awt::Point( sal_Int32(mnXOrigin), sal_Int32(mnYOrigin + mnVerticalOffset)); } -awt::Size PresenterTextParagraph::GetSize (void) +awt::Size PresenterTextParagraph::GetSize() { return awt::Size( sal_Int32(mnWidth), @@ -763,7 +763,7 @@ void PresenterTextParagraph::AddLine ( rCurrentLine.startPos = rCurrentLine.endPos; } -double PresenterTextParagraph::GetTotalTextHeight (void) +double PresenterTextParagraph::GetTotalTextHeight() { return maLines.size() * mnLineHeight; } @@ -773,7 +773,7 @@ void PresenterTextParagraph::SetCharacterOffset (const sal_Int32 nCharacterOffse mnCharacterOffset = nCharacterOffset; } -sal_Int32 PresenterTextParagraph::GetCharacterCount (void) const +sal_Int32 PresenterTextParagraph::GetCharacterCount() const { return msParagraphText.getLength(); } @@ -792,7 +792,7 @@ sal_Unicode PresenterTextParagraph::GetCharacter ( } } -OUString PresenterTextParagraph::GetText (void) const +OUString PresenterTextParagraph::GetText() const { return msParagraphText; } @@ -998,7 +998,7 @@ sal_Int32 PresenterTextParagraph::GetIndexAtPoint (const awt::Point& rPoint) con return -1; } -sal_Int8 PresenterTextParagraph::GetTextDirection (void) const +sal_Int8 PresenterTextParagraph::GetTextDirection() const { // Find first portion that has a non-neutral text direction. sal_Int32 nPosition (0); @@ -1046,7 +1046,7 @@ sal_Int8 PresenterTextParagraph::GetTextDirection (void) const return nTextDirection; } -bool PresenterTextParagraph::IsTextReferencePointLeft (void) const +bool PresenterTextParagraph::IsTextReferencePointLeft() const { return mnWritingMode != text::WritingMode2::RL_TB; } @@ -1103,12 +1103,12 @@ PresenterTextCaret::PresenterTextCaret ( { } -PresenterTextCaret::~PresenterTextCaret (void) +PresenterTextCaret::~PresenterTextCaret() { HideCaret(); } -void PresenterTextCaret::ShowCaret (void) +void PresenterTextCaret::ShowCaret() { if (mnCaretBlinkTaskId == 0) { @@ -1120,7 +1120,7 @@ void PresenterTextCaret::ShowCaret (void) mbIsCaretVisible = true; } -void PresenterTextCaret::HideCaret (void) +void PresenterTextCaret::HideCaret() { if (mnCaretBlinkTaskId != 0) { @@ -1175,12 +1175,12 @@ void PresenterTextCaret::SetCaretMotionBroadcaster ( maBroadcaster = rBroadcaster; } -css::awt::Rectangle PresenterTextCaret::GetBounds (void) const +css::awt::Rectangle PresenterTextCaret::GetBounds() const { return maCaretBounds; } -void PresenterTextCaret::InvertCaret (void) +void PresenterTextCaret::InvertCaret() { mbIsCaretVisible = !mbIsCaretVisible; if (mnParagraphIndex >= 0) @@ -1213,7 +1213,7 @@ PresenterTextParagraph::Line::Line ( { } -void PresenterTextParagraph::Line::ProvideCellBoxes (void) +void PresenterTextParagraph::Line::ProvideCellBoxes() { if ( ! IsEmpty() && maCellBoxes.getLength()==0) { @@ -1245,7 +1245,7 @@ void PresenterTextParagraph::Line::ProvideLayoutedLine ( } } -bool PresenterTextParagraph::Line::IsEmpty (void) const +bool PresenterTextParagraph::Line::IsEmpty() const { return mnLineStartCharacterIndex >= mnLineEndCharacterIndex; } diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 60beb1bb21ef..349e9df6902b 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -45,18 +45,18 @@ public: rCharacterBoundsAccess, const ::boost::function<void(const css::awt::Rectangle&)>& rInvalidator); - ~PresenterTextCaret (void); + ~PresenterTextCaret(); - void ShowCaret (void); - void HideCaret (void); + void ShowCaret(); + void HideCaret(); - sal_Int32 GetParagraphIndex (void) const { return mnParagraphIndex;} - sal_Int32 GetCharacterIndex (void) const { return mnCharacterIndex;} + sal_Int32 GetParagraphIndex() const { return mnParagraphIndex;} + sal_Int32 GetCharacterIndex() const { return mnCharacterIndex;} void SetPosition ( const sal_Int32 nParagraphIndex, const sal_Int32 nCharacterIndex); - bool IsVisible (void) const { return mbIsCaretVisible;} + bool IsVisible() const { return mbIsCaretVisible;} /** Set a (possibly empty) functor that broadcasts changes of the caret position. This is used when a PresenterTextView object is set at @@ -66,7 +66,7 @@ public: void SetCaretMotionBroadcaster ( const ::boost::function<void(sal_Int32,sal_Int32,sal_Int32,sal_Int32)>& rBroadcaster); - css::awt::Rectangle GetBounds (void) const; + css::awt::Rectangle GetBounds() const; private: sal_Int32 mnParagraphIndex; @@ -78,7 +78,7 @@ private: ::boost::function<void(sal_Int32,sal_Int32,sal_Int32,sal_Int32)> maBroadcaster; css::awt::Rectangle maCaretBounds; - void InvertCaret (void); + void InvertCaret(); }; typedef ::boost::shared_ptr<PresenterTextCaret> SharedPresenterTextCaret; @@ -104,12 +104,12 @@ public: const double nClipTop, const double nClipBottom); - double GetTotalTextHeight (void); + double GetTotalTextHeight(); void SetCharacterOffset (const sal_Int32 nCharacterOffset); - sal_Int32 GetCharacterCount (void) const; + sal_Int32 GetCharacterCount() const; sal_Unicode GetCharacter (const sal_Int32 nGlobalCharacterIndex) const; - OUString GetText (void) const; + OUString GetText() const; css::accessibility::TextSegment GetTextSegment ( const sal_Int32 nOffset, const sal_Int32 nGlobalCharacterIndex, @@ -133,11 +133,11 @@ public: sal_Int32 GetWordBoundary( const sal_Int32 nLocalCharacterIndex, const sal_Int32 nDistance); - sal_Int32 GetCaretPosition (void) const; + sal_Int32 GetCaretPosition() const; void SetCaretPosition (const sal_Int32 nPosition) const; void SetOrigin (const double nXOrigin, const double nYOrigin); - css::awt::Point GetRelativeLocation (void) const; - css::awt::Size GetSize (void); + css::awt::Point GetRelativeLocation() const; + css::awt::Size GetSize(); private: OUString msParagraphText; @@ -175,8 +175,8 @@ private: const OUString& rsParagraphText, const PresenterTheme::SharedFontDescriptor& rpFont, const sal_Int8 nTextDirection); - void ProvideCellBoxes (void); - bool IsEmpty (void) const; + void ProvideCellBoxes(); + bool IsEmpty() const; }; css::uno::Reference<css::i18n::XBreakIterator> mxBreakIterator; @@ -206,8 +206,8 @@ private: const PresenterTheme::SharedFontDescriptor& rpFont); void AddLine ( css::i18n::Boundary& rCurrentLine); - sal_Int8 GetTextDirection (void) const; - bool IsTextReferencePointLeft (void) const; + sal_Int8 GetTextDirection() const; + bool IsTextReferencePointLeft() const; }; typedef ::boost::shared_ptr<PresenterTextParagraph> SharedPresenterTextParagraph; @@ -222,11 +222,11 @@ public: const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const ::boost::function<void(const css::awt::Rectangle&)>& rInvalidator); void SetText (const css::uno::Reference<css::text::XText>& rxText); - void SetTextChangeBroadcaster (const ::boost::function<void(void)>& rBroadcaster); + void SetTextChangeBroadcaster (const ::boost::function<void()>& rBroadcaster); void SetLocation (const css::geometry::RealPoint2D& rLocation); void SetSize (const css::geometry::RealSize2D& rSize); - double GetTotalTextHeight (void); + double GetTotalTextHeight(); void SetFont (const PresenterTheme::SharedFontDescriptor& rpFont); @@ -248,9 +248,9 @@ public: void Paint (const css::awt::Rectangle& rUpdateBox); - SharedPresenterTextCaret GetCaret (void) const; + SharedPresenterTextCaret GetCaret() const; - sal_Int32 GetParagraphCount (void) const; + sal_Int32 GetParagraphCount() const; SharedPresenterTextParagraph GetParagraph (const sal_Int32 nParagraphIndex) const; private: @@ -268,10 +268,10 @@ private: const ::boost::function<void(const css::awt::Rectangle&)> maInvalidator; bool mbIsFormatPending; sal_Int32 mnCharacterCount; - ::boost::function<void(void)> maTextChangeBroadcaster; + ::boost::function<void()> maTextChangeBroadcaster; - void RequestFormat (void); - void Format (void); + void RequestFormat(); + void Format(); SharedPresenterTextParagraph GetParagraphForCharacterIndex (const sal_Int32 nCharacterIndex) const; css::awt::Rectangle GetCaretBounds ( const sal_Int32 nParagraphIndex, diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index b71bec671d47..36387a2861b1 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -47,7 +47,7 @@ class BorderSize public: const static sal_Int32 mnInvalidValue = -10000; - BorderSize (void) : mnLeft(mnInvalidValue), + BorderSize() : mnLeft(mnInvalidValue), mnTop(mnInvalidValue), mnRight(mnInvalidValue), mnBottom(mnInvalidValue) {} @@ -57,7 +57,7 @@ public: sal_Int32 mnRight; sal_Int32 mnBottom; - vector<sal_Int32> ToVector (void) + vector<sal_Int32> ToVector() { vector<sal_Int32> aSequence (4); aSequence[0] = mnLeft == mnInvalidValue ? 0 : mnLeft; @@ -94,7 +94,7 @@ public: ReadContext ( const Reference<XComponentContext>& rxContext, const Reference<rendering::XCanvas>& rxCanvas); - ~ReadContext (void); + ~ReadContext(); /** Read data describing a font from the node that can be reached from the given root via the given path. @@ -126,8 +126,8 @@ private: class PaneStyle { public: - PaneStyle (void); - ~PaneStyle (void); + PaneStyle(); + ~PaneStyle(); const SharedBitmapDescriptor GetBitmap (const OUString& sBitmapName) const; @@ -138,7 +138,7 @@ public: BorderSize maOuterBorderSize; ::boost::shared_ptr<PresenterBitmapContainer> mpBitmaps; - PresenterTheme::SharedFontDescriptor GetFont (void) const; + PresenterTheme::SharedFontDescriptor GetFont() const; }; typedef ::boost::shared_ptr<PaneStyle> SharedPaneStyle; @@ -167,12 +167,12 @@ private: class ViewStyle { public: - ViewStyle (void); - ~ViewStyle (void); + ViewStyle(); + ~ViewStyle(); const SharedBitmapDescriptor GetBitmap (const OUString& sBitmapName) const; - PresenterTheme::SharedFontDescriptor GetFont (void) const; + PresenterTheme::SharedFontDescriptor GetFont() const; OUString msStyleName; ::boost::shared_ptr<ViewStyle> mpParentStyle; @@ -235,7 +235,7 @@ public: const OUString& rsName, const Reference<container::XHierarchicalNameAccess>& rThemeRoot, const OUString& rsNodeName); - ~Theme (void); + ~Theme(); void Read ( PresenterConfigurationAccess& rConfiguration, @@ -279,11 +279,11 @@ PresenterTheme::PresenterTheme ( mpTheme = ReadTheme(); } -PresenterTheme::~PresenterTheme (void) +PresenterTheme::~PresenterTheme() { } -::boost::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme (void) +::boost::shared_ptr<PresenterTheme::Theme> PresenterTheme::ReadTheme() { ReadContext aReadContext(mxContext, mxCanvas); @@ -295,7 +295,7 @@ PresenterTheme::~PresenterTheme (void) return aReadContext.ReadTheme(aConfiguration, msThemeName); } -bool PresenterTheme::HasCanvas (void) const +bool PresenterTheme::HasCanvas() const { return mxCanvas.is(); } @@ -461,7 +461,7 @@ SharedBitmapDescriptor PresenterTheme::GetBitmap ( return SharedBitmapDescriptor(); } -::boost::shared_ptr<PresenterBitmapContainer> PresenterTheme::GetBitmapContainer (void) const +::boost::shared_ptr<PresenterBitmapContainer> PresenterTheme::GetBitmapContainer() const { if (mpTheme.get() != NULL) return mpTheme->mpIconContainer; @@ -601,7 +601,7 @@ PresenterTheme::Theme::Theme ( { } -PresenterTheme::Theme::~Theme (void) +PresenterTheme::Theme::~Theme() { } @@ -713,7 +713,7 @@ ReadContext::ReadContext ( } } -ReadContext::~ReadContext (void) +ReadContext::~ReadContext() { } @@ -940,7 +940,7 @@ SharedPaneStyle PaneStyleContainer::GetPaneStyle (const OUString& rsStyleName) c //===== PaneStyle ============================================================= -PaneStyle::PaneStyle (void) +PaneStyle::PaneStyle() : msStyleName(), mpParentStyle(), mpFont(), @@ -950,7 +950,7 @@ PaneStyle::PaneStyle (void) { } -PaneStyle::~PaneStyle (void) +PaneStyle::~PaneStyle() { } @@ -969,7 +969,7 @@ const SharedBitmapDescriptor PaneStyle::GetBitmap (const OUString& rsBitmapName) return SharedBitmapDescriptor(); } -PresenterTheme::SharedFontDescriptor PaneStyle::GetFont (void) const +PresenterTheme::SharedFontDescriptor PaneStyle::GetFont() const { if (mpFont.get() != NULL) return mpFont; @@ -1060,7 +1060,7 @@ SharedViewStyle ViewStyleContainer::GetViewStyle (const OUString& rsStyleName) c //===== ViewStyle ============================================================= -ViewStyle::ViewStyle (void) +ViewStyle::ViewStyle() : msStyleName(), mpParentStyle(), mpFont(), @@ -1068,7 +1068,7 @@ ViewStyle::ViewStyle (void) { } -ViewStyle::~ViewStyle (void) +ViewStyle::~ViewStyle() { } @@ -1080,7 +1080,7 @@ const SharedBitmapDescriptor ViewStyle::GetBitmap (const OUString& rsBitmapName) return SharedBitmapDescriptor(); } -PresenterTheme::SharedFontDescriptor ViewStyle::GetFont (void) const +PresenterTheme::SharedFontDescriptor ViewStyle::GetFont() const { if (mpFont.get() != NULL) return mpFont; diff --git a/sdext/source/presenter/PresenterTheme.hxx b/sdext/source/presenter/PresenterTheme.hxx index 12789c1988ce..651859e59bd3 100644 --- a/sdext/source/presenter/PresenterTheme.hxx +++ b/sdext/source/presenter/PresenterTheme.hxx @@ -62,9 +62,9 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const OUString& rsThemeName, const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); - ~PresenterTheme (void); + ~PresenterTheme(); - bool HasCanvas (void) const; + bool HasCanvas() const; void ProvideCanvas (const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); OUString GetStyleName (const OUString& rsResourceURL) const; @@ -106,7 +106,7 @@ public: SharedBitmapDescriptor GetBitmap ( const OUString& rsBitmapName) const; - ::boost::shared_ptr<PresenterBitmapContainer> GetBitmapContainer (void) const; + ::boost::shared_ptr<PresenterBitmapContainer> GetBitmapContainer() const; SharedFontDescriptor GetFont ( const OUString& rsStyleName) const; @@ -130,7 +130,7 @@ private: ::boost::shared_ptr<PresenterBitmapContainer> mpBitmapContainer; css::uno::Reference<css::rendering::XCanvas> mxCanvas; - ::boost::shared_ptr<Theme> ReadTheme (void); + ::boost::shared_ptr<Theme> ReadTheme(); }; } } // end of namespace ::sd::presenter diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index a54a3cb866dd..0af44829382b 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -42,7 +42,7 @@ public: const TimeValue& rDueTime, const sal_Int64 nRepeatIntervall, const sal_Int32 nTaskId); - ~TimerTask (void) {} + ~TimerTask() {} PresenterTimer::Task maTask; TimeValue maDueTime; @@ -71,7 +71,7 @@ class TimerScheduler public ::osl::Thread { public: - static ::boost::shared_ptr<TimerScheduler> Instance (void); + static ::boost::shared_ptr<TimerScheduler> Instance(); static SharedTimerTask CreateTimerTask ( const PresenterTimer::Task& rTask, const TimeValue& rDueTime, @@ -102,13 +102,13 @@ private: ::osl::Mutex maCurrentTaskMutex; SharedTimerTask mpCurrentTask; - TimerScheduler (void); - virtual ~TimerScheduler (void); + TimerScheduler(); + virtual ~TimerScheduler(); class Deleter {public: void operator () (TimerScheduler* pScheduler) { delete pScheduler; } }; friend class Deleter; - virtual void SAL_CALL run (void) SAL_OVERRIDE; - virtual void SAL_CALL onTerminated (void) SAL_OVERRIDE { mpLateDestroy.reset(); } + virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE { mpLateDestroy.reset(); } }; } // end of anonymous namespace @@ -146,7 +146,7 @@ void PresenterTimer::CancelTask (const sal_Int32 nTaskId) ::osl::Mutex TimerScheduler::maInstanceMutex; sal_Int32 TimerScheduler::mnTaskId = PresenterTimer::NotAValidTaskId; -::boost::shared_ptr<TimerScheduler> TimerScheduler::Instance (void) +::boost::shared_ptr<TimerScheduler> TimerScheduler::Instance() { ::osl::MutexGuard aGuard (maInstanceMutex); if (mpInstance.get() == NULL) @@ -157,7 +157,7 @@ sal_Int32 TimerScheduler::mnTaskId = PresenterTimer::NotAValidTaskId; return mpInstance; } -TimerScheduler::TimerScheduler (void) +TimerScheduler::TimerScheduler() : maTaskContainerMutex(), maScheduledTasks(), maCurrentTaskMutex(), @@ -165,7 +165,7 @@ TimerScheduler::TimerScheduler (void) { } -TimerScheduler::~TimerScheduler (void) +TimerScheduler::~TimerScheduler() { } @@ -222,7 +222,7 @@ void TimerScheduler::CancelTask (const sal_Int32 nTaskId) // Let the main-loop cleanup in it's own time } -void SAL_CALL TimerScheduler::run (void) +void SAL_CALL TimerScheduler::run() { osl_setThreadName("sdext::presenter::TimerScheduler"); @@ -393,7 +393,7 @@ PresenterClockTimer::PresenterClockTimer (const Reference<XComponentContext>& rx UNO_QUERY_THROW); } -PresenterClockTimer::~PresenterClockTimer (void) +PresenterClockTimer::~PresenterClockTimer() { if (mnTimerTaskId != PresenterTimer::NotAValidTaskId) { @@ -445,7 +445,7 @@ void PresenterClockTimer::RemoveListener (const SharedListener& rListener) } } -oslDateTime PresenterClockTimer::GetCurrentTime (void) +oslDateTime PresenterClockTimer::GetCurrentTime() { TimeValue aCurrentTime; TimerScheduler::GetCurrentTime(aCurrentTime); diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx index f4db79904f49..8e37a8b2a7fe 100644 --- a/sdext/source/presenter/PresenterTimer.hxx +++ b/sdext/source/presenter/PresenterTimer.hxx @@ -89,7 +89,7 @@ public: void AddListener (const SharedListener& rListener); void RemoveListener (const SharedListener& rListener); - static oslDateTime GetCurrentTime (void); + static oslDateTime GetCurrentTime(); // XCallback @@ -109,7 +109,7 @@ private: PresenterClockTimer ( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual ~PresenterClockTimer (void); + virtual ~PresenterClockTimer(); void CheckCurrentTime (const TimeValue& rCurrentTime); }; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 05d88a6dc2ea..a850602bebfe 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -66,14 +66,14 @@ namespace { class Text { public: - Text (void); + Text(); Text ( const OUString& rsText, const PresenterTheme::SharedFontDescriptor& rpFont); void SetText (const OUString& rsText); - OUString GetText (void) const; - PresenterTheme::SharedFontDescriptor GetFont (void) const; + OUString GetText() const; + PresenterTheme::SharedFontDescriptor GetFont() const; void Paint ( const Reference<rendering::XCanvas>& rxCanvas, @@ -93,7 +93,7 @@ namespace { : private ::boost::noncopyable { public: - ElementMode (void); + ElementMode(); SharedBitmapDescriptor mpIcon; OUString msAction; @@ -132,16 +132,16 @@ namespace { { public: Element (const ::rtl::Reference<PresenterToolBar>& rpToolBar); - virtual ~Element (void); + virtual ~Element(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void SetModes ( const SharedElementMode& rpNormalMode, const SharedElementMode& rpMouseOverMode, const SharedElementMode& rpSelectedMode, const SharedElementMode& rpDisabledMode); - void CurrentSlideHasChanged (void); + void CurrentSlideHasChanged(); void SetLocation (const awt::Point& rLocation); void SetSize (const geometry::RealSize2D& rSize); virtual void Paint ( @@ -149,12 +149,12 @@ namespace { const rendering::ViewState& rViewState) = 0; awt::Size GetBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas); - awt::Rectangle GetBoundingBox (void) const; + awt::Rectangle GetBoundingBox() const; virtual bool SetState (const bool bIsOver, const bool bIsPressed); void Invalidate (const bool bSynchronous = true); bool IsOutside (const awt::Rectangle& rBox); - virtual bool IsFilling (void) const; - void UpdateState (void); + virtual bool IsFilling() const; + void UpdateState(); // lang::XEventListener @@ -187,7 +187,7 @@ namespace { virtual awt::Size CreateBoundingSize ( const Reference<rendering::XCanvas>& rxCanvas) = 0; - bool IsEnabled (void) const { return mbIsEnabled;} + bool IsEnabled() const { return mbIsEnabled;} private: bool mbIsEnabled; }; @@ -209,8 +209,8 @@ namespace { static ::rtl::Reference<Element> Create ( const ::rtl::Reference<PresenterToolBar>& rpToolBar); - virtual ~Button (void); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual ~Button(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, @@ -229,12 +229,12 @@ namespace { bool mbIsListenerRegistered; Button (const ::rtl::Reference<PresenterToolBar>& rpToolBar); - void Initialize (void); + void Initialize(); void PaintIcon ( const Reference<rendering::XCanvas>& rxCanvas, const sal_Int32 nTextHeight, const rendering::ViewState& rViewState); - PresenterBitmapDescriptor::Mode GetMode (void) const; + PresenterBitmapDescriptor::Mode GetMode() const; }; //===== Label ================================================================= @@ -260,7 +260,7 @@ namespace { class TimeFormatter { public: - TimeFormatter (void); + TimeFormatter(); OUString FormatTime (const oslDateTime& rTime); private: bool mbIs24HourFormat; @@ -271,19 +271,19 @@ namespace { class TimeLabel : public Label { public: - void ConnectToTimer (void); + void ConnectToTimer(); virtual void TimeHasChanged (const oslDateTime& rCurrentTime) = 0; protected: TimeLabel(const ::rtl::Reference<PresenterToolBar>& rpToolBar); using Element::disposing; - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: class Listener : public PresenterClockTimer::Listener { public: Listener (const ::rtl::Reference<TimeLabel>& rxLabel) : mxLabel(rxLabel) {} - virtual ~Listener (void) {} + virtual ~Listener() {} virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE { if (mxLabel.is()) mxLabel->TimeHasChanged(rCurrentTime); } private: @@ -305,7 +305,7 @@ namespace { private: TimeFormatter maTimeFormatter; CurrentTimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar); - virtual ~CurrentTimeLabel (void); + virtual ~CurrentTimeLabel(); virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE; }; @@ -323,7 +323,7 @@ namespace { TimeFormatter maTimeFormatter; TimeValue maStartTimeValue; PresentationTimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar); - virtual ~PresentationTimeLabel (void); + virtual ~PresentationTimeLabel(); virtual void TimeHasChanged (const oslDateTime& rCurrentTime) SAL_OVERRIDE; }; @@ -334,7 +334,7 @@ namespace { virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) SAL_OVERRIDE; - virtual bool IsFilling (void) const SAL_OVERRIDE; + virtual bool IsFilling() const SAL_OVERRIDE; protected: virtual awt::Size CreateBoundingSize ( @@ -348,7 +348,7 @@ namespace { virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) SAL_OVERRIDE; - virtual bool IsFilling (void) const SAL_OVERRIDE; + virtual bool IsFilling() const SAL_OVERRIDE; protected: virtual awt::Size CreateBoundingSize ( @@ -413,11 +413,11 @@ void PresenterToolBar::Initialize ( } } -PresenterToolBar::~PresenterToolBar (void) +PresenterToolBar::~PresenterToolBar() { } -void SAL_CALL PresenterToolBar::disposing (void) +void SAL_CALL PresenterToolBar::disposing() { if (mxWindow.is()) { @@ -466,7 +466,7 @@ void PresenterToolBar::InvalidateArea ( bSynchronous); } -void PresenterToolBar::RequestLayout (void) +void PresenterToolBar::RequestLayout() { mbIsLayoutPending = true; @@ -477,19 +477,19 @@ void PresenterToolBar::RequestLayout (void) xManager->Invalidate(mxWindow); } -geometry::RealSize2D PresenterToolBar::GetMinimalSize (void) +geometry::RealSize2D PresenterToolBar::GetMinimalSize() { if (mbIsLayoutPending) Layout(mxCanvas); return maMinimalSize; } -::rtl::Reference<PresenterController> PresenterToolBar::GetPresenterController (void) const +::rtl::Reference<PresenterController> PresenterToolBar::GetPresenterController() const { return mpPresenterController; } -Reference<XComponentContext> PresenterToolBar::GetComponentContext (void) const +Reference<XComponentContext> PresenterToolBar::GetComponentContext() const { return mxComponentContext; } @@ -613,7 +613,7 @@ void SAL_CALL PresenterToolBar::setCurrentPage (const Reference<drawing::XDrawPa } } -Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage() throw (RuntimeException, std::exception) { return mxCurrentSlide; @@ -1000,7 +1000,7 @@ void PresenterToolBar::Paint ( } } -void PresenterToolBar::UpdateSlideNumber (void) +void PresenterToolBar::UpdateSlideNumber() { if( mxSlideShowController.is() ) { @@ -1053,7 +1053,7 @@ void PresenterToolBar::CheckMouseOver ( } } -void PresenterToolBar::ThrowIfDisposed (void) const +void PresenterToolBar::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -1115,11 +1115,11 @@ PresenterToolBarView::PresenterToolBarView ( } } -PresenterToolBarView::~PresenterToolBarView (void) +PresenterToolBarView::~PresenterToolBarView() { } -void SAL_CALL PresenterToolBarView::disposing (void) +void SAL_CALL PresenterToolBarView::disposing() { Reference<lang::XComponent> xComponent (static_cast<XWeak*>(mpToolBar.get()), UNO_QUERY); mpToolBar = NULL; @@ -1139,7 +1139,7 @@ void SAL_CALL PresenterToolBarView::disposing (void) } -::rtl::Reference<PresenterToolBar> PresenterToolBarView::GetPresenterToolBar (void) const +::rtl::Reference<PresenterToolBar> PresenterToolBarView::GetPresenterToolBar() const { return mpToolBar; } @@ -1169,13 +1169,13 @@ void SAL_CALL PresenterToolBarView::disposing (const lang::EventObject& rEventOb //----- XResourceId ----------------------------------------------------------- -Reference<XResourceId> SAL_CALL PresenterToolBarView::getResourceId (void) +Reference<XResourceId> SAL_CALL PresenterToolBarView::getResourceId() throw (RuntimeException, std::exception) { return mxViewId; } -sal_Bool SAL_CALL PresenterToolBarView::isAnchorOnly (void) +sal_Bool SAL_CALL PresenterToolBarView::isAnchorOnly() throw (RuntimeException, std::exception) { return false; @@ -1191,7 +1191,7 @@ void SAL_CALL PresenterToolBarView::setCurrentPage (const Reference<drawing::XDr xToolBar->setCurrentPage(rxSlide); } -Reference<drawing::XDrawPage> SAL_CALL PresenterToolBarView::getCurrentPage (void) +Reference<drawing::XDrawPage> SAL_CALL PresenterToolBarView::getCurrentPage() throw (RuntimeException, std::exception) { return NULL; @@ -1224,7 +1224,7 @@ Element::Element ( } } -Element::~Element (void) +Element::~Element() { } @@ -1241,7 +1241,7 @@ void Element::SetModes ( mpMode = rpNormalMode; } -void Element::disposing (void) +void Element::disposing() { } @@ -1252,12 +1252,12 @@ awt::Size Element::GetBoundingSize ( return maSize; } -awt::Rectangle Element::GetBoundingBox (void) const +awt::Rectangle Element::GetBoundingBox() const { return awt::Rectangle(maLocation.X,maLocation.Y, maSize.Width, maSize.Height); } -void Element::CurrentSlideHasChanged (void) +void Element::CurrentSlideHasChanged() { UpdateState(); } @@ -1344,12 +1344,12 @@ bool Element::IsOutside (const awt::Rectangle& rBox) } -bool Element::IsFilling (void) const +bool Element::IsFilling() const { return false; } -void Element::UpdateState (void) +void Element::UpdateState() { OSL_ASSERT(mpToolBar.get() != NULL); OSL_ASSERT(mpToolBar->GetPresenterController().get() != NULL); @@ -1407,7 +1407,7 @@ void SAL_CALL Element::statusChanged (const css::frame::FeatureStateEvent& rEven namespace { -ElementMode::ElementMode (void) +ElementMode::ElementMode() : mpIcon(), msAction(), maText() @@ -1494,17 +1494,17 @@ Button::Button ( OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is()); } -Button::~Button (void) +Button::~Button() { } -void Button::Initialize (void) +void Button::Initialize() { mpToolBar->GetPresenterController()->GetWindowManager()->AddLayoutListener(this); mbIsListenerRegistered = true; } -void Button::disposing (void) +void Button::disposing() { OSL_ASSERT(mpToolBar.get() != NULL); if (mpToolBar.get() != NULL @@ -1609,7 +1609,7 @@ void Button::PaintIcon ( } } -PresenterBitmapDescriptor::Mode Button::GetMode (void) const +PresenterBitmapDescriptor::Mode Button::GetMode() const { if ( ! IsEnabled()) return PresenterBitmapDescriptor::Disabled; @@ -1697,7 +1697,7 @@ bool Label::SetState (const bool bIsOver, const bool bIsPressed) namespace { -Text::Text (void) +Text::Text() : msText(), mpFont() { @@ -1716,12 +1716,12 @@ void Text::SetText (const OUString& rsText) msText = rsText; } -OUString Text::GetText (void) const +OUString Text::GetText() const { return msText; } -PresenterTheme::SharedFontDescriptor Text::GetFont (void) const +PresenterTheme::SharedFontDescriptor Text::GetFont() const { return mpFont; } @@ -1791,7 +1791,7 @@ geometry::RealRectangle2D Text::GetBoundingBox (const Reference<rendering::XCanv //===== TimeFormatter ========================================================= -TimeFormatter::TimeFormatter (void) +TimeFormatter::TimeFormatter() : mbIs24HourFormat(true), mbIsAmPmFormat(false), mbIsShowSeconds(true) @@ -1847,13 +1847,13 @@ TimeLabel::TimeLabel (const ::rtl::Reference<PresenterToolBar>& rpToolBar) { } -void SAL_CALL TimeLabel::disposing (void) +void SAL_CALL TimeLabel::disposing() { PresenterClockTimer::Instance(mpToolBar->GetComponentContext())->RemoveListener(mpListener); mpListener.reset(); } -void TimeLabel::ConnectToTimer (void) +void TimeLabel::ConnectToTimer() { mpListener.reset(new Listener(this)); PresenterClockTimer::Instance(mpToolBar->GetComponentContext())->AddListener(mpListener); @@ -1869,7 +1869,7 @@ void TimeLabel::ConnectToTimer (void) return ::rtl::Reference<Element>(pElement.get()); } -CurrentTimeLabel::~CurrentTimeLabel (void) +CurrentTimeLabel::~CurrentTimeLabel() { } @@ -1906,7 +1906,7 @@ void CurrentTimeLabel::SetModes ( return ::rtl::Reference<Element>(pElement.get()); } -PresentationTimeLabel::~PresentationTimeLabel (void) +PresentationTimeLabel::~PresentationTimeLabel() { } @@ -2010,7 +2010,7 @@ awt::Size VerticalSeparator::CreateBoundingSize ( return awt::Size(1,20); } -bool VerticalSeparator::IsFilling (void) const +bool VerticalSeparator::IsFilling() const { return true; } @@ -2061,7 +2061,7 @@ awt::Size HorizontalSeparator::CreateBoundingSize ( return awt::Size(20,1); } -bool HorizontalSeparator::IsFilling (void) const +bool HorizontalSeparator::IsFilling() const { return true; } diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index 47e1c6133088..42c225c076a9 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -76,7 +76,7 @@ class PresenterToolBar public CachablePresenterView { public: - typedef ::boost::function<void(void)> Action; + typedef ::boost::function<void()> Action; enum Anchor { Left, Center, Right }; @@ -86,21 +86,21 @@ public: const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, const ::rtl::Reference<PresenterController>& rpPresenterController, const Anchor eAnchor); - virtual ~PresenterToolBar (void); + virtual ~PresenterToolBar(); void Initialize ( const OUString& rsConfigurationPath); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; void InvalidateArea ( const css::awt::Rectangle& rRepaintBox, const bool bSynchronous); - void RequestLayout (void); - css::geometry::RealSize2D GetMinimalSize (void); - ::rtl::Reference<PresenterController> GetPresenterController (void) const; - css::uno::Reference<css::uno::XComponentContext> GetComponentContext (void) const; + void RequestLayout(); + css::geometry::RealSize2D GetMinimalSize(); + ::rtl::Reference<PresenterController> GetPresenterController() const; + css::uno::Reference<css::uno::XComponentContext> GetComponentContext() const; // lang::XEventListener @@ -155,7 +155,7 @@ 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; class Context; @@ -201,7 +201,7 @@ private: const css::awt::Rectangle& rUpdateBox, const css::rendering::ViewState& rViewState); - void UpdateSlideNumber (void); + void UpdateSlideNumber(); void CheckMouseOver ( const css::awt::MouseEvent& rEvent, @@ -215,7 +215,7 @@ private: /** This method throws a DisposedException when the object has already been disposed. */ - void ThrowIfDisposed (void) const + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; @@ -232,11 +232,11 @@ public: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterToolBarView (void); + virtual ~PresenterToolBarView(); - virtual void SAL_CALL disposing (void) SAL_OVERRIDE; + virtual void SAL_CALL disposing() SAL_OVERRIDE; - ::rtl::Reference<PresenterToolBar> GetPresenterToolBar (void) const; + ::rtl::Reference<PresenterToolBar> GetPresenterToolBar() const; // XPaintListener @@ -251,10 +251,10 @@ public: // XResourceId - virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId (void) + virtual css::uno::Reference<css::drawing::framework::XResourceId> SAL_CALL getResourceId() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isAnchorOnly (void) + virtual sal_Bool SAL_CALL isAnchorOnly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDrawView @@ -263,7 +263,7 @@ 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; private: diff --git a/sdext/source/presenter/PresenterUIPainter.hxx b/sdext/source/presenter/PresenterUIPainter.hxx index ae65b3bf0b4a..c1461489817a 100644 --- a/sdext/source/presenter/PresenterUIPainter.hxx +++ b/sdext/source/presenter/PresenterUIPainter.hxx @@ -34,8 +34,8 @@ class PresenterUIPainter : ::boost::noncopyable { public: - PresenterUIPainter (void); - ~PresenterUIPainter (void); + PresenterUIPainter(); + ~PresenterUIPainter(); static void PaintHorizontalBitmapComposite ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas, diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 30611b3204d0..ab884974acc6 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -74,7 +74,7 @@ public: : PresenterSlidePreview(rxContext, rxViewId, rxAnchorPane, rpPresenterController) { } - virtual ~NextSlidePreview (void) {} + virtual ~NextSlidePreview() {} virtual void SAL_CALL setCurrentPage ( const css::uno::Reference<css::drawing::XDrawPage>& rxSlide) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE @@ -176,11 +176,11 @@ void PresenterViewFactory::Register (const Reference<frame::XController>& rxCont } } -PresenterViewFactory::~PresenterViewFactory (void) +PresenterViewFactory::~PresenterViewFactory() { } -void SAL_CALL PresenterViewFactory::disposing (void) +void SAL_CALL PresenterViewFactory::disposing() throw (RuntimeException) { if (mxConfigurationController.is()) @@ -514,7 +514,7 @@ Reference<XView> PresenterViewFactory::CreateHelpView( mpPresenterController)); } -void PresenterViewFactory::ThrowIfDisposed (void) const +void PresenterViewFactory::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) @@ -528,22 +528,22 @@ void PresenterViewFactory::ThrowIfDisposed (void) const //===== CachablePresenterView ================================================= -CachablePresenterView::CachablePresenterView (void) +CachablePresenterView::CachablePresenterView() : mbIsPresenterViewActive(true) { } -void CachablePresenterView::ActivatePresenterView (void) +void CachablePresenterView::ActivatePresenterView() { mbIsPresenterViewActive = true; } -void CachablePresenterView::DeactivatePresenterView (void) +void CachablePresenterView::DeactivatePresenterView() { mbIsPresenterViewActive = false; } -void CachablePresenterView::ReleaseView (void) +void CachablePresenterView::ReleaseView() { } diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index d9a7a4572703..0510ba4ced12 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -46,23 +46,23 @@ namespace { class CachablePresenterView { public: - virtual void ActivatePresenterView (void); + virtual void ActivatePresenterView(); /** Called when the view is put into a cache. The view must not paint itself while being deactive. */ - virtual void DeactivatePresenterView (void); + virtual void DeactivatePresenterView(); /** Called before the view is disposed. This gives the view the opportunity to trigger actions that may lead to (synchronous) callbacks that do not result in DisposedExceptions. */ - virtual void ReleaseView (void); + virtual void ReleaseView(); protected: bool mbIsPresenterViewActive; - CachablePresenterView (void); + CachablePresenterView(); ~CachablePresenterView() {} }; @@ -96,14 +96,14 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const css::uno::Reference<css::frame::XController>& rxController, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterViewFactory (void); + virtual ~PresenterViewFactory(); - static OUString getImplementationName_static (void); - static css::uno::Sequence< OUString > getSupportedServiceNames_static (void); + static OUString getImplementationName_static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_static(); static css::uno::Reference<css::uno::XInterface> Create( const css::uno::Reference<css::uno::XComponentContext>& rxContext); - virtual void SAL_CALL disposing (void) + virtual void SAL_CALL disposing() throw (css::uno::RuntimeException) SAL_OVERRIDE; // XResourceFactory @@ -163,7 +163,7 @@ private: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, const css::uno::Reference<css::drawing::framework::XPane>& rxAnchorPane); - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; } } diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 95406faee57b..0fce6117345b 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -90,11 +90,11 @@ PresenterWindowManager::PresenterWindowManager ( UpdateWindowList(); } -PresenterWindowManager::~PresenterWindowManager (void) +PresenterWindowManager::~PresenterWindowManager() { } -void SAL_CALL PresenterWindowManager::disposing (void) +void SAL_CALL PresenterWindowManager::disposing() { NotifyDisposing(); @@ -515,7 +515,7 @@ void PresenterWindowManager::SetViewMode (const ViewMode eMode) StoreViewMode(eMode); } -PresenterWindowManager::ViewMode PresenterWindowManager::GetViewMode (void) const +PresenterWindowManager::ViewMode PresenterWindowManager::GetViewMode() const { if (mbIsHelpViewActive) return VM_Help; @@ -527,7 +527,7 @@ PresenterWindowManager::ViewMode PresenterWindowManager::GetViewMode (void) cons return VM_Standard; } -void PresenterWindowManager::RestoreViewMode (void) +void PresenterWindowManager::RestoreViewMode() { sal_Int32 nMode (0); PresenterConfigurationAccess aConfiguration ( @@ -608,7 +608,7 @@ void PresenterWindowManager::RemoveLayoutListener ( } } -void PresenterWindowManager::Layout (void) +void PresenterWindowManager::Layout() { if (mxParentWindow.is() && ! mbIsLayouting) { @@ -646,7 +646,7 @@ void PresenterWindowManager::Layout (void) } } -void PresenterWindowManager::LayoutStandardMode (void) +void PresenterWindowManager::LayoutStandardMode() { awt::Rectangle aBox = mxParentWindow->getPosSize(); @@ -703,7 +703,7 @@ void PresenterWindowManager::LayoutStandardMode (void) LayoutToolBar(); } -void PresenterWindowManager::LayoutNotesMode (void) +void PresenterWindowManager::LayoutNotesMode() { awt::Rectangle aBox = mxParentWindow->getPosSize(); @@ -788,7 +788,7 @@ void PresenterWindowManager::LayoutNotesMode (void) } -void PresenterWindowManager::LayoutSlideSorterMode (void) +void PresenterWindowManager::LayoutSlideSorterMode() { const geometry::RealRectangle2D aToolBarBox (LayoutToolBar()); @@ -802,7 +802,7 @@ void PresenterWindowManager::LayoutSlideSorterMode (void) aToolBarBox.Y1 - 2*nGap); } -void PresenterWindowManager::LayoutHelpMode (void) +void PresenterWindowManager::LayoutHelpMode() { const geometry::RealRectangle2D aToolBarBox (LayoutToolBar()); @@ -818,7 +818,7 @@ void PresenterWindowManager::LayoutHelpMode (void) aToolBarBox.Y1 - 2*nGap); } -geometry::RealRectangle2D PresenterWindowManager::LayoutToolBar (void) +geometry::RealRectangle2D PresenterWindowManager::LayoutToolBar() { double nToolBarWidth (400); double nToolBarHeight (80); @@ -898,7 +898,7 @@ awt::Size PresenterWindowManager::CalculatePaneSize ( return awt::Size(aOuterBox.Width, aOuterBox.Height); } -void PresenterWindowManager::NotifyLayoutModeChange (void) +void PresenterWindowManager::NotifyLayoutModeChange() { document::EventObject aEvent; aEvent.Source = Reference<XInterface>(static_cast<XWeak*>(this)); @@ -925,7 +925,7 @@ void PresenterWindowManager::NotifyLayoutModeChange (void) } } -void PresenterWindowManager::NotifyDisposing (void) +void PresenterWindowManager::NotifyDisposing() { lang::EventObject aEvent; aEvent.Source = static_cast<XWeak*>(this); @@ -1054,7 +1054,7 @@ void PresenterWindowManager::PaintBackground (const awt::Rectangle& rUpdateBox) } } -void PresenterWindowManager::ProvideBackgroundBitmap (void) +void PresenterWindowManager::ProvideBackgroundBitmap() { if ( ! mxScaledBackgroundBitmap.is()) { @@ -1087,7 +1087,7 @@ void PresenterWindowManager::ProvideBackgroundBitmap (void) } } -Reference<rendering::XPolyPolygon2D> PresenterWindowManager::CreateClipPolyPolygon (void) const +Reference<rendering::XPolyPolygon2D> PresenterWindowManager::CreateClipPolyPolygon() const { // Create a clip polygon that includes the whole update area but has the // content windows as holes. @@ -1125,7 +1125,7 @@ Reference<rendering::XPolyPolygon2D> PresenterWindowManager::CreateClipPolyPolyg return xPolyPolygon; } -void PresenterWindowManager::UpdateWindowList (void) +void PresenterWindowManager::UpdateWindowList() { #ifdef ENABLE_PANE_RESIZING try @@ -1176,11 +1176,11 @@ void PresenterWindowManager::UpdateWindowList (void) #endif } -void PresenterWindowManager::Invalidate (void) +void PresenterWindowManager::Invalidate() { mpPresenterController->GetPaintManager()->Invalidate(mxParentWindow); } -void PresenterWindowManager::Update (void) +void PresenterWindowManager::Update() { mxClipPolygon = NULL; mbIsLayoutPending = true; @@ -1189,7 +1189,7 @@ void PresenterWindowManager::Update (void) Invalidate(); } -void PresenterWindowManager::ThrowIfDisposed (void) const +void PresenterWindowManager::ThrowIfDisposed() const throw (::com::sun::star::lang::DisposedException) { if (rBHelper.bDisposed || rBHelper.bInDispose) diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index a8475e2b54bb..c9355b5511cf 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -71,9 +71,9 @@ public: const css::uno::Reference<css::uno::XComponentContext>& rxContext, const ::rtl::Reference<PresenterPaneContainer>& rpPaneContainer, const ::rtl::Reference<PresenterController>& rpPresenterController); - virtual ~PresenterWindowManager (void); + virtual ~PresenterWindowManager(); - void SAL_CALL disposing (void) SAL_OVERRIDE; + void SAL_CALL disposing() SAL_OVERRIDE; void SetParentPane (const css::uno::Reference<css::drawing::framework::XPane>& rxPane); void SetTheme (const ::boost::shared_ptr<PresenterTheme>& rpTheme); @@ -85,8 +85,8 @@ public: const double nWidth, const double nHeight); void SetPaneBorderPainter (const ::rtl::Reference<PresenterPaneBorderPainter>& rPainter); - void Update (void); - void Layout (void); + void Update(); + void Layout(); void SetSlideSorterState (bool bIsActive); void SetHelpViewState (bool bIsActive); @@ -102,12 +102,12 @@ public: */ void SetViewMode (const ViewMode eMode); - ViewMode GetViewMode (void) const; + ViewMode GetViewMode() const; /** Restore the layout mode (or slide sorter state) from the configuration. */ - void RestoreViewMode (void); + void RestoreViewMode(); void AddLayoutListener ( const css::uno::Reference<css::document::XEventListener>& rxListener); @@ -191,26 +191,26 @@ private: bool PaintChildren (const css::awt::PaintEvent& rEvent) const; void UpdateWindowSize (const css::uno::Reference<css::awt::XWindow>& rxBorderWindow); void PaintBackground (const css::awt::Rectangle& rUpdateBox); - void ProvideBackgroundBitmap (void); - css::uno::Reference<css::rendering::XPolyPolygon2D> CreateClipPolyPolygon (void) const; + void ProvideBackgroundBitmap(); + css::uno::Reference<css::rendering::XPolyPolygon2D> CreateClipPolyPolygon() const; void ToTop (); - static void UpdateWindowList (void); + static void UpdateWindowList(); bool ChildNeedsRepaint ( const css::uno::Reference<css::drawing::framework::XPane>& rxPane) const; - void Invalidate (void); + void Invalidate(); void StoreViewMode (const ViewMode eViewMode); - void LayoutStandardMode (void); - void LayoutNotesMode (void); - void LayoutSlideSorterMode (void); - void LayoutHelpMode (void); + void LayoutStandardMode(); + void LayoutNotesMode(); + void LayoutSlideSorterMode(); + void LayoutHelpMode(); /** Layout the tool bar and return its outer bounding box. */ - css::geometry::RealRectangle2D LayoutToolBar (void); + css::geometry::RealRectangle2D LayoutToolBar(); css::awt::Size CalculatePaneSize ( const double nOuterWidth, @@ -218,11 +218,11 @@ private: /** Notify changes of the layout mode and of the slide sorter state. */ - void NotifyLayoutModeChange (void); + void NotifyLayoutModeChange(); - void NotifyDisposing (void); + void NotifyDisposing(); - void ThrowIfDisposed (void) const throw (css::lang::DisposedException); + void ThrowIfDisposed() const throw (css::lang::DisposedException); }; } } |