summaryrefslogtreecommitdiff
path: root/sc/inc/attrib.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/inc/attrib.hxx')
-rw-r--r--sc/inc/attrib.hxx122
1 files changed, 61 insertions, 61 deletions
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 96a0529c48a1..d72c41037ae2 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -54,7 +54,7 @@
class EditTextObject;
class SvxBorderLine;
-BOOL SC_DLLPUBLIC ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther );
+sal_Bool SC_DLLPUBLIC ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther );
//------------------------------------------------------------------------
@@ -73,12 +73,12 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const;
SCsCOL GetColMerge() const {return nColMerge; }
SCsROW GetRowMerge() const {return nRowMerge; }
- BOOL IsMerged() const { return nColMerge>1 || nRowMerge>1; }
+ sal_Bool IsMerged() const { return nColMerge>1 || nRowMerge>1; }
inline ScMergeAttr& operator=(const ScMergeAttr& rMerge)
{
@@ -94,34 +94,34 @@ class SC_DLLPUBLIC ScMergeFlagAttr: public SfxInt16Item
{
public:
ScMergeFlagAttr();
- ScMergeFlagAttr(INT16 nFlags);
+ ScMergeFlagAttr(sal_Int16 nFlags);
~ScMergeFlagAttr();
- BOOL IsHorOverlapped() const { return ( GetValue() & SC_MF_HOR ) != 0; }
- BOOL IsVerOverlapped() const { return ( GetValue() & SC_MF_VER ) != 0; }
- BOOL IsOverlapped() const { return ( GetValue() & ( SC_MF_HOR | SC_MF_VER ) ) != 0; }
+ sal_Bool IsHorOverlapped() const { return ( GetValue() & SC_MF_HOR ) != 0; }
+ sal_Bool IsVerOverlapped() const { return ( GetValue() & SC_MF_VER ) != 0; }
+ sal_Bool IsOverlapped() const { return ( GetValue() & ( SC_MF_HOR | SC_MF_VER ) ) != 0; }
- BOOL HasAutoFilter() const { return ( GetValue() & SC_MF_AUTO ) != 0; }
- BOOL HasButton() const { return ( GetValue() & SC_MF_BUTTON ) != 0; }
+ sal_Bool HasAutoFilter() const { return ( GetValue() & SC_MF_AUTO ) != 0; }
+ sal_Bool HasButton() const { return ( GetValue() & SC_MF_BUTTON ) != 0; }
bool HasDPTable() const { return ( GetValue() & SC_MF_DP_TABLE ) != 0; }
- BOOL IsScenario() const { return ( GetValue() & SC_MF_SCENARIO ) != 0; }
+ sal_Bool IsScenario() const { return ( GetValue() & SC_MF_SCENARIO ) != 0; }
};
//------------------------------------------------------------------------
class SC_DLLPUBLIC ScProtectionAttr: public SfxPoolItem
{
- BOOL bProtection; // Zelle schuetzen
- BOOL bHideFormula; // Formel nicht Anzeigen
- BOOL bHideCell; // Zelle nicht Anzeigen
- BOOL bHidePrint; // Zelle nicht Ausdrucken
+ sal_Bool bProtection; // Zelle schuetzen
+ sal_Bool bHideFormula; // Formel nicht Anzeigen
+ sal_Bool bHideCell; // Zelle nicht Anzeigen
+ sal_Bool bHidePrint; // Zelle nicht Ausdrucken
public:
TYPEINFO();
ScProtectionAttr();
- ScProtectionAttr( BOOL bProtect,
- BOOL bHFormula = FALSE,
- BOOL bHCell = FALSE,
- BOOL bHPrint = FALSE);
+ ScProtectionAttr( sal_Bool bProtect,
+ sal_Bool bHFormula = sal_False,
+ sal_Bool bHCell = sal_False,
+ sal_Bool bHPrint = sal_False);
ScProtectionAttr( const ScProtectionAttr& );
~ScProtectionAttr();
@@ -135,19 +135,19 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) 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 );
-
- BOOL GetProtection() const { return bProtection; }
- BOOL SetProtection( BOOL bProtect);
- BOOL GetHideFormula() const { return bHideFormula; }
- BOOL SetHideFormula( BOOL bHFormula);
- BOOL GetHideCell() const { return bHideCell; }
- BOOL SetHideCell( BOOL bHCell);
- BOOL GetHidePrint() const { return bHidePrint; }
- BOOL SetHidePrint( BOOL bHPrint);
+ virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const;
+
+ 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 );
+
+ sal_Bool GetProtection() const { return bProtection; }
+ sal_Bool SetProtection( sal_Bool bProtect);
+ sal_Bool GetHideFormula() const { return bHideFormula; }
+ sal_Bool SetHideFormula( sal_Bool bHFormula);
+ sal_Bool GetHideCell() const { return bHideCell; }
+ sal_Bool SetHideCell( sal_Bool bHCell);
+ sal_Bool GetHidePrint() const { return bHidePrint; }
+ sal_Bool SetHidePrint( sal_Bool bHPrint);
inline ScProtectionAttr& operator=(const ScProtectionAttr& rProtection)
{
bProtection = rProtection.bProtection;
@@ -171,10 +171,10 @@ class ScRangeItem : public SfxPoolItem
public:
TYPEINFO();
- inline ScRangeItem( const USHORT nWhich );
- inline ScRangeItem( const USHORT nWhich,
+ inline ScRangeItem( const sal_uInt16 nWhich );
+ inline ScRangeItem( const sal_uInt16 nWhich,
const ScRange& rRange,
- const USHORT nNewFlags = 0 );
+ const sal_uInt16 nNewFlags = 0 );
inline ScRangeItem( const ScRangeItem& rCpy );
inline ScRangeItem& operator=( const ScRangeItem &rCpy );
@@ -191,22 +191,22 @@ public:
const ScRange& GetRange() const { return aRange; }
void SetRange( const ScRange& rNew ) { aRange = rNew; }
- USHORT GetFlags() const { return nFlags; }
- void SetFlags( USHORT nNew ) { nFlags = nNew; }
+ sal_uInt16 GetFlags() const { return nFlags; }
+ void SetFlags( sal_uInt16 nNew ) { nFlags = nNew; }
private:
ScRange aRange;
- USHORT nFlags;
+ sal_uInt16 nFlags;
};
-inline ScRangeItem::ScRangeItem( const USHORT nWhichP )
+inline ScRangeItem::ScRangeItem( const sal_uInt16 nWhichP )
: SfxPoolItem( nWhichP ), nFlags( SCR_INVALID ) // == ungueltige Area
{
}
-inline ScRangeItem::ScRangeItem( const USHORT nWhichP,
+inline ScRangeItem::ScRangeItem( const sal_uInt16 nWhichP,
const ScRange& rRange,
- const USHORT nNew )
+ const sal_uInt16 nNew )
: SfxPoolItem( nWhichP ), aRange( rRange ), nFlags( nNew )
{
}
@@ -229,9 +229,9 @@ class ScTableListItem : public SfxPoolItem
public:
TYPEINFO();
- inline ScTableListItem( const USHORT nWhich );
+ inline ScTableListItem( const sal_uInt16 nWhich );
ScTableListItem( const ScTableListItem& rCpy );
-//UNUSED2008-05 ScTableListItem( const USHORT nWhich, const List& rList );
+//UNUSED2008-05 ScTableListItem( const sal_uInt16 nWhich, const List& rList );
~ScTableListItem();
ScTableListItem& operator=( const ScTableListItem &rCpy );
@@ -245,15 +245,15 @@ public:
const IntlWrapper* pIntl = 0 ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
-//UNUSED2009-05 BOOL GetTableList( List& aList ) const;
+//UNUSED2009-05 sal_Bool GetTableList( List& aList ) const;
//UNUSED2009-05 void SetTableList( const List& aList );
public:
- USHORT nCount;
+ sal_uInt16 nCount;
SCTAB* pTabArr;
};
-inline ScTableListItem::ScTableListItem( const USHORT nWhichP )
+inline ScTableListItem::ScTableListItem( const sal_uInt16 nWhichP )
: SfxPoolItem(nWhichP), nCount(0), pTabArr(NULL)
{}
@@ -272,7 +272,7 @@ class SC_DLLPUBLIC ScPageHFItem : public SfxPoolItem
public:
TYPEINFO();
- ScPageHFItem( USHORT nWhich );
+ ScPageHFItem( sal_uInt16 nWhich );
ScPageHFItem( const ScPageHFItem& rItem );
~ScPageHFItem();
@@ -280,10 +280,10 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) 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 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 );
const EditTextObject* GetLeftArea() const { return pLeftArea; }
const EditTextObject* GetCenterArea() const { return pCenterArea; }
@@ -306,15 +306,15 @@ class SC_DLLPUBLIC ScViewObjectModeItem: public SfxEnumItem
public:
TYPEINFO();
- ScViewObjectModeItem( USHORT nWhich );
- ScViewObjectModeItem( USHORT nWhich, ScVObjMode eMode );
+ ScViewObjectModeItem( sal_uInt16 nWhich );
+ ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode );
~ScViewObjectModeItem();
- virtual USHORT GetValueCount() const;
- virtual String GetValueText( USHORT nVal ) const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual String GetValueText( sal_uInt16 nVal ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, USHORT) const;
- virtual USHORT GetVersion( USHORT nFileVersion ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
@@ -329,7 +329,7 @@ class ScDoubleItem : public SfxPoolItem
{
public:
TYPEINFO();
- ScDoubleItem( USHORT nWhich, double nVal=0 );
+ ScDoubleItem( sal_uInt16 nWhich, double nVal=0 );
ScDoubleItem( const ScDoubleItem& rItem );
~ScDoubleItem();
@@ -337,7 +337,7 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const;
double GetValue() const { return nValue; }
@@ -351,9 +351,9 @@ private:
// ============================================================================
/** Member ID for "page scale to width" value in QueryValue() and PutValue(). */
-const BYTE SC_MID_PAGE_SCALETO_WIDTH = 1;
+const sal_uInt8 SC_MID_PAGE_SCALETO_WIDTH = 1;
/** Member ID for "page scale to height" value in QueryValue() and PutValue(). */
-const BYTE SC_MID_PAGE_SCALETO_HEIGHT = 2;
+const sal_uInt8 SC_MID_PAGE_SCALETO_HEIGHT = 2;
/** Contains the "scale to width/height" attribute in page styles. */
@@ -388,8 +388,8 @@ public:
XubString& rText,
const IntlWrapper* = 0 ) const;
- virtual BOOL QueryValue( ::com::sun::star::uno::Any& rAny, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const ::com::sun::star::uno::Any& rAny, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const ::com::sun::star::uno::Any& rAny, sal_uInt8 nMemberId = 0 );
private:
sal_uInt16 mnWidth;