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

[Caolán McNamara (via logerrit)]

 include/vcl/floatwin.hxx       |    3 +--
 vcl/source/window/floatwin.cxx |   12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit f9b10e54d139388df44e63501be5f209f8f3302f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 7 10:37:18 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Nov 7 13:08:51 2019 +0100

    rename FloatingWindow::ImplInit so no need for using directive
    
    Change-Id: I55babcf716292fa9fac3e9cb4ba66a2038a1d80b
    Reviewed-on: https://gerrit.libreoffice.org/82203
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 75dd4c1fec10..52d09597b59c 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -100,8 +100,7 @@ private:
                            FloatingWindow & operator= (const FloatingWindow &) = delete;
 
 protected:
-    using Window::ImplInit;
-    SAL_DLLPRIVATE void    ImplInit( vcl::Window* pParent, WinBits nStyle );
+    SAL_DLLPRIVATE void    ImplInitFloating( vcl::Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE void    ImplInitSettings();
 
     virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 198ac87de9d8..baa3a46bc978 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -54,7 +54,7 @@ tools::Rectangle& FloatingWindow::ImplGetItemEdgeClipRect()
     return mpImplData->maItemEdgeClipRect;
 }
 
-void FloatingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
+void FloatingWindow::ImplInitFloating( vcl::Window* pParent, WinBits nStyle )
 {
     mpImplData.reset(new ImplData);
 
@@ -74,7 +74,7 @@ void FloatingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
     {
         mpWindowImpl->mbOverlapWin = true;
         nStyle |= WB_DIALOGCONTROL;
-        SystemWindow::ImplInit(pParent, nStyle, nullptr);
+        ImplInit(pParent, nStyle, nullptr);
     }
     else
     {
@@ -89,7 +89,7 @@ void FloatingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
             // nFloatWinStyle |= WB_CLOSEABLE;
             mpWindowImpl->mbFrame = true;
             mpWindowImpl->mbOverlapWin = true;
-            SystemWindow::ImplInit(pParent, nFloatWinStyle & ~WB_BORDER, nullptr);
+            ImplInit(pParent, nFloatWinStyle & ~WB_BORDER, nullptr);
         }
         else
         {
@@ -107,7 +107,7 @@ void FloatingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle )
                 nStyle |= WB_CLOSEABLE; // make undecorated floaters closeable
             }
             pBorderWin  = VclPtr<ImplBorderWindow>::Create(pParent, nStyle, nBorderStyle);
-            SystemWindow::ImplInit(pBorderWin, nStyle & ~WB_BORDER, nullptr);
+            ImplInit(pBorderWin, nStyle & ~WB_BORDER, nullptr);
             pBorderWin->mpWindowImpl->mpClientWindow = this;
             pBorderWin->GetBorder(mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder,
                                   mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder);
@@ -150,7 +150,7 @@ void FloatingWindow::ImplInitSettings()
 FloatingWindow::FloatingWindow(vcl::Window* pParent, WinBits nStyle) :
     SystemWindow(WindowType::FLOATINGWINDOW)
 {
-    ImplInit(pParent, nStyle);
+    ImplInitFloating(pParent, nStyle);
 }
 
 FloatingWindow::FloatingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame)
@@ -177,7 +177,7 @@ void FloatingWindow::doDeferredInit(WinBits nBits)
 {
     vcl::Window *pParent = mpDialogParent;
     mpDialogParent = nullptr;
-    ImplInit(pParent, nBits);
+    ImplInitFloating(pParent, nBits);
     mbIsDeferredInit = false;
 }