Kaydet (Commit) 40871e22 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:unusedfields in sdext

Change-Id: Ifec87ab2b54fa18c5089bac53457e376826645cb
Reviewed-on: https://gerrit.libreoffice.org/68222
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst a7989265
...@@ -753,9 +753,7 @@ void SAL_CALL PresenterController::notifyConfigurationChange ( ...@@ -753,9 +753,7 @@ void SAL_CALL PresenterController::notifyConfigurationChange (
Reference<XView> xView (rEvent.ResourceObject,UNO_QUERY); Reference<XView> xView (rEvent.ResourceObject,UNO_QUERY);
if (xView.is()) if (xView.is())
{ {
SharedBitmapDescriptor pViewBackground( mpPaneContainer->StoreView(xView);
GetViewBackground(xView->getResourceId()->getResourceURL()));
mpPaneContainer->StoreView(xView, pViewBackground);
UpdateViews(); UpdateViews();
mpWindowManager->NotifyViewCreation(xView); mpWindowManager->NotifyViewCreation(xView);
} }
......
...@@ -53,8 +53,7 @@ PresenterPaneBase::PresenterPaneBase ( ...@@ -53,8 +53,7 @@ PresenterPaneBase::PresenterPaneBase (
mxBorderPainter(), mxBorderPainter(),
mxPresenterHelper(), mxPresenterHelper(),
msTitle(), msTitle(),
mxComponentContext(rxContext), mxComponentContext(rxContext)
mpViewBackground()
{ {
if (mpPresenterController.get() != nullptr) if (mpPresenterController.get() != nullptr)
mxPresenterHelper = mpPresenterController->GetPresenterHelper(); mxPresenterHelper = mpPresenterController->GetPresenterHelper();
...@@ -295,11 +294,6 @@ void PresenterPaneBase::ToTop() ...@@ -295,11 +294,6 @@ void PresenterPaneBase::ToTop()
mxPresenterHelper->toTop(mxContentWindow); mxPresenterHelper->toTop(mxContentWindow);
} }
void PresenterPaneBase::SetBackground (const SharedBitmapDescriptor& rpBackground)
{
mpViewBackground = rpBackground;
}
void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox) void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox)
{ {
OSL_ASSERT(mxPaneId.is()); OSL_ASSERT(mxPaneId.is());
......
...@@ -70,7 +70,6 @@ public: ...@@ -70,7 +70,6 @@ public:
virtual void SAL_CALL disposing() override; virtual void SAL_CALL disposing() override;
const css::uno::Reference<css::awt::XWindow>& GetBorderWindow() const; const css::uno::Reference<css::awt::XWindow>& GetBorderWindow() const;
void SetBackground (const SharedBitmapDescriptor& rpBackground);
void SetTitle (const OUString& rsTitle); void SetTitle (const OUString& rsTitle);
const OUString& GetTitle() const; const OUString& GetTitle() const;
const css::uno::Reference<css::drawing::framework::XPaneBorderPainter>& GetPaneBorderPainter() const; const css::uno::Reference<css::drawing::framework::XPaneBorderPainter>& GetPaneBorderPainter() const;
...@@ -111,7 +110,6 @@ protected: ...@@ -111,7 +110,6 @@ protected:
css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper; css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
OUString msTitle; OUString msTitle;
css::uno::Reference<css::uno::XComponentContext> mxComponentContext; css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
SharedBitmapDescriptor mpViewBackground;
virtual void CreateCanvases ( virtual void CreateCanvases (
const css::uno::Reference<css::rendering::XSpriteCanvas>& rxParentCanvas) = 0; const css::uno::Reference<css::rendering::XSpriteCanvas>& rxParentCanvas) = 0;
......
...@@ -85,9 +85,7 @@ void PresenterPaneContainer::PreparePane ( ...@@ -85,9 +85,7 @@ void PresenterPaneContainer::PreparePane (
pDescriptor->maViewInitialization = rViewInitialization; pDescriptor->maViewInitialization = rViewInitialization;
pDescriptor->mbIsActive = true; pDescriptor->mbIsActive = true;
pDescriptor->mbIsOpaque = bIsOpaque; pDescriptor->mbIsOpaque = bIsOpaque;
pDescriptor->maSpriteProvider = PaneDescriptor::SpriteProvider();
pDescriptor->mbIsSprite = false; pDescriptor->mbIsSprite = false;
pDescriptor->maCalloutAnchorLocation = awt::Point(-1,-1);
maPanes.push_back(pDescriptor); maPanes.push_back(pDescriptor);
} }
...@@ -155,8 +153,7 @@ PresenterPaneContainer::SharedPaneDescriptor ...@@ -155,8 +153,7 @@ PresenterPaneContainer::SharedPaneDescriptor
PresenterPaneContainer::SharedPaneDescriptor PresenterPaneContainer::SharedPaneDescriptor
PresenterPaneContainer::StoreView ( PresenterPaneContainer::StoreView (
const Reference<XView>& rxView, const Reference<XView>& rxView)
const SharedBitmapDescriptor& rpViewBackground)
{ {
SharedPaneDescriptor pDescriptor; SharedPaneDescriptor pDescriptor;
...@@ -175,9 +172,6 @@ PresenterPaneContainer::SharedPaneDescriptor ...@@ -175,9 +172,6 @@ PresenterPaneContainer::SharedPaneDescriptor
if (pDescriptor.get() != nullptr) if (pDescriptor.get() != nullptr)
{ {
pDescriptor->mxView = rxView; pDescriptor->mxView = rxView;
pDescriptor->mpViewBackground = rpViewBackground;
if (pDescriptor->mxPane.is())
pDescriptor->mxPane->SetBackground(rpViewBackground);
try try
{ {
if (pDescriptor->maViewInitialization) if (pDescriptor->maViewInitialization)
...@@ -230,7 +224,6 @@ PresenterPaneContainer::SharedPaneDescriptor ...@@ -230,7 +224,6 @@ PresenterPaneContainer::SharedPaneDescriptor
if (pDescriptor.get() != nullptr) if (pDescriptor.get() != nullptr)
{ {
pDescriptor->mxView = nullptr; pDescriptor->mxView = nullptr;
pDescriptor->mpViewBackground = SharedBitmapDescriptor();
} }
} }
......
...@@ -89,12 +89,9 @@ public: ...@@ -89,12 +89,9 @@ public:
OUString msAccessibleTitleTemplate; OUString msAccessibleTitleTemplate;
OUString msTitle; OUString msTitle;
ViewInitializationFunction maViewInitialization; ViewInitializationFunction maViewInitialization;
SharedBitmapDescriptor mpViewBackground;
bool mbIsActive; bool mbIsActive;
bool mbIsOpaque; bool mbIsOpaque;
SpriteProvider maSpriteProvider;
bool mbIsSprite; bool mbIsSprite;
css::awt::Point maCalloutAnchorLocation;
void SetActivationState (const bool bIsActive); void SetActivationState (const bool bIsActive);
}; };
...@@ -118,8 +115,7 @@ public: ...@@ -118,8 +115,7 @@ public:
const css::uno::Reference<css::awt::XWindow>& rxBorderWindow); const css::uno::Reference<css::awt::XWindow>& rxBorderWindow);
SharedPaneDescriptor StoreView ( SharedPaneDescriptor StoreView (
const css::uno::Reference<css::drawing::framework::XView>& rxView, const css::uno::Reference<css::drawing::framework::XView>& rxView);
const SharedBitmapDescriptor& rpViewBackground);
SharedPaneDescriptor RemovePane ( SharedPaneDescriptor RemovePane (
const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId); const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId);
......
...@@ -284,16 +284,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane ( ...@@ -284,16 +284,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane (
pContainer->StorePane(xPane); pContainer->StorePane(xPane);
if (pDescriptor.get() != nullptr) if (pDescriptor.get() != nullptr)
{ {
if (bIsSpritePane) pDescriptor->mbIsSprite = bIsSpritePane;
{
auto const pPane(dynamic_cast<PresenterSpritePane*>(xPane.get()));
pDescriptor->maSpriteProvider = [pPane](){ return pPane->GetSprite(); };
pDescriptor->mbIsSprite = true;
}
else
{
pDescriptor->mbIsSprite = false;
}
// Get the window of the frame and make that visible. // Get the window of the frame and make that visible.
Reference<awt::XWindow> xWindow (pDescriptor->mxBorderWindow, UNO_QUERY_THROW); Reference<awt::XWindow> xWindow (pDescriptor->mxBorderWindow, UNO_QUERY_THROW);
......
...@@ -254,7 +254,6 @@ PresenterScreen::PresenterScreen ( ...@@ -254,7 +254,6 @@ PresenterScreen::PresenterScreen (
mxController(), mxController(),
mxConfigurationControllerWeak(), mxConfigurationControllerWeak(),
mxContextWeak(rxContext), mxContextWeak(rxContext),
mxSlideShowControllerWeak(),
mpPresenterController(), mpPresenterController(),
mxSavedConfiguration(), mxSavedConfiguration(),
mpPaneContainer(), mpPaneContainer(),
...@@ -302,7 +301,6 @@ void SAL_CALL PresenterScreen::disposing() ...@@ -302,7 +301,6 @@ void SAL_CALL PresenterScreen::disposing()
void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/) void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/)
{ {
mxSlideShowControllerWeak = WeakReference<presentation::XSlideShowController>();
RequestShutdownPresenterScreen(); RequestShutdownPresenterScreen();
} }
...@@ -317,7 +315,6 @@ void PresenterScreen::InitializePresenterScreen() ...@@ -317,7 +315,6 @@ void PresenterScreen::InitializePresenterScreen()
Reference<XPresentationSupplier> xPS ( mxModel, UNO_QUERY_THROW); Reference<XPresentationSupplier> xPS ( mxModel, UNO_QUERY_THROW);
Reference<XPresentation2> xPresentation(xPS->getPresentation(), UNO_QUERY_THROW); Reference<XPresentation2> xPresentation(xPS->getPresentation(), UNO_QUERY_THROW);
Reference<presentation::XSlideShowController> xSlideShowController( xPresentation->getController() ); Reference<presentation::XSlideShowController> xSlideShowController( xPresentation->getController() );
mxSlideShowControllerWeak = xSlideShowController;
if( !xSlideShowController.is() || !xSlideShowController->isFullScreen() ) if( !xSlideShowController.is() || !xSlideShowController->isFullScreen() )
return; return;
......
...@@ -128,7 +128,6 @@ private: ...@@ -128,7 +128,6 @@ private:
css::uno::WeakReference<css::drawing::framework::XConfigurationController> css::uno::WeakReference<css::drawing::framework::XConfigurationController>
mxConfigurationControllerWeak; mxConfigurationControllerWeak;
css::uno::WeakReference<css::uno::XComponentContext> mxContextWeak; css::uno::WeakReference<css::uno::XComponentContext> mxContextWeak;
css::uno::WeakReference<css::presentation::XSlideShowController> mxSlideShowControllerWeak;
::rtl::Reference<PresenterController> mpPresenterController; ::rtl::Reference<PresenterController> mpPresenterController;
css::uno::Reference<css::drawing::framework::XConfiguration> mxSavedConfiguration; css::uno::Reference<css::drawing::framework::XConfiguration> mxSavedConfiguration;
::rtl::Reference<PresenterPaneContainer> mpPaneContainer; ::rtl::Reference<PresenterPaneContainer> mpPaneContainer;
......
...@@ -1016,7 +1016,6 @@ PresenterToolBarView::PresenterToolBarView ( ...@@ -1016,7 +1016,6 @@ PresenterToolBarView::PresenterToolBarView (
mxWindow(), mxWindow(),
mxCanvas(), mxCanvas(),
mpPresenterController(rpPresenterController), mpPresenterController(rpPresenterController),
mxSlideShowController(rpPresenterController->GetSlideShowController()),
mpToolBar() mpToolBar()
{ {
try try
...@@ -1074,8 +1073,6 @@ void SAL_CALL PresenterToolBarView::disposing() ...@@ -1074,8 +1073,6 @@ void SAL_CALL PresenterToolBarView::disposing()
mxViewId = nullptr; mxViewId = nullptr;
mxPane = nullptr; mxPane = nullptr;
mpPresenterController = nullptr; mpPresenterController = nullptr;
mxSlideShowController = nullptr;
} }
const ::rtl::Reference<PresenterToolBar>& PresenterToolBarView::GetPresenterToolBar() const const ::rtl::Reference<PresenterToolBar>& PresenterToolBarView::GetPresenterToolBar() const
......
...@@ -247,7 +247,6 @@ private: ...@@ -247,7 +247,6 @@ private:
css::uno::Reference<css::awt::XWindow> mxWindow; css::uno::Reference<css::awt::XWindow> mxWindow;
css::uno::Reference<css::rendering::XCanvas> mxCanvas; css::uno::Reference<css::rendering::XCanvas> mxCanvas;
::rtl::Reference<PresenterController> mpPresenterController; ::rtl::Reference<PresenterController> mpPresenterController;
css::uno::Reference<css::presentation::XSlideShowController> mxSlideShowController;
::rtl::Reference<PresenterToolBar> mpToolBar; ::rtl::Reference<PresenterToolBar> mpToolBar;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment