summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-12-12 14:52:04 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-12-13 07:23:24 +0100
commitefa4c68c35a0074657b016e0132446e72385c725 (patch)
tree11abec8b2348a25cb1ec8c046cea4cf0291d91c9 /include
parentd2bc01ff10f93a710296c7355efa8b11c6be0f56 (diff)
loplugin:mergeclasses merge LineLB into SvxLineBox
Change-Id: I76bab66b09ae809c069f586ccb1c4ce13fa30234 Reviewed-on: https://gerrit.libreoffice.org/65025 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/svx/dlgctrl.hxx8
-rw-r--r--include/svx/itemwin.hxx4
2 files changed, 3 insertions, 9 deletions
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 64205752626e..fd51e5264dd3 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -227,14 +227,6 @@ public:
/************************************************************************/
-class SAL_WARN_UNUSED SVX_DLLPUBLIC LineLB : public ListBox
-{
-public:
- LineLB(vcl::Window* pParent);
-
- void Fill(const XDashListRef &pList);
-};
-
class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxLineLB
{
private:
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index a50126eb6440..ac910a8f6fc5 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -28,7 +28,7 @@ class XLineColorItem;
class XLineWidthItem;
class SfxObjectShell;
-class SvxLineBox : public LineLB
+class SvxLineBox : public ListBox
{
sal_uInt16 nCurPos;
Timer aDelayTimer;
@@ -47,6 +47,8 @@ public:
void FillControl();
+ void Fill(const XDashListRef &pList);
+
protected:
virtual void Select() override;
virtual bool PreNotify( NotifyEvent& rNEvt ) override;