From c4c23515d6f94f5d06215a9b0f9ca605655e3497 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 23 Dec 2016 10:44:33 +0200
Subject: merge svx::sidebar::BulletsSettings with
 svx::sidebar::BulletsSettings_Impl

Change-Id: I7cf6bb4cf3aa532718753904c2100882b0df6775
Reviewed-on: https://gerrit.libreoffice.org/32373
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 include/svx/nbdtmg.hxx | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

(limited to 'include')

diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index bfab0071e3cc..d79976b2d369 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -76,28 +76,14 @@ typedef std::vector< std::shared_ptr<NumSettings_Impl> > NumSettingsArr_Impl;
 
 class  SVX_DLLPUBLIC BulletsSettings
 {
-    public:
-        bool            bIsCustomized;
-        rtl::OUString   sDescription;
-    public:
-        BulletsSettings() :
-            bIsCustomized(false)
-            {}
-        virtual ~BulletsSettings(){}
+public:
+    bool            bIsCustomized;
+    rtl::OUString   sDescription;
+    sal_Unicode     cBulletChar;
+    vcl::Font       aFont;
+    BulletsSettings() : bIsCustomized(false), cBulletChar(0) {}
 };
 
-class  SVX_DLLPUBLIC BulletsSettings_Impl:public BulletsSettings
-{
-    public:
-        sal_Unicode cBulletChar;
-        vcl::Font   aFont;
-
-    public:
-        BulletsSettings_Impl()
-            : cBulletChar(0)
-            {}
-        virtual ~BulletsSettings_Impl() override {}
-};
 
 class  SVX_DLLPUBLIC NumberSettings_Impl
 {
@@ -180,7 +166,7 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
     public:
         static sal_Unicode aDynamicBulletTypes[DEFAULT_BULLET_TYPES];
         static sal_Unicode aDynamicRTLBulletTypes[DEFAULT_BULLET_TYPES];
-        static BulletsSettings_Impl* pActualBullets[DEFAULT_BULLET_TYPES];
+        static BulletsSettings* pActualBullets[DEFAULT_BULLET_TYPES];
     public:
         BulletsTypeMgr();
         virtual ~BulletsTypeMgr() override {}
-- 
cgit