rename a createPopupWindow so we can remove 'using createPopupWindow'

Change-Id: I6e24d3f796b4b958513166ba2fd9e63239729375
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86886
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

11 files changed, 26 insertions, 47 deletions

diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
index 470e5eb7e3fd..867e0846a970 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
@@ -69,7 +69,7 @@ std::unique_ptr<WeldToolbarPopup> SvxLineSpacingToolBoxControl::weldPopupWindow(
     return std::make_unique<ParaLineSpacingControl>(this, m_pToolbar);
 }
 
-VclPtr<vcl::Window> SvxLineSpacingToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxLineSpacingToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
 {
     mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
         std::make_unique<ParaLineSpacingControl>(this, pParent->GetFrameWeld()));
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
index 259fa83fe494..5ae14443e231 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx
@@ -48,7 +48,7 @@ std::unique_ptr<WeldToolbarPopup> TextCharacterSpacingPopup::weldPopupWindow()
     return std::make_unique<TextCharacterSpacingControl>(this, m_pToolbar);
 }
 
-VclPtr<vcl::Window> TextCharacterSpacingPopup::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> TextCharacterSpacingPopup::createVclPopupWindow( vcl::Window* pParent )
 {
     mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
         std::make_unique<TextCharacterSpacingControl>(this, pParent->GetFrameWeld()));
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx
index 4532f09a8a44..8e3169bcd816 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.cxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx
@@ -47,7 +47,7 @@ std::unique_ptr<WeldToolbarPopup> TextUnderlinePopup::weldPopupWindow()
     return std::make_unique<TextUnderlineControl>(this, m_pToolbar);
 }
 
-VclPtr<vcl::Window> TextUnderlinePopup::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> TextUnderlinePopup::createVclPopupWindow( vcl::Window* pParent )
 {
     mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
         std::make_unique<TextUnderlineControl>(this, pParent->GetFrameWeld()));
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 10e93efc69e2..69bad8a9a01c 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -52,7 +52,7 @@ class NumberingToolBoxControl : public svt::PopupWindowController
 
 public:
     explicit NumberingToolBoxControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
-    virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+    virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
     std::unique_ptr<WeldToolbarPopup> weldPopupWindow() override;
 
     // XInitialization
@@ -61,8 +61,6 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
-    using svt::ToolboxController::createPopupWindow;
 };
 
 }
@@ -190,7 +188,7 @@ std::unique_ptr<WeldToolbarPopup> NumberingToolBoxControl::weldPopupWindow()
     return std::make_unique<NumberingPopup>(*this, m_pToolbar, mePageType);
 }
 
-VclPtr<vcl::Window> NumberingToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> NumberingToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
 {
     mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
         std::make_unique<NumberingPopup>(*this, pParent->GetFrameWeld(), mePageType));
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index db308b2e5caa..d81e40d26a53 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -301,7 +301,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl(
 }
 
 
-VclPtr<vcl::Window> ExtrusionDirectionControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> ExtrusionDirectionControl::createVclPopupWindow( vcl::Window* pParent )
 {
     return VclPtr<ExtrusionDirectionWindow>::Create( *this, pParent );
 }
@@ -538,7 +538,7 @@ ExtrusionDepthController::ExtrusionDepthController(
 }
 
 
-VclPtr<vcl::Window> ExtrusionDepthController::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> ExtrusionDepthController::createVclPopupWindow( vcl::Window* pParent )
 {
     return VclPtr<ExtrusionDepthWindow>::Create( *this, pParent );
 }
@@ -789,7 +789,7 @@ ExtrusionLightingControl::ExtrusionLightingControl(
 }
 
 
-VclPtr<vcl::Window> ExtrusionLightingControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> ExtrusionLightingControl::createVclPopupWindow( vcl::Window* pParent )
 {
     return VclPtr<ExtrusionLightingWindow>::Create( *this, pParent );
 }
@@ -902,7 +902,6 @@ IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl, ToolbarMenu*, void)
     }
 }
 
-
 ExtrusionSurfaceControl::ExtrusionSurfaceControl(
     const Reference< XComponentContext >& rxContext
 )
@@ -914,8 +913,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl(
 {
 }
 
-
-VclPtr<vcl::Window> ExtrusionSurfaceControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> ExtrusionSurfaceControl::createVclPopupWindow( vcl::Window* pParent )
 {
     return VclPtr<ExtrusionSurfaceWindow>::Create( *this, pParent );
 }
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 4804c56459c5..db901dc82fe7 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -80,7 +80,7 @@ class ExtrusionDirectionControl : public svt::PopupWindowController
 public:
     explicit ExtrusionDirectionControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+    virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
@@ -88,8 +88,6 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
-    using svt::PopupWindowController::createPopupWindow;
 };
 
 class ExtrusionDepthWindow : public svtools::ToolbarMenu
@@ -115,7 +113,7 @@ class ExtrusionDepthController : public svt::PopupWindowController
 public:
     explicit ExtrusionDepthController( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+    virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
@@ -123,11 +121,8 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
-    using svt::PopupWindowController::createPopupWindow;
 };
 
-
 class ExtrusionLightingWindow : public svtools::ToolbarMenu
 {
 private:
@@ -166,7 +161,7 @@ class ExtrusionLightingControl : public svt::PopupWindowController
 public:
     explicit ExtrusionLightingControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+    virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
@@ -174,11 +169,8 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
-    using svt::PopupWindowController::createPopupWindow;
 };
 
-
 class ExtrusionSurfaceWindow : public svtools::ToolbarMenu
 {
 private:
@@ -200,7 +192,7 @@ class ExtrusionSurfaceControl : public svt::PopupWindowController
 public:
     explicit ExtrusionSurfaceControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+    virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
@@ -208,11 +200,8 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
-    using svt::PopupWindowController::createPopupWindow;
 };
 
-
 }
 #endif
 
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 10b29b7f29d4..b558a49d019a 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -359,7 +359,7 @@ class FontworkAlignmentControl : public svt::PopupWindowController
 public:
     explicit FontworkAlignmentControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+    virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
@@ -367,8 +367,6 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
-    using  svt::PopupWindowController::createPopupWindow;
 };
 
 }
@@ -379,7 +377,7 @@ FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentC
 }
 
 
-VclPtr<vcl::Window> FontworkAlignmentControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> FontworkAlignmentControl::createVclPopupWindow( vcl::Window* pParent )
 {
     return VclPtr<FontworkAlignmentWindow>::Create( *this, pParent );
 }
@@ -578,7 +576,7 @@ class FontworkCharacterSpacingControl : public svt::PopupWindowController
 public:
     explicit FontworkCharacterSpacingControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
 
-    virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
+    virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
 
     // XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
@@ -586,8 +584,6 @@ public:
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
-
-    using svt::PopupWindowController::createPopupWindow;
 };
 
 }
@@ -598,7 +594,7 @@ FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Referenc
 }
 
 
-VclPtr<vcl::Window> FontworkCharacterSpacingControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> FontworkCharacterSpacingControl::createVclPopupWindow( vcl::Window* pParent )
 {
     return VclPtr<FontworkCharacterSpacingWindow>::Create( *this, pParent );
 }
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 0a07f8dfcb5c..3d7f57d60db9 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -707,7 +707,7 @@ std::unique_ptr<WeldToolbarPopup> SvxTableToolBoxControl::weldPopupWindow()
     return std::make_unique<TableWindow>(this, m_pToolbar, m_aCommandURL);
 }
 
-VclPtr<vcl::Window> SvxTableToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxTableToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
 {
     ToolBox* pToolBox = nullptr;
     sal_uInt16 nId = 0;
@@ -765,7 +765,7 @@ std::unique_ptr<WeldToolbarPopup> SvxColumnsToolBoxControl::weldPopupWindow()
     return std::make_unique<ColumnsWindow>(this, m_pToolbar);
 }
 
-VclPtr<vcl::Window> SvxColumnsToolBoxControl::createPopupWindow(vcl::Window* pParent)
+VclPtr<vcl::Window> SvxColumnsToolBoxControl::createVclPopupWindow(vcl::Window* pParent)
 {
     ToolBox* pToolBox = nullptr;
     sal_uInt16 nId = 0;
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 28c3dc6f4fa3..0527fe0ec125 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -195,7 +195,7 @@ void SAL_CALL SvxUndoRedoControl::statusChanged(const css::frame::FeatureStateEv
         pToolBox->SetQuickHelpText(nId, aQuickHelpText);
 }
 
-VclPtr<vcl::Window> SvxUndoRedoControl::createPopupWindow(vcl::Window* pParent)
+VclPtr<vcl::Window> SvxUndoRedoControl::createVclPopupWindow(vcl::Window* pParent)
 {
     if ( m_aCommandURL == ".uno:Undo" )
         updateStatus( ".uno:GetUndoStrings");
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 545c58eda1d1..c6d259fb6567 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -477,8 +477,7 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 private:
-    virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
-    using svt::ToolboxController::createPopupWindow;
+    virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
 };
 
 }
@@ -497,7 +496,7 @@ void SvxLineEndToolBoxControl::initialize( const css::uno::Sequence<css::uno::An
         pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY );
 }
 
-VclPtr<vcl::Window> SvxLineEndToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxLineEndToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
 {
     return VclPtr<SvxLineEndWindow>::Create( *this, pParent );
 }
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 2a0b85e97c30..e190200810e7 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3456,7 +3456,7 @@ std::unique_ptr<WeldToolbarPopup> SvxColorToolBoxControl::weldPopupWindow()
     return xPopover;
 }
 
-VclPtr<vcl::Window> SvxColorToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxColorToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
 {
     ToolBox* pToolBox = nullptr;
     sal_uInt16 nId = 0;
@@ -3623,8 +3623,7 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 private:
-    virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
-    using svt::ToolboxController::createPopupWindow;
+    virtual VclPtr<vcl::Window> createVclPopupWindow( vcl::Window* pParent ) override;
 };
 
 }
@@ -3643,7 +3642,7 @@ void SvxFrameToolBoxControl::initialize( const css::uno::Sequence< css::uno::Any
         pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | ToolBoxItemBits::DROPDOWNONLY );
 }
 
-VclPtr<vcl::Window> SvxFrameToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxFrameToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
 {
     if ( m_aCommandURL == ".uno:LineStyle" )
         return VclPtr<SvxLineWindow_Impl>::Create( *this, pParent );
@@ -3844,7 +3843,7 @@ std::unique_ptr<WeldToolbarPopup> SvxCurrencyToolBoxControl::weldPopupWindow()
     return std::make_unique<SvxCurrencyList_Impl>(this, m_pToolbar, m_aFormatString, m_eLanguage);
 }
 
-VclPtr<vcl::Window> SvxCurrencyToolBoxControl::createPopupWindow( vcl::Window* pParent )
+VclPtr<vcl::Window> SvxCurrencyToolBoxControl::createVclPopupWindow( vcl::Window* pParent )
 {
     mxInterimPopover = VclPtr<InterimToolbarPopup>::Create(getFrameInterface(), pParent,
         std::make_unique<SvxCurrencyList_Impl>(this, pParent->GetFrameWeld(), m_aFormatString, m_eLanguage));