Skip to content

C
core
Kaydet (Commit) 729c93c1 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

svx: sal_Bool->bool 

Change-Id: Ieb21d01fef7b25fc3b6326108d451fe239c9b461
üst c72ce293
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 41 deletions
include/svx/nbdtmg.hxx
Dosyayı görüntüle @ 729c93c1
...@@ -87,12 +87,12 @@ typedef std::vector< boost::shared_ptr<NumSettings_Impl> > NumSettingsArr_Impl; ...@@ -87,12 +87,12 @@ typedef std::vector< boost::shared_ptr<NumSettings_Impl> > NumSettingsArr_Impl;
class SVX_DLLPUBLIC BulletsSettings class SVX_DLLPUBLIC BulletsSettings
{ {
public: public:
sal_Bool bIsCustomized; bool bIsCustomized;
rtl::OUString sDescription; rtl::OUString sDescription;
NBType eType; NBType eType;
public: public:
BulletsSettings(NBType eTy) : BulletsSettings(NBType eTy) :
bIsCustomized(sal_False), bIsCustomized(false),
eType(eTy) eType(eTy)
{} {}
virtual ~BulletsSettings(){} virtual ~BulletsSettings(){}
...@@ -150,14 +150,14 @@ class SVX_DLLPUBLIC MixBulletsSettings_Impl ...@@ -150,14 +150,14 @@ class SVX_DLLPUBLIC MixBulletsSettings_Impl
class SVX_DLLPUBLIC NumberSettings_Impl class SVX_DLLPUBLIC NumberSettings_Impl
{ {
public: public:
sal_Bool bIsCustomized; bool bIsCustomized;
rtl::OUString sDescription; rtl::OUString sDescription;
sal_uInt16 nIndex; //index in the tab page display sal_uInt16 nIndex; //index in the tab page display
sal_uInt16 nIndexDefault; sal_uInt16 nIndexDefault;
NumSettings_Impl *pNumSetting; NumSettings_Impl *pNumSetting;
public: public:
NumberSettings_Impl() : NumberSettings_Impl() :
bIsCustomized(sal_False), bIsCustomized(false),
nIndex((sal_uInt16)0xFFFF), nIndex((sal_uInt16)0xFFFF),
nIndexDefault((sal_uInt16)0xFFFF), nIndexDefault((sal_uInt16)0xFFFF),
pNumSetting(NULL) pNumSetting(NULL)
...@@ -171,12 +171,12 @@ typedef std::vector< boost::shared_ptr<NumberSettings_Impl> > NumberSettingsArr_ ...@@ -171,12 +171,12 @@ typedef std::vector< boost::shared_ptr<NumberSettings_Impl> > NumberSettingsArr_
class SVX_DLLPUBLIC OutlineSettings_Impl class SVX_DLLPUBLIC OutlineSettings_Impl
{ {
public: public:
sal_Bool bIsCustomized; bool bIsCustomized;
rtl::OUString sDescription; rtl::OUString sDescription;
NumSettingsArr_Impl *pNumSettingsArr; NumSettingsArr_Impl *pNumSettingsArr;
public: public:
OutlineSettings_Impl() : OutlineSettings_Impl() :
bIsCustomized(sal_False), bIsCustomized(false),
pNumSettingsArr(NULL) pNumSettingsArr(NULL)
{} {}
~OutlineSettings_Impl(){ ~OutlineSettings_Impl(){
...@@ -221,10 +221,10 @@ class SVX_DLLPUBLIC NBOTypeMgrBase ...@@ -221,10 +221,10 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
virtual ~NBOTypeMgrBase() {} virtual ~NBOTypeMgrBase() {}
virtual void Init()=0; virtual void Init()=0;
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0)=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 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 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,sal_Bool isDefault=false)=0; virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false)=0;
virtual sal_Bool IsCustomized(sal_uInt16 nIndex)=0; virtual bool IsCustomized(sal_uInt16 nIndex)=0;
sal_uInt16 IsSingleLevel(sal_uInt16 nCurLevel); sal_uInt16 IsSingleLevel(sal_uInt16 nCurLevel);
const SfxItemSet* GetItems() { return pSet;} const SfxItemSet* GetItems() { return pSet;}
// store the attributes passed from pSet // store the attributes passed from pSet
...@@ -254,10 +254,10 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase ...@@ -254,10 +254,10 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
virtual ~BulletsTypeMgr() {} virtual ~BulletsTypeMgr() {}
virtual void Init(); virtual void Init();
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); 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 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 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,sal_Bool isDefault=false); virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false);
virtual sal_Bool IsCustomized(sal_uInt16 nIndex); virtual bool IsCustomized(sal_uInt16 nIndex);
sal_Unicode GetBulChar(sal_uInt16 nIndex); sal_Unicode GetBulChar(sal_uInt16 nIndex);
Font GetBulCharFont(sal_uInt16 nIndex); Font GetBulCharFont(sal_uInt16 nIndex);
static BulletsTypeMgr& GetInstance(); static BulletsTypeMgr& GetInstance();
...@@ -276,10 +276,10 @@ class SVX_DLLPUBLIC GraphyicBulletsTypeMgr: public NBOTypeMgrBase ...@@ -276,10 +276,10 @@ class SVX_DLLPUBLIC GraphyicBulletsTypeMgr: public NBOTypeMgrBase
virtual ~GraphyicBulletsTypeMgr(); virtual ~GraphyicBulletsTypeMgr();
virtual void Init(); virtual void Init();
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); 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 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 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,sal_Bool isDefault=false); virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false);
virtual sal_Bool IsCustomized(sal_uInt16 nIndex); virtual bool IsCustomized(sal_uInt16 nIndex);
OUString GetGrfName(sal_uInt16 nIndex); OUString GetGrfName(sal_uInt16 nIndex);
static GraphyicBulletsTypeMgr& GetInstance(); static GraphyicBulletsTypeMgr& GetInstance();
}; };
...@@ -297,10 +297,10 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase ...@@ -297,10 +297,10 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase
virtual ~MixBulletsTypeMgr() {} virtual ~MixBulletsTypeMgr() {}
virtual void Init(); virtual void Init();
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); 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 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 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,sal_Bool isDefault=false); virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false);
virtual sal_Bool IsCustomized(sal_uInt16 nIndex); virtual bool IsCustomized(sal_uInt16 nIndex);
static MixBulletsTypeMgr& GetInstance(); static MixBulletsTypeMgr& GetInstance();
}; };
...@@ -315,10 +315,10 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase ...@@ -315,10 +315,10 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase
virtual ~NumberingTypeMgr(); virtual ~NumberingTypeMgr();
virtual void Init(); virtual void Init();
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); 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 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 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,sal_Bool isDefault=false); virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false);
virtual sal_Bool IsCustomized(sal_uInt16 nIndex); virtual bool IsCustomized(sal_uInt16 nIndex);
static NumberingTypeMgr& GetInstance(); static NumberingTypeMgr& GetInstance();
}; };
...@@ -333,10 +333,10 @@ class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase ...@@ -333,10 +333,10 @@ class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase
virtual ~OutlineTypeMgr() {} virtual ~OutlineTypeMgr() {}
virtual void Init(); virtual void Init();
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); 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 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 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,sal_Bool isDefault=false); virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false);
virtual sal_Bool IsCustomized(sal_uInt16 nIndex); virtual bool IsCustomized(sal_uInt16 nIndex);
static OutlineTypeMgr& GetInstance(); static OutlineTypeMgr& GetInstance();
}; };
}} }}
......
include/svx/numvset.hxx
Dosyayı görüntüle @ 729c93c1
...@@ -49,8 +49,8 @@ struct SvxBmpItemInfo ...@@ -49,8 +49,8 @@ struct SvxBmpItemInfo
class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
{ {
Color aLineColor; Color aLineColor;
sal_uInt16 nPageType; sal_uInt16 nPageType;
sal_Bool bHTMLMode; bool bHTMLMode;
Rectangle aOrgRect; Rectangle aOrgRect;
VirtualDevice* pVDev; VirtualDevice* pVDev;
...@@ -72,7 +72,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet ...@@ -72,7 +72,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void UserDraw( const UserDrawEvent& rUDEvt );
void SetHTMLMode(sal_Bool bSet) {bHTMLMode = bSet;} void SetHTMLMode(bool bSet) {bHTMLMode = bSet;}
void SetNumberingSettings( void SetNumberingSettings(
const com::sun::star::uno::Sequence< const com::sun::star::uno::Sequence<
com::sun::star::uno::Sequence< com::sun::star::uno::Sequence<
...@@ -92,15 +92,15 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet ...@@ -92,15 +92,15 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
{ {
OUString sBullets; OUString sBullets;
Timer aFormatTimer; Timer aFormatTimer;
sal_Bool bGrfNotFound; bool bGrfNotFound;
void init(); void init();
protected: protected:
DECL_LINK(FormatHdl_Impl, void *); DECL_LINK(FormatHdl_Impl, void *);
void SetGrfNotFound(sal_Bool bSet) {bGrfNotFound = bSet;} void SetGrfNotFound(bool bSet) {bGrfNotFound = bSet;}
sal_Bool IsGrfNotFound()const {return bGrfNotFound;} bool IsGrfNotFound()const {return bGrfNotFound;}
Timer& GetFormatTimer() {return aFormatTimer;} Timer& GetFormatTimer() {return aFormatTimer;}
......
svx/source/dialog/svxbmpnumvalueset.cxx
Dosyayı görüntüle @ 729c93c1
...@@ -403,7 +403,7 @@ void SvxNumValueSet::init(sal_uInt16 nType) ...@@ -403,7 +403,7 @@ void SvxNumValueSet::init(sal_uInt16 nType)
{ {
aLineColor = COL_LIGHTGRAY; aLineColor = COL_LIGHTGRAY;
nPageType = nType; nPageType = nType;
bHTMLMode = sal_False; bHTMLMode = false;
pVDev = NULL; pVDev = NULL;
SetColCount( 4 ); SetColCount( 4 );
...@@ -474,7 +474,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxBmpNumValueSet(Window *p ...@@ -474,7 +474,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxBmpNumValueSet(Window *p
void SvxBmpNumValueSet::init() void SvxBmpNumValueSet::init()
{ {
SvxNumValueSet::init(NUM_PAGETYPE_BMP); SvxNumValueSet::init(NUM_PAGETYPE_BMP);
bGrfNotFound = sal_False; bGrfNotFound = false;
GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS); GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
SetStyle( GetStyle() | WB_VSCROLL ); SetStyle( GetStyle() | WB_VSCROLL );
SetLineCount( 3 ); SetLineCount( 3 );
...@@ -505,7 +505,7 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) ...@@ -505,7 +505,7 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1, if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1,
&aGraphic, NULL)) &aGraphic, NULL))
{ {
bGrfNotFound = sal_True; bGrfNotFound = true;
} }
else else
{ {
...@@ -524,7 +524,7 @@ IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl) ...@@ -524,7 +524,7 @@ IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl)
// only when a graphics was not there, it needs to be formatted // only when a graphics was not there, it needs to be formatted
if(bGrfNotFound) if(bGrfNotFound)
{ {
bGrfNotFound = sal_False; bGrfNotFound = false;
Format(); Format();
} }
Invalidate(); Invalidate();
......
svx/source/sidebar/nbdtmg.cxx
Dosyayı görüntüle @ 729c93c1
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment