remove PopupControl as an intermediate step

Change-Id: I31438860511af6ae00bf7a94fb29326c3ed1a10c

10 files changed, 14 insertions, 17 deletions

diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index a4251454885a..3cc6e4f47701 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -50,7 +50,7 @@ const char UNO_LINESTYLE[] = ".uno:LineStyle";
 
 namespace sc { namespace sidebar {
 
-svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent)
+Control* CellAppearancePropertyPanel::CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent)
 {
     return VclPtr<CellLineStyleControl>::Create(pParent, *this);
 }
@@ -63,7 +63,7 @@ void CellAppearancePropertyPanel::EndCellLineStylePopupMode()
     }
 }
 
-svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent)
+Control* CellAppearancePropertyPanel::CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent)
 {
     return VclPtr<CellBorderStyleControl>::Create(pParent, *this);
 }
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index 10b5a3757431..1e6dfcf5229f 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -26,7 +26,6 @@
 
 class FixedText;
 namespace svx { namespace sidebar {
-    class PopupControl;
     class PopupContainer;
 }}
 namespace sc { namespace sidebar {
@@ -142,11 +141,11 @@ private:
     DECL_LINK_TYPED(TbxLineStyleSelectHdl, ToolBox*, void);
 
     // for CellLineStyle popup
-    svx::sidebar::PopupControl* CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent);
+    Control* CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent);
     void EndCellLineStylePopupMode();
 
     // for CellBorderStyle popup
-    svx::sidebar::PopupControl* CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent);
+    Control* CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent);
     void EndCellBorderStylePopupMode();
 
     void Initialize();
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 8280bc3ed43f..47a60cc15d51 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -43,7 +43,7 @@ namespace sc { namespace sidebar {
 #define FRM_VALID_ALL       0xff
 
 CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel)
-:   svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE)),
+:   Control(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE)),
     mrCellAppearancePropertyPanel(rPanel),
     maTBBorder1(VclPtr<ToolBox>::Create(this, ScResId(TB_BORDER1))),
     maTBBorder2(VclPtr<ToolBox>::Create(this, ScResId(TB_BORDER2))),
@@ -69,7 +69,7 @@ void CellBorderStyleControl::dispose()
     maTBBorder3.disposeAndClear();
     maFL1.disposeAndClear();
     maFL2.disposeAndClear();
-    svx::sidebar::PopupControl::dispose();
+    Control::dispose();
 }
 
 void CellBorderStyleControl::Initialize()
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
index a19580f1fb15..38c2710ec2cc 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLBORDERSTYLECONTROL_HXX
 #define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLBORDERSTYLECONTROL_HXX
 
-#include <svx/sidebar/PopupControl.hxx>
 #include <vcl/button.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/fixed.hxx>
@@ -28,7 +27,7 @@ namespace sc { namespace sidebar {
 
 class CellAppearancePropertyPanel;
 
-class CellBorderStyleControl : public svx::sidebar::PopupControl
+class CellBorderStyleControl : public Control
 {
 private:
     CellAppearancePropertyPanel&    mrCellAppearancePropertyPanel;
diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.cxx b/sc/source/ui/sidebar/CellBorderStylePopup.cxx
index f71603e9ccb9..7b5e8712febd 100644
--- a/sc/source/ui/sidebar/CellBorderStylePopup.cxx
+++ b/sc/source/ui/sidebar/CellBorderStylePopup.cxx
@@ -24,7 +24,7 @@ namespace sc { namespace sidebar {
 
 CellBorderStylePopup::CellBorderStylePopup (
     vcl::Window* pParent,
-    const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator)
+    const ::std::function<Control* (svx::sidebar::PopupContainer*)>& rControlCreator)
 :   Popup(pParent, rControlCreator,  ::OUString("CellBorderStyle"))
 {
 }
diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.hxx b/sc/source/ui/sidebar/CellBorderStylePopup.hxx
index 7b3e82204830..17909b7ea373 100644
--- a/sc/source/ui/sidebar/CellBorderStylePopup.hxx
+++ b/sc/source/ui/sidebar/CellBorderStylePopup.hxx
@@ -30,7 +30,7 @@ class CellBorderStylePopup : public svx::sidebar::Popup
 public:
     CellBorderStylePopup(
         vcl::Window* pParent,
-        const ::std::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator);
+        const ::std::function<Control*(svx::sidebar::PopupContainer*)>& rControlCreator);
     virtual ~CellBorderStylePopup() override;
 };
 
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index 59a25ed95e8b..d383adee797b 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -34,7 +34,7 @@
 namespace sc { namespace sidebar {
 
 CellLineStyleControl::CellLineStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel)
-:   svx::sidebar::PopupControl(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE)),
+:   Control(pParent, ScResId(RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE)),
     mrCellAppearancePropertyPanel(rPanel),
     maPushButtonMoreOptions(VclPtr<PushButton>::Create(this, ScResId(PB_OPTIONS))),
     maCellLineStyleValueSet(VclPtr<sc::sidebar::CellLineStyleValueSet>::Create(this, ScResId(VS_STYLE))),
@@ -53,7 +53,7 @@ void CellLineStyleControl::dispose()
 {
     maPushButtonMoreOptions.disposeAndClear();
     maCellLineStyleValueSet.disposeAndClear();
-    svx::sidebar::PopupControl::dispose();
+    Control::dispose();
 }
 
 void CellLineStyleControl::Initialize()
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx
index ef74eb096a91..9e98e686a558 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLLINESTYLECONTROL_HXX
 #define INCLUDED_SC_SOURCE_UI_SIDEBAR_CELLLINESTYLECONTROL_HXX
 
-#include <svx/sidebar/PopupControl.hxx>
 #include <vcl/button.hxx>
 #include "CellLineStyleValueSet.hxx"
 
@@ -27,7 +26,7 @@ namespace sc { namespace sidebar {
 
 class CellAppearancePropertyPanel;
 
-class CellLineStyleControl : public svx::sidebar::PopupControl
+class CellLineStyleControl : public Control
 {
 private:
     CellAppearancePropertyPanel&       mrCellAppearancePropertyPanel;
diff --git a/sc/source/ui/sidebar/CellLineStylePopup.cxx b/sc/source/ui/sidebar/CellLineStylePopup.cxx
index 59b4b065f134..363029bf1037 100644
--- a/sc/source/ui/sidebar/CellLineStylePopup.cxx
+++ b/sc/source/ui/sidebar/CellLineStylePopup.cxx
@@ -24,7 +24,7 @@ namespace sc { namespace sidebar {
 
 CellLineStylePopup::CellLineStylePopup (
     vcl::Window* pParent,
-    const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator)
+    const ::std::function<Control* (svx::sidebar::PopupContainer*)>& rControlCreator)
 :   Popup(pParent, rControlCreator, OUString("CellLineStyle"))
 {
 }
diff --git a/sc/source/ui/sidebar/CellLineStylePopup.hxx b/sc/source/ui/sidebar/CellLineStylePopup.hxx
index 7e908291c17c..d72128c29462 100644
--- a/sc/source/ui/sidebar/CellLineStylePopup.hxx
+++ b/sc/source/ui/sidebar/CellLineStylePopup.hxx
@@ -30,7 +30,7 @@ class CellLineStylePopup : public svx::sidebar::Popup
 public:
     CellLineStylePopup(
         vcl::Window* pParent,
-        const ::std::function<svx::sidebar::PopupControl* (svx::sidebar::PopupContainer*)>& rControlCreator);
+        const ::std::function<Control* (svx::sidebar::PopupContainer*)>& rControlCreator);
     virtual ~CellLineStylePopup() override;
 
     void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis);