mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge svx::sidebar::BulletsSettings with svx::sidebar::BulletsSettings_Impl

Browse Source 
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>
This commit is contained in:
Noel Grandin 2016-12-23 10:44:33 +02:00
parent b641929e69
commit c4c23515d6
3 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@ -344,7 +344,6 @@ merge svx::IControllerFeatureInvalidation with FmXFormShell
merge svx::IFocusObserver with svx::FmTextControlShell merge svx::IFocusObserver with svx::FmTextControlShell
merge svx::IPropertyValueProvider with svx::PropertyValueProvider merge svx::IPropertyValueProvider with svx::PropertyValueProvider
merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog merge svx::RegistrationItemSetHolder with svx::DatabaseRegistrationDialog
merge svx::sidebar::BulletsSettings with svx::sidebar::BulletsSettings_Impl
merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel merge svx::sidebar::SvxShapeCommandsMap with svx::sidebar::DefaultShapesPanel
merge svxform::(anonymous namespace)::IScript with svxform::(anonymous namespace)::NewStyleUNOScript merge svxform::(anonymous namespace)::IScript with svxform::(anonymous namespace)::NewStyleUNOScript
merge svxform::DispatchInterceptor with svxform::FormController merge svxform::DispatchInterceptor with svxform::FormController

28
include/svx/nbdtmg.hxx
View File

@ -76,28 +76,14 @@ typedef std::vector< std::shared_ptr<NumSettings_Impl> > NumSettingsArr_Impl;
class SVX_DLLPUBLIC BulletsSettings class SVX_DLLPUBLIC BulletsSettings
{ {
public: public:
bool bIsCustomized; bool bIsCustomized;
rtl::OUString sDescription; rtl::OUString sDescription;
public: sal_Unicode cBulletChar;
BulletsSettings() : vcl::Font aFont;
bIsCustomized(false) BulletsSettings() : bIsCustomized(false), cBulletChar(0) {}
{}
virtual ~BulletsSettings(){}
}; };
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 class SVX_DLLPUBLIC NumberSettings_Impl
{ {
@ -180,7 +166,7 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
public: public:
static sal_Unicode aDynamicBulletTypes[DEFAULT_BULLET_TYPES]; static sal_Unicode aDynamicBulletTypes[DEFAULT_BULLET_TYPES];
static sal_Unicode aDynamicRTLBulletTypes[DEFAULT_BULLET_TYPES]; static sal_Unicode aDynamicRTLBulletTypes[DEFAULT_BULLET_TYPES];
static BulletsSettings_Impl* pActualBullets[DEFAULT_BULLET_TYPES]; static BulletsSettings* pActualBullets[DEFAULT_BULLET_TYPES];
public: public:
BulletsTypeMgr(); BulletsTypeMgr();
virtual ~BulletsTypeMgr() override {} virtual ~BulletsTypeMgr() override {}

11
svx/source/sidebar/nbdtmg.cxx
View File

@ -237,7 +237,7 @@ void NBOTypeMgrBase::ImplStore(const OUString& filename)
} }
// Character Bullet Type lib // 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::aDynamicBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '};
sal_Unicode BulletsTypeMgr::aDynamicRTLBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '}; sal_Unicode BulletsTypeMgr::aDynamicRTLBulletTypes[]={' ',' ',' ',' ',' ',' ',' ',' '};
@ -260,7 +260,7 @@ void BulletsTypeMgr::Init()
for (sal_uInt16 i=0;i<DEFAULT_BULLET_TYPES;i++) 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]->cBulletChar = aDefaultBulletTypes[i];
pActualBullets[i]->aFont =rActBulletFont; pActualBullets[i]->aFont =rActBulletFont;
pActualBullets[i]->sDescription = SVX_RESSTR( RID_SVXSTR_BULLET_DESCRIPTION_0 + i ); 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++) for(sal_uInt16 i = nFromIndex; i < DEFAULT_BULLET_TYPES; i++)
{ {
if ( (cChar == pActualBullets[i]->cBulletChar|| if ( (cChar == pActualBullets[i]->cBulletChar||
@ -354,7 +353,6 @@ void BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
aDynamicBulletTypes[nIndex] = cChar; aDynamicBulletTypes[nIndex] = cChar;
}*/ }*/
//nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl);
if ( nIndex >= DEFAULT_BULLET_TYPES ) if ( nIndex >= DEFAULT_BULLET_TYPES )
return; return;
@ -394,7 +392,6 @@ void BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
cChar = aDynamicBulletTypes[nIndex]; cChar = aDynamicBulletTypes[nIndex];
}*/ }*/
//nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl);
if ( nIndex >= DEFAULT_BULLET_TYPES ) if ( nIndex >= DEFAULT_BULLET_TYPES )
return; return;
cChar = pActualBullets[nIndex]->cBulletChar; 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 BulletsTypeMgr::GetDescription(sal_uInt16 nIndex, bool /*isDefault*/)
{ {
OUString sRet; OUString sRet;
//sal_uInt16 nLength = 0;
//nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl);
if ( nIndex >= DEFAULT_BULLET_TYPES ) if ( nIndex >= DEFAULT_BULLET_TYPES )
return sRet; return sRet;
@ -438,8 +433,6 @@ OUString BulletsTypeMgr::GetDescription(sal_uInt16 nIndex, bool /*isDefault*/)
bool BulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) bool BulletsTypeMgr::IsCustomized(sal_uInt16 nIndex)
{ {
bool bRet = false; bool bRet = false;
//sal_uInt16 nLength = 0;
//nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl);
if ( nIndex >= DEFAULT_BULLET_TYPES ) if ( nIndex >= DEFAULT_BULLET_TYPES )
bRet = false; bRet = false;