diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-23 10:44:33 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-23 11:43:10 +0000 |
commit | c4c23515d6f94f5d06215a9b0f9ca605655e3497 (patch) | |
tree | 6e2be0f7740358cfcbc60d93f446f99a74b7dadb | |
parent | merge StringNode with RscDefine (diff) | |
download | core-c4c23515d6f94f5d06215a9b0f9ca605655e3497.tar.gz core-c4c23515d6f94f5d06215a9b0f9ca605655e3497.zip |
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>
-rw-r--r-- | compilerplugins/clang/mergeclasses.results | 1 | ||||
-rw-r--r-- | include/svx/nbdtmg.hxx | 28 | ||||
-rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 11 |
3 files changed, 9 insertions, 31 deletions
diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 8a7db693dad3..ab9a01e3b112 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -344,7 +344,6 @@ merge svx::IControllerFeatureInvalidation with FmXFormShell merge svx::IFocusObserver with svx::FmTextControlShell merge svx::IPropertyValueProvider with svx::PropertyValueProvider merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog -merge svx::sidebar::BulletsSettings with svx::sidebar::BulletsSettings_Impl merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel merge svxform::(anonymous namespace)::IScript with svxform::(anonymous namespace)::NewStyleUNOScript merge svxform::DispatchInterceptor with svxform::FormController 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 {} diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index af5a2c218c4e..ac95d7b86381 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -237,7 +237,7 @@ void NBOTypeMgrBase::ImplStore(const OUString& filename) } // Character Bullet Type lib -BulletsSettings_Impl* BulletsTypeMgr::pActualBullets[] ={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr}; +BulletsSettings* BulletsTypeMgr::pActualBullets[] ={nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr}; sal_Unicode BulletsTypeMgr::aDynamicBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '}; sal_Unicode BulletsTypeMgr::aDynamicRTLBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '}; @@ -260,7 +260,7 @@ void BulletsTypeMgr::Init() for (sal_uInt16 i=0;i<DEFAULT_BULLET_TYPES;i++) { - pActualBullets[i] = new BulletsSettings_Impl; + pActualBullets[i] = new BulletsSettings; pActualBullets[i]->cBulletChar = aDefaultBulletTypes[i]; pActualBullets[i]->aFont =rActBulletFont; pActualBullets[i]->sDescription = SVX_RESSTR( RID_SVXSTR_BULLET_DESCRIPTION_0 + i ); @@ -306,7 +306,6 @@ sal_uInt16 BulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLe } } }*/ - //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl); for(sal_uInt16 i = nFromIndex; i < DEFAULT_BULLET_TYPES; i++) { if ( (cChar == pActualBullets[i]->cBulletChar|| @@ -354,7 +353,6 @@ void BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI aDynamicBulletTypes[nIndex] = cChar; }*/ - //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl); if ( nIndex >= DEFAULT_BULLET_TYPES ) return; @@ -394,7 +392,6 @@ void BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 cChar = aDynamicBulletTypes[nIndex]; }*/ - //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl); if ( nIndex >= DEFAULT_BULLET_TYPES ) return; cChar = pActualBullets[nIndex]->cBulletChar; @@ -424,8 +421,6 @@ void BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1 OUString BulletsTypeMgr::GetDescription(sal_uInt16 nIndex, bool /*isDefault*/) { OUString sRet; - //sal_uInt16 nLength = 0; - //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl); if ( nIndex >= DEFAULT_BULLET_TYPES ) return sRet; @@ -438,8 +433,6 @@ OUString BulletsTypeMgr::GetDescription(sal_uInt16 nIndex, bool /*isDefault*/) bool BulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) { bool bRet = false; - //sal_uInt16 nLength = 0; - //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl); if ( nIndex >= DEFAULT_BULLET_TYPES ) bRet = false; |