diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-02 22:30:34 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-02 22:30:34 +0200 |
commit | ec0146214165c53a9b82d62b8c1408aaaaf465ca (patch) | |
tree | 46daa9d1fc9081ef10f65165c5ba86767368bd7b /sdext/source/presenter | |
parent | 278aae133e3252572bfae5e950c6ec9f8f254b29 (diff) |
loplugin:casttovoid: sdext
Change-Id: I557d59a4bfb9cab17a2cb00c3a80f85a6ef9671b
Diffstat (limited to 'sdext/source/presenter')
23 files changed, 114 insertions, 305 deletions
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 93392a74c1c1..849590cab476 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -611,13 +611,8 @@ void PresenterAccessible::UpdateAccessibilityHierarchy ( } } -void PresenterAccessible::NotifyCurrentSlideChange ( - const sal_Int32 nCurrentSlideIndex, - const sal_Int32 nSlideCount) +void PresenterAccessible::NotifyCurrentSlideChange () { - (void)nCurrentSlideIndex; - (void)nSlideCount; - if (mpAccessiblePreview.is()) { PresenterPaneContainer::SharedPaneDescriptor pPreviewPane (GetPreviewPane()); @@ -680,17 +675,15 @@ Reference<XAccessibleContext> SAL_CALL PresenterAccessible::getAccessibleContext //----- XFocusListener ---------------------------------------------------- -void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent& rEvent) +void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent&) { - (void)rEvent; SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusGained at " << this << " and window " << mxMainWindow.get()); AccessibleFocusManager::Instance()->FocusObject(mpAccessibleConsole); } -void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent& rEvent) +void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent&) { - (void)rEvent; SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusLost at " << this); AccessibleFocusManager::Instance()->FocusObject(nullptr); } @@ -912,9 +905,8 @@ sal_Bool SAL_CALL PresenterAccessible::AccessibleObject::containsPoint ( } Reference<XAccessible> SAL_CALL - PresenterAccessible::AccessibleObject::getAccessibleAtPoint (const awt::Point& rPoint) + PresenterAccessible::AccessibleObject::getAccessibleAtPoint (const awt::Point&) { - (void)rPoint; ThrowIfDisposed(); return Reference<XAccessible>(); @@ -1023,32 +1015,26 @@ void SAL_CALL PresenterAccessible::AccessibleObject::removeAccessibleEventListen //----- XWindowListener --------------------------------------------------- void SAL_CALL PresenterAccessible::AccessibleObject::windowResized ( - const css::awt::WindowEvent& rEvent) + const css::awt::WindowEvent&) { - (void)rEvent; - FireAccessibleEvent(AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any()); } void SAL_CALL PresenterAccessible::AccessibleObject::windowMoved ( - const css::awt::WindowEvent& rEvent) + const css::awt::WindowEvent&) { - (void)rEvent; - FireAccessibleEvent(AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any()); } void SAL_CALL PresenterAccessible::AccessibleObject::windowShown ( - const css::lang::EventObject& rEvent) + const css::lang::EventObject&) { - (void)rEvent; UpdateStateSet(); } void SAL_CALL PresenterAccessible::AccessibleObject::windowHidden ( - const css::lang::EventObject& rEvent) + const css::lang::EventObject&) { - (void)rEvent; UpdateStateSet(); } @@ -1442,11 +1428,12 @@ Sequence<css::beans::PropertyValue> SAL_CALL SAL_INFO( "sdext.presenter", " requested attribute " << nAttributeIndex << " is " << rRequestedAttributes[nAttributeIndex] ); } +#else + (void)nIndex; + (void)rRequestedAttributes; #endif // Character properties are not supported. - (void)nIndex; - (void)rRequestedAttributes; return Sequence<css::beans::PropertyValue>(); } @@ -1518,9 +1505,8 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getSelectionEnd() sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::setSelection ( sal_Int32 nStartIndex, - sal_Int32 nEndIndex) + sal_Int32) { - (void)nEndIndex; ThrowIfDisposed(); return setCaretPosition(nStartIndex); @@ -1594,16 +1580,14 @@ TextSegment SAL_CALL PresenterAccessible::AccessibleParagraph::getTextBehindInde } sal_Bool SAL_CALL PresenterAccessible::AccessibleParagraph::copyText ( - sal_Int32 nStartIndex, - sal_Int32 nEndIndex) + sal_Int32, + sal_Int32) { ThrowIfDisposed(); // Return false because copying to clipboard is not supported. // It IS supported in the notes view. There is no need to duplicate // this here. - (void)nStartIndex; - (void)nEndIndex; return false; } diff --git a/sdext/source/presenter/PresenterAccessibility.hxx b/sdext/source/presenter/PresenterAccessibility.hxx index eb8531ac84db..fdc858bea399 100644 --- a/sdext/source/presenter/PresenterAccessibility.hxx +++ b/sdext/source/presenter/PresenterAccessibility.hxx @@ -64,9 +64,7 @@ public: void UpdateAccessibilityHierarchy(); - void NotifyCurrentSlideChange ( - const sal_Int32 nCurrentSlideIndex, - const sal_Int32 nSlideCount); + void NotifyCurrentSlideChange (); virtual void SAL_CALL disposing() override; diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index 4487e70bad0e..70f9c493981c 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -230,27 +230,23 @@ css::geometry::IntegerSize2D const & PresenterButton::GetSize() //----- XWindowListener ------------------------------------------------------- -void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent& rEvent) +void SAL_CALL PresenterButton::windowResized (const css::awt::WindowEvent&) { - (void)rEvent; ThrowIfDisposed(); } -void SAL_CALL PresenterButton::windowMoved (const css::awt::WindowEvent& rEvent) +void SAL_CALL PresenterButton::windowMoved (const css::awt::WindowEvent&) { - (void)rEvent; ThrowIfDisposed(); } -void SAL_CALL PresenterButton::windowShown (const css::lang::EventObject& rEvent) +void SAL_CALL PresenterButton::windowShown (const css::lang::EventObject&) { - (void)rEvent; ThrowIfDisposed(); } -void SAL_CALL PresenterButton::windowHidden (const css::lang::EventObject& rEvent) +void SAL_CALL PresenterButton::windowHidden (const css::lang::EventObject&) { - (void)rEvent; ThrowIfDisposed(); } @@ -288,16 +284,14 @@ void SAL_CALL PresenterButton::windowPaint (const css::awt::PaintEvent& rEvent) //----- XMouseListener -------------------------------------------------------- -void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterButton::mousePressed (const css::awt::MouseEvent&) { - (void)rEvent; ThrowIfDisposed(); meState = PresenterBitmapDescriptor::ButtonDown; } -void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent&) { - (void)rEvent; ThrowIfDisposed(); if (meState == PresenterBitmapDescriptor::ButtonDown) @@ -310,17 +304,15 @@ void SAL_CALL PresenterButton::mouseReleased (const css::awt::MouseEvent& rEvent } } -void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterButton::mouseEntered (const css::awt::MouseEvent&) { - (void)rEvent; ThrowIfDisposed(); meState = PresenterBitmapDescriptor::MouseOver; Invalidate(); } -void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent&) { - (void)rEvent; ThrowIfDisposed(); meState = PresenterBitmapDescriptor::Normal; Invalidate(); @@ -328,15 +320,13 @@ void SAL_CALL PresenterButton::mouseExited (const css::awt::MouseEvent& rEvent) //----- XMouseMotionListener -------------------------------------------------- -void SAL_CALL PresenterButton::mouseMoved (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterButton::mouseMoved (const css::awt::MouseEvent&) { - (void)rEvent; ThrowIfDisposed(); } -void SAL_CALL PresenterButton::mouseDragged (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterButton::mouseDragged (const css::awt::MouseEvent&) { - (void)rEvent; ThrowIfDisposed(); } diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index cf65f8d7e65c..cc2b17eeab55 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -266,11 +266,7 @@ void PresenterController::UpdateCurrentSlide (const sal_Int32 nOffset) // Update the accessibility object. if (IsAccessibilityActive()) { - sal_Int32 nSlideCount (0); - Reference<container::XIndexAccess> xIndexAccess(mxSlideShowController, UNO_QUERY); - if (xIndexAccess.is()) - nSlideCount = xIndexAccess->getCount(); - mpAccessibleObject->NotifyCurrentSlideChange(mnCurrentSlideIndex, nSlideCount); + mpAccessibleObject->NotifyCurrentSlideChange(); } } @@ -1042,51 +1038,29 @@ void PresenterController::HandleNumericKeyPress ( //----- XFocusListener -------------------------------------------------------- -void SAL_CALL PresenterController::focusGained (const css::awt::FocusEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterController::focusGained (const css::awt::FocusEvent&) {} -void SAL_CALL PresenterController::focusLost (const css::awt::FocusEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterController::focusLost (const css::awt::FocusEvent&) {} //----- XMouseListener -------------------------------------------------------- -void SAL_CALL PresenterController::mousePressed (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterController::mousePressed (const css::awt::MouseEvent&) { - (void)rEvent; if (mxMainWindow.is()) mxMainWindow->setFocus(); } -void SAL_CALL PresenterController::mouseReleased (const css::awt::MouseEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterController::mouseReleased (const css::awt::MouseEvent&) {} -void SAL_CALL PresenterController::mouseEntered (const css::awt::MouseEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterController::mouseEntered (const css::awt::MouseEvent&) {} -void SAL_CALL PresenterController::mouseExited (const css::awt::MouseEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterController::mouseExited (const css::awt::MouseEvent&) {} //----- XMouseMotionListener -------------------------------------------------- -void SAL_CALL PresenterController::mouseMoved (const css::awt::MouseEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterController::mouseMoved (const css::awt::MouseEvent&) {} -void SAL_CALL PresenterController::mouseDragged (const css::awt::MouseEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterController::mouseDragged (const css::awt::MouseEvent&) {} void PresenterController::InitializeMainPane (const Reference<XPane>& rxPane) diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx index d6f3986be086..4e74e070113c 100644 --- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx +++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx @@ -62,23 +62,17 @@ void SAL_CALL PresenterCurrentSlideObserver::disposing() //----- XSlideShowListener ---------------------------------------------------- void SAL_CALL PresenterCurrentSlideObserver::beginEvent ( - const Reference<animations::XAnimationNode>& rNode) -{ - (void)rNode; -} + const Reference<animations::XAnimationNode>&) +{} void SAL_CALL PresenterCurrentSlideObserver::endEvent ( - const Reference<animations::XAnimationNode>& rNode) -{ - (void)rNode; -} + const Reference<animations::XAnimationNode>&) +{} void SAL_CALL PresenterCurrentSlideObserver::repeat ( - const css::uno::Reference<css::animations::XAnimationNode>& rNode, + const css::uno::Reference<css::animations::XAnimationNode>&, sal_Int32) -{ - (void)rNode; -} +{} void SAL_CALL PresenterCurrentSlideObserver::paused() { diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx index 531c6cb979f5..c7a04138b6e0 100644 --- a/sdext/source/presenter/PresenterHelpView.cxx +++ b/sdext/source/presenter/PresenterHelpView.cxx @@ -223,29 +223,25 @@ void SAL_CALL PresenterHelpView::disposing (const lang::EventObject& rEventObjec //----- XWindowListener ------------------------------------------------------- -void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent& rEvent) +void SAL_CALL PresenterHelpView::windowResized (const awt::WindowEvent&) { - (void)rEvent; ThrowIfDisposed(); Resize(); } -void SAL_CALL PresenterHelpView::windowMoved (const awt::WindowEvent& rEvent) +void SAL_CALL PresenterHelpView::windowMoved (const awt::WindowEvent&) { - (void)rEvent; ThrowIfDisposed(); } -void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject& rEvent) +void SAL_CALL PresenterHelpView::windowShown (const lang::EventObject&) { - (void)rEvent; ThrowIfDisposed(); Resize(); } -void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject& rEvent) +void SAL_CALL PresenterHelpView::windowHidden (const lang::EventObject&) { - (void)rEvent; ThrowIfDisposed(); } diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx index 4fc1ac3a4995..e1fa98ce43aa 100644 --- a/sdext/source/presenter/PresenterNotesView.cxx +++ b/sdext/source/presenter/PresenterNotesView.cxx @@ -289,26 +289,16 @@ void SAL_CALL PresenterNotesView::disposing (const lang::EventObject& rEventObje //----- XWindowListener ------------------------------------------------------- -void SAL_CALL PresenterNotesView::windowResized (const awt::WindowEvent& rEvent) +void SAL_CALL PresenterNotesView::windowResized (const awt::WindowEvent&) { - (void)rEvent; Layout(); } -void SAL_CALL PresenterNotesView::windowMoved (const awt::WindowEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterNotesView::windowMoved (const awt::WindowEvent&) {} -void SAL_CALL PresenterNotesView::windowShown (const lang::EventObject& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterNotesView::windowShown (const lang::EventObject&) {} -void SAL_CALL PresenterNotesView::windowHidden (const lang::EventObject& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterNotesView::windowHidden (const lang::EventObject&) {} //----- XPaintListener -------------------------------------------------------- @@ -407,10 +397,7 @@ void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent) } } -void SAL_CALL PresenterNotesView::keyReleased (const awt::KeyEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterNotesView::keyReleased (const awt::KeyEvent&) {} void PresenterNotesView::Layout() diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx index d51b397cb41f..e806c7e58a51 100644 --- a/sdext/source/presenter/PresenterPane.cxx +++ b/sdext/source/presenter/PresenterPane.cxx @@ -70,7 +70,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterPane::getCanvas() void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent) { - (void)rEvent; PresenterPaneBase::windowResized(rEvent); Invalidate(maBoundingBox); @@ -84,7 +83,6 @@ void SAL_CALL PresenterPane::windowResized (const awt::WindowEvent& rEvent) void SAL_CALL PresenterPane::windowMoved (const awt::WindowEvent& rEvent) { - (void)rEvent; PresenterPaneBase::windowMoved(rEvent); Invalidate(maBoundingBox); @@ -97,7 +95,6 @@ void SAL_CALL PresenterPane::windowMoved (const awt::WindowEvent& rEvent) void SAL_CALL PresenterPane::windowShown (const lang::EventObject& rEvent) { - (void)rEvent; PresenterPaneBase::windowShown(rEvent); ToTop(); @@ -114,7 +111,6 @@ void SAL_CALL PresenterPane::windowShown (const lang::EventObject& rEvent) void SAL_CALL PresenterPane::windowHidden (const lang::EventObject& rEvent) { - (void)rEvent; PresenterPaneBase::windowHidden(rEvent); if (mxContentWindow.is()) @@ -125,7 +121,6 @@ void SAL_CALL PresenterPane::windowHidden (const lang::EventObject& rEvent) void SAL_CALL PresenterPane::windowPaint (const awt::PaintEvent& rEvent) { - (void)rEvent; ThrowIfDisposed(); PaintBorder(rEvent.UpdateRect); diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index ee5b09cb5f45..7e034ee30551 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -241,27 +241,23 @@ sal_Bool SAL_CALL PresenterPaneBase::isAnchorOnly() //----- XWindowListener ------------------------------------------------------- -void SAL_CALL PresenterPaneBase::windowResized (const awt::WindowEvent& rEvent) +void SAL_CALL PresenterPaneBase::windowResized (const awt::WindowEvent&) { - (void)rEvent; ThrowIfDisposed(); } -void SAL_CALL PresenterPaneBase::windowMoved (const awt::WindowEvent& rEvent) +void SAL_CALL PresenterPaneBase::windowMoved (const awt::WindowEvent&) { - (void)rEvent; ThrowIfDisposed(); } -void SAL_CALL PresenterPaneBase::windowShown (const lang::EventObject& rEvent) +void SAL_CALL PresenterPaneBase::windowShown (const lang::EventObject&) { - (void)rEvent; ThrowIfDisposed(); } -void SAL_CALL PresenterPaneBase::windowHidden (const lang::EventObject& rEvent) +void SAL_CALL PresenterPaneBase::windowHidden (const lang::EventObject&) { - (void)rEvent; ThrowIfDisposed(); } diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 28b1fd6cdf95..8aab1f8768e1 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -386,8 +386,6 @@ PresenterPaneBorderPainter::Renderer::Renderer ( mbHasCallout(false), maCalloutAnchor() { - (void)rxContext; - Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager()); if (xFactory.is()) { diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index 57e12a301002..f1aceb54f8d1 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -238,17 +238,16 @@ Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static() } Reference<XInterface> PresenterProtocolHandler::Create ( - const Reference<uno::XComponentContext>& rxContext) + SAL_UNUSED_PARAMETER const Reference<uno::XComponentContext>&) { - return Reference<XInterface>(static_cast<XWeak*>(new PresenterProtocolHandler(rxContext))); + return Reference<XInterface>(static_cast<XWeak*>(new PresenterProtocolHandler)); } //===== PresenterProtocolHandler ========================================================= -PresenterProtocolHandler::PresenterProtocolHandler (const Reference<XComponentContext>& rxContext) +PresenterProtocolHandler::PresenterProtocolHandler () : PresenterProtocolHandlerInterfaceBase(m_aMutex) { - (void)rxContext; } PresenterProtocolHandler::~PresenterProtocolHandler() @@ -301,11 +300,9 @@ PresenterProtocolHandler::getSupportedServiceNames() Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch ( const css::util::URL& rURL, - const OUString& rsTargetFrameName, - sal_Int32 nSearchFlags) + const OUString&, + sal_Int32) { - (void)rsTargetFrameName; - (void)nSearchFlags; ThrowIfDisposed(); Reference<frame::XDispatch> xDispatch; @@ -319,9 +316,8 @@ Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch ( } Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryDispatches( - const Sequence<frame::DispatchDescriptor>& rDescriptors) + const Sequence<frame::DispatchDescriptor>&) { - (void)rDescriptors; ThrowIfDisposed(); return Sequence<Reference<frame::XDispatch> >(); } @@ -487,18 +483,15 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::removeStatusListener ( //----- document::XEventListener ---------------------------------------------- void SAL_CALL PresenterProtocolHandler::Dispatch::notifyEvent ( - const css::document::EventObject& rEvent) + const css::document::EventObject&) { - (void)rEvent; - mpCommand->GetState(); } //----- lang::XEventListener -------------------------------------------------- -void SAL_CALL PresenterProtocolHandler::Dispatch::disposing (const css::lang::EventObject& rEvent) +void SAL_CALL PresenterProtocolHandler::Dispatch::disposing (const css::lang::EventObject&) { - (void)rEvent; mbIsListeningToWindowManager = false; } diff --git a/sdext/source/presenter/PresenterProtocolHandler.hxx b/sdext/source/presenter/PresenterProtocolHandler.hxx index 890b65db4bbf..e43b2ec69c20 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.hxx +++ b/sdext/source/presenter/PresenterProtocolHandler.hxx @@ -44,7 +44,7 @@ class PresenterProtocolHandler public PresenterProtocolHandlerInterfaceBase { public: - explicit PresenterProtocolHandler (const css::uno::Reference<css::uno::XComponentContext>& rxContext); + PresenterProtocolHandler (); virtual ~PresenterProtocolHandler() override; void SAL_CALL disposing() override; diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index b19b7a540f0d..8c3d7cf35752 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -232,10 +232,8 @@ void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventOb // XEventListener -void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject& rEvent) +void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject&) { - (void)rEvent; - if (mpPresenterScreen.is()) { mpPresenterScreen->RequestShutdownPresenterScreen(); diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 988b3d82d791..ec244a2ef520 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -56,7 +56,7 @@ public: void SetMouseArea (const PresenterScrollBar::Area& reArea); private: - void Callback (const TimeValue& rCurrentTime); + void Callback (); void Execute(); sal_Int32 mnMousePressRepeaterTaskId; @@ -321,25 +321,13 @@ void PresenterScrollBar::Paint ( //----- XWindowListener ------------------------------------------------------- -void SAL_CALL PresenterScrollBar::windowResized (const css::awt::WindowEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterScrollBar::windowResized (const css::awt::WindowEvent&) {} -void SAL_CALL PresenterScrollBar::windowMoved (const css::awt::WindowEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterScrollBar::windowMoved (const css::awt::WindowEvent&) {} -void SAL_CALL PresenterScrollBar::windowShown (const css::lang::EventObject& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterScrollBar::windowShown (const css::lang::EventObject&) {} -void SAL_CALL PresenterScrollBar::windowHidden (const css::lang::EventObject& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterScrollBar::windowHidden (const css::lang::EventObject&) {} //----- XPaintListener -------------------------------------------------------- @@ -370,24 +358,18 @@ void SAL_CALL PresenterScrollBar::mousePressed (const css::awt::MouseEvent& rEve mpMousePressRepeater->Start(meButtonDownArea); } -void SAL_CALL PresenterScrollBar::mouseReleased (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterScrollBar::mouseReleased (const css::awt::MouseEvent&) { - (void)rEvent; - mpMousePressRepeater->Stop(); if (mxPresenterHelper.is()) mxPresenterHelper->releaseMouse(mxWindow); } -void SAL_CALL PresenterScrollBar::mouseEntered (const css::awt::MouseEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterScrollBar::mouseEntered (const css::awt::MouseEvent&) {} -void SAL_CALL PresenterScrollBar::mouseExited (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterScrollBar::mouseExited (const css::awt::MouseEvent&) { - (void)rEvent; if (meMouseMoveArea != None) { const Area eOldMouseMoveArea (meMouseMoveArea); @@ -602,9 +584,8 @@ PresenterVerticalScrollBar::~PresenterVerticalScrollBar() { } -double PresenterVerticalScrollBar::GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const +double PresenterVerticalScrollBar::GetDragDistance (const sal_Int32, const sal_Int32 nY) const { - (void)nX; const double nDistance (nY - maDragAnchor.Y); if (nDistance == 0) return 0; @@ -636,9 +617,8 @@ sal_Int32 PresenterVerticalScrollBar::GetSize() const return mnScrollBarWidth; } -double PresenterVerticalScrollBar::GetMinor (const double nX, const double nY) const +double PresenterVerticalScrollBar::GetMinor (const double nX, const double) const { - (void)nY; return nX; } @@ -791,7 +771,7 @@ void PresenterScrollBar::MousePressRepeater::Start (const PresenterScrollBar::Ar auto pThis(shared_from_this()); mnMousePressRepeaterTaskId = PresenterTimer::ScheduleRepeatedTask ( mpScrollBar->GetComponentContext(), - [pThis] (TimeValue const& rTime) { return pThis->Callback(rTime); }, + [pThis] (TimeValue const&) { return pThis->Callback(); }, 500000000, 250000000); } @@ -822,10 +802,8 @@ void PresenterScrollBar::MousePressRepeater::SetMouseArea(const PresenterScrollB } } -void PresenterScrollBar::MousePressRepeater::Callback (const TimeValue& rCurrentTime) +void PresenterScrollBar::MousePressRepeater::Callback () { - (void)rCurrentTime; - if (mpScrollBar.get() == nullptr) { Stop(); diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx index 978a6577ac45..d49d5b4b79f0 100644 --- a/sdext/source/presenter/PresenterSlidePreview.cxx +++ b/sdext/source/presenter/PresenterSlidePreview.cxx @@ -137,31 +137,23 @@ sal_Bool SAL_CALL PresenterSlidePreview::isAnchorOnly() //----- XWindowListener ------------------------------------------------------- -void SAL_CALL PresenterSlidePreview::windowResized (const awt::WindowEvent& rEvent) +void SAL_CALL PresenterSlidePreview::windowResized (const awt::WindowEvent&) { - (void)rEvent; ThrowIfDisposed(); ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); Resize(); } -void SAL_CALL PresenterSlidePreview::windowMoved (const awt::WindowEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterSlidePreview::windowMoved (const awt::WindowEvent&) {} -void SAL_CALL PresenterSlidePreview::windowShown (const lang::EventObject& rEvent) +void SAL_CALL PresenterSlidePreview::windowShown (const lang::EventObject&) { - (void)rEvent; ThrowIfDisposed(); ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); Resize(); } -void SAL_CALL PresenterSlidePreview::windowHidden (const lang::EventObject& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterSlidePreview::windowHidden (const lang::EventObject&) {} //----- XPaintListener -------------------------------------------------------- @@ -233,7 +225,6 @@ void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPag void PresenterSlidePreview::Paint (const awt::Rectangle& rBoundingBox) { - (void)rBoundingBox; if ( ! mxWindow.is()) return; if ( ! mxCanvas.is()) diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx index 71d743f3e405..acc4e9f6f7b2 100644 --- a/sdext/source/presenter/PresenterSlideShowView.cxx +++ b/sdext/source/presenter/PresenterSlideShowView.cxx @@ -596,33 +596,26 @@ void SAL_CALL PresenterSlideShowView::mouseMoved (const awt::MouseEvent& rEvent) //----- XWindowListener ------------------------------------------------------- -void SAL_CALL PresenterSlideShowView::windowResized (const awt::WindowEvent& rEvent) +void SAL_CALL PresenterSlideShowView::windowResized (const awt::WindowEvent&) { - (void)rEvent; - ThrowIfDisposed(); ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); Resize(); } -void SAL_CALL PresenterSlideShowView::windowMoved (const awt::WindowEvent& rEvent) +void SAL_CALL PresenterSlideShowView::windowMoved (const awt::WindowEvent&) { - (void)rEvent; if ( ! mbIsPaintPending) mbIsForcedPaintPending = true; } -void SAL_CALL PresenterSlideShowView::windowShown (const lang::EventObject& rEvent) +void SAL_CALL PresenterSlideShowView::windowShown (const lang::EventObject&) { - (void)rEvent; Resize(); } -void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterSlideShowView::windowHidden (const lang::EventObject&) {} //----- XView ----------------------------------------------------------------- diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx index 5d457f82a7b7..191c2a5010a5 100644 --- a/sdext/source/presenter/PresenterSlideSorter.cxx +++ b/sdext/source/presenter/PresenterSlideSorter.cxx @@ -442,31 +442,27 @@ void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventOb //----- XWindowListener ------------------------------------------------------- -void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent& rEvent) +void SAL_CALL PresenterSlideSorter::windowResized (const awt::WindowEvent&) { - (void)rEvent; ThrowIfDisposed(); mbIsLayoutPending = true; mpPresenterController->GetPaintManager()->Invalidate(mxWindow); } -void SAL_CALL PresenterSlideSorter::windowMoved (const awt::WindowEvent& rEvent) +void SAL_CALL PresenterSlideSorter::windowMoved (const awt::WindowEvent&) { - (void)rEvent; ThrowIfDisposed(); } -void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject& rEvent) +void SAL_CALL PresenterSlideSorter::windowShown (const lang::EventObject&) { - (void)rEvent; ThrowIfDisposed(); mbIsLayoutPending = true; mpPresenterController->GetPaintManager()->Invalidate(mxWindow); } -void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEvent) +void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject&) { - (void)rEvent; ThrowIfDisposed(); } @@ -474,8 +470,6 @@ void SAL_CALL PresenterSlideSorter::windowHidden (const lang::EventObject& rEven void SAL_CALL PresenterSlideSorter::windowPaint (const css::awt::PaintEvent& rEvent) { - (void)rEvent; - // Deactivated views must not be painted. if ( ! mbIsPresenterViewActive) return; @@ -531,14 +525,10 @@ void SAL_CALL PresenterSlideSorter::mouseReleased (const css::awt::MouseEvent& r } } -void SAL_CALL PresenterSlideSorter::mouseEntered (const css::awt::MouseEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterSlideSorter::mouseEntered (const css::awt::MouseEvent&) {} -void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterSlideSorter::mouseExited (const css::awt::MouseEvent&) { - (void)rEvent; mnSlideIndexMousePressed = -1; if (mpMouseOverManager.get() != nullptr) mpMouseOverManager->SetSlide(mnSlideIndexMousePressed, awt::Rectangle(0,0,0,0)); @@ -575,10 +565,7 @@ void SAL_CALL PresenterSlideSorter::mouseMoved (const css::awt::MouseEvent& rEve } } -void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterSlideSorter::mouseDragged (const css::awt::MouseEvent&) {} //----- XResourceId ----------------------------------------------------------- @@ -596,10 +583,8 @@ sal_Bool SAL_CALL PresenterSlideSorter::isAnchorOnly() //----- XPropertyChangeListener ----------------------------------------------- void SAL_CALL PresenterSlideSorter::propertyChange ( - const css::beans::PropertyChangeEvent& rEvent) -{ - (void)rEvent; -} + const css::beans::PropertyChangeEvent&) +{} //----- XSlidePreviewCacheListener -------------------------------------------- @@ -614,10 +599,8 @@ void SAL_CALL PresenterSlideSorter::notifyPreviewCreation ( //----- XDrawView ------------------------------------------------------------- -void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDrawPage>& rxSlide) +void SAL_CALL PresenterSlideSorter::setCurrentPage (const Reference<drawing::XDrawPage>&) { - (void)rxSlide; - ThrowIfDisposed(); ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex()); diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx index 85da44dd29f9..64c7ee327e44 100644 --- a/sdext/source/presenter/PresenterSpritePane.cxx +++ b/sdext/source/presenter/PresenterSpritePane.cxx @@ -80,7 +80,6 @@ Reference<rendering::XCanvas> SAL_CALL PresenterSpritePane::getCanvas() void SAL_CALL PresenterSpritePane::windowResized (const awt::WindowEvent& rEvent) { - (void)rEvent; PresenterPaneBase::windowResized(rEvent); mpSprite->Resize(geometry::RealSize2D(rEvent.Width, rEvent.Height)); @@ -90,7 +89,6 @@ void SAL_CALL PresenterSpritePane::windowResized (const awt::WindowEvent& rEvent void SAL_CALL PresenterSpritePane::windowMoved (const awt::WindowEvent& rEvent) { - (void)rEvent; PresenterPaneBase::windowMoved(rEvent); awt::Rectangle aBox ( @@ -101,7 +99,6 @@ void SAL_CALL PresenterSpritePane::windowMoved (const awt::WindowEvent& rEvent) void SAL_CALL PresenterSpritePane::windowShown (const lang::EventObject& rEvent) { - (void)rEvent; PresenterPaneBase::windowShown(rEvent); mpSprite->Show(); @@ -116,7 +113,6 @@ void SAL_CALL PresenterSpritePane::windowShown (const lang::EventObject& rEvent) void SAL_CALL PresenterSpritePane::windowHidden (const lang::EventObject& rEvent) { - (void)rEvent; PresenterPaneBase::windowHidden(rEvent); mpSprite->Hide(); @@ -126,9 +122,8 @@ void SAL_CALL PresenterSpritePane::windowHidden (const lang::EventObject& rEvent //----- XPaintListener -------------------------------------------------------- -void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent) +void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent&) { - (void)rEvent; ThrowIfDisposed(); /* diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx index 0fba43273613..eb85119c6bc6 100644 --- a/sdext/source/presenter/PresenterTimer.cxx +++ b/sdext/source/presenter/PresenterTimer.cxx @@ -567,10 +567,8 @@ void PresenterClockTimer::CheckCurrentTime (const TimeValue& rCurrentTime) //----- XCallback ------------------------------------------------------------- -void SAL_CALL PresenterClockTimer::notify (const css::uno::Any& rUserData) +void SAL_CALL PresenterClockTimer::notify (const css::uno::Any&) { - (void)rUserData; - ListenerContainer aListenerCopy (maListeners); { diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index ba9645c0a893..871c0c36e17e 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -493,27 +493,19 @@ void SAL_CALL PresenterToolBar::disposing (const lang::EventObject& rEventObject //----- XWindowListener ------------------------------------------------------- -void SAL_CALL PresenterToolBar::windowResized (const awt::WindowEvent& rEvent) +void SAL_CALL PresenterToolBar::windowResized (const awt::WindowEvent&) { - (void)rEvent; mbIsLayoutPending = true; } -void SAL_CALL PresenterToolBar::windowMoved (const awt::WindowEvent& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterToolBar::windowMoved (const awt::WindowEvent&) {} -void SAL_CALL PresenterToolBar::windowShown (const lang::EventObject& rEvent) +void SAL_CALL PresenterToolBar::windowShown (const lang::EventObject&) { - (void)rEvent; mbIsLayoutPending = true; } -void SAL_CALL PresenterToolBar::windowHidden (const lang::EventObject& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterToolBar::windowHidden (const lang::EventObject&) {} //----- XPaintListener -------------------------------------------------------- void SAL_CALL PresenterToolBar::windowPaint (const css::awt::PaintEvent& rEvent) @@ -572,10 +564,9 @@ void SAL_CALL PresenterToolBar::mouseMoved (const css::awt::MouseEvent& rEvent) CheckMouseOver(rEvent, true); } -void SAL_CALL PresenterToolBar::mouseDragged (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterToolBar::mouseDragged (const css::awt::MouseEvent&) { ThrowIfDisposed(); - (void)rEvent; } //----- XDrawView ------------------------------------------------------------- @@ -1328,16 +1319,12 @@ void Element::UpdateState() //----- lang::XEventListener -------------------------------------------------- -void SAL_CALL Element::disposing (const css::lang::EventObject& rEvent) -{ - (void)rEvent; -} +void SAL_CALL Element::disposing (const css::lang::EventObject&) {} //----- document::XEventListener ---------------------------------------------- -void SAL_CALL Element::notifyEvent (const css::document::EventObject& rEvent) +void SAL_CALL Element::notifyEvent (const css::document::EventObject&) { - (void)rEvent; UpdateState(); } @@ -1570,7 +1557,6 @@ PresenterBitmapDescriptor::Mode Button::GetMode() const void SAL_CALL Button::disposing (const css::lang::EventObject& rEvent) { - (void)rEvent; mbIsListenerRegistered = false; Element::disposing(rEvent); } @@ -1627,11 +1613,9 @@ void Label::Paint ( mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox()); } -bool Label::SetState (const bool bIsOver, const bool bIsPressed) +bool Label::SetState (const bool, const bool) { // For labels there is no mouse over effect. - (void)bIsOver; - (void)bIsPressed; return Element::SetState(false, false); } @@ -1930,9 +1914,8 @@ void VerticalSeparator::Paint ( } awt::Size VerticalSeparator::CreateBoundingSize ( - const Reference<rendering::XCanvas>& rxCanvas) + const Reference<rendering::XCanvas>&) { - (void)rxCanvas; return awt::Size(1,20); } @@ -1981,9 +1964,8 @@ void HorizontalSeparator::Paint ( } awt::Size HorizontalSeparator::CreateBoundingSize ( - const Reference<rendering::XCanvas>& rxCanvas) + const Reference<rendering::XCanvas>&) { - (void)rxCanvas; return awt::Size(20,1); } diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx index 1e5b1a304e09..2cdb935ba5e6 100644 --- a/sdext/source/presenter/PresenterViewFactory.cxx +++ b/sdext/source/presenter/PresenterViewFactory.cxx @@ -332,7 +332,7 @@ Reference<XResource> PresenterViewFactory::CreateView( } else if (sResourceURL.equals(msNotesViewURL)) { - xView = CreateNotesView(rxViewId, rxAnchorPane); + xView = CreateNotesView(rxViewId); } else if (sResourceURL.equals(msNextSlidePreviewViewURL)) { @@ -433,10 +433,8 @@ Reference<XView> PresenterViewFactory::CreateToolBarView( } Reference<XView> PresenterViewFactory::CreateNotesView( - const Reference<XResourceId>& rxViewId, - const Reference<XPane>& rxAnchorPane) const + const Reference<XResourceId>& rxViewId) const { - (void)rxAnchorPane; Reference<XView> xView; if ( ! mxConfigurationController.is()) diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx index 7df32ae592a8..6c944b21354a 100644 --- a/sdext/source/presenter/PresenterViewFactory.hxx +++ b/sdext/source/presenter/PresenterViewFactory.hxx @@ -136,8 +136,7 @@ private: const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) const; css::uno::Reference<css::drawing::framework::XView> CreateNotesView( - const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId, - const css::uno::Reference<css::drawing::framework::XPane>& rxPane) const; + const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) const; css::uno::Reference<css::drawing::framework::XView> CreateSlideSorterView( const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId) const; diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 70687aac7afb..31cfa9d337be 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -240,15 +240,9 @@ void SAL_CALL PresenterWindowManager::windowMoved (const awt::WindowEvent& rEven } } -void SAL_CALL PresenterWindowManager::windowShown (const lang::EventObject& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterWindowManager::windowShown (const lang::EventObject&) {} -void SAL_CALL PresenterWindowManager::windowHidden (const lang::EventObject& rEvent) -{ - (void)rEvent; -} +void SAL_CALL PresenterWindowManager::windowHidden (const lang::EventObject&) {} //----- XPaintListener -------------------------------------------------------- @@ -279,9 +273,8 @@ void SAL_CALL PresenterWindowManager::windowPaint (const awt::PaintEvent& rEvent //----- XMouseListener -------------------------------------------------------- -void SAL_CALL PresenterWindowManager::mousePressed (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterWindowManager::mousePressed (const css::awt::MouseEvent&) { - (void)rEvent; mbIsMouseClickPending = true; } @@ -294,15 +287,13 @@ void SAL_CALL PresenterWindowManager::mouseReleased (const css::awt::MouseEvent& } } -void SAL_CALL PresenterWindowManager::mouseEntered (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterWindowManager::mouseEntered (const css::awt::MouseEvent&) { - (void)rEvent; mbIsMouseClickPending = false; } -void SAL_CALL PresenterWindowManager::mouseExited (const css::awt::MouseEvent& rEvent) +void SAL_CALL PresenterWindowManager::mouseExited (const css::awt::MouseEvent&) { - (void)rEvent; mbIsMouseClickPending = false; } @@ -313,10 +304,9 @@ void SAL_CALL PresenterWindowManager::focusGained (const css::awt::FocusEvent& / ThrowIfDisposed(); } -void SAL_CALL PresenterWindowManager::focusLost (const css::awt::FocusEvent& rEvent) +void SAL_CALL PresenterWindowManager::focusLost (const css::awt::FocusEvent&) { ThrowIfDisposed(); - (void)rEvent; } //----- XEventListener -------------------------------------------------------- @@ -921,7 +911,6 @@ void PresenterWindowManager::UpdateWindowSize (const Reference<awt::XWindow>& rx void PresenterWindowManager::PaintBackground (const awt::Rectangle& rUpdateBox) { - (void)rUpdateBox; if ( ! mxParentWindow.is()) return; |