summaryrefslogtreecommitdiff
path: root/formula/inc/formula/formdata.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'formula/inc/formula/formdata.hxx')
-rw-r--r--formula/inc/formula/formdata.hxx38
1 files changed, 19 insertions, 19 deletions
diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx
index 0db3492a9519..8be0bea12c87 100644
--- a/formula/inc/formula/formdata.hxx
+++ b/formula/inc/formula/formdata.hxx
@@ -43,27 +43,27 @@ public:
virtual void SaveValues();
void RestoreValues();
- BOOL HasParent() const { return pParent != NULL; }
+ sal_Bool HasParent() const { return pParent != NULL; }
- inline USHORT GetMode() const { return nMode; }
+ inline sal_uInt16 GetMode() const { return nMode; }
inline xub_StrLen GetFStart() const { return nFStart; }
- inline USHORT GetCatSel() const { return nCatSel; }
- inline USHORT GetFuncSel() const { return nFuncSel; }
- inline USHORT GetOffset() const { return nOffset; }
- inline USHORT GetEdFocus() const { return nEdFocus; }
+ inline sal_uInt16 GetCatSel() const { return nCatSel; }
+ inline sal_uInt16 GetFuncSel() const { return nFuncSel; }
+ inline sal_uInt16 GetOffset() const { return nOffset; }
+ inline sal_uInt16 GetEdFocus() const { return nEdFocus; }
inline const String& GetUndoStr() const { return aUndoStr; }
- inline BOOL GetMatrixFlag()const{ return bMatrix;}
+ inline sal_Bool GetMatrixFlag()const{ return bMatrix;}
inline rtl::OString GetUniqueId()const { return aUniqueId;}
inline const Selection& GetSelection()const { return aSelection;}
- inline void SetMode( USHORT nNew ) { nMode = nNew; }
+ inline void SetMode( sal_uInt16 nNew ) { nMode = nNew; }
inline void SetFStart( xub_StrLen nNew ) { nFStart = nNew; }
- inline void SetCatSel( USHORT nNew ) { nCatSel = nNew; }
- inline void SetFuncSel( USHORT nNew ) { nFuncSel = nNew; }
- inline void SetOffset( USHORT nNew ) { nOffset = nNew; }
- inline void SetEdFocus( USHORT nNew ) { nEdFocus = nNew; }
+ inline void SetCatSel( sal_uInt16 nNew ) { nCatSel = nNew; }
+ inline void SetFuncSel( sal_uInt16 nNew ) { nFuncSel = nNew; }
+ inline void SetOffset( sal_uInt16 nNew ) { nOffset = nNew; }
+ inline void SetEdFocus( sal_uInt16 nNew ) { nEdFocus = nNew; }
inline void SetUndoStr( const String& rNew ) { aUndoStr = rNew; }
- inline void SetMatrixFlag(BOOL bNew) { bMatrix=bNew;}
+ inline void SetMatrixFlag(sal_Bool bNew) { bMatrix=bNew;}
inline void SetUniqueId(const rtl::OString nNew) { aUniqueId=nNew;}
inline void SetSelection(const Selection& aSel) { aSelection=aSel;}
protected:
@@ -73,14 +73,14 @@ protected:
FormEditData* pParent; // fuer Verschachtelung
private:
- USHORT nMode; // enum ScFormulaDlgMode
+ sal_uInt16 nMode; // enum ScFormulaDlgMode
xub_StrLen nFStart;
- USHORT nCatSel;
- USHORT nFuncSel;
- USHORT nOffset;
- USHORT nEdFocus;
+ sal_uInt16 nCatSel;
+ sal_uInt16 nFuncSel;
+ sal_uInt16 nOffset;
+ sal_uInt16 nEdFocus;
String aUndoStr;
- BOOL bMatrix;
+ sal_Bool bMatrix;
rtl::OString aUniqueId;
Selection aSelection;
};