diff options
| -rw-r--r-- | include/svx/nbdtmg.hxx | 62 | ||||
| -rw-r--r-- | include/svx/numvset.hxx | 12 | ||||
| -rw-r--r-- | svx/source/dialog/svxbmpnumvalueset.cxx | 8 | ||||
| -rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 148 |
4 files changed, 119 insertions, 111 deletions
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index 130b5c66024f..189dc053ae43 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -87,12 +87,12 @@ typedef std::vector< boost::shared_ptr<NumSettings_Impl> > NumSettingsArr_Impl; class SVX_DLLPUBLIC BulletsSettings { public: - sal_Bool bIsCustomized; + bool bIsCustomized; rtl::OUString sDescription; - NBType eType; + NBType eType; public: BulletsSettings(NBType eTy) : - bIsCustomized(sal_False), + bIsCustomized(false), eType(eTy) {} virtual ~BulletsSettings(){} @@ -150,14 +150,14 @@ class SVX_DLLPUBLIC MixBulletsSettings_Impl class SVX_DLLPUBLIC NumberSettings_Impl { public: - sal_Bool bIsCustomized; + bool bIsCustomized; rtl::OUString sDescription; sal_uInt16 nIndex; //index in the tab page display sal_uInt16 nIndexDefault; NumSettings_Impl *pNumSetting; public: NumberSettings_Impl() : - bIsCustomized(sal_False), + bIsCustomized(false), nIndex((sal_uInt16)0xFFFF), nIndexDefault((sal_uInt16)0xFFFF), pNumSetting(NULL) @@ -171,12 +171,12 @@ typedef std::vector< boost::shared_ptr<NumberSettings_Impl> > NumberSettingsArr_ class SVX_DLLPUBLIC OutlineSettings_Impl { public: - sal_Bool bIsCustomized; + bool bIsCustomized; rtl::OUString sDescription; NumSettingsArr_Impl *pNumSettingsArr; public: OutlineSettings_Impl() : - bIsCustomized(sal_False), + bIsCustomized(false), pNumSettingsArr(NULL) {} ~OutlineSettings_Impl(){ @@ -221,10 +221,10 @@ class SVX_DLLPUBLIC NBOTypeMgrBase virtual ~NBOTypeMgrBase() {} virtual void Init()=0; virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0)=0; - virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF)=0; - virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF, sal_Bool isDefault=false,sal_Bool isResetSize=false)=0; - virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false)=0; - virtual sal_Bool IsCustomized(sal_uInt16 nIndex)=0; + virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF)=0; + virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF, bool isDefault=false,bool isResetSize=false)=0; + virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false)=0; + virtual bool IsCustomized(sal_uInt16 nIndex)=0; sal_uInt16 IsSingleLevel(sal_uInt16 nCurLevel); const SfxItemSet* GetItems() { return pSet;} // store the attributes passed from pSet @@ -254,10 +254,10 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase virtual ~BulletsTypeMgr() {} virtual void Init(); virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); - virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); - virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,sal_Bool isDefault=false,sal_Bool isResetSize=false); - virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false); - virtual sal_Bool IsCustomized(sal_uInt16 nIndex); + virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); + virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false); + virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false); + virtual bool IsCustomized(sal_uInt16 nIndex); sal_Unicode GetBulChar(sal_uInt16 nIndex); Font GetBulCharFont(sal_uInt16 nIndex); static BulletsTypeMgr& GetInstance(); @@ -276,10 +276,10 @@ class SVX_DLLPUBLIC GraphyicBulletsTypeMgr: public NBOTypeMgrBase virtual ~GraphyicBulletsTypeMgr(); virtual void Init(); virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); - virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); - virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,sal_Bool isDefault=false,sal_Bool isResetSize=false); - virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false); - virtual sal_Bool IsCustomized(sal_uInt16 nIndex); + virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); + virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false); + virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false); + virtual bool IsCustomized(sal_uInt16 nIndex); OUString GetGrfName(sal_uInt16 nIndex); static GraphyicBulletsTypeMgr& GetInstance(); }; @@ -297,10 +297,10 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase virtual ~MixBulletsTypeMgr() {} virtual void Init(); virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); - virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); - virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,sal_Bool isDefault=false,sal_Bool isResetSize=false); - virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false); - virtual sal_Bool IsCustomized(sal_uInt16 nIndex); + virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); + virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false); + virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false); + virtual bool IsCustomized(sal_uInt16 nIndex); static MixBulletsTypeMgr& GetInstance(); }; @@ -315,10 +315,10 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase virtual ~NumberingTypeMgr(); virtual void Init(); virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); - virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); - virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,sal_Bool isDefault=false,sal_Bool isResetSize=false); - virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false); - virtual sal_Bool IsCustomized(sal_uInt16 nIndex); + virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); + virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false); + virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false); + virtual bool IsCustomized(sal_uInt16 nIndex); static NumberingTypeMgr& GetInstance(); }; @@ -333,10 +333,10 @@ class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase virtual ~OutlineTypeMgr() {} virtual void Init(); virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); - virtual sal_Bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); - virtual sal_Bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,sal_Bool isDefault=false,sal_Bool isResetSize=false); - virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool isDefault=false); - virtual sal_Bool IsCustomized(sal_uInt16 nIndex); + virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); + virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false); + virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false); + virtual bool IsCustomized(sal_uInt16 nIndex); static OutlineTypeMgr& GetInstance(); }; }} diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index c8da38bf91d5..a9db528dbc08 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -49,8 +49,8 @@ struct SvxBmpItemInfo class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet { Color aLineColor; - sal_uInt16 nPageType; - sal_Bool bHTMLMode; + sal_uInt16 nPageType; + bool bHTMLMode; Rectangle aOrgRect; VirtualDevice* pVDev; @@ -72,7 +72,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet virtual void UserDraw( const UserDrawEvent& rUDEvt ); - void SetHTMLMode(sal_Bool bSet) {bHTMLMode = bSet;} + void SetHTMLMode(bool bSet) {bHTMLMode = bSet;} void SetNumberingSettings( const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< @@ -92,15 +92,15 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet { OUString sBullets; Timer aFormatTimer; - sal_Bool bGrfNotFound; + bool bGrfNotFound; void init(); protected: DECL_LINK(FormatHdl_Impl, void *); - void SetGrfNotFound(sal_Bool bSet) {bGrfNotFound = bSet;} - sal_Bool IsGrfNotFound()const {return bGrfNotFound;} + void SetGrfNotFound(bool bSet) {bGrfNotFound = bSet;} + bool IsGrfNotFound()const {return bGrfNotFound;} Timer& GetFormatTimer() {return aFormatTimer;} diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 00e9c7e96379..161ca7536639 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -403,7 +403,7 @@ void SvxNumValueSet::init(sal_uInt16 nType) { aLineColor = COL_LIGHTGRAY; nPageType = nType; - bHTMLMode = sal_False; + bHTMLMode = false; pVDev = NULL; SetColCount( 4 ); @@ -474,7 +474,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxBmpNumValueSet(Window *p void SvxBmpNumValueSet::init() { SvxNumValueSet::init(NUM_PAGETYPE_BMP); - bGrfNotFound = sal_False; + bGrfNotFound = false; GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS); SetStyle( GetStyle() | WB_VSCROLL ); SetLineCount( 3 ); @@ -505,7 +505,7 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1, &aGraphic, NULL)) { - bGrfNotFound = sal_True; + bGrfNotFound = true; } else { @@ -524,7 +524,7 @@ IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl) // only when a graphics was not there, it needs to be formatted if(bGrfNotFound) { - bGrfNotFound = sal_False; + bGrfNotFound = false; Format(); } Invalidate(); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 3caedc1f7369..cf2ad6e55fda 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -379,18 +379,18 @@ sal_uInt16 BulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLe return (sal_uInt16)0xFFFF; } -sal_Bool BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel) +bool BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel) { if ( mLevel == (sal_uInt16)0xFFFF || mLevel == 0) - return sal_False; + return false; if ( GetNBOIndexForNumRule(aNum,mLevel) != (sal_uInt16)0xFFFF ) - return sal_False; + return false; sal_uInt16 nActLv = IsSingleLevel(mLevel); if ( nActLv == (sal_uInt16)0xFFFF ) - return sal_False; + return false; SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); sal_Unicode cChar = aFmt.GetBulletChar(); @@ -415,12 +415,12 @@ sal_Bool BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_ }*/ //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl); if ( nIndex >= DEFAULT_BULLET_TYPES ) - return sal_False; + return false; pActualBullets[nIndex]->cBulletChar = cChar; if ( pFont ) pActualBullets[nIndex]->aFont = *pFont; - pActualBullets[nIndex]->bIsCustomized = sal_True; + pActualBullets[nIndex]->bIsCustomized = true; OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION); OUString aReplace = "%LIST_NUM"; @@ -428,10 +428,10 @@ sal_Bool BulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_ aStrFromRES = aStrFromRES.replaceFirst(aReplace,sNUM); pActualBullets[nIndex]->sDescription = aStrFromRES; - return sal_True; + return true; } -sal_Bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel,sal_Bool /*isDefault*/,sal_Bool isResetSize) +bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel, bool /*isDefault*/, bool isResetSize) { //if ( mLevel == (sal_uInt16)0xFFFF ) // return sal_False; @@ -457,7 +457,7 @@ sal_Bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn }*/ //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl); if ( nIndex >= DEFAULT_BULLET_TYPES ) - return sal_False; + return false; cChar = pActualBullets[nIndex]->cBulletChar; //Font& rActBulletFont = lcl_GetDefaultBulletFont(); Font rActBulletFont = pActualBullets[nIndex]->aFont; @@ -479,10 +479,10 @@ sal_Bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn nMask <<= 1; } - return sal_True; + return true; } -OUString BulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isDefault*/) +OUString BulletsTypeMgr::GetDescription(sal_uInt16 nIndex, bool /*isDefault*/) { OUString sRet; //sal_uInt16 nLength = 0; @@ -495,14 +495,15 @@ OUString BulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isDefault*/ return sRet; } -sal_Bool BulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) + +bool BulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) { - sal_Bool bRet = sal_False; + bool bRet = false; //sal_uInt16 nLength = 0; //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl); if ( nIndex >= DEFAULT_BULLET_TYPES ) - bRet = sal_False; + bRet = false; else bRet = pActualBullets[nIndex]->bIsCustomized; @@ -657,20 +658,20 @@ sal_uInt16 GraphyicBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uI return (sal_uInt16)0xFFFF; } -sal_Bool GraphyicBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel) +bool GraphyicBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel) { if ( mLevel == (sal_uInt16)0xFFFF || mLevel > aNum.GetLevelCount() || mLevel == 0) - return sal_False; + return false; if ( GetNBOIndexForNumRule(aNum,mLevel) != (sal_uInt16)0xFFFF ) - return sal_False; + return false; if ( nIndex >= aGrfDataLst.size() ) - return sal_False; + return false; sal_uInt16 nActLv = IsSingleLevel(mLevel); if ( nActLv == (sal_uInt16)0xFFFF ) - return sal_False; + return false; SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); const SvxBrushItem* pBrsh = aFmt.GetBrush(); @@ -678,7 +679,7 @@ sal_Bool GraphyicBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIn if ( pBrsh ) pGrf = pBrsh->GetGraphic(); else - return sal_False; + return false; if ( pGrf ) { @@ -689,26 +690,26 @@ sal_Bool GraphyicBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIn pEntry->sGrfName = aGrfName; //pEntry->sDescription = sEmpty; pEntry->nGallaryIndex = (sal_uInt16)0xFFFF; - pEntry->bIsCustomized = sal_True; + pEntry->bIsCustomized = true; OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION); OUString sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM); pEntry->sDescription = aStrFromRES; }else { - return sal_False; + return false; } - return sal_True; + return true; } -sal_Bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel,sal_Bool /*isDefault*/,sal_Bool /*isResetSize*/) +bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel, bool /*isDefault*/, bool /*isResetSize*/) { //if ( mLevel == (sal_uInt16)0xFFFF ) // return sal_False; if ( nIndex >= aGrfDataLst.size() ) - return sal_False; + return false; OUString sGrfName; GrfBulDataRelation* pEntry = aGrfDataLst[nIndex]; @@ -745,9 +746,10 @@ sal_Bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex nMask <<= 1 ; } - return sal_True; + return true; } -OUString GraphyicBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isDefault*/) + +OUString GraphyicBulletsTypeMgr::GetDescription(sal_uInt16 nIndex, bool /*isDefault*/) { OUString sRet; sal_uInt16 nLength = 0; @@ -765,9 +767,10 @@ OUString GraphyicBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool /*isD } return sRet; } -sal_Bool GraphyicBulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) + +bool GraphyicBulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt16 nLength = 0; nLength = aGrfDataLst.size() ; @@ -1031,10 +1034,10 @@ sal_uInt16 MixBulletsTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 return (sal_uInt16)0xFFFF; } -sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel) +bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel) { if ( mLevel == (sal_uInt16)0xFFFF || mLevel == 0 || nIndex>=DEFAULT_BULLET_TYPES) - return sal_False; + return false; //if ( GetNBOIndexForNumRule(aNum,mLevel) != (sal_uInt16)0xFFFF ) // return sal_False; @@ -1042,7 +1045,7 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s sal_uInt16 nActLv = IsSingleLevel(mLevel); if ( nActLv == (sal_uInt16)0xFFFF ) - return sal_False; + return false; SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); sal_Int16 eNumType = aFmt.GetNumberingType(); @@ -1053,7 +1056,7 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s BulletsSettings_Impl* pEntry = (BulletsSettings_Impl*) (pActualBullets[nIndex]->pBullets); pEntry->cBulletChar = cChar; pEntry->aFont = pFont?*pFont:lcl_GetDefaultBulletFont(); - pEntry->bIsCustomized = sal_True; + pEntry->bIsCustomized = true; OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION); OUString sNUM = OUString::number( nIndex + 1 ); aStrFromRES = aStrFromRES.replaceFirst("%LIST_NUM",sNUM); @@ -1066,7 +1069,7 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s if ( pBrsh ) pGrf = pBrsh->GetGraphic(); else - return sal_False; + return false; OUString sEmpty; if ( pGrf ) @@ -1089,10 +1092,10 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s pEntry->aSize=Size(0,0); } pEntry->sDescription = sEmpty; - pEntry->bIsCustomized = sal_True; + pEntry->bIsCustomized = true; }else { - return sal_False; + return false; } }else { @@ -1107,7 +1110,7 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s pActualBullets[nIndex]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; ((BulletsSettings_Impl*)(pActualBullets[nIndex]->pBullets))->cBulletChar = cChar; ((BulletsSettings_Impl*)(pActualBullets[nIndex]->pBullets))->aFont = pFont?*pFont:lcl_GetDefaultBulletFont(); - ((BulletsSettings_Impl*)(pActualBullets[nIndex]->pBullets))->bIsCustomized = sal_True; + ((BulletsSettings_Impl*)(pActualBullets[nIndex]->pBullets))->bIsCustomized = true; ((BulletsSettings_Impl*)(pActualBullets[nIndex]->pBullets))->eType = eNBType::BULLETS; pActualBullets[nIndex]->nIndexDefault = (sal_uInt16)0xFFFF; OUString aStrFromRES = SVX_RESSTR( RID_SVXSTR_NUMBULLET_CUSTOM_BULLET_DESCRIPTION); @@ -1121,7 +1124,7 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s if ( pBrsh ) pGrf = pBrsh->GetGraphic(); else - return sal_False; + return false; OUString aGrfName; if ( pGrf ) @@ -1133,7 +1136,7 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s pActualBullets[nIndex]->pBullets = new GrfBulDataRelation(eNBType::GRAPHICBULLETS) ; if (!aGrfName.isEmpty()) ((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->sGrfName = aGrfName; - ((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->bIsCustomized = sal_True; + ((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->bIsCustomized = true; ((GrfBulDataRelation*)(pActualBullets[nIndex]->pBullets))->eType = eNBType::GRAPHICBULLETS; GraphyicBulletsTypeMgr& rGrfTMgr = GraphyicBulletsTypeMgr::GetInstance(); { @@ -1169,14 +1172,14 @@ sal_Bool MixBulletsTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,s } } ImplStore(OUString("standard.sya")); - return sal_True; + return true; } -sal_Bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel,sal_Bool isDefault,sal_Bool isResetSize) +bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel, bool isDefault, bool isResetSize) { //if ( mLevel == (sal_uInt16)0xFFFF || nIndex>=DEFAULT_BULLET_TYPES ) if ( nIndex>=DEFAULT_BULLET_TYPES ) - return sal_False; + return false; MixBulletsSettings_Impl* pCurrentBullets = pActualBullets[nIndex]; if (isDefault) pCurrentBullets=pDefaultActualBullets[nIndex]; @@ -1266,10 +1269,10 @@ sal_Bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_ } } - return sal_True; + return true; } -OUString MixBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault) +OUString MixBulletsTypeMgr::GetDescription(sal_uInt16 nIndex, bool isDefault) { OUString sRet; //sal_uInt16 nLength = 0; @@ -1282,14 +1285,15 @@ OUString MixBulletsTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault) if (isDefault) sRet = pDefaultActualBullets[nIndex]->pBullets->sDescription; return sRet; } -sal_Bool MixBulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) + +bool MixBulletsTypeMgr::IsCustomized(sal_uInt16 nIndex) { - sal_Bool bRet = sal_False; + bool bRet = false; //sal_uInt16 nLength = 0; //nLength = sizeof(pActualBullets)/sizeof(BulletsSettings_Impl); if ( nIndex >= DEFAULT_BULLET_TYPES ) - bRet = sal_False; + bRet = false; else bRet = pActualBullets[nIndex]->pBullets->bIsCustomized; @@ -1433,7 +1437,7 @@ sal_uInt16 NumberingTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 m return (sal_uInt16)0xFFFF; } -sal_Bool NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel) +bool NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel) { //if ( mLevel == (sal_uInt16)0xFFFF || mLevel == 0) // return sal_False; @@ -1444,7 +1448,7 @@ sal_Bool NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sa sal_uInt16 nActLv = IsSingleLevel(mLevel); if ( nActLv == (sal_uInt16)0xFFFF ) - return sal_False; + return false; SvxNumberFormat aFmt(aNum.GetLevel(nActLv)); //sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix())[0]; @@ -1453,14 +1457,14 @@ sal_Bool NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sa sal_uInt16 nCount = pNumberSettingsArr->size(); if ( nIndex >= nCount ) - return sal_False; + return false; NumberSettings_ImplPtr _pSet = (*pNumberSettingsArr)[nIndex].get(); _pSet->pNumSetting->sPrefix = aFmt.GetPrefix(); _pSet->pNumSetting->sSuffix = aFmt.GetSuffix(); _pSet->pNumSetting->nNumberType = eNumType; - _pSet->bIsCustomized = sal_True; + _pSet->bIsCustomized = true; SvxNumRule aTmpRule1(aNum); SvxNumRule aTmpRule2(aNum); @@ -1476,17 +1480,17 @@ sal_Bool NumberingTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sa _pSet->sDescription = GetDescription(nIndex,true); } ImplStore(OUString("standard.syb")); - return sal_True; + return true; } -sal_Bool NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel,sal_Bool isDefault,sal_Bool isResetSize) +bool NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel, bool isDefault, bool isResetSize) { //if ( mLevel == (sal_uInt16)0xFFFF ) // return sal_False; //DBG_ASSERT(pNumSettingsArr->Count() > nIndex, "wrong index"); if(pNumberSettingsArr->size() <= nIndex) - return sal_False; + return false; NumberSettingsArr_Impl* pCurrentNumberSettingsArr=pNumberSettingsArr; if (isDefault) pCurrentNumberSettingsArr=pDefaultNumberSettingsArr; NumberSettings_ImplPtr _pSet = (*pCurrentNumberSettingsArr)[nIndex].get(); @@ -1511,9 +1515,10 @@ sal_Bool NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_u nMask <<= 1 ; } - return sal_True; + return true; } -OUString NumberingTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault) + +OUString NumberingTypeMgr::GetDescription(sal_uInt16 nIndex, bool isDefault) { OUString sRet; sal_uInt16 nLength = 0; @@ -1527,14 +1532,15 @@ OUString NumberingTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault) return sRet; } -sal_Bool NumberingTypeMgr::IsCustomized(sal_uInt16 nIndex) + +bool NumberingTypeMgr::IsCustomized(sal_uInt16 nIndex) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt16 nLength = 0; nLength = pNumberSettingsArr->size(); if ( nIndex >= nLength ) - bRet = sal_False; + bRet = false; else bRet = (*pNumberSettingsArr)[nIndex]->bIsCustomized; @@ -1697,14 +1703,14 @@ sal_uInt16 OutlineTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 /*m return (sal_uInt16)0xFFFF; } -sal_Bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel) +bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 mLevel) { //if ( mLevel == 0 || mLevel == (sal_uInt16)0xFFFF ) // return sal_False; sal_uInt16 nLength = sizeof(pOutlineSettingsArrs)/sizeof(OutlineSettings_Impl*); if ( nIndex >= nLength ) - return sal_False; + return false; OutlineSettings_Impl* pItemArr = pOutlineSettingsArrs[nIndex]; sal_uInt16 nCount = pItemArr->pNumSettingsArr->size(); @@ -1731,7 +1737,7 @@ sal_Bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_ if ( aFmt.GetBulletFont() ) _pSet->sBulletFont = rtl::OUString(aFmt.GetBulletFont()->GetName()); _pSet->nNumberType = eNumType; - pItemArr->bIsCustomized = sal_True; + pItemArr->bIsCustomized = true; }else if ((eNumType&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) { if (_pSet->pBrushItem) { delete (_pSet->pBrushItem); @@ -1748,7 +1754,7 @@ sal_Bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_ _pSet->nNumberType = eNumType; if ( aFmt.GetBulletFont() ) _pSet->sBulletFont = rtl::OUString(aFmt.GetBulletFont()->GetName()); - pItemArr->bIsCustomized = sal_True; + pItemArr->bIsCustomized = true; } } SvxNumRule aTmpRule1(aNum); @@ -1765,17 +1771,17 @@ sal_Bool OutlineTypeMgr::RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_ pItemArr->sDescription = GetDescription(nIndex,true); } ImplStore(OUString("standard.syc")); - return sal_True; + return true; } -sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 /*mLevel*/,sal_Bool isDefault,sal_Bool isResetSize) +bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt16 /*mLevel*/, bool isDefault, bool isResetSize) { //if ( mLevel == (sal_uInt16)0xFFFF ) // return sal_False; DBG_ASSERT(DEFAULT_NUM_VALUSET_COUNT > nIndex, "wrong index"); if(DEFAULT_NUM_VALUSET_COUNT <= nIndex) - return sal_False; + return false; const FontList* pList = 0; @@ -1883,9 +1889,10 @@ sal_Bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uIn aNum.SetLevel(i, aFmt); } - return sal_True; + return true; } -OUString OutlineTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault) + +OUString OutlineTypeMgr::GetDescription(sal_uInt16 nIndex, bool isDefault) { OUString sRet; sal_uInt16 nLength = 0; @@ -1904,9 +1911,10 @@ OUString OutlineTypeMgr::GetDescription(sal_uInt16 nIndex,sal_Bool isDefault) } return sRet; } -sal_Bool OutlineTypeMgr::IsCustomized(sal_uInt16 nIndex) + +bool OutlineTypeMgr::IsCustomized(sal_uInt16 nIndex) { - sal_Bool bRet = sal_False; + bool bRet = false; sal_uInt16 nLength = 0; nLength = sizeof(pOutlineSettingsArrs)/sizeof(OutlineSettings_Impl*); |