summaryrefslogtreecommitdiff
path: root/cui/source/inc/numpages.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/inc/numpages.hxx')
-rw-r--r--cui/source/inc/numpages.hxx78
1 files changed, 39 insertions, 39 deletions
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index c06924ec90ad..9604f22d7dde 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -81,12 +81,12 @@ class SvxSingleNumPickTabPage : public SfxTabPage
SvxNumSettingsArr_Impl aNumSettingsArr;
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
- USHORT nActNumLvl;
- BOOL bModified : 1;
- BOOL bPreset : 1;
+ sal_uInt16 nActNumLvl;
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
String sNumCharFmtName;
- USHORT nNumItemId;
+ sal_uInt16 nNumItemId;
protected:
DECL_LINK( NumSelectHdl_Impl, ValueSet*);
@@ -102,7 +102,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
@@ -120,10 +120,10 @@ class SvxBulletPickTabPage : public SfxTabPage
SvxNumValueSet* pExamplesVS;
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
- USHORT nActNumLvl;
- BOOL bModified : 1;
- BOOL bPreset : 1;
- USHORT nNumItemId;
+ sal_uInt16 nActNumLvl;
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
+ sal_uInt16 nNumItemId;
String sBulletCharFmtName;
protected:
@@ -139,7 +139,7 @@ class SvxBulletPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void SetCharFmtName(const String& rName){sBulletCharFmtName = rName;}
@@ -165,10 +165,10 @@ class SvxNumPickTabPage : public SfxTabPage
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
- USHORT nActNumLvl;
- USHORT nNumItemId;
- BOOL bModified : 1;
- BOOL bPreset : 1;
+ sal_uInt16 nActNumLvl;
+ sal_uInt16 nNumItemId;
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
protected:
@@ -185,7 +185,7 @@ class SvxNumPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void SetCharFmtNames(const String& rCharName, const String& rBulName)
@@ -211,11 +211,11 @@ class SvxBitmapPickTabPage : public SfxTabPage
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
- USHORT nActNumLvl;
- USHORT nNumItemId;
+ sal_uInt16 nActNumLvl;
+ sal_uInt16 nNumItemId;
SfxMapUnit eCoreUnit;
- BOOL bModified : 1;
- BOOL bPreset : 1;
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
protected:
DECL_LINK( NumSelectHdl_Impl, ValueSet*);
@@ -232,7 +232,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
@@ -292,25 +292,25 @@ class SvxNumOptionsTabPage : public SfxTabPage
Size aInitSize[SVX_MAX_NUM];
- BOOL bLastWidthModified : 1;
- BOOL bModified : 1;
- BOOL bPreset : 1;
- BOOL bAutomaticCharStyles: 1;
- BOOL bHTMLMode : 1;
- BOOL bMenuButtonInitialized : 1;
+ sal_Bool bLastWidthModified : 1;
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
+ sal_Bool bAutomaticCharStyles: 1;
+ sal_Bool bHTMLMode : 1;
+ sal_Bool bMenuButtonInitialized : 1;
List aGrfNames;
Font aActBulletFont;
String sBullet;
String sStartWith;
- BYTE nBullet;
- USHORT nActNumLvl;
- USHORT nNumItemId;
+ sal_uInt8 nBullet;
+ sal_uInt16 nActNumLvl;
+ sal_uInt16 nNumItemId;
SfxMapUnit eCoreUnit;
void InitControls();
- void SwitchNumberType( BYTE nType, BOOL bBmp = FALSE );
+ void SwitchNumberType( sal_uInt8 nType, sal_Bool bBmp = sal_False );
void CheckForStartValue_Impl(sal_uInt16 nNumberingType);
DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * );
@@ -341,7 +341,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void SetCharFmts(const String& rNumName, const String& rBulletName )
@@ -352,7 +352,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
void SetMetric(FieldUnit eSet);
ListBox& GetCharFmtListBox() {return aCharFmtLB;}
- void SetModified(BOOL bRepaint = TRUE);
+ void SetModified(sal_Bool bRepaint = sal_True);
virtual void PageCreated(SfxAllItemSet aSet);
};
@@ -401,13 +401,13 @@ class SvxNumPositionTabPage : public SfxTabPage
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
- USHORT nActNumLvl;
- USHORT nNumItemId;
+ sal_uInt16 nActNumLvl;
+ sal_uInt16 nNumItemId;
SfxMapUnit eCoreUnit;
- BOOL bModified : 1;
- BOOL bPreset : 1;
- BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
+ sal_Bool bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein
bool bLabelAlignmentPosAndSpaceModeActive;
void InitControls();
@@ -433,14 +433,14 @@ public:
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
void SetMetric(FieldUnit eSet);
- void SetModified(BOOL bRepaint = TRUE);
+ void SetModified(sal_Bool bRepaint = sal_True);
virtual void PageCreated(SfxAllItemSet aSet);
};