[Libreoffice-commits] core.git: include/vcl svtools/source vcl/source

[Caolán McNamara (via logerrit)]

 include/vcl/outdev.hxx              |    2 +-
 svtools/source/control/valueset.cxx |    4 ++--
 vcl/source/app/salvtables.cxx       |    2 +-
 vcl/source/window/window2.cxx       |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 67af9b07bcbb98686b80610ccdbae0f7aaa65ca2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Apr 20 16:43:14 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Apr 20 21:01:56 2021 +0200

    rename DrawFocusRect to InvertFocusRect
    
    Change-Id: If7a951a3f5f68cebc7e7fedb810db74c99f94765
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114346
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index ce7d54e75689..0b5ad987a060 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -291,7 +291,7 @@ namespace vcl {
     typedef OutputDevice RenderContext;
 }
 
-VCL_DLLPUBLIC void DrawFocusRect(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
+VCL_DLLPUBLIC void InvertFocusRect(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
 
 typedef struct _cairo_surface cairo_surface_t;
 
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index c4456b1364ac..821462879b82 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1262,7 +1262,7 @@ void ValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nIt
     if (nStyle & WB_MENUSTYLEVALUESET)
     {
         if (bFocus)
-            DrawFocusRect(rRenderContext, aRect);
+            InvertFocusRect(rRenderContext, aRect);
         if (bDrawSel)
         {
             rRenderContext.SetLineColor(mbBlackSel ? COL_BLACK : aDoubleColor);
@@ -1316,7 +1316,7 @@ void ValueSet::ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nIt
         }
         rRenderContext.DrawRect(aRect2);
         if (bFocus)
-            DrawFocusRect(rRenderContext, aRect2);
+            InvertFocusRect(rRenderContext, aRect2);
     }
 
     ImplDrawItemText(rRenderContext, pItem->maText);
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index d99ac4548817..bdb45fe9ad45 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -6036,7 +6036,7 @@ IMPL_LINK(SalInstanceDrawingArea, PaintHdl, target_and_area, aPayload, void)
     m_aDrawHdl.Call(aPayload);
     tools::Rectangle aFocusRect(m_aGetFocusRectHdl.Call(*this));
     if (!aFocusRect.IsEmpty())
-        DrawFocusRect(aPayload.first, aFocusRect);
+        InvertFocusRect(aPayload.first, aFocusRect);
 }
 
 IMPL_LINK(SalInstanceDrawingArea, ResizeHdl, const Size&, rSize, void)
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 63cfca1b4291..86dd53bcfb9f 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1993,7 +1993,7 @@ const std::vector<VclPtr<FixedText> >& Window::list_mnemonic_labels() const
 
 } /* namespace vcl */
 
-void DrawFocusRect(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
+void InvertFocusRect(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
 {
     const int nBorder = 1;
     rRenderContext.Invert(tools::Rectangle(Point(rRect.Left(), rRect.Top()), Size(rRect.GetWidth(), nBorder)), InvertFlags::N50);