include/vcl/toolbox.hxx | 2 +-
include/vcl/toolkit/floatwin.hxx | 2 +-
vcl/source/window/floatwin.cxx | 2 +-
vcl/source/window/toolbox.cxx | 2 --
4 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 4bba62e69bae1d1e065b8634b2fea291372ea1ba
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jul 19 13:38:53 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 20 08:15:11 2023 +0200
remove dead code in ImplDrawFloatwinBorder
Change-Id: I4f71d7dbf3ae3fbc139f770084dbdea4cbf9b848
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154651
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index e04cb3d1ae37..6cf448a30b1d 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -199,7 +199,7 @@ private:
SAL_DLLPRIVATE const OUString& ImplGetHelpText( ToolBoxItemId nItemId )
const;
SAL_DLLPRIVATE Size ImplGetOptimalFloatingSize();
SAL_DLLPRIVATE bool ImplHasExternalMenubutton() const;
- SAL_DLLPRIVATE void ImplDrawFloatwinBorder(vcl::RenderContext&
rRenderContext, ImplToolItem const * pItem );
+ static SAL_DLLPRIVATE void ImplDrawFloatwinBorder(vcl::RenderContext&
rRenderContext, ImplToolItem const * pItem );
DECL_DLLPRIVATE_LINK( ImplUpdateHdl, Timer*, void );
DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent&, void );
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 95c5fd5d0867..fc9effe58065 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2782,8 +2782,6 @@ void ToolBox::ImplDrawFloatwinBorder(vcl::RenderContext&
rRenderContext, ImplToo
if ( pItem->maRect.IsEmpty() )
return;
- tools::Rectangle aRect( mpFloatWin->ImplGetItemEdgeClipRect() );
- aRect.SetPos( AbsoluteScreenToOutputPixel( aRect.TopLeft() ) );
rRenderContext.SetLineColor(rRenderContext.GetSettings().GetStyleSettings().GetShadowColor());
Point p1, p2;
commit b1279dbe3169eda9a431b87a703f03a619731d5d
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Jul 19 13:06:50 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 20 08:15:02 2023 +0200
no need to return a mutable ref from ImplGetItemEdgeClipRect
and risk updating internal site.
Luckily, all of the current callers are making a local copy
Change-Id: I8b85d087ef934b1bb32f5a902a4fbf08659b7511
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154650
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/vcl/toolkit/floatwin.hxx b/include/vcl/toolkit/floatwin.hxx
index 1d9692c434f4..d640eb33554b 100644
--- a/include/vcl/toolkit/floatwin.hxx
+++ b/include/vcl/toolkit/floatwin.hxx
@@ -100,7 +100,7 @@ public:
static tools::Rectangle ImplConvertToAbsPos(vcl::Window*
pReference, const tools::Rectangle& rRect);
static tools::Rectangle ImplConvertToRelPos(vcl::Window*
pReference, const tools::Rectangle& rRect);
SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags
nFlags, const VclPtr<vcl::Window>& xFocusId );
- SAL_DLLPRIVATE tools::Rectangle& ImplGetItemEdgeClipRect();
+ SAL_DLLPRIVATE tools::Rectangle ImplGetItemEdgeClipRect() const;
SAL_DLLPRIVATE bool ImplIsInPrivatePopupMode() const { return
mbInPopupMode; }
virtual void doDeferredInit(WinBits nBits) override;
void PixelInvalidate(const tools::Rectangle*
pRectangle) override;
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 915ebe055f81..56a9b06b0471 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -50,7 +50,7 @@ FloatingWindow::ImplData::ImplData()
mpBox = nullptr;
}
-tools::Rectangle& FloatingWindow::ImplGetItemEdgeClipRect()
+tools::Rectangle FloatingWindow::ImplGetItemEdgeClipRect() const
{
return mpImplData->maItemEdgeClipRect;
}
