summaryrefslogtreecommitdiff
path: root/editeng/inc/editeng/numitem.hxx
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-18 15:49:47 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-18 15:49:47 +0100
commit091e4aee3386f3bfee081dc8646494e0eb97f88a (patch)
treedd79298b4e8729ca7dc874274d4a33ea88fe107d /editeng/inc/editeng/numitem.hxx
parentf0681adbf092e2b455db52535f2df882bc87343a (diff)
parent224bd63b3fa459baa0a6bb5cd03f5dc2ca475d82 (diff)
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts: avmedia/source/framework/mediacontrol.cxx connectivity/source/commontools/DateConversion.cxx desktop/source/deployment/registry/component/dp_component.cxx editeng/inc/editeng/numitem.hxx editeng/inc/editeng/txtrange.hxx editeng/source/editeng/editobj.cxx editeng/source/editeng/editview.cxx editeng/source/editeng/eehtml.cxx editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit4.cxx editeng/source/misc/txtrange.cxx editeng/source/outliner/outlin2.cxx editeng/source/outliner/outlvw.cxx framework/source/layoutmanager/layoutmanager.cxx linguistic/source/lngsvcmgr.hxx sfx2/source/appl/app.cxx sfx2/source/appl/app.src sfx2/source/appl/appbas.cxx sfx2/source/appl/appcfg.cxx sfx2/source/appl/appdde.cxx sfx2/source/appl/appmain.cxx sfx2/source/appl/appopen.cxx sfx2/source/appl/appquit.cxx sfx2/source/appl/appserv.cxx sfx2/source/appl/childwin.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/fileobj.hxx sfx2/source/appl/workwin.cxx sfx2/source/control/dispatch.cxx sfx2/source/control/macro.cxx sfx2/source/control/objface.cxx sfx2/source/control/request.cxx sfx2/source/control/shell.cxx sfx2/source/control/statcach.cxx sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dockwin.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodelapi.cxx sfx2/source/dialog/mgetempl.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/styledlg.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/dialog/tplcitem.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/doc/doctempl.cxx sfx2/source/doc/docvor.cxx sfx2/source/doc/new.cxx sfx2/source/doc/objcont.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/objxtor.cxx sfx2/source/inc/appdata.hxx sfx2/source/inc/helpid.hrc sfx2/source/inc/sfxlocal.hrc sfx2/source/inc/statcach.hxx sfx2/source/inc/templdgi.hxx sfx2/source/inc/virtmenu.hxx sfx2/source/inc/workwin.hxx sfx2/source/menu/mnumgr.cxx sfx2/source/menu/virtmenu.cxx sfx2/source/statbar/stbitem.cxx sfx2/source/view/frame.cxx sfx2/source/view/frame2.cxx sfx2/source/view/orgmgr.cxx sfx2/source/view/printer.cxx sfx2/source/view/prnmon.cxx sfx2/source/view/sfxbasecontroller.cxx sfx2/source/view/viewfrm.cxx sfx2/source/view/viewfrm2.cxx sfx2/source/view/viewprn.cxx sfx2/source/view/viewsh.cxx svx/inc/svx/svditer.hxx svx/source/dialog/sdstring.src svx/source/form/fmpage.cxx svx/source/form/formcontroller.cxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svditer.cxx svx/source/svdraw/svdview.cxx xmloff/source/forms/elementimport.cxx
Diffstat (limited to 'editeng/inc/editeng/numitem.hxx')
-rwxr-xr-x[-rw-r--r--]editeng/inc/editeng/numitem.hxx113
1 files changed, 56 insertions, 57 deletions
diff --git a/editeng/inc/editeng/numitem.hxx b/editeng/inc/editeng/numitem.hxx
index 13183ce69756..32d771cf00ac 100644..100755
--- a/editeng/inc/editeng/numitem.hxx
+++ b/editeng/inc/editeng/numitem.hxx
@@ -56,7 +56,7 @@ namespace com{namespace sun{ namespace star{
}}}
// -----------------------------------------------------------------------
-//Feature-Flags (only USHORT!)
+//Feature-Flags (only sal_uInt16!)
#define NUM_CONTINUOUS 0x0001 // consecutive numbers possible?
#define NUM_CHAR_TEXT_DISTANCE 0x0002 // Distance Symbol<->Text?
#define NUM_CHAR_STYLE 0x0004 // Character styles?
@@ -84,8 +84,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_uLong nNo ) const;
+ String GetNumStr( sal_uLong nNo, const com::sun::star::lang::Locale& rLocale ) const;
void SetNumberingType(sal_Int16 nSet) {nNumType = nSet;}
sal_Int16 GetNumberingType() const {return nNumType;}
@@ -122,11 +122,11 @@ private:
SvxAdjust eNumAdjust;
- BYTE nInclUpperLevels; // Take over numbers from the previous level.
- USHORT nStart; // Start of counting
+ sal_uInt8 nInclUpperLevels; // Take over numbers from the previous level.
+ sal_uInt16 nStart; // Start of counting
sal_Unicode cBullet; // Symbol
- USHORT nBulletRelSize; // percentage size of bullets
+ sal_uInt16 nBulletRelSize; // percentage size of bullets
Color nBulletColor; // Bullet color
// mode indicating, if the position and spacing of the list label is
@@ -178,8 +178,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;}
@@ -195,15 +195,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;}
@@ -235,7 +235,7 @@ public:
long GetIndentAt() const;
static Size GetGraphicSizeMM100(const Graphic* pGraphic);
- static String CreateRomanString( ULONG nNo, BOOL bUpper );
+ static String CreateRomanString( sal_uLong nNo, sal_Bool bUpper );
};
enum SvxNumRuleType
@@ -248,20 +248,20 @@ enum SvxNumRuleType
class EDITENG_DLLPUBLIC SvxNumRule
{
- USHORT nLevelCount; // Number of supported levels
- ULONG nFeatureFlags; // What is supported?
+ sal_uInt16 nLevelCount; // Number of supported levels
+ sal_uInt32 nFeatureFlags; // What is supported?
SvxNumRuleType eNumberingType; // Type of numbering
- BOOL bContinuousNumbering; // sequential numbering
+ sal_Bool bContinuousNumbering; // sequential numbering
SvxNumberFormat* aFmts[SVX_MAX_NUM];
- BOOL aFmtsSet[SVX_MAX_NUM]; // Flags indicating valid levels
+ sal_Bool aFmtsSet[SVX_MAX_NUM]; // Flags indicating valid levels
static sal_Int32 nRefCount;
com::sun::star::lang::Locale aLocale;
public:
- SvxNumRule( ULONG nFeatures,
- USHORT nLevels,
- BOOL bCont,
+ SvxNumRule( sal_uLong nFeatures,
+ sal_uInt16 nLevels,
+ sal_Bool bCont,
SvxNumRuleType eType = SVX_RULETYPE_NUMBERING,
SvxNumberFormat::SvxNumPositionAndSpaceMode
eDefaultNumberFormatPositionAndSpaceMode
@@ -277,28 +277,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();
};
class EDITENG_DLLPUBLIC SvxNumBulletItem : public SfxPoolItem
@@ -306,48 +306,48 @@ 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 bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
class SvxNodeNum
{
- USHORT nLevelVal[ SVX_MAX_NUM ]; // Numbers of all levels
- USHORT nSetValue; // predetermined number
- BYTE nMyLevel; // Current Level
- BOOL bStartNum; // Restart numbering
+ sal_uInt16 nLevelVal[ SVX_MAX_NUM ]; // Numbers of all levels
+ sal_uInt16 nSetValue; // predetermined number
+ sal_uInt8 nMyLevel; // Current Level
+ sal_Bool bStartNum; // Restart numbering
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 ) );
}
@@ -362,8 +362,7 @@ inline SvxNodeNum& SvxNodeNum::operator=( const SvxNodeNum& rCpy )
return *this;
}
-
-SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, USHORT nLevel, SvxNumRuleType eType );
+SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, sal_uInt16 nLevel, SvxNumRuleType eType );
#endif