diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:59:29 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:59:29 +0100 |
| commit | 75a78c3224b3aa4b626381b8f4993019a2ea4036 (patch) | |
| tree | 9de4fc4a455e66d5d478dbfb97655e09fef3ec2c /sw/source/ui/inc/swcont.hxx | |
| parent | 1cb177f424942549b547c2113129d607dec3c1e5 (diff) | |
| parent | ae9f68d1e73a973046deee6fd602a2a4c3eba2a3 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
starmath/source/symbol.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/draw/dview.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/layout/calcmove.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/rtf/rtftbl.cxx
sw/source/ui/config/modcfg.cxx
sw/source/ui/dialog/docstdlg.cxx
sw/source/ui/dialog/docstdlg.src
sw/source/ui/fldui/flddb.cxx
sw/source/ui/fldui/flddinf.cxx
sw/source/ui/fldui/flddok.cxx
sw/source/ui/fldui/fldfunc.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/fldui/fldpage.hxx
sw/source/ui/fldui/fldref.cxx
sw/source/ui/fldui/fldvar.cxx
sw/source/ui/fldui/fldvar.hxx
sw/source/ui/fldui/fldwrap.cxx
sw/source/ui/fldui/xfldui.cxx
sw/source/ui/inc/docstdlg.hxx
sw/source/ui/shells/langhelper.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/shells/txtcrsr.cxx
sw/source/ui/table/tabledlg.cxx
Diffstat (limited to 'sw/source/ui/inc/swcont.hxx')
| -rw-r--r-- | sw/source/ui/inc/swcont.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/inc/swcont.hxx b/sw/source/ui/inc/swcont.hxx index 6f7358eab7..0688dd6732 100644 --- a/sw/source/ui/inc/swcont.hxx +++ b/sw/source/ui/inc/swcont.hxx @@ -70,13 +70,13 @@ class SwContentType; //mini rtti class SwTypeNumber { - BYTE nTypeId; + sal_uInt8 nTypeId; public: - SwTypeNumber(BYTE nId) :nTypeId(nId){} + SwTypeNumber(sal_uInt8 nId) :nTypeId(nId){} virtual ~SwTypeNumber(); - virtual BYTE GetTypeId(); + virtual sal_uInt8 GetTypeId(); }; //---------------------------------------------------------------------------- @@ -85,17 +85,17 @@ class SwContent : public SwTypeNumber const SwContentType* pParent; String sContentName; long nYPosition; - BOOL bInvisible; + sal_Bool bInvisible; public: SwContent(const SwContentType* pCnt, const String& rName, long nYPos ); - virtual BOOL IsProtect() const; + virtual sal_Bool IsProtect() const; const SwContentType* GetParent() const {return pParent;} const String& GetName() const {return sContentName;} int operator==(const SwContent& /*rCont*/) const { //gleich sind sie nie, sonst fallen sie aus dem Array - return FALSE; + return sal_False; } int operator<(const SwContent& rCont) const { @@ -107,8 +107,8 @@ public: long GetYPos() const {return nYPosition;} - BOOL IsInvisible() const {return bInvisible;} - void SetInvisible(){ bInvisible = TRUE;} + sal_Bool IsInvisible() const {return bInvisible;} + void SetInvisible(){ bInvisible = sal_True;} }; #endif |