diff options
Diffstat (limited to 'sw/inc/fmtpdsc.hxx')
| -rw-r--r-- | sw/inc/fmtpdsc.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index b52ac1cd6074..307fcb6576ab 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -43,17 +43,17 @@ class IntlWrapper; // Pagedescriptor // Client of SwPageDesc that is "described" by the attribute. -#define IVER_FMTPAGEDESC_NOAUTO ((USHORT)0x0001) -#define IVER_FMTPAGEDESC_LONGPAGE ((USHORT)0x0002) +#define IVER_FMTPAGEDESC_NOAUTO ((sal_uInt16)0x0001) +#define IVER_FMTPAGEDESC_LONGPAGE ((sal_uInt16)0x0002) class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient { // This "Doc"-function is made friend in order to be able // to set the auto-flag after copying!! - friend BOOL InsAttr( SwDoc*, const SwPaM &, const SfxItemSet&, USHORT, + friend sal_Bool InsAttr( SwDoc*, const SwPaM &, const SfxItemSet&, sal_uInt16, SwHistory* ); - USHORT nNumOffset; // Offset page number. - USHORT nDescNameIdx; // SW3-Reader: stringpool-index of style name. + sal_uInt16 nNumOffset; // Offset page number. + sal_uInt16 nDescNameIdx; // SW3-Reader: stringpool-index of style name. SwModify* pDefinedIn; // Points to the object in which the // attribute was set (CntntNode/Format). @@ -73,16 +73,16 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; - 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 ); virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ); SwPageDesc *GetPageDesc() { return (SwPageDesc*)GetRegisteredIn(); } const SwPageDesc *GetPageDesc() const { return (SwPageDesc*)GetRegisteredIn(); } - USHORT GetNumOffset() const { return nNumOffset; } - void SetNumOffset( USHORT nNum ) { nNumOffset = nNum; } + sal_uInt16 GetNumOffset() const { return nNumOffset; } + void SetNumOffset( sal_uInt16 nNum ) { nNumOffset = nNum; } // Query / set where attribute is anchored. inline const SwModify* GetDefinedIn() const { return pDefinedIn; } @@ -90,10 +90,10 @@ public: }; -inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(BOOL bInP) const +inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(sal_Bool bInP) const { return (const SwFmtPageDesc&)Get( RES_PAGEDESC,bInP); } -inline const SwFmtPageDesc &SwFmt::GetPageDesc(BOOL bInP) const +inline const SwFmtPageDesc &SwFmt::GetPageDesc(sal_Bool bInP) const { return aSet.GetPageDesc(bInP); } #endif |