diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-21 21:43:02 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-22 08:22:33 +0100 |
| commit | f649cef13c172a211a10ba0d9e69711fbcba509c (patch) | |
| tree | 99cef357e26664e1a69dc4b8f6da7a98ac5390ca /include | |
| parent | 1b1031a8f6aa3ed7eeb1516aac6c327b1fddea4b (diff) | |
bool improvements
Change-Id: I142196c59ff0dc5c26e0cc9a79293ddfb0ee94cf
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/fmshell.hxx | 4 | ||||
| -rw-r--r-- | include/svx/svdglue.hxx | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index f0e7eb52abf3..7ec00279768c 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -79,8 +79,8 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell SfxViewShell* m_pParentShell; sal_uInt16 m_nLastSlot; - sal_Bool m_bDesignMode : 1; - sal_Bool m_bHasForms : 1; // flag storing if the forms on a page exist, + bool m_bDesignMode : 1; + bool m_bHasForms : 1; // flag storing if the forms on a page exist, // only for the DesignMode, see UIFeatureChanged! // the marks of a FormView have changed... diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx index ffe5ec419048..386d84c67d91 100644 --- a/include/svx/svdglue.hxx +++ b/include/svx/svdglue.hxx @@ -55,18 +55,18 @@ class SdrObject; class SVX_DLLPUBLIC SdrGluePoint { // Bezugspunkt ist SdrObject::GetSnapRect().Center() - // bNoPercent=FALSE: Position ist -5000..5000 (1/100)% bzw. 0..10000 (je nach Align) - // bNoPercent=sal_True : Position ist in log Einh, rel zum Bezugspunkt + // bNoPercent=false: Position ist -5000..5000 (1/100)% bzw. 0..10000 (je nach Align) + // bNoPercent=true : Position ist in log Einh, rel zum Bezugspunkt Point aPos; sal_uInt16 nEscDir; sal_uInt16 nId; sal_uInt16 nAlign; - sal_uInt8 bNoPercent:1; - sal_uInt8 bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - sal_uInt8 bUserDefined:1; // #i38892# + bool bNoPercent:1; + bool bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt + bool bUserDefined:1; // #i38892# public: - SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=sal_False; bReallyAbsolute=sal_False; bUserDefined=sal_True; } - SdrGluePoint(const Point& rNewPos, bool bNewPercent= sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute = sal_False; bUserDefined = sal_True; } + SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0),bNoPercent(false),bReallyAbsolute(false),bUserDefined(true) {} + SdrGluePoint(const Point& rNewPos, bool bNewPercent=true, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign),bNoPercent(!bNewPercent),bReallyAbsolute(false),bUserDefined(true) {} bool operator==(const SdrGluePoint& rCmpGP) const { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; } bool operator!=(const SdrGluePoint& rCmpGP) const { return !operator==(rCmpGP); } const Point& GetPos() const { return aPos; } @@ -75,15 +75,15 @@ public: void SetEscDir(sal_uInt16 nNewEsc) { nEscDir=nNewEsc; } sal_uInt16 GetId() const { return nId; } void SetId(sal_uInt16 nNewId) { nId=nNewId; } - bool IsPercent() const { return bNoPercent ? false : true; } + bool IsPercent() const { return !bNoPercent; } void SetPercent(bool bOn) { bNoPercent = !bOn; } // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - bool IsReallyAbsolute() const { return bReallyAbsolute ? true : false; } + bool IsReallyAbsolute() const { return bReallyAbsolute; } void SetReallyAbsolute(bool bOn, const SdrObject& rObj); // #i38892# - bool IsUserDefined() const { return bUserDefined ? true : false; } - void SetUserDefined(bool bNew) { bUserDefined = bNew ? true : false; } + bool IsUserDefined() const { return bUserDefined; } + void SetUserDefined(bool bNew) { bUserDefined = bNew; } sal_uInt16 GetAlign() const { return nAlign; } void SetAlign(sal_uInt16 nAlg) { nAlign=nAlg; } |