[Libreoffice-commits] core.git: 24 commits - cui/source dbaccess/source forms/source reportdesign/source sc/inc sc/source sdext/source sd/source sw/inc sw/source unoxml/source

Stephan Bergmann sbergman at redhat.com
Sun Jul 2 20:08:03 UTC 2017


 cui/source/dialogs/passwdomdlg.cxx                           |    9 +--
 cui/source/factory/dlgfact.cxx                               |    2 
 cui/source/inc/passwdomdlg.hxx                               |    2 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx               |    1 
 forms/source/richtext/rtattributehandler.cxx                 |    2 
 reportdesign/source/ui/inc/ViewsWindow.hxx                   |    2 
 reportdesign/source/ui/report/DesignView.cxx                 |    2 
 reportdesign/source/ui/report/ViewsWindow.cxx                |    4 -
 reportdesign/source/ui/report/dlgedfunc.cxx                  |    6 +-
 sc/inc/address.hxx                                           |    4 -
 sc/source/core/tool/address.cxx                              |    8 --
 sc/source/filter/excel/read.cxx                              |    2 
 sc/source/ui/vba/vbarange.cxx                                |    6 +-
 sd/source/ui/dlg/RemoteDialogClientBox.cxx                   |    5 -
 sd/source/ui/dlg/RemoteDialogClientBox.hxx                   |    2 
 sd/source/ui/framework/factories/BasicViewFactory.cxx        |    9 +--
 sd/source/ui/framework/factories/BasicViewFactory.hxx        |    3 -
 sd/source/ui/inc/SlideSorterViewShell.hxx                    |    3 -
 sd/source/ui/presenter/PresenterCanvas.cxx                   |   23 ++-----
 sd/source/ui/presenter/PresenterCanvas.hxx                   |    3 -
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |   13 +---
 sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx      |    5 -
 sd/source/ui/slidesorter/view/SlsLayouter.cxx                |   33 +++--------
 sd/source/ui/view/DocumentRenderer.cxx                       |    7 --
 sd/source/ui/view/ViewShellManager.cxx                       |   16 +----
 sdext/source/presenter/PresenterPaneContainer.cxx            |    6 --
 sdext/source/presenter/PresenterPaneContainer.hxx            |    2 
 sdext/source/presenter/PresenterSlideSorter.cxx              |    5 -
 sdext/source/presenter/PresenterSlideSorter.hxx              |    2 
 sdext/source/presenter/PresenterTheme.cxx                    |   19 +-----
 sdext/source/presenter/PresenterToolBar.cxx                  |   19 +-----
 sdext/source/presenter/PresenterViewFactory.cxx              |    8 --
 sw/inc/dbgoutsw.hxx                                          |    2 
 sw/source/core/doc/dbgoutsw.cxx                              |   17 -----
 sw/source/filter/ww8/ww8par2.cxx                             |    2 
 sw/source/filter/ww8/ww8par2.hxx                             |    1 
 sw/source/filter/ww8/ww8par6.cxx                             |    4 -
 sw/source/uibase/inc/chartins.hxx                            |    2 
 sw/source/uibase/inc/langhelper.hxx                          |    3 -
 sw/source/uibase/lingu/olmenu.cxx                            |    4 -
 sw/source/uibase/shells/langhelper.cxx                       |   12 ----
 sw/source/uibase/shells/textsh.cxx                           |    3 -
 sw/source/uibase/shells/textsh1.cxx                          |    2 
 sw/source/uibase/table/chartins.cxx                          |    4 -
 unoxml/source/rdf/librdf_repository.cxx                      |   10 ---
 45 files changed, 75 insertions(+), 224 deletions(-)

New commits:
commit 1f5523197de2a713118a2309583af8d81358f1f5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jul 2 15:13:27 2017 +0200

    nOldSplitPos is unused
    
    ...ever since bee746960f3d94d92e71006a7365a26669f52f8c "dba34d: limit
    invalidate calls"
    
    Change-Id: Ie0c278fea7dbccd54ef99c7303c3fe4d0f4cc93c

diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 7e57a17aed8c..8c0a7414b724 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -407,8 +407,6 @@ IMPL_LINK_NOARG( ODesignView, SplitHdl, SplitWindow*, void )
 
     if ( (aOutputSize.Width() - nTest) >= nMinWidth && nTest > m_aScrollWindow->getMaxMarkerWidth() )
     {
-        long nOldSplitPos = getController().getSplitPos();
-        (void)nOldSplitPos;
         getController().setSplitPos(nTest);
     }
 }
commit c7c26b84543a0270c30b076eb2c4f28d49333d78
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jul 2 15:10:39 2017 +0200

    OViewsWindow::MovAction parameter _bMove is unused
    
    ...ever since 30f74793701408589527511bde620d0d245ca951 "INTEGRATION: CWS
    reportdesign02"
    
    Change-Id: I14903484f65ef4453ed9834bcd5d3ed66f3a0d2b

diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index b74a9b1a0a0d..cb707d7961af 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -265,7 +265,7 @@ namespace rptui
         */
         OSectionView* getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt);
 
-        void MovAction(const Point& rPnt,const OSectionView* _pSection,bool _bMove /*= true */, bool _bControlKeySet);
+        void MovAction(const Point& rPnt,const OSectionView* _pSection, bool _bControlKeySet);
 
         sal_uInt32 getMarkedObjectCount() const;
 
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 4547ce83814e..44459a0d60ea 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -1342,10 +1342,8 @@ void OViewsWindow::EndAction()
     ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction(eEndAction) );
 }
 
-void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bool _bMove, bool _bControlKeySet)
+void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection, bool _bControlKeySet)
 {
-    (void)_bMove;
-
     Point aRealMousePos = _aPnt;
     Point aCurrentSectionPos;
     SAL_INFO(
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index 98f4ae2857da..2511747f11d6 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -764,7 +764,7 @@ bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
         }
         bIsSetPoint = setMovementPointer(rMEvt);
         ForceScroll(aPos);
-        m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPos,&m_rView, m_rView.GetDragMethod() == nullptr, false);
+        m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPos,&m_rView, false);
     }
 
     if ( !bIsSetPoint )
@@ -868,7 +868,7 @@ bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
         if (m_rView.GetDragMethod()==nullptr)
         {
             // create a selection
-            m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, true, false);
+            m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, false);
         }
         else
         {
@@ -882,7 +882,7 @@ bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
             }
             // drag or resize an object
             bool bControlKey = rMEvt.IsMod1();
-            m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, false, bControlKey);
+            m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, bControlKey);
         }
     }
 
commit d634a9edd22e4fbd5cec8d0c1e8fa866b344c32e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jul 2 14:33:47 2017 +0200

    eItemMapUnit is unused
    
    ...ever since the code's introduction in
    7eff3d3fc53fa494a86b1df127e45605bfe2fd71 "INTEGRATION: CWS frmcontrols03"
    
    Change-Id: Ibbc4e8e5f7b756fde3a4da5f696a5dab23e16770

diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index 0b34312c4433..c36f408da238 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -351,8 +351,6 @@ namespace frm
 
         if ( pFontHeightItem )
         {
-            // correct measurement units
-            MapUnit eItemMapUnit = pFontHeightItem->GetPropUnit(); (void)eItemMapUnit;
             sal_uLong nHeight = pFontHeightItem->GetHeight();
             if ( _rNewAttribs.GetPool()->GetMetric( getWhich() ) != MapUnit::MapTwip )
             {
commit e49467094db15e4a44fc5dfdd6494b02144b6334
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jul 2 14:26:57 2017 +0200

    DocumentRenderer::Implementation::GetProperties rOptions is unused
    
    ...ever since the code's introduction in
    3667b8e20a4c35aa2dfae63f159b2c96b4ade2b1 "#i92516# Refactored printing
    code, adapted it to new printing model, moved it to DocumentRenderer."
    
    Change-Id: Ie375fb3e7815ca0450c6d2b0d502a9c162b39bfb

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index f649f3d3f778..57f8ed7ac3d0 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1232,11 +1232,8 @@ public:
     /** Return a sequence of properties that can be returned by the
         XRenderable::getRenderer() method.
     */
-    css::uno::Sequence<css::beans::PropertyValue> GetProperties (
-        const css::uno::Sequence<css::beans::PropertyValue>& rOptions)
+    css::uno::Sequence<css::beans::PropertyValue> GetProperties ()
     {
-        (void)rOptions;
-
         css::uno::Sequence<css::beans::PropertyValue> aProperties (3);
 
         aProperties[0].Name = "ExtraPrintUIOptions";
@@ -2245,7 +2242,7 @@ Sequence<beans::PropertyValue> SAL_CALL DocumentRenderer::getRenderer (
     (void)nRenderer;
     (void)rSelection;
     mpImpl->ProcessProperties(rOptions);
-    return mpImpl->GetProperties(rOptions);
+    return mpImpl->GetProperties();
 }
 
 void SAL_CALL DocumentRenderer::render (
commit 6212d5fafe2025375178edbb83765b9f0afd8750
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jul 2 14:19:55 2017 +0200

    SlideSorterViewShell::Create parameter bIsCenterPane is unused
    
    ...ever since b390fae1706b9c511158a03e4fd61f263be4e511 "renaissance1:
     #i107215# Reorganized and improved layouting."
    
    Change-Id: I69bd8074cc7c33d8c85ff9ac43fb380795c28ee3

diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index a03bff816801..0eacf4f15a79 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -288,8 +288,7 @@ std::shared_ptr<BasicViewFactory::ViewDescriptor> BasicViewFactory::CreateView (
         rxViewId,
         rFrame,
         rWindow,
-        pFrameView,
-        bIsCenterPane);
+        pFrameView);
     pDescriptor->mxViewId = rxViewId;
 
     if (pDescriptor->mpViewShell.get() != nullptr)
@@ -323,8 +322,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
     const Reference<XResourceId>& rxViewId,
     SfxViewFrame& rFrame,
     vcl::Window& rWindow,
-    FrameView* pFrameView,
-    const bool bIsCenterPane)
+    FrameView* pFrameView)
 {
     std::shared_ptr<ViewShell> pViewShell;
     const OUString& rsViewURL (rxViewId->getResourceURL());
@@ -392,8 +390,7 @@ std::shared_ptr<ViewShell> BasicViewFactory::CreateViewShell (
             &rFrame,
             *mpBase,
             &rWindow,
-            pFrameView,
-            bIsCenterPane);
+            pFrameView);
         pViewShell->GetContentWindow()->set_id("slidesorter");
     }
 
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index 119485791374..b822360c9307 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -112,8 +112,7 @@ private:
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxViewId,
         SfxViewFrame& rFrame,
         vcl::Window& rWindow,
-        FrameView* pFrameView,
-        const bool bIsCenterView);
+        FrameView* pFrameView);
 
     void ActivateCenterView (
         const std::shared_ptr<ViewDescriptor>& rpDescriptor);
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 5f3e4c284756..ee97864c2145 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -53,8 +53,7 @@ public:
         SfxViewFrame* pFrame,
         ViewShellBase& rViewShellBase,
         vcl::Window* pParentWindow,
-        FrameView* pFrameView,
-        const bool bIsCenterPane);
+        FrameView* pFrameView);
 
     virtual ~SlideSorterViewShell() override;
 
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 650ccd022fe1..29c14bf08db1 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -93,11 +93,8 @@ std::shared_ptr<SlideSorterViewShell> SlideSorterViewShell::Create (
     SfxViewFrame* pFrame,
     ViewShellBase& rViewShellBase,
     vcl::Window* pParentWindow,
-    FrameView* pFrameViewArgument,
-    const bool bIsCenterPane)
+    FrameView* pFrameViewArgument)
 {
-    (void)bIsCenterPane;
-
     std::shared_ptr<SlideSorterViewShell> pViewShell;
     try
     {
commit e2d610ab18f5a41cec27567ed1be631ee6846209
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jul 2 14:08:49 2017 +0200

    ViewShellManager::Implementation ctor parameter rManager is unused
    
    ...ever since 5f47590d3911eb49ec86c671019fd32469fba4ae "INTEGRATION: CWS
    viewswitch"
    
    Change-Id: I49c474354cdb11fadf0f949bb5c19dcbb1f22e8d

diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 155ebef6488b..9762e8d90f4b 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -94,7 +94,6 @@ class ViewShellManager::Implementation
 {
 public:
     Implementation (
-        ViewShellManager& rManager,
         ViewShellBase& rBase);
     ~Implementation() COVERITY_NOEXCEPT_FALSE;
 
@@ -228,7 +227,7 @@ private:
 //===== ViewShellManager ======================================================
 
 ViewShellManager::ViewShellManager (ViewShellBase& rBase)
-    : mpImpl(new Implementation(*this,rBase)),
+    : mpImpl(new Implementation(rBase)),
       mbValid(true)
 {
 }
@@ -356,7 +355,6 @@ void ViewShellManager::UnlockUpdate()
 //===== ViewShellManager::Implementation ======================================
 
 ViewShellManager::Implementation::Implementation (
-    ViewShellManager& rManager,
     ViewShellBase& rBase)
     : mrBase(rBase),
       maMutex(),
@@ -370,9 +368,7 @@ ViewShellManager::Implementation::Implementation (
       mbFormShellAboveParent(true),
       mpTopShell(nullptr),
       mpTopViewShell(nullptr)
-{
-    (void)rManager;
-}
+{}
 
 ViewShellManager::Implementation::~Implementation() COVERITY_NOEXCEPT_FALSE
 {
commit 37a2fda3563c8518543c22ff640b9dc3c035de1b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jul 2 14:04:10 2017 +0200

    ClientBox::CalcActiveHeight parameter nPos is unused
    
    ...ever since the code's introduction in
    2d63c4689a13599ec9389c370726005f01fea08c "Basic Impress Remote + linking of
    dialog and server."
    
    Change-Id: I312315263fbb73dea421ddeb16381318a6fd8bec

diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index d0583395923f..fa97922690b9 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -137,9 +137,8 @@ void ClientBox::dispose()
 }
 
 // Title + description
-void ClientBox::CalcActiveHeight( const long nPos )
+void ClientBox::CalcActiveHeight()
 {
-    (void) nPos;
     const ::osl::MutexGuard aGuard( m_entriesMutex );
 
     // get title height
@@ -342,7 +341,7 @@ void ClientBox::DrawRow(vcl::RenderContext& rRenderContext, const ::tools::Recta
 void ClientBox::RecalcAll()
 {
     if ( m_bHasActive )
-        CalcActiveHeight( m_nActive );
+        CalcActiveHeight();
 
     SetupScrollBar();
 
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index 156ffc48e5f5..f5c194efd358 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -117,7 +117,7 @@ class ClientBox : public Control
     std::vector< TClientBoxEntry > m_vEntries;
     std::vector< TClientBoxEntry > m_vRemovedEntries;
 
-    void CalcActiveHeight( const long nPos );
+    void CalcActiveHeight();
     long GetTotalHeight() const;
     void SetupScrollBar();
     void DrawRow(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& rRect, const TClientBoxEntry& rEntry);
commit 2acedec56df2695e561aaab95dbbda6976fbd7b3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jul 2 13:28:30 2017 +0200

    ViewShellManager::Implementation::DestroySubShell rParentShell is unused
    
    ...ever since the code's introduction in
    5f47590d3911eb49ec86c671019fd32469fba4ae "INTEGRATION: CWS viewswitch"
    
    Change-Id: Ib39ed80d06e24acd2e450c5d0faa4684414cb77c

diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 7b26449ed189..155ebef6488b 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -222,9 +222,7 @@ private:
         SfxShell* pShell,
         ShellId nShellId);
     void DestroyViewShell (ShellDescriptor& rDescriptor);
-    static void DestroySubShell (
-        const SfxShell& rViewShell,
-        const ShellDescriptor& rDescriptor);
+    static void DestroySubShell (const ShellDescriptor& rDescriptor);
 };
 
 //===== ViewShellManager ======================================================
@@ -601,7 +599,7 @@ void ViewShellManager::Implementation::DeactivateSubShell (
     rList.erase(iShell);
     TakeShellsFromStack(pShell);
 
-    DestroySubShell(rParentShell, aDescriptor);
+    DestroySubShell(aDescriptor);
 }
 
 void ViewShellManager::Implementation::MoveToTop (const SfxShell& rShell)
@@ -1085,10 +1083,8 @@ void ViewShellManager::Implementation::DestroyViewShell (
 }
 
 void ViewShellManager::Implementation::DestroySubShell (
-    const SfxShell& rParentShell,
     const ShellDescriptor& rDescriptor)
 {
-    (void)rParentShell;
     OSL_ASSERT(rDescriptor.mpFactory.get() != nullptr);
     rDescriptor.mpFactory->ReleaseShell(rDescriptor.mpShell);
 }
commit 14a3111e6db99200439b55b558ee15fd8fb617f6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jul 2 13:23:40 2017 +0200

    SelectionFunction::ModeHandler::StartDrag parameter eMode is unused
    
    ...ever since 8c9901906bbc6b59baa0b2ef918b7e7fe89538b8 "renaissance1:
     #i107215# Reorganized the selection function. Introduced button bar."
    
    Change-Id: I54ebea0f74d83fe4f4455a3b666bbb9737764b49

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index ebfaef7526de..565eac564e18 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -165,8 +165,7 @@ public:
     void SwitchView (const model::SharedPageDescriptor& rpDescriptor);
 
     void StartDrag (
-        const Point& rMousePosition,
-        const InsertionIndicatorHandler::Mode eMode);
+        const Point& rMousePosition);
 
     bool IsMouseOverIndicatorAllowed() const { return mbIsMouseOverIndicatorAllowed;}
 
@@ -990,10 +989,8 @@ void SelectionFunction::ModeHandler::SwitchView (const model::SharedPageDescript
 }
 
 void SelectionFunction::ModeHandler::StartDrag (
-    const Point& rMousePosition,
-    const InsertionIndicatorHandler::Mode eMode)
+    const Point& rMousePosition)
 {
-    (void)eMode;
     // Do not start a drag-and-drop operation when one is already active.
     // (when dragging pages from one document into another, pressing a
     // modifier key can trigger a MouseMotion event in the originating
@@ -1168,11 +1165,7 @@ bool NormalModeHandler::ProcessMotionEvent (
                         std::abs(maButtonDownLocation->Y() - rDescriptor.maMousePosition.Y()))
                     : 0);
                 if (nDistance > 3)
-                    StartDrag(
-                        rDescriptor.maMousePosition,
-                        (rDescriptor.mnEventCode & CONTROL_MODIFIER) != 0
-                            ? InsertionIndicatorHandler::CopyMode
-                            : InsertionIndicatorHandler::MoveMode);
+                    StartDrag(rDescriptor.maMousePosition);
             }
             break;
         }
commit c5452dcc426b3c9de43defa855fd5139c2c78de5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jul 2 13:17:37 2017 +0200

    Layouter::Implementation::GetTargetSize rPreviewModelSize is unused
    
    ...ever since 1e89c38545f74a2d18564f9df6ec1ff4d5ef9390 "renaissance1:
     #i107215# Fixed minor compilation problems."
    
    Change-Id: I8d3c79e5082747f14fb774bccb8b4a53507f9167

diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index 1728cc390c3f..bb67972edf7b 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -207,11 +207,9 @@ protected:
     virtual void CalculateRowAndColumnCount (const Size& rWindowSize) = 0;
     virtual void CalculateMaxRowAndColumnCount (const Size& rWindowSize) = 0;
     virtual Size CalculateTargetSize (
-        const Size& rWindowSize,
-        const Size& rPreviewModelSize) const = 0;
+        const Size& rWindowSize) const = 0;
     Size GetTargetSize (
         const Size& rWindowSize,
-        const Size& rPreviewModelSize,
         const bool bCalculateWidth,
         const bool bCalculateHeight) const;
     void CalculateVerticalLogicalInsertPosition (
@@ -237,8 +235,7 @@ protected:
     virtual void CalculateRowAndColumnCount (const Size& rWindowSize) override;
     virtual void CalculateMaxRowAndColumnCount (const Size& rWindowSize) override;
     virtual Size CalculateTargetSize (
-        const Size& rWindowSize,
-        const Size& rPreviewModelSize) const override;
+        const Size& rWindowSize) const override;
 };
 
 /** The horizontal layouter has one row and as many columns as there are
@@ -259,8 +256,7 @@ protected:
     virtual void CalculateRowAndColumnCount (const Size& rWindowSize) override;
     virtual void CalculateMaxRowAndColumnCount (const Size& rWindowSize) override;
     virtual Size CalculateTargetSize (
-        const Size& rWindowSize,
-        const Size& rPreviewModelSize) const override;
+        const Size& rWindowSize) const override;
 };
 
 /** The number of columns of the grid layouter is defined via a control in
@@ -285,8 +281,7 @@ protected:
     virtual void CalculateRowAndColumnCount (const Size& rWindowSize) override;
     virtual void CalculateMaxRowAndColumnCount (const Size& rWindowSize) override;
     virtual Size CalculateTargetSize (
-        const Size& rWindowSize,
-        const Size& rPreviewModelSize) const override;
+        const Size& rWindowSize) const override;
 };
 
 //===== Layouter ==============================================================
@@ -519,7 +514,7 @@ bool Layouter::Implementation::Rearrange (
 
     mpPageObjectLayouter.reset(
         new PageObjectLayouter(
-            CalculateTargetSize(rWindowSize, rPreviewModelSize),
+            CalculateTargetSize(rWindowSize),
             rPreviewModelSize,
             mpWindow,
             mnPageCount));
@@ -832,12 +827,9 @@ Range Layouter::Implementation::GetRangeOfVisiblePageObjects (const ::tools::Rec
 
 Size Layouter::Implementation::GetTargetSize (
     const Size& rWindowSize,
-    const Size& rPreviewModelSize,
     const bool bCalculateWidth,
     const bool bCalculateHeight) const
 {
-    (void)rPreviewModelSize;
-
     if (mnColumnCount<=0 || mnRowCount<=0)
         return maPreferredSize;
     if ( ! (bCalculateWidth || bCalculateHeight))
@@ -1025,10 +1017,9 @@ void HorizontalImplementation::CalculateMaxRowAndColumnCount (const Size& rWindo
 }
 
 Size HorizontalImplementation::CalculateTargetSize (
-    const Size& rWindowSize,
-    const Size& rPreviewModelSize) const
+    const Size& rWindowSize) const
 {
-    return Implementation::GetTargetSize(rWindowSize, rPreviewModelSize, false, true);
+    return Implementation::GetTargetSize(rWindowSize, false, true);
 }
 
 void HorizontalImplementation::CalculateLogicalInsertPosition (
@@ -1077,10 +1068,9 @@ void VerticalImplementation::CalculateMaxRowAndColumnCount (const Size& rWindowS
 }
 
 Size VerticalImplementation::CalculateTargetSize (
-    const Size& rWindowSize,
-    const Size& rPreviewModelSize) const
+    const Size& rWindowSize) const
 {
-    return Implementation::GetTargetSize(rWindowSize, rPreviewModelSize, true, false);
+    return Implementation::GetTargetSize(rWindowSize, true, false);
 }
 
 void VerticalImplementation::CalculateLogicalInsertPosition (
@@ -1131,10 +1121,9 @@ void GridImplementation::CalculateMaxRowAndColumnCount (const Size& rWindowSize)
 }
 
 Size GridImplementation::CalculateTargetSize (
-    const Size& rWindowSize,
-    const Size& rPreviewModelSize) const
+    const Size& rWindowSize) const
 {
-    return Implementation::GetTargetSize(rWindowSize, rPreviewModelSize, true, true);
+    return Implementation::GetTargetSize(rWindowSize, true, true);
 }
 
 void GridImplementation::CalculateLogicalInsertPosition (
commit fa6c20372d6e9ce033718c50464f6575b5d20372
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Jul 2 12:49:48 2017 +0200

    PresenterCanvas::UpdateSpriteClip rSize parameter is unused
    
    ...ever since the code's introductioj in
    61114869c76de15bf63c929d07f524cd545f418f "INTEGRATION: CWS presenterfixes:
     #i89792# Added UpdateSpriteClip() method to fix sprite clipping."
    
    Change-Id: I4a2a9bf80f751a2524ef97688bc694d6805d702d

diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 7acab0c60f43..de271757144c 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -55,8 +55,7 @@ public:
     PresenterCustomSprite (
         const rtl::Reference<PresenterCanvas>& rpCanvas,
         const Reference<rendering::XCustomSprite>& rxSprite,
-        const Reference<awt::XWindow>& rxBaseWindow,
-        const css::geometry::RealSize2D& rSpriteSize);
+        const Reference<awt::XWindow>& rxBaseWindow);
     PresenterCustomSprite(const PresenterCustomSprite&) = delete;
     PresenterCustomSprite& operator=(const PresenterCustomSprite&) = delete;
     virtual void SAL_CALL disposing() override;
@@ -88,7 +87,6 @@ private:
     Reference<rendering::XCustomSprite> mxSprite;
     Reference<awt::XWindow> mxBaseWindow;
     geometry::RealPoint2D maPosition;
-    geometry::RealSize2D maSpriteSize;
 
     /// @throws css::lang::DisposedException
     void ThrowIfDisposed();
@@ -384,14 +382,12 @@ Reference<rendering::XCustomSprite> SAL_CALL
         return new PresenterCustomSprite(
             this,
             xSpriteCanvas->createCustomSprite(rSpriteSize),
-            mxSharedWindow,
-            rSpriteSize);
+            mxSharedWindow);
     else if (mxUpdateCanvas.is())
         return new PresenterCustomSprite(
             this,
             mxUpdateCanvas->createCustomSprite(rSpriteSize),
-            mxUpdateWindow,
-            rSpriteSize);
+            mxUpdateWindow);
     else
         return nullptr;
 }
@@ -644,11 +640,8 @@ awt::Point PresenterCanvas::GetOffset (const Reference<awt::XWindow>& rxBaseWind
 
 Reference<rendering::XPolyPolygon2D> PresenterCanvas::UpdateSpriteClip (
     const Reference<rendering::XPolyPolygon2D>& rxOriginalClip,
-    const geometry::RealPoint2D& rLocation,
-    const geometry::RealSize2D& rSize)
+    const geometry::RealPoint2D& rLocation)
 {
-    (void)rSize;
-
     // Check used resources and just return the original clip when not
     // every one of them is available.
     if ( ! mxWindow.is())
@@ -717,14 +710,12 @@ void PresenterCanvas::ThrowIfDisposed()
 PresenterCustomSprite::PresenterCustomSprite (
     const rtl::Reference<PresenterCanvas>& rpCanvas,
     const Reference<rendering::XCustomSprite>& rxSprite,
-    const Reference<awt::XWindow>& rxBaseWindow,
-    const css::geometry::RealSize2D& rSpriteSize)
+    const Reference<awt::XWindow>& rxBaseWindow)
     : PresenterCustomSpriteInterfaceBase(m_aMutex),
       mpCanvas(rpCanvas),
       mxSprite(rxSprite),
       mxBaseWindow(rxBaseWindow),
-      maPosition(0,0),
-      maSpriteSize(rSpriteSize)
+      maPosition(0,0)
 {
 }
 
@@ -775,7 +766,7 @@ void SAL_CALL PresenterCustomSprite::clip (const Reference<rendering::XPolyPolyg
     // The clip region is expected in the coordinate system of the sprite.
     // UpdateSpriteClip() integrates the window bounds, transformed into the
     // sprites coordinate system, with the given clip.
-    mxSprite->clip(mpCanvas->UpdateSpriteClip(rxClip, maPosition, maSpriteSize));
+    mxSprite->clip(mpCanvas->UpdateSpriteClip(rxClip, maPosition));
 }
 
 void SAL_CALL PresenterCustomSprite::setPriority (const double nPriority)
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx b/sd/source/ui/presenter/PresenterCanvas.hxx
index b9d91932871e..76555ac88c31 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -117,8 +117,7 @@ public:
     */
     css::uno::Reference<css::rendering::XPolyPolygon2D> UpdateSpriteClip (
         const css::uno::Reference<css::rendering::XPolyPolygon2D>& rxOriginalClip,
-        const css::geometry::RealPoint2D& rLocation,
-        const css::geometry::RealSize2D& rSize);
+        const css::geometry::RealPoint2D& rLocation);
 
     // XCanvas
 
commit 0123787158aee4bdc5a50e60a16b7e782ae653a2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Jul 1 20:27:54 2017 +0200

    rObjMgr is unused
    
    ...ever since dbeb6066e879baf1507d5065fb6bd4ef4adb884f "#i12587# import
    shapes embedded in charts and chart sheets from BIFF5/BIFF8"
    
    Change-Id: I8f7e294cdc3c224b1dc9766e9c2546daae1a57eb

diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 794bad50e2f0..191700134537 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -72,8 +72,6 @@ ErrCode ImportExcel::Read()
     XclImpNumFmtBuffer&     rNumFmtBfr      = GetNumFmtBuffer();
     XclImpXFBuffer&         rXFBfr          = GetXFBuffer();
     XclImpNameManager&      rNameMgr        = GetNameManager();
-    XclImpObjectManager&    rObjMgr         = GetObjectManager();
-    (void)rObjMgr;
     // call to GetCurrSheetDrawing() cannot be cached (changes in new sheets)
 
     enum Zustand {
commit 6e5560e9f2e8fde05388e4765c3e74f7360f1fbc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Jul 1 19:48:28 2017 +0200

    ScRange::ParseCols/Rows pDoc parameter is unused
    
    ...ever since the code's introduction with
    f4e75ed9b00a4d8410fe685aae66735ec82837ec "INTEGRATION: CWS scr1c1", despite
    the "we may need this later" claim that also originated there
    
    Change-Id: I88e2b2a8d01fda8adf942ff78f84b6d8638dc154

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 93ea9c1720be..a13f3e9ddb62 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -526,9 +526,9 @@ public:
 
     SC_DLLPUBLIC ScRefFlags ParseAny( const OUString&, ScDocument*,
                                       const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
-    SC_DLLPUBLIC ScRefFlags ParseCols( const OUString&, ScDocument*,
+    SC_DLLPUBLIC ScRefFlags ParseCols( const OUString&,
                                        const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
-    SC_DLLPUBLIC void ParseRows( const OUString&, ScDocument*,
+    SC_DLLPUBLIC void ParseRows( const OUString&,
                                        const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 );
 
     /** Parse an Excel style reference up to and including the sheet name
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index c8e617dede94..de79a3d8a4df 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1774,7 +1774,7 @@ ScRefFlags ScRange::ParseAny( const OUString& rString, ScDocument* pDoc,
 }
 
 // Parse only full row references
-ScRefFlags ScRange::ParseCols( const OUString& rStr, ScDocument* pDoc,
+ScRefFlags ScRange::ParseCols( const OUString& rStr,
                                const ScAddress::Details& rDetails )
 {
     if (rStr.isEmpty())
@@ -1784,8 +1784,6 @@ ScRefFlags ScRange::ParseCols( const OUString& rStr, ScDocument* pDoc,
     ScRefFlags nRes = ScRefFlags::ZERO;
     ScRefFlags ignored = ScRefFlags::ZERO;
 
-    (void)pDoc; // make compiler shutup we may need this later
-
     switch (rDetails.eConv)
     {
     default :
@@ -1834,7 +1832,7 @@ ScRefFlags ScRange::ParseCols( const OUString& rStr, ScDocument* pDoc,
 }
 
 // Parse only full row references
-void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
+void ScRange::ParseRows( const OUString& rStr,
                                const ScAddress::Details& rDetails )
 {
     if (rStr.isEmpty())
@@ -1843,8 +1841,6 @@ void ScRange::ParseRows( const OUString& rStr, ScDocument* pDoc,
     const sal_Unicode* p = rStr.getStr();
     ScRefFlags ignored = ScRefFlags::ZERO;
 
-    (void)pDoc; // make compiler shutup we may need this later
-
     switch (rDetails.eConv)
     {
     default :
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 59769264ec1a..01bd01c4ffc1 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -2189,7 +2189,7 @@ ScVbaRange::CellsHelper( const uno::Reference< ov::XHelperInterface >& xParent,
         {
             ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
             ScRange tmpRange;
-            ScRefFlags flags = tmpRange.ParseCols( sCol, &getDocumentFromRange( xRange ), dDetails );
+            ScRefFlags flags = tmpRange.ParseCols( sCol, dDetails );
             if ( (flags & ScRefFlags::COL_VALID) == ScRefFlags::ZERO )
                throw uno::RuntimeException();
             nColumn = tmpRange.aStart.Col() + 1;
@@ -2364,7 +2364,7 @@ ScVbaRange::Rows(const uno::Any& aIndex )
         {
             ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
             ScRange tmpRange;
-            tmpRange.ParseRows( sAddress, &getDocumentFromRange( mxRange ), dDetails );
+            tmpRange.ParseRows( sAddress, dDetails );
             SCROW nStartRow = tmpRange.aStart.Row();
             SCROW nEndRow = tmpRange.aEnd.Row();
 
@@ -2408,7 +2408,7 @@ ScVbaRange::Columns(const uno::Any& aIndex )
         {
             ScAddress::Details dDetails( formula::FormulaGrammar::CONV_XL_A1, 0, 0 );
             ScRange tmpRange;
-            tmpRange.ParseCols( sAddress, &getDocumentFromRange( mxRange ), dDetails );
+            tmpRange.ParseCols( sAddress, dDetails );
             SCCOL nStartCol = tmpRange.aStart.Col();
             SCCOL nEndCol = tmpRange.aEnd.Col();
 
commit 49baf95bc061f917b9c56612ddc77fe4de990095
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Jul 1 17:04:46 2017 +0200

    SwInsertChart's parameters are unused
    
    ...ever since the function's introduction in
    28c9973206e2a97b36bb8343e452d7fda8b0bd5d "INTEGRATION: CWS chart2mst3"
    
    Change-Id: I090c8eb5451d29f9f3e04242e7ba27b914f7b3de

diff --git a/sw/source/uibase/inc/chartins.hxx b/sw/source/uibase/inc/chartins.hxx
index bb1c6d860e23..ef79107c2ff3 100644
--- a/sw/source/uibase/inc/chartins.hxx
+++ b/sw/source/uibase/inc/chartins.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX
 
 Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const tools::Rectangle& rLogicChart );
-void SwInsertChart( vcl::Window *pParent, SfxBindings *pBindings );
+void SwInsertChart();
 
 #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX
 
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 87bfca3b4d05..2fb8186ac545 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -324,8 +324,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
                 break;
             if(!rReq.IsAPI())
             {
-                SfxViewFrame* pVFrame = GetView().GetViewFrame();
-                SwInsertChart( &GetView().GetEditWin(), &pVFrame->GetBindings() );
+                SwInsertChart();
             }
             else
             {
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index 5717b6c2981b..435452b889d8 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -127,10 +127,8 @@ Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSiz
     return aRet;
 }
 
-void SwInsertChart(vcl::Window* pParent, SfxBindings* pBindings )
+void SwInsertChart()
 {
-    (void) pParent;
-    (void) pBindings;
     SwView *pView = ::GetActiveView();
 
     // get range string of marked data
commit d2178a12ad28d0ca33c60a76daa80deaa7db1881
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Jul 1 16:56:54 2017 +0200

    WW8SwFlyPara ctor nPgLeft parameter is unused
    
    ...ever since its last use in OLD_ANCHORING-conditional code got removed
    with 2e755e2d09c584e8d7eead5883cf5c13f3752e23 "INTEGRATION: CWS swobjpos04"
    
    Change-Id: Ibdbab544bc94667c4f04b5fbd1b1042d165f1fa8

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 76929b7303b0..ac6af529a915 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3510,7 +3510,7 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
                 // containing WW8 page top margin.
                 pTableSFlyPara = new WW8SwFlyPara(*m_pPaM, *this, *pTableWFlyPara,
                     m_aSectionManager.GetWWPageTopMargin(),
-                    m_aSectionManager.GetPageLeft(), m_aSectionManager.GetTextAreaWidth(),
+                    m_aSectionManager.GetTextAreaWidth(),
                     m_nIniFlyDx, m_nIniFlyDy);
 
                 // #i45301# - anchor nested table Writer fly frame at-character
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index a097b62ba774..f7e7121012be 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -77,7 +77,6 @@ struct WW8SwFlyPara
                   SwWW8ImplReader& rIo,
                   WW8FlyPara& rWW,
                   const sal_uInt32 nWWPgTop,
-                  const sal_uInt32 nPgLeft,
                   const sal_uInt32 nPgWidth,
                   const sal_Int32 nIniFlyDx,
                   const sal_Int32 nIniFlyDy );
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 144de1964730..4030ccaee09d 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1780,13 +1780,10 @@ WW8SwFlyPara::WW8SwFlyPara( SwPaM& rPaM,
                             SwWW8ImplReader& rIo,
                             WW8FlyPara& rWW,
                             const sal_uInt32 nWWPgTop,
-                            const sal_uInt32 nPgLeft,
                             const sal_uInt32 nPgWidth,
                             const sal_Int32 nIniFlyDx,
                             const sal_Int32 nIniFlyDy )
 {
-    (void) nPgLeft;
-
     memset( this, 0, sizeof( WW8SwFlyPara ) );  // initialize
     nNewNetWidth = MINFLY;                    // minimum
 
@@ -2348,7 +2345,6 @@ bool SwWW8ImplReader::StartApo(const ApoTestResults &rApo, const WW8_TablePos *p
     // containing WW8 page top margin.
     m_xSFlyPara.reset(new WW8SwFlyPara( *m_pPaM, *this, *m_xWFlyPara,
                                   m_aSectionManager.GetWWPageTopMargin(),
-                                  m_aSectionManager.GetPageLeft(),
                                   m_aSectionManager.GetTextAreaWidth(),
                                   m_nIniFlyDx, m_nIniFlyDy));
 
commit 64ac0ce918742f1266e555fa3ddd951c917b91b5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Jul 1 16:48:46 2017 +0200

    Clean up SwLangHelper::ResetLanguages
    
    Change-Id: Ia6e98eabad2405f6b064e541c800a56bb9ea3a2e

diff --git a/sw/source/uibase/inc/langhelper.hxx b/sw/source/uibase/inc/langhelper.hxx
index dd572c76aef0..3e38e4badffa 100644
--- a/sw/source/uibase/inc/langhelper.hxx
+++ b/sw/source/uibase/inc/langhelper.hxx
@@ -37,8 +37,7 @@ namespace SwLangHelper
     extern void SetLanguage( SwWrtShell &rWrtSh, OutlinerView* pOLV, const ESelection& rSelection, const OUString &rLangText, bool bIsForSelection, SfxItemSet &rCoreSet );
     extern void SetLanguage_None( SwWrtShell &rWrtSh, bool bIsForSelection, SfxItemSet &rCoreSet );
     extern void SetLanguage_None( SwWrtShell &rWrtSh, OutlinerView* pOLV, const ESelection& rSelection, bool bIsForSelection, SfxItemSet &rCoreSet  );
-    extern void ResetLanguages( SwWrtShell &rWrtSh, bool bIsForSelection );
-    extern void ResetLanguages( SwWrtShell &rWrtSh, OutlinerView* pOLV, const ESelection& rSelection, bool bIsForSelection );
+    extern void ResetLanguages( SwWrtShell &rWrtSh, OutlinerView* pOLV = nullptr );
 
     // document
     extern void SelectCurrentPara( SwWrtShell &rWrtSh );
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 140ab07814d8..629a89e5b4b5 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -841,7 +841,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
         else if (nId == MN_SET_SELECTION_RESET)
         {
             //reset languages for current selection
-            SwLangHelper::ResetLanguages( *m_pSh, true );
+            SwLangHelper::ResetLanguages( *m_pSh );
         }
         else if (nId == MN_SET_SELECTION_MORE)
         {
@@ -870,7 +870,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
             //reset languages for current paragraph
             m_pSh->Push();        // save cursor
             SwLangHelper::SelectCurrentPara( *m_pSh );
-            SwLangHelper::ResetLanguages( *m_pSh, true );
+            SwLangHelper::ResetLanguages( *m_pSh );
             m_pSh->Pop(SwCursorShell::PopMode::DeleteCurrent); // restore cursor
         }
         else if (nId == MN_SET_PARA_MORE)
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index 547c6c389ea5..478c58351404 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -182,7 +182,7 @@ namespace SwLangHelper
                 if (aNewLangText == "LANGUAGE_NONE")
                     SwLangHelper::SetLanguage_None( rSh, pOLV, aSelection, bForSelection, aEditAttr );
                 else if (aNewLangText == "RESET_LANGUAGES")
-                    SwLangHelper::ResetLanguages( rSh, pOLV, aSelection, bForSelection );
+                    SwLangHelper::ResetLanguages( rSh, pOLV );
                 else
                     SwLangHelper::SetLanguage( rSh, pOLV, aSelection, aNewLangText, bForSelection, aEditAttr );
 
@@ -366,16 +366,8 @@ namespace SwLangHelper
         }
     }
 
-    void ResetLanguages( SwWrtShell &rWrtSh, bool bIsForSelection )
+    void ResetLanguages( SwWrtShell &rWrtSh, OutlinerView* pOLV )
     {
-        ResetLanguages( rWrtSh, nullptr , ESelection(), bIsForSelection );
-    }
-
-    void ResetLanguages( SwWrtShell &rWrtSh, OutlinerView* pOLV, const ESelection& rSelection, bool bIsForSelection )
-    {
-        (void) bIsForSelection;
-        (void) rSelection;
-
         // reset language for current selection.
         // The selection should already have been expanded to the whole paragraph or
         // to all text in the document if those are the ranges where to reset
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index a5a295c820d6..028180000f42 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -404,7 +404,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                     if (aNewLangText == aStrNone)
                         SwLangHelper::SetLanguage_None( rWrtSh, bForSelection, aCoreSet );
                     else if (aNewLangText == aStrResetLangs)
-                        SwLangHelper::ResetLanguages( rWrtSh, bForSelection );
+                        SwLangHelper::ResetLanguages( rWrtSh );
                     else
                         SwLangHelper::SetLanguage( rWrtSh, aNewLangText, bForSelection, aCoreSet );
                     rWrtSh.EndUndo();
commit 41874c93e6eea179185f260ed42f1cd4789900d5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Jul 1 16:27:32 2017 +0200

    dbg_out(SwRewriter) is unused
    
    Change-Id: I2ebdba0a162bd02d0b36f6577af09b6f95b356d2

diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index e70d032ff803..803dc0729a9b 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -41,7 +41,6 @@ class SwRect;
 class SwFrameFormat;
 class SwFrameFormats;
 class SwNodes;
-class SwRewriter;
 class SwNumRuleTable;
 class SwNumRule;
 class SwOutlineNodes;
@@ -70,7 +69,6 @@ SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam);
 SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum);
 SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo);
 SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes & rNodes);
-SW_DLLPUBLIC const char * dbg_out(const SwRewriter & rRewriter);
 SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule);
 SW_DLLPUBLIC const char * dbg_out(const SwTextFormatColl & rFormat);
 SW_DLLPUBLIC const char * dbg_out(const SwFrameFormats & rFrameFormats);
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 45fdaa220720..ed1e411f6cb7 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -41,7 +41,6 @@
 #include <paratr.hxx>
 #include <SwNodeNum.hxx>
 #include <dbgoutsw.hxx>
-#include <SwRewriter.hxx>
 #include <iostream>
 #include <cstdio>
 
@@ -797,22 +796,6 @@ const char * dbg_out(SwOutlineNodes & rNodes)
     return dbg_out(lcl_dbg_out(rNodes));
 }
 
-//FIXME: this method seems to do nothing at all
-static OUString lcl_dbg_out(const SwRewriter & rRewriter)
-{
-    (void) rRewriter;
-    OUString aResult;
-
-    //aResult = rRewriter.ToString();
-
-    return aResult;
-}
-
-const char * dbg_out(const SwRewriter & rRewriter)
-{
-    return dbg_out(lcl_dbg_out(rRewriter));
-}
-
 static OUString lcl_dbg_out(const SvxNumberFormat & rFormat)
 {
     OUString aResult;
commit c63bf22b215b2e51ea69527fd80693079572b640
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Jul 1 14:47:17 2017 +0200

    eFunc is unused
    
    ...ever since the code's introduction with
    dab7a6e9f54acac164994a8550a4570bcffb5087 "INTEGRATION: CWS insight01"
    
    Change-Id: Id9cd9c365a802dd9b67c1dfb297007c2b8ebc0bc

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index a4d508006ca5..f797da66b562 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -1191,7 +1191,6 @@ void OAppDetailPageHelper::KeyInput( const KeyEvent& rKEvt )
     SvTreeListBox* pCurrentView = getCurrentView();
     OSL_PRECOND( pCurrentView, "OAppDetailPageHelper::KeyInput: how this?" );
 
-    KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction(); (void)eFunc;
     sal_uInt16      nCode = rKEvt.GetKeyCode().GetCode();
 
     if ( ( KEY_RETURN == nCode ) && pCurrentView )
commit ae0771c1581de76450b53c04268c0d8927fb3e0d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sat Jul 1 12:30:48 2017 +0200

    nMinPasswdLen is "currently not supported" ever since
    
    ...the code's introduction with 7cd3ea794099e257d99748908855e61aa9df89eb
    "#i109634# password to open/modify dialog", and demonstrated to be always
    passed in as 0 with 673b436c3592c5747f3dce4947168d6fa3ba45ea
    "loplugin:constantparam in vcl"
    
    Change-Id: Ic7eee77b114f39a0c016148e9176f58dcfc53ebc

diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 8db8d4f633d3..21d058f3f4ff 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -52,12 +52,11 @@ struct PasswordToOpenModifyDialog_Impl
     DECL_LINK( OkBtnClickHdl, Button*, void );
 
     PasswordToOpenModifyDialog_Impl( PasswordToOpenModifyDialog * pParent,
-            sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify );
+            sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify );
 };
 
 PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
         PasswordToOpenModifyDialog * pParent,
-        sal_uInt16 nMinPasswdLen,
         sal_uInt16 nMaxPasswdLen,
         bool bIsPasswordToModify )
     : m_pParent( pParent )
@@ -85,8 +84,6 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
         m_pReenterPasswdToModifyED->SetMaxTextLen( nMaxPasswdLen );
     }
 
-    (void) nMinPasswdLen;   // currently not supported
-
     m_pPasswdToOpenED->GrabFocus();
 
     m_pOptionsExpander->Enable(bIsPasswordToModify);
@@ -139,12 +136,12 @@ IMPL_LINK_NOARG( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, Button *, void
 }
 
 PasswordToOpenModifyDialog::PasswordToOpenModifyDialog(
-    vcl::Window * pParent, sal_uInt16 nMinPasswdLen,
+    vcl::Window * pParent,
     sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify)
     : SfxModalDialog( pParent, "PasswordDialog", "cui/ui/password.ui" )
 {
     m_pImpl.reset(new PasswordToOpenModifyDialog_Impl(this,
-        nMinPasswdLen, nMaxPasswdLen, bIsPasswordToModify ) );
+        nMaxPasswdLen, bIsPasswordToModify ) );
 }
 
 
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 4d07d9f9e5f8..cf945c40f955 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1535,7 +1535,7 @@ VclPtr<AbstractPasswordToOpenModifyDialog> AbstractDialogFactory_Impl::CreatePas
     vcl::Window * pParent,
     sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify )
 {
-    VclPtrInstance<PasswordToOpenModifyDialog> pDlg( pParent, 0, nMaxPasswdLen, bIsPasswordToModify );
+    VclPtrInstance<PasswordToOpenModifyDialog> pDlg( pParent, nMaxPasswdLen, bIsPasswordToModify );
     return VclPtr<AbstractPasswordToOpenModifyDialog_Impl>::Create( pDlg );
 }
 
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index 92ede8689816..529b67fb06ed 100644
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -35,7 +35,7 @@ class PasswordToOpenModifyDialog : public SfxModalDialog
     PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ) = delete;
 
 public:
-    PasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen,
+    PasswordToOpenModifyDialog( vcl::Window * pParent,
             sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */,
             bool bIsPasswordToModify );
     virtual ~PasswordToOpenModifyDialog() override;
commit 578e0f22e13e14abfd03681a8b327a2989792444
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 30 23:30:33 2017 +0200

    formatNeedsBaseURI always returns true
    
    ...ever since the code's introduction with
    9671014435807328ac33b70ad0383f392bfa67df "INTEGRATION: CWS odfmetadata"
    
    Change-Id: I18f5a18bf42b4b945b197f5294597fdfe2fbbeca

diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx
index 9ca65e65b3b0..8224d6991d6c 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -860,12 +860,6 @@ uno::Reference< rdf::XBlankNode > SAL_CALL librdf_Repository::createBlankNode()
     }
 }
 
-bool formatNeedsBaseURI(::sal_Int16 i_Format)
-{
-    (void) i_Format; //FIXME any which don't?
-    return true;
-}
-
 //void SAL_CALL
 uno::Reference<rdf::XNamedGraph> SAL_CALL
 librdf_Repository::importGraph(::sal_Int16 i_Format,
@@ -891,7 +885,7 @@ librdf_Repository::importGraph(::sal_Int16 i_Format,
         throw lang::IllegalArgumentException(
                 "librdf_Repository::importGraph: URI is reserved", *this, 0);
     }
-    if (formatNeedsBaseURI(i_Format) && !i_xBaseURI.is()) {
+    if (!i_xBaseURI.is()) { //FIXME: any i_Format that don't need a base URI?
         throw lang::IllegalArgumentException(
                 "librdf_Repository::importGraph: base URI is null", *this, 3);
     }
@@ -1039,7 +1033,7 @@ librdf_Repository::exportGraph(::sal_Int16 i_Format,
                 "librdf_Repository::exportGraph: "
                 "graph name is null", *this, 2);
     }
-    if (formatNeedsBaseURI(i_Format) && !i_xBaseURI.is()) {
+    if (!i_xBaseURI.is()) { //FIXME: any i_Format that don't need a base URI?
         throw lang::IllegalArgumentException(
                 "librdf_Repository::exportGraph: "
                 "base URI is null", *this, 3);
commit da00de7b5623d146e2121e4541e9362cd6d46f69
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 30 23:20:33 2017 +0200

    Text::Paint rOffset parameter is unused
    
    ...ever since the code's introduction with
    89efcae67e166f88a0e63f51af146fdfc8e41edd "INTEGRATION: CWS presenterscreen"
    
    Change-Id: Idcf76dbfff67270ae12780d3e460e1fe39897c52

diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index cb3bad6511e5..ba9645c0a893 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -77,8 +77,7 @@ namespace {
         void Paint (
             const Reference<rendering::XCanvas>& rxCanvas,
             const rendering::ViewState& rViewState,
-            const awt::Rectangle& rBoundingBox,
-            const awt::Point& rOffset);
+            const awt::Rectangle& rBoundingBox);
 
         geometry::RealRectangle2D GetBoundingBox (
             const Reference<rendering::XCanvas>& rxCanvas);
@@ -1489,15 +1488,7 @@ void Button::Paint (
     sal_Int32 nTextHeight (sal::static_int_cast<sal_Int32>(0.5 + aTextBBox.Y2 - aTextBBox.Y1));
 
     PaintIcon(rxCanvas, nTextHeight, rViewState);
-    awt::Point aOffset(0,0);
-    if ( ! IsEnabled())
-        if (mpMode->mpIcon.get() != nullptr)
-        {
-            Reference<rendering::XBitmap> xBitmap (mpMode->mpIcon->GetNormalBitmap());
-            if (xBitmap.is())
-                aOffset.Y = xBitmap->getSize().Height;
-        }
-    mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox(), aOffset);
+    mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox());
 }
 
 awt::Size Button::CreateBoundingSize (
@@ -1633,7 +1624,7 @@ void Label::Paint (
     if (mpMode.get() == nullptr)
         return;
 
-    mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox(), awt::Point(0,0));
+    mpMode->maText.Paint(rxCanvas, rViewState, GetBoundingBox());
 }
 
 bool Label::SetState (const bool bIsOver, const bool bIsPressed)
@@ -1682,10 +1673,8 @@ const PresenterTheme::SharedFontDescriptor& Text::GetFont() const
 void Text::Paint (
     const Reference<rendering::XCanvas>& rxCanvas,
     const rendering::ViewState& rViewState,
-    const awt::Rectangle& rBoundingBox,
-    const awt::Point& rOffset)
+    const awt::Rectangle& rBoundingBox)
 {
-    (void)rOffset;
     OSL_ASSERT(rxCanvas.is());
 
     if (msText.isEmpty())
commit 7d72ddb93b18b262757a28b2f3e9bc920d8fcd04
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 30 23:08:02 2017 +0200

    StyleAssociationContainer::ProcessStyleAssociation rReadContext unused
    
    ...ever since the code's introduction with
    405451ce720564a936341ca24868a8ba1138ea5f "INTEGRATION: CWS presenterview"
    
    Change-Id: I150803e64c44046cbec1e268d04ad510b17fb295

diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 85e03fdf466d..412c2c9e8f3e 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -205,7 +205,6 @@ class StyleAssociationContainer
 {
 public:
     void Read (
-        ReadContext& rReadContext,
         const Reference<container::XHierarchicalNameAccess>& rThemeRoot);
 
     OUString GetStyleName (const OUString& rsResourceName) const;
@@ -215,7 +214,6 @@ private:
     StyleAssociations maStyleAssociations;
 
     void ProcessStyleAssociation(
-        ReadContext& rReadContext,
         const ::std::vector<css::uno::Any>& rValues);
 };
 
@@ -610,7 +608,7 @@ void PresenterTheme::Theme::Read (
         SharedBitmapDescriptor());
 
     // Style associations.
-    maStyleAssociations.Read(rReadContext, mxThemeRoot);
+    maStyleAssociations.Read(mxThemeRoot);
 
     // Pane styles.
     maPaneStyles.Read(rReadContext, mxThemeRoot);
@@ -1062,7 +1060,6 @@ PresenterTheme::SharedFontDescriptor ViewStyle::GetFont() const
 //===== StyleAssociationContainer =============================================
 
 void StyleAssociationContainer::Read (
-    ReadContext& rReadContext,
     const Reference<container::XHierarchicalNameAccess>& rxThemeRoot)
 {
     Reference<container::XNameAccess> xStyleAssociationList (
@@ -1078,9 +1075,9 @@ void StyleAssociationContainer::Read (
         PresenterConfigurationAccess::ForAll(
             xStyleAssociationList,
             aProperties,
-            [this, &rReadContext] (std::vector<uno::Any> const& rValues)
+            [this] (std::vector<uno::Any> const& rValues)
             {
-                return this->ProcessStyleAssociation(rReadContext, rValues);
+                return this->ProcessStyleAssociation(rValues);
             });
     }
 }
@@ -1095,11 +1092,8 @@ OUString StyleAssociationContainer::GetStyleName (const OUString& rsResourceName
 }
 
 void StyleAssociationContainer::ProcessStyleAssociation(
-    ReadContext& rReadContext,
     const ::std::vector<Any>& rValues)
 {
-    (void)rReadContext;
-
     if (rValues.size() != 2)
         return;
 
commit 82ce03deac42581b89838f8b496e3decbe68426a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 30 23:02:41 2017 +0200

    PresenterTheme::Theme::ProcessFont rReadContext parameter is unused
    
    ...ever since the code's introduction with
    fdc701b1e152dfce94f880099b8d1a04f36671d6 "INTEGRATION: CWS presenterscreen"
    
    Change-Id: I7fd71ccd034b21439b375a8df843c3306a30c6ac

diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index f5cc34a28937..85e03fdf466d 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -249,7 +249,6 @@ public:
 
 private:
     void ProcessFont(
-        ReadContext& rReadContext,
         const OUString& rsKey,
         const Reference<beans::XPropertySet>& rxProperties);
 };
@@ -637,9 +636,9 @@ void PresenterTheme::Theme::Read (
         UNO_QUERY);
     PresenterConfigurationAccess::ForAll(
         xFontNode,
-        [this, &rReadContext] (OUString const& rKey, uno::Reference<beans::XPropertySet> const& xProps)
+        [this] (OUString const& rKey, uno::Reference<beans::XPropertySet> const& xProps)
         {
-            return this->ProcessFont(rReadContext, rKey, xProps);
+            return this->ProcessFont(rKey, xProps);
         });
 }
 
@@ -666,11 +665,9 @@ SharedViewStyle PresenterTheme::Theme::GetViewStyle (const OUString& rsStyleName
 }
 
 void PresenterTheme::Theme::ProcessFont(
-    ReadContext& rReadContext,
     const OUString& rsKey,
     const Reference<beans::XPropertySet>& rxProperties)
 {
-    (void)rReadContext;
     maFontContainer[rsKey] = ReadContext::ReadFont(rxProperties, SharedFontDescriptor());
 }
 
commit 64d2019b2cab4a14408be15ef6c245a46a75dcb6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 30 22:56:18 2017 +0200

    PresenterSlideSorter::SetActiveState does nothing
    
    ...ever since d3ff78188fd08422586e7a884a31e185ecdde34c "INTEGRATION: CWS
    presenterscreen"
    
    Change-Id: Ideca940c514c60188040d5ebe75b95cc4f2b816b

diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index 91a520d688ca..e99c946ac73e 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -184,10 +184,6 @@ PresenterPaneContainer::SharedPaneDescriptor
             {
                 if (pDescriptor->maViewInitialization)
                     pDescriptor->maViewInitialization(rxView);
-
-                // Activate or deactivate the pane/view.
-                if (pDescriptor->maActivator)
-                    pDescriptor->maActivator(pDescriptor->mbIsActive);
             }
             catch (RuntimeException&)
             {
@@ -361,8 +357,6 @@ void SAL_CALL PresenterPaneContainer::disposing (
 void PresenterPaneContainer::PaneDescriptor::SetActivationState (const bool bIsActive)
 {
     mbIsActive = bIsActive;
-    if (maActivator)
-        maActivator(mbIsActive);
 }
 
 } } // end of namespace ::sdext::presenter
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index ff8c9bf8b13e..e7e3ef948fef 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -78,7 +78,6 @@ public:
     class PaneDescriptor
     {
     public:
-        typedef ::std::function<void (bool)> Activator;
         typedef ::std::function<std::shared_ptr<PresenterSprite> ()> SpriteProvider;
         css::uno::Reference<css::drawing::framework::XResourceId> mxPaneId;
         OUString msViewURL;
@@ -95,7 +94,6 @@ public:
         bool mbIsOpaque;
         SpriteProvider maSpriteProvider;
         bool mbIsSprite;
-        Activator maActivator;
         css::awt::Point maCalloutAnchorLocation;
 
         void SetActivationState (const bool bIsActive);
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 56405880ad17..5d457f82a7b7 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -417,11 +417,6 @@ void SAL_CALL PresenterSlideSorter::disposing()
     }
 }
 
-void PresenterSlideSorter::SetActiveState (const bool bIsActive)
-{
-    (void)bIsActive;
-}
-
 //----- lang::XEventListener --------------------------------------------------
 
 void SAL_CALL PresenterSlideSorter::disposing (const lang::EventObject& rEventObject)
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index f9da7896a2e7..24010e38e88a 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -73,8 +73,6 @@ public:
 
     virtual void SAL_CALL disposing() override;
 
-    static void SetActiveState (const bool bIsActive);
-
     // lang::XEventListener
 
     virtual void SAL_CALL
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 3d15993e8614..1e5b1a304e09 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -480,14 +480,6 @@ Reference<XView> PresenterViewFactory::CreateSlideSorterView(
                 rxViewId,
                 Reference<frame::XController>(mxControllerWeak),
                 mpPresenterController));
-        PresenterPaneContainer::SharedPaneDescriptor pDescriptor (
-            mpPresenterController->GetPaneContainer()->FindPaneId(rxViewId->getAnchor()));
-        if (pDescriptor.get() != nullptr)
-        {
-            pDescriptor->maActivator = [] (bool const isActive) {
-                    return PresenterSlideSorter::SetActiveState(isActive);
-                };
-        }
         xView = pView.get();
     }
     catch (RuntimeException&)


More information about the Libreoffice-commits mailing list