loplugin:unusedfields in sdext

Change-Id: Ifec87ab2b54fa18c5089bac53457e376826645cb
Reviewed-on: https://gerrit.libreoffice.org/68222
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

10 files changed, 5 insertions, 43 deletions

diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index cbd4300cc152..99600638cf8d 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -753,9 +753,7 @@ void SAL_CALL PresenterController::notifyConfigurationChange (
                 Reference<XView> xView (rEvent.ResourceObject,UNO_QUERY);
                 if (xView.is())
                 {
-                    SharedBitmapDescriptor pViewBackground(
-                        GetViewBackground(xView->getResourceId()->getResourceURL()));
-                    mpPaneContainer->StoreView(xView, pViewBackground);
+                    mpPaneContainer->StoreView(xView);
                     UpdateViews();
                     mpWindowManager->NotifyViewCreation(xView);
                 }
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 2378f393b0c2..cbf78989e94e 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -53,8 +53,7 @@ PresenterPaneBase::PresenterPaneBase (
       mxBorderPainter(),
       mxPresenterHelper(),
       msTitle(),
-      mxComponentContext(rxContext),
-      mpViewBackground()
+      mxComponentContext(rxContext)
 {
     if (mpPresenterController.get() != nullptr)
         mxPresenterHelper = mpPresenterController->GetPresenterHelper();
@@ -295,11 +294,6 @@ void PresenterPaneBase::ToTop()
         mxPresenterHelper->toTop(mxContentWindow);
 }
 
-void PresenterPaneBase::SetBackground (const SharedBitmapDescriptor& rpBackground)
-{
-    mpViewBackground = rpBackground;
-}
-
 void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox)
 {
     OSL_ASSERT(mxPaneId.is());
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index bfe87ed42206..c3bb1d93bb72 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -70,7 +70,6 @@ public:
     virtual void SAL_CALL disposing() override;
 
     const css::uno::Reference<css::awt::XWindow>& GetBorderWindow() const;
-    void SetBackground (const SharedBitmapDescriptor& rpBackground);
     void SetTitle (const OUString& rsTitle);
     const OUString& GetTitle() const;
     const css::uno::Reference<css::drawing::framework::XPaneBorderPainter>& GetPaneBorderPainter() const;
@@ -111,7 +110,6 @@ protected:
     css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
     OUString msTitle;
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
-    SharedBitmapDescriptor mpViewBackground;
 
     virtual void CreateCanvases (
         const css::uno::Reference<css::rendering::XSpriteCanvas>& rxParentCanvas) = 0;
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index da7cd5db667e..3cef8ac65984 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -85,9 +85,7 @@ void PresenterPaneContainer::PreparePane (
     pDescriptor->maViewInitialization = rViewInitialization;
     pDescriptor->mbIsActive = true;
     pDescriptor->mbIsOpaque = bIsOpaque;
-    pDescriptor->maSpriteProvider = PaneDescriptor::SpriteProvider();
     pDescriptor->mbIsSprite = false;
-    pDescriptor->maCalloutAnchorLocation = awt::Point(-1,-1);
 
     maPanes.push_back(pDescriptor);
 }
@@ -155,8 +153,7 @@ PresenterPaneContainer::SharedPaneDescriptor
 
 PresenterPaneContainer::SharedPaneDescriptor
     PresenterPaneContainer::StoreView (
-        const Reference<XView>& rxView,
-        const SharedBitmapDescriptor& rpViewBackground)
+        const Reference<XView>& rxView)
 {
     SharedPaneDescriptor pDescriptor;
 
@@ -175,9 +172,6 @@ PresenterPaneContainer::SharedPaneDescriptor
         if (pDescriptor.get() != nullptr)
         {
             pDescriptor->mxView = rxView;
-            pDescriptor->mpViewBackground = rpViewBackground;
-            if (pDescriptor->mxPane.is())
-                pDescriptor->mxPane->SetBackground(rpViewBackground);
             try
             {
                 if (pDescriptor->maViewInitialization)
@@ -230,7 +224,6 @@ PresenterPaneContainer::SharedPaneDescriptor
         if (pDescriptor.get() != nullptr)
         {
             pDescriptor->mxView = nullptr;
-            pDescriptor->mpViewBackground = SharedBitmapDescriptor();
         }
     }
 
diff --git a/sdext/source/presenter/PresenterPaneContainer.hxx b/sdext/source/presenter/PresenterPaneContainer.hxx
index e7e3ef948fef..f951005ab2ad 100644
--- a/sdext/source/presenter/PresenterPaneContainer.hxx
+++ b/sdext/source/presenter/PresenterPaneContainer.hxx
@@ -89,12 +89,9 @@ public:
         OUString msAccessibleTitleTemplate;
         OUString msTitle;
         ViewInitializationFunction maViewInitialization;
-        SharedBitmapDescriptor mpViewBackground;
         bool mbIsActive;
         bool mbIsOpaque;
-        SpriteProvider maSpriteProvider;
         bool mbIsSprite;
-        css::awt::Point maCalloutAnchorLocation;
 
         void SetActivationState (const bool bIsActive);
     };
@@ -118,8 +115,7 @@ public:
         const css::uno::Reference<css::awt::XWindow>& rxBorderWindow);
 
     SharedPaneDescriptor StoreView (
-        const css::uno::Reference<css::drawing::framework::XView>& rxView,
-        const SharedBitmapDescriptor& rpViewBackground);
+        const css::uno::Reference<css::drawing::framework::XView>& rxView);
 
     SharedPaneDescriptor RemovePane (
         const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId);
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index 5990babcc18e..3bc43ebbd2cc 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -284,16 +284,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
     pContainer->StorePane(xPane);
     if (pDescriptor.get() != nullptr)
     {
-        if (bIsSpritePane)
-        {
-            auto const pPane(dynamic_cast<PresenterSpritePane*>(xPane.get()));
-            pDescriptor->maSpriteProvider = [pPane](){ return pPane->GetSprite(); };
-            pDescriptor->mbIsSprite = true;
-        }
-        else
-        {
-            pDescriptor->mbIsSprite = false;
-        }
+        pDescriptor->mbIsSprite = bIsSpritePane;
 
         // Get the window of the frame and make that visible.
         Reference<awt::XWindow> xWindow (pDescriptor->mxBorderWindow, UNO_QUERY_THROW);
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 086f1ce157ec..847919e720bc 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -254,7 +254,6 @@ PresenterScreen::PresenterScreen (
       mxController(),
       mxConfigurationControllerWeak(),
       mxContextWeak(rxContext),
-      mxSlideShowControllerWeak(),
       mpPresenterController(),
       mxSavedConfiguration(),
       mpPaneContainer(),
@@ -302,7 +301,6 @@ void SAL_CALL PresenterScreen::disposing()
 
 void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/)
 {
-    mxSlideShowControllerWeak = WeakReference<presentation::XSlideShowController>();
     RequestShutdownPresenterScreen();
 }
 
@@ -317,7 +315,6 @@ void PresenterScreen::InitializePresenterScreen()
         Reference<XPresentationSupplier> xPS ( mxModel, UNO_QUERY_THROW);
         Reference<XPresentation2> xPresentation(xPS->getPresentation(), UNO_QUERY_THROW);
         Reference<presentation::XSlideShowController> xSlideShowController( xPresentation->getController() );
-        mxSlideShowControllerWeak = xSlideShowController;
 
         if( !xSlideShowController.is() || !xSlideShowController->isFullScreen() )
             return;
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index 8cfadd3a4ce9..10cb613d83dd 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -128,7 +128,6 @@ private:
     css::uno::WeakReference<css::drawing::framework::XConfigurationController>
         mxConfigurationControllerWeak;
     css::uno::WeakReference<css::uno::XComponentContext> mxContextWeak;
-    css::uno::WeakReference<css::presentation::XSlideShowController> mxSlideShowControllerWeak;
     ::rtl::Reference<PresenterController> mpPresenterController;
     css::uno::Reference<css::drawing::framework::XConfiguration> mxSavedConfiguration;
     ::rtl::Reference<PresenterPaneContainer> mpPaneContainer;
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index c7d4ddb5d280..10dfda0bcea4 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -1016,7 +1016,6 @@ PresenterToolBarView::PresenterToolBarView (
       mxWindow(),
       mxCanvas(),
       mpPresenterController(rpPresenterController),
-      mxSlideShowController(rpPresenterController->GetSlideShowController()),
       mpToolBar()
 {
     try
@@ -1074,8 +1073,6 @@ void SAL_CALL PresenterToolBarView::disposing()
     mxViewId = nullptr;
     mxPane = nullptr;
     mpPresenterController = nullptr;
-    mxSlideShowController = nullptr;
-
 }
 
 const ::rtl::Reference<PresenterToolBar>& PresenterToolBarView::GetPresenterToolBar() const
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index bf6dcd519053..84c97911f41d 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -247,7 +247,6 @@ private:
     css::uno::Reference<css::awt::XWindow> mxWindow;
     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
     ::rtl::Reference<PresenterController> mpPresenterController;
-    css::uno::Reference<css::presentation::XSlideShowController> mxSlideShowController;
     ::rtl::Reference<PresenterToolBar> mpToolBar;
 
 };