summaryrefslogtreecommitdiff
path: root/editeng/inc/editeng/numitem.hxx
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2011-01-10 14:47:04 +0100
committerCarsten Driesner <cd@openoffice.org>2011-01-10 14:47:04 +0100
commit12149cec8bcaf0e234def8d435025f07be24e15b (patch)
tree7c18020b6c9877ee3e1e6cfeb4920df49ebdf643 /editeng/inc/editeng/numitem.hxx
parentf8431bc530cabfe39df3918b994269dded8d7f8c (diff)
removetooltypes01: #i112600# First part remove tools types from editeng
Diffstat (limited to 'editeng/inc/editeng/numitem.hxx')
-rw-r--r--editeng/inc/editeng/numitem.hxx112
1 files changed, 56 insertions, 56 deletions
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 101518b227c4..fb1051e38c78 100644
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -55,7 +55,7 @@ namespace com{namespace sun{ namespace star{
}}}
// -----------------------------------------------------------------------
-//Feature-Flags (only USHORT!)
+//Feature-Flags (only sal_uInt16!)
#define NUM_CONTINUOUS 0x0001 // fortlaufende Numerierung moeglich?
#define NUM_CHAR_TEXT_DISTANCE 0x0002 // Abstand Symbol<->Text?
#define NUM_CHAR_STYLE 0x0004 // Zeichenvorlagen?
@@ -83,8 +83,8 @@ public:
SvxNumberType(const SvxNumberType& rType);
~SvxNumberType();
- String GetNumStr( ULONG nNo ) const;
- String GetNumStr( ULONG nNo, const com::sun::star::lang::Locale& rLocale ) const;
+ String GetNumStr( sal_uInt32 nNo ) const;
+ String GetNumStr( sal_uInt32 nNo, const com::sun::star::lang::Locale& rLocale ) const;
void SetNumberingType(sal_Int16 nSet) {nNumType = nSet;}
sal_Int16 GetNumberingType() const {return nNumType;}
@@ -123,11 +123,11 @@ private:
SvxAdjust eNumAdjust;
- BYTE nInclUpperLevels; //Nummern aus der vorigen Ebenen uebernehmen
- USHORT nStart; //Start der Zaehlung
+ sal_uInt8 nInclUpperLevels; //Nummern aus der vorigen Ebenen uebernehmen
+ sal_uInt16 nStart; //Start der Zaehlung
sal_Unicode cBullet; //Symbol
- USHORT nBulletRelSize; //proz. Groesse des Bullets
+ sal_uInt16 nBulletRelSize; //proz. Groesse des Bullets
Color nBulletColor; //Bullet color
// --> OD 2008-01-08 #newlistlevelattrs#
@@ -185,8 +185,8 @@ public:
SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter);
SvxNumberFormat& operator=( const SvxNumberFormat& );
- BOOL operator==( const SvxNumberFormat& ) const;
- BOOL operator!=( const SvxNumberFormat& rFmt) const {return !(*this == rFmt);}
+ sal_Bool operator==( const SvxNumberFormat& ) const;
+ sal_Bool operator!=( const SvxNumberFormat& rFmt) const {return !(*this == rFmt);}
void SetNumAdjust(SvxAdjust eSet) {eNumAdjust = eSet;}
SvxAdjust GetNumAdjust() const {return eNumAdjust;}
@@ -202,15 +202,15 @@ public:
const Font* GetBulletFont() const {return pBulletFont;}
void SetBulletChar(sal_Unicode cSet){cBullet = cSet;}
sal_Unicode GetBulletChar()const {return cBullet;}
- void SetBulletRelSize(USHORT nSet) {nBulletRelSize = nSet;}
- USHORT GetBulletRelSize() const { return nBulletRelSize;}
+ void SetBulletRelSize(sal_uInt16 nSet) {nBulletRelSize = nSet;}
+ sal_uInt16 GetBulletRelSize() const { return nBulletRelSize;}
void SetBulletColor(Color nSet){nBulletColor = nSet;}
Color GetBulletColor()const {return nBulletColor;}
- void SetIncludeUpperLevels( BYTE nSet ) { nInclUpperLevels = nSet;}
- BYTE GetIncludeUpperLevels()const { return nInclUpperLevels;}
- void SetStart(USHORT nSet) {nStart = nSet;}
- USHORT GetStart() const {return nStart;}
+ void SetIncludeUpperLevels( sal_uInt8 nSet ) { nInclUpperLevels = nSet;}
+ sal_uInt8 GetIncludeUpperLevels()const { return nInclUpperLevels;}
+ void SetStart(sal_uInt16 nSet) {nStart = nSet;}
+ sal_uInt16 GetStart() const {return nStart;}
virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const sal_Int16* pOrient = 0);
const SvxBrushItem* GetBrush() const {return pGraphicBrush;}
@@ -254,7 +254,7 @@ public:
// <--
static Size GetGraphicSizeMM100(const Graphic* pGraphic);
- static String CreateRomanString( ULONG nNo, BOOL bUpper );
+ static String CreateRomanString( sal_uInt32 nNo, sal_Bool bUpper );
};
enum SvxNumRuleType
@@ -267,21 +267,21 @@ enum SvxNumRuleType
class EDITENG_DLLPUBLIC SvxNumRule
{
- USHORT nLevelCount; // Anzahl der unterstuetzten Levels
- ULONG nFeatureFlags; // was wird unterstuetzt?
+ sal_uInt16 nLevelCount; // Anzahl der unterstuetzten Levels
+ sal_uInt32 nFeatureFlags; // was wird unterstuetzt?
SvxNumRuleType eNumberingType; // was fuer eine Numerierung
- BOOL bContinuousNumbering; // fortlaufende Numerierung
+ sal_Bool bContinuousNumbering; // fortlaufende Numerierung
SvxNumberFormat* aFmts[SVX_MAX_NUM];
- BOOL aFmtsSet[SVX_MAX_NUM]; //Flags ueber Gueltigkeit der Ebenen
+ sal_Bool aFmtsSet[SVX_MAX_NUM]; //Flags ueber Gueltigkeit der Ebenen
static sal_Int32 nRefCount;
com::sun::star::lang::Locale aLocale;
public:
// --> OD 2008-02-11 #newlistlevelattrs#
- SvxNumRule( ULONG nFeatures,
- USHORT nLevels,
- BOOL bCont,
+ SvxNumRule( sal_uInt32 nFeatures,
+ sal_uInt16 nLevels,
+ sal_Bool bCont,
SvxNumRuleType eType = SVX_RULETYPE_NUMBERING,
SvxNumberFormat::SvxNumPositionAndSpaceMode
eDefaultNumberFormatPositionAndSpaceMode
@@ -298,28 +298,28 @@ public:
SvStream& Store(SvStream &rStream);
- const SvxNumberFormat* Get(USHORT nLevel)const;
- const SvxNumberFormat& GetLevel(USHORT nLevel)const;
- void SetLevel(USHORT nLevel, const SvxNumberFormat& rFmt, BOOL bIsValid = TRUE);
- void SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt);
+ const SvxNumberFormat* Get(sal_uInt16 nLevel)const;
+ const SvxNumberFormat& GetLevel(sal_uInt16 nLevel)const;
+ void SetLevel(sal_uInt16 nLevel, const SvxNumberFormat& rFmt, sal_Bool bIsValid = sal_True);
+ void SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt);
- BOOL IsContinuousNumbering()const
+ sal_Bool IsContinuousNumbering()const
{return bContinuousNumbering;}
- void SetContinuousNumbering(BOOL bSet)
+ void SetContinuousNumbering(sal_Bool bSet)
{bContinuousNumbering = bSet;}
- USHORT GetLevelCount() const {return nLevelCount;}
- BOOL IsFeatureSupported(ULONG nFeature) const
+ sal_uInt16 GetLevelCount() const {return nLevelCount;}
+ sal_Bool IsFeatureSupported(sal_uInt32 nFeature) const
{return 0 != (nFeatureFlags & nFeature);}
- ULONG GetFeatureFlags() const {return nFeatureFlags;}
- void SetFeatureFlag( ULONG nFlag, BOOL bSet = TRUE ) { if(bSet) nFeatureFlags |= nFlag; else nFeatureFlags &= ~nFlag; }
+ sal_uInt32 GetFeatureFlags() const {return nFeatureFlags;}
+ void SetFeatureFlag( sal_uInt32 nFlag, sal_Bool bSet = sal_True ) { if(bSet) nFeatureFlags |= nFlag; else nFeatureFlags &= ~nFlag; }
- String MakeNumString( const SvxNodeNum&, BOOL bInclStrings = TRUE ) const;
+ String MakeNumString( const SvxNodeNum&, sal_Bool bInclStrings = sal_True ) const;
SvxNumRuleType GetNumRuleType() const { return eNumberingType; }
void SetNumRuleType( const SvxNumRuleType& rType ) { eNumberingType = rType; }
- BOOL UnLinkGraphics();
+ sal_Bool UnLinkGraphics();
};
/* -----------------27.10.98 13:04-------------------
*
@@ -329,50 +329,50 @@ class EDITENG_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
SvxNumRule* pNumRule;
public:
SvxNumBulletItem(SvxNumRule& rRule);
- SvxNumBulletItem(SvxNumRule& rRule, USHORT nWhich );
+ SvxNumBulletItem(SvxNumRule& rRule, sal_uInt16 nWhich );
SvxNumBulletItem(const SvxNumBulletItem& rCopy);
virtual ~SvxNumBulletItem();
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, USHORT) const;
- USHORT GetVersion( USHORT nFileVersion ) const;
- virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const;
virtual int operator==( const SfxPoolItem& ) const;
SvxNumRule* GetNumRule() const {return pNumRule;}
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
/* -----------------28.10.98 15:21-------------------
*
* --------------------------------------------------*/
class SvxNodeNum
{
- USHORT nLevelVal[ SVX_MAX_NUM ]; // Nummern aller Levels
- USHORT nSetValue; // vorgegebene Nummer
- BYTE nMyLevel; // akt. Level
- BOOL bStartNum; // Numerierung neu starten
+ sal_uInt16 nLevelVal[ SVX_MAX_NUM ]; // Nummern aller Levels
+ sal_uInt16 nSetValue; // vorgegebene Nummer
+ sal_uInt8 nMyLevel; // akt. Level
+ sal_Bool bStartNum; // Numerierung neu starten
public:
- inline SvxNodeNum( BYTE nLevel = SVX_NO_NUM, USHORT nSetVal = USHRT_MAX );
+ inline SvxNodeNum( sal_uInt8 nLevel = SVX_NO_NUM, sal_uInt16 nSetVal = USHRT_MAX );
inline SvxNodeNum& operator=( const SvxNodeNum& rCpy );
- BYTE GetLevel() const { return nMyLevel; }
- void SetLevel( BYTE nVal ) { nMyLevel = nVal; }
+ sal_uInt8 GetLevel() const { return nMyLevel; }
+ void SetLevel( sal_uInt8 nVal ) { nMyLevel = nVal; }
- BOOL IsStart() const { return bStartNum; }
- void SetStart( BOOL bFlag = TRUE ) { bStartNum = bFlag; }
+ sal_Bool IsStart() const { return bStartNum; }
+ void SetStart( sal_Bool bFlag = sal_True ) { bStartNum = bFlag; }
- USHORT GetSetValue() const { return nSetValue; }
- void SetSetValue( USHORT nVal ) { nSetValue = nVal; }
+ sal_uInt16 GetSetValue() const { return nSetValue; }
+ void SetSetValue( sal_uInt16 nVal ) { nSetValue = nVal; }
- const USHORT* GetLevelVal() const { return nLevelVal; }
- USHORT* GetLevelVal() { return nLevelVal; }
+ const sal_uInt16* GetLevelVal() const { return nLevelVal; }
+ sal_uInt16* GetLevelVal() { return nLevelVal; }
};
-SvxNodeNum::SvxNodeNum( BYTE nLevel, USHORT nSetVal )
- : nSetValue( nSetVal ), nMyLevel( nLevel ), bStartNum( FALSE )
+SvxNodeNum::SvxNodeNum( sal_uInt8 nLevel, sal_uInt16 nSetVal )
+ : nSetValue( nSetVal ), nMyLevel( nLevel ), bStartNum( sal_False )
{
memset( nLevelVal, 0, sizeof( nLevelVal ) );
}
@@ -390,7 +390,7 @@ inline SvxNodeNum& SvxNodeNum::operator=( const SvxNodeNum& rCpy )
/* --------------------------------------------------
*
* --------------------------------------------------*/
-SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, USHORT nLevel, SvxNumRuleType eType );
+SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, sal_uInt16 nLevel, SvxNumRuleType eType );
#endif