sdext/source/presenter/PresenterPaneBase.cxx | 30 --------------------------- sdext/source/presenter/PresenterPaneBase.hxx | 3 -- 2 files changed, 1 insertion(+), 32 deletions(-)
New commits: commit 766cd45488ab8c2cb2ae772f225cd967a7d32475 Author: Stephan Bergmann <[email protected]> Date: Tue Jun 27 10:32:58 2017 +0200 PresenterPaneBase::PaintBorderBackground does nothing ...ever since 1eeb7358933afbb8d673c16c92bfd8492e8b5620 "INTEGRATION: CWS presenterscreen" Change-Id: Ibb5bf69eb3d11aa3c3b67ed0b342ca95ecf40bfe diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx index 10abe27ce812..ee5b09cb5f45 100644 --- a/sdext/source/presenter/PresenterPaneBase.cxx +++ b/sdext/source/presenter/PresenterPaneBase.cxx @@ -314,34 +314,6 @@ void PresenterPaneBase::SetBackground (const SharedBitmapDescriptor& rpBackgroun mpViewBackground = rpBackground; } -void PresenterPaneBase::PaintBorderBackground ( - const awt::Rectangle& rBorderBox, - const awt::Rectangle& rUpdateBox) -{ - (void)rBorderBox; - (void)rUpdateBox; - /* - // The outer box of the border is given. We need the center and inner - // box as well. - awt::Rectangle aCenterBox ( - mxBorderPainter->removeBorder( - mxPaneId->getResourceURL(), - rBorderBox, - drawing::framework::BorderType_OUTER_BORDER)); - awt::Rectangle aInnerBox ( - mxBorderPainter->removeBorder( - mxPaneId->getResourceURL(), - rBorderBox, - drawing::framework::BorderType_TOTAL_BORDER)); - mpPresenterController->GetCanvasHelper()->Paint( - mpViewBackground, - mxBorderCanvas, - rUpdateBox, - aCenterBox, - aInnerBox); - */ -} - void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox) { OSL_ASSERT(mxPaneId.is()); @@ -351,7 +323,7 @@ void PresenterPaneBase::PaintBorder (const awt::Rectangle& rUpdateBox) awt::Rectangle aBorderBox (mxBorderWindow->getPosSize()); awt::Rectangle aLocalBorderBox (0,0, aBorderBox.Width, aBorderBox.Height); - PaintBorderBackground(aLocalBorderBox, rUpdateBox); + //TODO: paint border background? mxBorderPainter->paintBorder( mxPaneId->getResourceURL(), diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx index 3f19273236d7..41e53f3f5309 100644 --- a/sdext/source/presenter/PresenterPaneBase.hxx +++ b/sdext/source/presenter/PresenterPaneBase.hxx @@ -122,9 +122,6 @@ protected: void CreateWindows ( const css::uno::Reference<css::awt::XWindow>& rxParentWindow, const bool bIsWindowVisibleOnCreation); - static void PaintBorderBackground ( - const css::awt::Rectangle& rCenterBox, - const css::awt::Rectangle& rUpdateBox); void PaintBorder (const css::awt::Rectangle& rUpdateRectangle); void ToTop(); void LayoutContextWindow(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
