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 (
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);
}
......
......@@ -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());
......
......@@ -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;
......
......@@ -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();
}
}
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
};
......
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