diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-11 16:23:55 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-11 16:23:55 +0100 |
| commit | 66356194e2a9b45df904e6452b954b9e15a121c3 (patch) | |
| tree | 4d3d153c76d31cbf187807334f60eaf3cfa0671f /svx/inc | |
| parent | ce4e7d16a32df7448947e4cc72836bfea9aace26 (diff) | |
removetooltypes01: #i112600# do not affect FASTBOOL in this cws
Diffstat (limited to 'svx/inc')
33 files changed, 318 insertions, 318 deletions
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index 7c844e80c71c..0d20b950a49c 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -50,11 +50,11 @@ friend class ImpItemEdit; sal_uInt16 nLastWhich; sal_uInt16 nLastWhichOben; sal_uInt16 nLastWhichUnten; - int bWhichesButNames; - int bDontHideIneffectiveItems; - int bDontSortItems; - int bShowWhichIds; - int bShowRealValues; + FASTBOOL bWhichesButNames; + FASTBOOL bDontHideIneffectiveItems; + FASTBOOL bDontSortItems; + FASTBOOL bShowWhichIds; + FASTBOOL bShowRealValues; private: #if _SOLAR__PRIVATE void ImpCtor(); @@ -80,8 +80,8 @@ public: void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); sal_uIntPtr GetCurrentPos() const; sal_uInt16 GetCurrentWhich() const; - virtual int BegChangeEntry(sal_uIntPtr nPos); - virtual int EndChangeEntry(); + virtual FASTBOOL BegChangeEntry(sal_uIntPtr nPos); + virtual FASTBOOL EndChangeEntry(); virtual void BrkChangeEntry(); /** GetCellText returns the text at the given position @@ -114,7 +114,7 @@ public: virtual void GetFocus(); void Clear() { aBrowse.Clear(); } void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL) { aBrowse.SetAttributes(pAttr,p2ndSet); } - void SetFloatingMode(int /*bOn*/) {} + void SetFloatingMode(FASTBOOL /*bOn*/) {} const _SdrItemBrowserControl& GetBrowserControl() const { return aBrowse; } _SdrItemBrowserControl& GetBrowserControl() { return aBrowse; } }; @@ -124,7 +124,7 @@ class SdrView; class SdrItemBrowser: public _SdrItemBrowserWindow { Timer aIdleTimer; SdrView* pView; - int bDirty; + FASTBOOL bDirty; private: static Window* ImpGetViewWin(SdrView& rView); DECL_LINK(IdleHdl,Timer*); diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx index a8e7519adb43..98655fb4e640 100644 --- a/svx/inc/svx/fmmodel.hxx +++ b/svx/inc/svx/fmmodel.hxx @@ -60,13 +60,13 @@ public: FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); FmFormModel(const XubString& rPath, SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); - FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, int bUseExtColorTable); + FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers, FASTBOOL bUseExtColorTable); FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers, - int bUseExtColorTable); + FASTBOOL bUseExtColorTable); virtual ~FmFormModel(); - virtual SdrPage* AllocPage(int bMasterPage); + virtual SdrPage* AllocPage(FASTBOOL bMasterPage); virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); virtual SdrPage* RemovePage(sal_uInt16 nPgNum); virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index 297d44acaa07..adc4745ace83 100644 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -90,7 +90,7 @@ protected: SfxItemSet* pBBSet; sal_Bool bDisableQueryBox; sal_Bool bEnableBackgroundSelector; - int bInReset; + FASTBOOL bInReset; void InitHandler(); DECL_LINK( TurnOnHdl, CheckBox*); diff --git a/svx/inc/svx/layctrl.hxx b/svx/inc/svx/layctrl.hxx index cf77a41f0ee7..6137c33a0eb2 100644 --- a/svx/inc/svx/layctrl.hxx +++ b/svx/inc/svx/layctrl.hxx @@ -38,7 +38,7 @@ class SVX_DLLPUBLIC SvxTableToolBoxControl : public SfxToolBoxControl { private: - int bEnabled; + FASTBOOL bEnabled; public: virtual SfxPopupWindowType GetPopupWindowType() const; @@ -58,7 +58,7 @@ public: class SVX_DLLPUBLIC SvxColumnsToolBoxControl : public SfxToolBoxControl { - int bEnabled; + FASTBOOL bEnabled; public: virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx index bd01c7f35475..a55eac577419 100644 --- a/svx/inc/svx/scene3d.hxx +++ b/svx/inc/svx/scene3d.hxx @@ -242,10 +242,10 @@ public: virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; // create moves - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); }; diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index fdcffbfe79c0..a92e9f0944b8 100644 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -44,8 +44,8 @@ public: SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual int HasMetrics() const; - virtual int ScaleMetrics(long nMul, long nDiv); + virtual FASTBOOL HasMetrics() const; + virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx index 5bdcb4097997..d60e83859eaf 100644 --- a/svx/inc/svx/sdtaaitm.hxx +++ b/svx/inc/svx/sdtaaitm.hxx @@ -38,8 +38,8 @@ public: SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual int HasMetrics() const; - virtual int ScaleMetrics(long nMul, long nDiv); + virtual FASTBOOL HasMetrics() const; + virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index b4e8cb17a555..c2a7893be044 100644 --- a/svx/inc/svx/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -218,9 +218,9 @@ private: sal_Bool bSearch; sal_Bool bFormat; sal_uInt16 nOptions; - int bSet; - int bReadOnly; - int bConstruct; + FASTBOOL bSet; + FASTBOOL bReadOnly; + FASTBOOL bConstruct; sal_uIntPtr nModifyFlag; String aStylesStr; String aLayoutStr; diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx index 8b2ff7f6a733..00355132fab2 100644 --- a/svx/inc/svx/svddrag.hxx +++ b/svx/inc/svx/svddrag.hxx @@ -69,11 +69,11 @@ protected: Point aReservePoint4; Rectangle aReserveRect1; Rectangle aReserveRect2; - int bEndDragChangesAttributes; - int bEndDragChangesGeoAndAttributes; - int bMouseIsUp; - int aReserveBool3; - int aReserveBool4; + FASTBOOL bEndDragChangesAttributes; + FASTBOOL bEndDragChangesGeoAndAttributes; + FASTBOOL bMouseIsUp; + FASTBOOL aReserveBool3; + FASTBOOL aReserveBool4; long aReserveLong1; long aReserveLong2; long aReserveLong3; @@ -83,21 +83,21 @@ protected: void* aReservePtr3; void* aReservePtr4; - int bShown; // Xor sichrbar? + FASTBOOL bShown; // Xor sichrbar? sal_uInt16 nMinMov; // Soviel muss erstmal minimal bewegt werden - int bMinMoved; // MinMove durchbrochen? + FASTBOOL bMinMoved; // MinMove durchbrochen? - int bHorFixed; // nur Vertikal draggen - int bVerFixed; // nur Horizontal draggen - int bWantNoSnap; // sal_True=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet + FASTBOOL bHorFixed; // nur Vertikal draggen + FASTBOOL bVerFixed; // nur Horizontal draggen + FASTBOOL bWantNoSnap; // sal_True=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet // werden soll. Entsprechend wird auch NoSnapPos in den Buffer geschrieben. - int bOrtho4; - int bOrtho8; + FASTBOOL bOrtho4; + FASTBOOL bOrtho8; SdrDragMethod* pDragMethod; protected: - void Clear(int bLeaveOne); + void Clear(FASTBOOL bLeaveOne); Point& Pnt(sal_uIntPtr nNum) { return *((Point*)aPnts.GetObject(nNum)); } //public: SdrDragStatUserData* pUser; // Userdata @@ -129,50 +129,50 @@ public: void SetHdl(SdrHdl* pH) { pHdl=pH; } SdrDragStatUserData* GetUser() const { return pUser; } void SetUser(SdrDragStatUserData* pU) { pUser=pU; } - int IsShown() const { return bShown; } - void SetShown(int bOn) { bShown=bOn; } + FASTBOOL IsShown() const { return bShown; } + void SetShown(FASTBOOL bOn) { bShown=bOn; } - int IsMinMoved() const { return bMinMoved; } + FASTBOOL IsMinMoved() const { return bMinMoved; } void SetMinMoved() { bMinMoved=sal_True; } void ResetMinMoved() { bMinMoved=sal_False; } void SetMinMove(sal_uInt16 nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; } sal_uInt16 GetMinMove() const { return nMinMov; } - int IsHorFixed() const { return bHorFixed; } - void SetHorFixed(int bOn) { bHorFixed=bOn; } - int IsVerFixed() const { return bVerFixed; } - void SetVerFixed(int bOn) { bVerFixed=bOn; } + FASTBOOL IsHorFixed() const { return bHorFixed; } + void SetHorFixed(FASTBOOL bOn) { bHorFixed=bOn; } + FASTBOOL IsVerFixed() const { return bVerFixed; } + void SetVerFixed(FASTBOOL bOn) { bVerFixed=bOn; } // Hier kann das Obj sagen: "Ich will keinen Koordinatenfang!" // z.B. fuer den Winkel des Kreisbogen... - int IsNoSnap() const { return bWantNoSnap; } - void SetNoSnap(int bOn=sal_True) { bWantNoSnap=bOn; } + FASTBOOL IsNoSnap() const { return bWantNoSnap; } + void SetNoSnap(FASTBOOL bOn=sal_True) { bWantNoSnap=bOn; } // Und hier kann das Obj sagen welches Ortho (wenn ueberhaupt eins) // sinnvoll auf ihm angewendet werden kann. // Ortho4 bedeutet Ortho in 4 Richtungen (fuer Rect und Cirt) - int IsOrtho4Possible() const { return bOrtho4; } - void SetOrtho4Possible(int bOn=sal_True) { bOrtho4=bOn; } + FASTBOOL IsOrtho4Possible() const { return bOrtho4; } + void SetOrtho4Possible(FASTBOOL bOn=sal_True) { bOrtho4=bOn; } // Ortho8 bedeutet Ortho in 8 Richtungen (fuer Linien) - int IsOrtho8Possible() const { return bOrtho8; } - void SetOrtho8Possible(int bOn=sal_True) { bOrtho8=bOn; } + FASTBOOL IsOrtho8Possible() const { return bOrtho8; } + void SetOrtho8Possible(FASTBOOL bOn=sal_True) { bOrtho8=bOn; } // Wird vom gedraggten Objekt gesetzt - int IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; } - void SetEndDragChangesAttributes(int bOn) { bEndDragChangesAttributes=bOn; } - int IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; } - void SetEndDragChangesGeoAndAttributes(int bOn) { bEndDragChangesGeoAndAttributes=bOn; } + FASTBOOL IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; } + void SetEndDragChangesAttributes(FASTBOOL bOn) { bEndDragChangesAttributes=bOn; } + FASTBOOL IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; } + void SetEndDragChangesGeoAndAttributes(FASTBOOL bOn) { bEndDragChangesGeoAndAttributes=bOn; } // Wird von der View gesetzt und kann vom Obj ausgewertet werden - int IsMouseDown() const { return !bMouseIsUp; } - void SetMouseDown(int bDown) { bMouseIsUp=!bDown; } + FASTBOOL IsMouseDown() const { return !bMouseIsUp; } + void SetMouseDown(FASTBOOL bDown) { bMouseIsUp=!bDown; } Point KorregPos(const Point& rNow, const Point& rPrev) const; void Reset(const Point& rPnt); void NextMove(const Point& rPnt); - void NextPoint(int bSaveReal=sal_False); + void NextPoint(FASTBOOL bSaveReal=sal_False); void PrevPoint(); - int CheckMinMoved(const Point& rPnt); + FASTBOOL CheckMinMoved(const Point& rPnt); long GetDX() const { return GetNow().X()-GetPrev().X(); } long GetDY() const { return GetNow().Y()-GetPrev().Y(); } Fraction GetXFact() const; diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index 7ea8d181e2fa..f1ba2d3cf93b 100644 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -125,7 +125,7 @@ public: class SfxItemSet; // Liefert eine Ersatzdarstellung fuer einen XFillStyle // Bei XFILL_NONE gibt's sal_False und rCol bleibt unveraendert. -SVX_DLLPUBLIC int GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); +SVX_DLLPUBLIC FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); // Ein Container fuer USHORTs (im Prinzip ein dynamisches Array) class UShortCont { @@ -163,7 +163,7 @@ private: // damit keiner vergessen wird virtual void Is1stLessThan2nd(const void* pElem1, const void* pElem2) const; -// virtual int Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL; +// virtual FASTBOOL Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL; }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -186,10 +186,10 @@ class ImpSdrHdcMerk Color* pLineColorMerk; sal_uInt16 nMode; public: - ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, int bAutoMerk=sal_True); + ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, FASTBOOL bAutoMerk=sal_True); ~ImpSdrHdcMerk(); void Save(const OutputDevice& rOut); - int IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } + FASTBOOL IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } void Restore(OutputDevice& rOut, sal_uInt16 nMask=SDRHDC_SAVEALL) const; }; //#endif // __PRIVATE @@ -275,7 +275,7 @@ public: const Link& GetLink(unsigned nNum) const { return *((Link*)(aList.GetObject(nNum))); } void InsertLink(const Link& rLink, unsigned nPos=0xFFFF); void RemoveLink(const Link& rLink); - int HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; } + FASTBOOL HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; } }; // Fuer die Factory in SvdObj.CXX diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx index ed8ab7dc33b0..334b79229aa0 100644 --- a/svx/inc/svx/svdglue.hxx +++ b/svx/inc/svx/svdglue.hxx @@ -69,12 +69,12 @@ class SVX_DLLPUBLIC SdrGluePoint { sal_uInt16 nEscDir; sal_uInt16 nId; sal_uInt16 nAlign; - int bNoPercent:1; - int bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - int bUserDefined:1; // #i38892# + FASTBOOL bNoPercent:1; + FASTBOOL bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt + FASTBOOL 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, int 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(const Point& rNewPos, FASTBOOL bNewPercent=sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=sal_False; bUserDefined=sal_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; } @@ -84,14 +84,14 @@ public: sal_uInt16 GetId() const { return nId; } void SetId(sal_uInt16 nNewId) { nId=nNewId; } bool IsPercent() const { return !bNoPercent; } - void SetPercent(int bOn) { bNoPercent=!bOn; } + void SetPercent(FASTBOOL bOn) { bNoPercent=!bOn; } // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - int IsReallyAbsolute() const { return bReallyAbsolute; } - void SetReallyAbsolute(int bOn, const SdrObject& rObj); + FASTBOOL IsReallyAbsolute() const { return bReallyAbsolute; } + void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj); // #i38892# - int IsUserDefined() const { return bUserDefined; } - void SetUserDefined(int bNew) { bUserDefined = bNew; } + FASTBOOL IsUserDefined() const { return bUserDefined; } + void SetUserDefined(FASTBOOL bNew) { bUserDefined = bNew; } sal_uInt16 GetAlign() const { return nAlign; } void SetAlign(sal_uInt16 nAlg) { nAlign=nAlg; } @@ -100,7 +100,7 @@ public: sal_uInt16 GetVertAlign() const { return nAlign&0xFF00; } void SetVertAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); } void Draw(OutputDevice& rOut, const SdrObject* pObj) const; - int IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; + FASTBOOL IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; Point GetAbsolutePos(const SdrObject& rObj) const; void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj); @@ -111,7 +111,7 @@ public: void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj); - void Shear (const Point& rRef, long nWink, double tn, int bVShear, const SdrObject* pObj); + void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj); }; #define SDRGLUEPOINT_NOTFOUND 0xFFFF @@ -134,14 +134,14 @@ public: SdrGluePoint& operator[](sal_uInt16 nPos) { return *GetObject(nPos); } const SdrGluePoint& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } sal_uInt16 FindGluePoint(sal_uInt16 nId) const; - sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, int bBack=sal_False, int bNext=sal_False, sal_uInt16 nId0=0) const; + sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack=sal_False, FASTBOOL bNext=sal_False, sal_uInt16 nId0=0) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - void SetReallyAbsolute(int bOn, const SdrObject& rObj); + void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj); void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj); - void Shear (const Point& rRef, long nWink, double tn, int bVShear, const SdrObject* pObj); + void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj); }; diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx index dd6698110f67..a41d69a38eff 100644 --- a/svx/inc/svx/svdhlpln.hxx +++ b/svx/inc/svx/svdhlpln.hxx @@ -68,7 +68,7 @@ public: const Point& GetPos() const { return aPos; } Pointer GetPointer() const; - int IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; + FASTBOOL IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; // OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben Rectangle GetBoundRect(const OutputDevice& rOut) const; diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx index db7caa7ce134..b38ada9733d7 100644 --- a/svx/inc/svx/svdlayer.hxx +++ b/svx/inc/svx/svdlayer.hxx @@ -69,8 +69,8 @@ public: // Einem SdrLayer kann man sagen dass er ein (der) Standardlayer sein soll. // Es wird dann laenderspeziefisch der passende Name gesetzt. SetName() // setzt das Flag "StandardLayer" ggf. zurueck auf "Userdefined". - void SetStandardLayer(int bStd=sal_True); - int IsStandardLayer() const { return nType==1; } + void SetStandardLayer(FASTBOOL bStd=sal_True); + FASTBOOL IsStandardLayer() const { return nType==1; } }; // Beim Aendern von Layerdaten muss man derzeit @@ -124,9 +124,9 @@ public: sal_uInt16 GetLayerPos(SdrLayer* pLayer) const; - SdrLayer* GetLayer(const String& rName, int bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); } - const SdrLayer* GetLayer(const String& rName, int bInherited) const; - SdrLayerID GetLayerID(const String& rName, int bInherited) const; + SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); } + const SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) const; + SdrLayerID GetLayerID(const String& rName, FASTBOOL bInherited) const; SdrLayer* GetLayerPerID(sal_uInt16 nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); } const SdrLayer* GetLayerPerID(sal_uInt16 nID) const; diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 28307b6f85b2..01661e1ca5b0 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -171,7 +171,7 @@ public: struct SdrDocumentStreamInfo { - int mbDeleteAfterUse; + FASTBOOL mbDeleteAfterUse; String maUserData; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorageRef; sal_Bool mbDummy1 : 1; @@ -196,11 +196,11 @@ protected: String aUIUnitStr; // see above Fraction aUIUnitFact; // see above int nUIUnitKomma; // see above - int bUIOnlyKomma; // see above + FASTBOOL bUIOnlyKomma; // see above SdrLayerAdmin* pLayerAdmin; SfxItemPool* pItemPool; - int bMyPool; // zum Aufraeumen von pMyPool ab 303a + FASTBOOL bMyPool; // zum Aufraeumen von pMyPool ab 303a comphelper::IEmbeddedHelper* m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell SdrOutliner* pDrawOutliner; // ein Outliner zur Textausgabe @@ -220,25 +220,25 @@ protected: bool mbUndoEnabled; // If false no undo is recorded or we are during the execution of an undo action sal_uInt16 nProgressPercent; // fuer den ProgressBar-Handler sal_uInt16 nLoadVersion; // Versionsnummer der geladenen Datei - int bExtColorTable; // Keinen eigenen ColorTable + FASTBOOL bExtColorTable; // Keinen eigenen ColorTable sal_Bool mbChanged; - int bInfoChanged; - int bPagNumsDirty; - int bMPgNumsDirty; - int bPageNotValid; // sal_True=Doc ist nur ObjektTraeger. Page ist nicht gueltig. - int bSavePortable; // Metafiles portabel speichern - int bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen - int bReadOnly; - int bTransparentTextFrames; - int bSaveCompressed; - int bSwapGraphics; - int bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode - int bSaveOLEPreview; // save preview metafile of OLE objects + FASTBOOL bInfoChanged; + FASTBOOL bPagNumsDirty; + FASTBOOL bMPgNumsDirty; + FASTBOOL bPageNotValid; // sal_True=Doc ist nur ObjektTraeger. Page ist nicht gueltig. + FASTBOOL bSavePortable; // Metafiles portabel speichern + FASTBOOL bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen + FASTBOOL bReadOnly; + FASTBOOL bTransparentTextFrames; + FASTBOOL bSaveCompressed; + FASTBOOL bSwapGraphics; + FASTBOOL bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode + FASTBOOL bSaveOLEPreview; // save preview metafile of OLE objects sal_uInt16 nStreamCompressMode; // Komprimiert schreiben? sal_uInt16 nStreamNumberFormat; sal_uInt16 nDefaultTabulator; sal_uInt32 nMaxUndoCount; - int bSaveNative; + FASTBOOL bSaveNative; sal_Bool bStarDrawPreviewMode; @@ -279,10 +279,10 @@ public: sal_uInt16 mnHandoutPageCount; sal_uInt16 nReserveUInt6; sal_uInt16 nReserveUInt7; - int mbModelLocked; - int mbKernAsianPunctuation; - int mbAddExtLeading; - int mbInDestruction; + FASTBOOL mbModelLocked; + FASTBOOL mbKernAsianPunctuation; + FASTBOOL mbAddExtLeading; + FASTBOOL mbInDestruction; // Zeiger auf Paletten, Listen und Tabellen XColorTable* pColorTable; @@ -310,7 +310,7 @@ private: // Nicht implementiert: SVX_DLLPRIVATE SdrModel(const SdrModel& rSrcModel); SVX_DLLPRIVATE void operator=(const SdrModel& rSrcModel); - SVX_DLLPRIVATE int operator==(const SdrModel& rCmpModel) const; + SVX_DLLPRIVATE FASTBOOL operator==(const SdrModel& rCmpModel) const; //#if 0 // _SOLAR__PRIVATE SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo); SVX_DLLPRIVATE void ImpSetUIUnit(); @@ -328,8 +328,8 @@ private: public: //#if 0 // _SOLAR__PRIVATE - int IsPasteResize() const { return bPasteResize; } - void SetPasteResize(int bOn) { bPasteResize=bOn; } + FASTBOOL IsPasteResize() const { return bPasteResize; } + void SetPasteResize(FASTBOOL bOn) { bPasteResize=bOn; } //#endif // __PRIVATE TYPEINFO(); // Steckt man hier seinen eigenen Pool rein, so wird die Klasse auch @@ -345,13 +345,13 @@ public: // Wahl des Pools. SdrModel(SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS); SdrModel(const String& rPath, SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS); - SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, int bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); - SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, int bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); + SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); + SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS); virtual ~SdrModel(); void ClearModel(sal_Bool bCalledFromDestructor); // Hier kann man erfragen, ob das Model gerade eingrstreamt wird - int IsLoading() const { return sal_False /*BFS01 bLoading */; } + FASTBOOL IsLoading() const { return sal_False /*BFS01 bLoading */; } // Muss z.B. ueberladen werden, um das Swappen/LoadOnDemand von Grafiken // zu ermoeglichen. Wird rbDeleteAfterUse auf sal_True gesetzt, so wird // die SvStream-Instanz vom Aufrufer nach Gebrauch destruiert. @@ -364,7 +364,7 @@ public: void BurnInStyleSheetAttributes(); // Wer sich von SdrPage ableitet muss sich auch von SdrModel ableiten // und diese beiden VM AllocPage() und AllocModel() ueberladen... - virtual SdrPage* AllocPage(int bMasterPage); + virtual SdrPage* AllocPage(FASTBOOL bMasterPage); virtual SdrModel* AllocModel() const; // Aenderungen an den Layern setzen das Modified-Flag und broadcasten am Model! @@ -449,17 +449,17 @@ public: const Fraction& GetUIUnitFact() const { return aUIUnitFact; } const String& GetUIUnitStr() const { return aUIUnitStr; } int GetUIUnitKomma() const { return nUIUnitKomma; } - int IsUIOnlyKomma() const { return bUIOnlyKomma; } + FASTBOOL IsUIOnlyKomma() const { return bUIOnlyKomma; } static void TakeUnitStr(FieldUnit eUnit, String& rStr); - void TakeMetricStr(long nVal, String& rStr, int bNoUnitChars=sal_False, sal_Int32 nNumDigits = -1) const; - void TakeWinkStr(long nWink, String& rStr, int bNoDegChar=sal_False) const; - void TakePercentStr(const Fraction& rVal, String& rStr, int bNoPercentChar=sal_False) const; + void TakeMetricStr(long nVal, String& rStr, FASTBOOL bNoUnitChars=sal_False, sal_Int32 nNumDigits = -1) const; + void TakeWinkStr(long nWink, String& rStr, FASTBOOL bNoDegChar=sal_False) const; + void TakePercentStr(const Fraction& rVal, String& rStr, FASTBOOL bNoPercentChar=sal_False) const; // RecalcPageNums wird idR. nur von der Page gerufen. - int IsPagNumsDirty() const { return bPagNumsDirty; }; - int IsMPgNumsDirty() const { return bMPgNumsDirty; }; - void RecalcPageNums(int bMaster); + FASTBOOL IsPagNumsDirty() const { return bPagNumsDirty; }; + FASTBOOL IsMPgNumsDirty() const { return bMPgNumsDirty; }; + void RecalcPageNums(FASTBOOL bMaster); // Nach dem Insert gehoert die Page dem SdrModel. virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); virtual void DeletePage(sal_uInt16 nPgNum); @@ -493,28 +493,28 @@ public: // PageNotValid bedeutet, dass das Model lediglich Objekte traegt die zwar // auf einer Page verankert sind, die Page aber nicht gueltig ist. Diese // Kennzeichnung wird fuers Clipboard/Drag&Drop benoetigt. - int IsPageNotValid() const { return bPageNotValid; } - void SetPageNotValid(int bJa=sal_True) { bPageNotValid=bJa; } + FASTBOOL IsPageNotValid() const { return bPageNotValid; } + void SetPageNotValid(FASTBOOL bJa=sal_True) { bPageNotValid=bJa; } // Schaltet man dieses Flag auf sal_True, so werden Grafikobjekte // portabel gespeichert. Es findet dann beim Speichern ggf. // eine implizite Wandlung von Metafiles statt. // Default=FALSE. Flag ist nicht persistent. - int IsSavePortable() const { return bSavePortable; } - void SetSavePortable(int bJa=sal_True) { bSavePortable=bJa; } + FASTBOOL IsSavePortable() const { return bSavePortable; } + void SetSavePortable(FASTBOOL bJa=sal_True) { bSavePortable=bJa; } // Schaltet man dieses Flag auf sal_True, so werden // Pixelobjekte (stark) komprimiert gespeichert. // Default=FALSE. Flag ist nicht persistent. - int IsSaveCompressed() const { return bSaveCompressed; } - void SetSaveCompressed(int bJa=sal_True) { bSaveCompressed=bJa; } + FASTBOOL IsSaveCompressed() const { return bSaveCompressed; } + void SetSaveCompressed(FASTBOOL bJa=sal_True) { bSaveCompressed=bJa; } // Schaltet man dieses Flag auf sal_True, so werden // Grafikobjekte mit gesetztem Native-Link // native gespeichert. // Default=FALSE. Flag ist nicht persistent. - int IsSaveNative() const { return bSaveNative; } - void SetSaveNative(int bJa=sal_True) { bSaveNative=bJa; } + FASTBOOL IsSaveNative() const { return bSaveNative; } + void SetSaveNative(FASTBOOL bJa=sal_True) { bSaveNative=bJa; } // Schaltet man dieses Flag auf sal_True, so werden die Grafiken // von Grafikobjekten: @@ -525,13 +525,13 @@ public: // Damit das funktioniert, muss die virtuelle Methode // GetDocumentStream() ueberladen werden. // Default=FALSE. Flag ist nicht persistent. - int IsSwapGraphics() const { return bSwapGraphics; } - void SetSwapGraphics(int bJa=sal_True); + FASTBOOL IsSwapGraphics() const { return bSwapGraphics; } + void SetSwapGraphics(FASTBOOL bJa=sal_True); void SetSwapGraphicsMode(sal_uIntPtr nMode) { nSwapGraphicsMode = nMode; } sal_uIntPtr GetSwapGraphicsMode() const { return nSwapGraphicsMode; } - int IsSaveOLEPreview() const { return bSaveOLEPreview; } - void SetSaveOLEPreview( int bSet) { bSaveOLEPreview = bSet; } + FASTBOOL IsSaveOLEPreview() const { return bSaveOLEPreview; } + void SetSaveOLEPreview( FASTBOOL bSet) { bSaveOLEPreview = bSet; } // Damit die Bildschirmausgabe von Bitmaps (insbesondere bei gedrehten) // etwas schneller wird, werden sie gecachet. Diesen Cache kann man mit @@ -540,14 +540,14 @@ public: // in's Undo, so wird der Cache fuer dieses Objekt sofort ausgeschaltet // (Speicher sparen). // Default=Cache eingeschaltet. Flag ist nicht persistent. - int IsBitmapCaching() const { return !bNoBitmapCaching; } - void SetBitmapCaching(int bJa=sal_True) { bNoBitmapCaching=!bJa; } + FASTBOOL IsBitmapCaching() const { return !bNoBitmapCaching; } + void SetBitmapCaching(FASTBOOL bJa=sal_True) { bNoBitmapCaching=!bJa; } // Defaultmaessig (sal_False) kann man Textrahmen ohne Fuellung durch // Mausklick selektieren. Nach Aktivierung dieses Flags trifft man sie // nur noch in dem Bereich, wo sich auch tatsaechlich Text befindet. - int IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; } - void SetPickThroughTransparentTextFrames(int bOn) { bTransparentTextFrames=bOn; } + FASTBOOL IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; } + void SetPickThroughTransparentTextFrames(FASTBOOL bOn) { bTransparentTextFrames=bOn; } // Darf denn das Model ueberhaupt veraendert werden? // Wird nur von den Possibility-Methoden der View ausgewerdet. @@ -555,8 +555,8 @@ public: // Sollte ueberladen werden und entsprechend des ReadOnly-Status des Files // sal_True oder sal_False liefern (Methode wird oeffters gerufen, also ein Flag // verwenden!). - virtual int IsReadOnly() const; - virtual void SetReadOnly(int bYes); + virtual FASTBOOL IsReadOnly() const; + virtual void SetReadOnly(FASTBOOL bYes); // Vermischen zweier SdrModel. Zu beachten sei, dass rSourceModel nicht // const ist. Die Pages werden beim einfuegen nicht kopiert, sondern gemoved. @@ -576,13 +576,13 @@ public: virtual void Merge(SdrModel& rSourceModel, sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF, sal_uInt16 nDestPos=0xFFFF, - int bMergeMasterPages=sal_False, int bAllMasterPages=sal_False, - int bUndo=sal_True, int bTreadSourceAsConst=sal_False); + FASTBOOL bMergeMasterPages=sal_False, FASTBOOL bAllMasterPages=sal_False, + FASTBOOL bUndo=sal_True, FASTBOOL bTreadSourceAsConst=sal_False); // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,sal_False,FALSE,bUndo,!bMoveNoCopy); void CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, sal_uInt16 nDestPos, - int bUndo=sal_True, int bMoveNoCopy=sal_False); + FASTBOOL bUndo=sal_True, FASTBOOL bMoveNoCopy=sal_False); // Mit BegUndo() / EndUndo() ist es moeglich beliebig viele UndoActions // beliebig tief zu klammern. Als Kommentar der @@ -617,9 +617,9 @@ public: sal_uIntPtr GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; } const SfxUndoAction* GetRedoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); } - int Undo(); - int Redo(); - int Repeat(SfxRepeatTarget&); + FASTBOOL Undo(); + FASTBOOL Redo(); + FASTBOOL Repeat(SfxRepeatTarget&); // Hier kann die Applikation einen Handler setzen, der die auflaufenden // UndoActions einsammelt. Der Handler hat folgendes Aussehen: @@ -681,7 +681,7 @@ public: // Methode sal_True, andernfalls FALSE. // Dieser Check steht nur zur Verfuegung, wenn die Engine mit DBG_UTIL // uebersetzt wurde. Andernfalls liefert die Methode immer TRUE. (ni) - int CheckConsistence() const; + FASTBOOL CheckConsistence() const; void SetStarDrawPreviewMode(sal_Bool bPreview); sal_Bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } @@ -711,7 +711,7 @@ public: void ReformatAllTextObjects(); - int HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; + FASTBOOL HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode ); void disposeOutliner( SdrOutliner* pOutliner ); diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx index 7e052cf9eb2e..db0477648599 100644 --- a/svx/inc/svx/svdoashp.hxx +++ b/svx/inc/svx/svdoashp.hxx @@ -124,7 +124,7 @@ public: void ImpCheckCustomGluePointsAreAdded(); // returns the new text rect that corresponds to the current logic rect, the return value can be empty if nothing changed. - Rectangle ImpCalculateTextFrame( const int bHgt, const int bWdt ); + Rectangle ImpCalculateTextFrame( const FASTBOOL bHgt, const FASTBOOL bWdt ); public: // #i37011# @@ -187,7 +187,7 @@ public: virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void Shear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void SetSnapRect(const Rectangle& rRect); virtual void SetLogicRect(const Rectangle& rRect); @@ -195,7 +195,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcSetLogicRect(const Rectangle& rRect); @@ -208,21 +208,21 @@ public: virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual int BegCreate( SdrDragStat& rStat ); - virtual int MovCreate(SdrDragStat& rStat); // #i37448# - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BegCreate( SdrDragStat& rStat ); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); // #i37448# + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt=sal_True, int bWdt=sal_True) const; - virtual int NbcAdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True); - virtual int AdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True); - virtual int IsAutoGrowHeight() const; - virtual int IsAutoGrowWidth() const; + virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; + virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); + virtual FASTBOOL IsAutoGrowHeight() const; + virtual FASTBOOL IsAutoGrowWidth() const; virtual void SetVerticalWriting( sal_Bool bVertical ); virtual sal_Bool BegTextEdit( SdrOutliner& rOutl ); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit( SdrOutliner& rOutl ); virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False, + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void operator=(const SdrObject& rObj); diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 30d8b407dabe..86d6f0717bb7 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -183,7 +183,7 @@ public: const SetOfByte* pVisiLayer; const SdrPageView* pPageView; sal_uInt16 nTol; - int bDown; + FASTBOOL bDown; public: SdrObjMacroHitRec() @@ -236,11 +236,11 @@ public: sal_uInt32 GetInventor() const { return nInventor; } sal_uInt16 GetId() const { return nIdentifier; } - virtual int HasMacro (const SdrObject* pObj) const; + virtual FASTBOOL HasMacro (const SdrObject* pObj) const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; - virtual int DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); + virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; }; @@ -522,8 +522,8 @@ protected: void ImpForcePlusData() { if (pPlusData==NULL) pPlusData=NewPlusData(); } - String GetWinkStr(long nWink, int bNoDegChar=sal_False) const; - String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, int bNoUnitChars=sal_False) const; + String GetWinkStr(long nWink, FASTBOOL bNoDegChar=sal_False) const; + String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, FASTBOOL bNoUnitChars=sal_False) const; // bNotMyself=sal_True bedeutet: Nur die ObjList auf Dirty setzen, nicht mich. // Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect @@ -596,7 +596,7 @@ public: // Ein solcher Referenzpunkt ist z.B. der Punkt eines Symbols, der // der beim Einfuegen des Symbols auf das Raster gefangen werden soll // oder der Fixpunkt eines Bildes innerhalb eines Animationsobjektes. - virtual int HasRefPoint() const; + virtual FASTBOOL HasRefPoint() const; virtual Point GetRefPoint() const; virtual void SetRefPoint(const Point& rPnt); @@ -757,10 +757,10 @@ public: // BckCreate() -> Letztes EndCreate() rueckgaengig machen (z.B. letzten // Polygonpunkt wieder loeschen). // RetrunCode: sal_True=Weiter gehts, sal_False=Create dadurch abgebrochen. - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); // damit holt man sich den Pointer, der das Createn dieses Objekts symbolisiert @@ -778,13 +778,13 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void Move (const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear (const Point& rRef, long nWink, double tn, int bVShear); + virtual void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); // Die relative Position eines Zeichenobjektes ist die Entfernung der // linken oberen Eche des logisch umschliessenden Rechtecks (SnapRect) @@ -821,7 +821,7 @@ public: // Drehwinkel und Shear virtual long GetRotateAngle() const; - virtual long GetShearAngle(int bVertical=sal_False) const; + virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; // Zum Fangen von/auf ausgezeichneten Punkten eines Obj (Polygonpunkte, // Kreismittelpunkt, ...) @@ -864,7 +864,7 @@ public: void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems = sal_False); // NotPersistAttr fuer Layer, ObjName, geometrische Transformationen, ... - void TakeNotPersistAttr(SfxItemSet& rAttr, int bMerge) const; + void TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const; void ApplyNotPersistAttr(const SfxItemSet& rAttr); void NbcApplyNotPersistAttr(const SfxItemSet& rAttr); @@ -875,7 +875,7 @@ public: SfxStyleSheet* GetStyleSheet() const; // TextEdit - virtual int HasTextEdit() const; + virtual FASTBOOL HasTextEdit() const; // Return==TRUE: TextEditMode gestartet virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); @@ -892,11 +892,11 @@ public: void BurnInStyleSheetAttributes(); // Macrofaehigkeit, z.B. ein Rechteck als PushButton. - virtual int HasMacro() const; + virtual FASTBOOL HasMacro() const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; - virtual int DoMacro (const SdrObjMacroHitRec& rRec); + virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; sal_Bool IsMacroHit(const SdrObjMacroHitRec& rRec) const { return CheckMacroHit(rRec)!=NULL; } @@ -917,7 +917,7 @@ public: // Beim Verschieben/Resizen der Kante wird dagegen die Verbindung // geloesst. // Objekt ist ein Knoten? - virtual int IsNode() const; + virtual FASTBOOL IsNode() const; // Automatische Klebepunkte: // je 4 Scheitelpunkt- und Eckpositionen muss ein Knotenobjekt liefern @@ -935,19 +935,19 @@ public: virtual SdrGluePointList* ForceGluePointList(); // Temporaer zu setzen fuer Transformationen am Bezugsobjekt - void SetGlueReallyAbsolute(int bOn); + void SetGlueReallyAbsolute(FASTBOOL bOn); void NbcRotateGluePoints(const Point& rRef, long nWink, double sn, double cs); void NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2); - void NbcShearGluePoints (const Point& rRef, long nWink, double tn, int bVShear); + void NbcShearGluePoints (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); // Objekt ist eine Kante? - virtual int IsEdge() const; + virtual FASTBOOL IsEdge() const; // bTail1=TRUE: Linienanfang, sonst LinienEnde // pObj=NULL: Disconnect - virtual void ConnectToNode(int bTail1, SdrObject* pObj); - virtual void DisconnectFromNode(int bTail1); - virtual SdrObject* GetConnectedNode(int bTail1) const; + virtual void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj); + virtual void DisconnectFromNode(FASTBOOL bTail1); + virtual SdrObject* GetConnectedNode(FASTBOOL bTail1) const; /** sets the writing mode of the object's context diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx index e85c2561798f..7bac32cb9c1e 100644 --- a/svx/inc/svx/svdocapt.hxx +++ b/svx/inc/svx/svdocapt.hxx @@ -118,10 +118,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx index 183eb4c93f3f..969920906dce 100644 --- a/svx/inc/svx/svdocirc.hxx +++ b/svx/inc/svx/svdocirc.hxx @@ -82,7 +82,7 @@ private: SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // Werte in den Pool kopieren // Liefert sal_True, wenn das Painten ein XPolygon erfordert. - SVX_DLLPRIVATE int PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc + SVX_DLLPRIVATE FASTBOOL PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc SVX_DLLPRIVATE virtual void RecalcXPoly(); protected: @@ -126,17 +126,17 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; virtual void NbcMove(const Size& aSiz); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; protected: diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx index dfe75d5f8b6f..77f3861898a3 100644 --- a/svx/inc/svx/svdoedge.hxx +++ b/svx/inc/svx/svdoedge.hxx @@ -73,7 +73,7 @@ public: SVX_DLLPUBLIC ~SdrObjConnection(); void ResetVars(); - int TakeGluePoint(SdrGluePoint& rGP, int bSetAbsolutePos) const; + FASTBOOL TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsolutePos) const; inline void SetBestConnection( sal_Bool rB ) { bBestConn = rB; }; inline void SetBestVertex( sal_Bool rB ) { bBestVertex = rB; }; @@ -126,7 +126,7 @@ public: Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode); const Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) const { return ((SdrEdgeInfoRec*)this)->ImpGetLineVersatzPoint(eLineCode); } sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; - int ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; + FASTBOOL ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal); long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; }; @@ -208,10 +208,10 @@ protected: XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1, const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2, sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; - static int ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL); + static FASTBOOL ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL); sal_uInt16 ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const; - int ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte - void ImpSetTailPoint(int bTail1, const Point& rPt); + FASTBOOL ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte + void ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt); void ImpUndirtyEdgeTrack(); // eventuelle Neuberechnung des Verbindungsverlaufs void ImpDirtyEdgeTrack(); // invalidate connector path, so it will be recalculated next time void ImpSetAttrToEdgeInfo(); // Werte vom Pool nach aEdgeInfo kopieren @@ -223,26 +223,26 @@ public: SdrEdgeObj(); virtual ~SdrEdgeObj(); - SdrObjConnection& GetConnection(int bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } + SdrObjConnection& GetConnection(FASTBOOL bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual sal_uInt16 GetObjIdentifier() const; virtual const Rectangle& GetCurrentBoundRect() const; virtual const Rectangle& GetSnapRect() const; - virtual int IsNode() const; + virtual FASTBOOL IsNode() const; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; virtual const SdrGluePointList* GetGluePointList() const; virtual SdrGluePointList* ForceGluePointList(); - virtual int IsEdge() const; + virtual FASTBOOL IsEdge() const; // bTail1=TRUE: Linienanfang, sonst LinienEnde // pObj=NULL: Disconnect void SetEdgeTrackDirty() { bEdgeTrackDirty=sal_True; } - void ConnectToNode(int bTail1, SdrObject* pObj); - void DisconnectFromNode(int bTail1); - SdrObject* GetConnectedNode(int bTail1) const; - const SdrObjConnection& GetConnection(int bTail1) const { return *(bTail1 ? &aCon1 : &aCon2); } - int CheckNodeConnection(int bTail1) const; + void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj); + void DisconnectFromNode(FASTBOOL bTail1); + SdrObject* GetConnectedNode(FASTBOOL bTail1) const; + const SdrObjConnection& GetConnection(FASTBOOL bTail1) const { return *(bTail1 ? &aCon1 : &aCon2); } + FASTBOOL CheckNodeConnection(FASTBOOL bTail1) const; virtual void RecalcSnapRect(); virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; @@ -273,10 +273,10 @@ public: // #102344# Added missing implementation virtual void NbcSetAnchorPos(const Point& rPnt); - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 9b8f318cce16..fa5b56e403e5 100644 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -188,14 +188,14 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcSetLogicRect(const Rectangle& rRect); virtual SdrObjGeoData* NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); - int HasGDIMetaFile() const; + FASTBOOL HasGDIMetaFile() const; const GDIMetaFile* GetGDIMetaFile() const; virtual void SetPage(SdrPage* pNewPage); diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx index 227d2817b450..9cf0ad056047 100644 --- a/svx/inc/svx/svdogrp.hxx +++ b/svx/inc/svx/svdogrp.hxx @@ -56,7 +56,7 @@ protected: long nShearWink; Point aRefPoint; // Referenzpunkt innerhalb der Objektgruppe - int bRefPoint; // Ist ein RefPoint gesetzt? + FASTBOOL bRefPoint; // Ist ein RefPoint gesetzt? public: TYPEINFO(); @@ -71,7 +71,7 @@ public: virtual void SetObjList(SdrObjList* pNewObjList); virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); - virtual int HasRefPoint() const; + virtual FASTBOOL HasRefPoint() const; virtual Point GetRefPoint() const; virtual void SetRefPoint(const Point& rPnt); virtual SdrObjList* GetSubList() const; @@ -90,16 +90,16 @@ public: // special drag methods virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); virtual long GetRotateAngle() const; - virtual long GetShearAngle(int bVertical=sal_False) const; + virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; virtual void Move(const Size& rSiz); virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void SetAnchorPos(const Point& rPnt); virtual void SetRelativePos(const Point& rPnt); virtual void SetSnapRect(const Rectangle& rRect); @@ -109,7 +109,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual void NbcSetAnchorPos(const Point& rPnt); virtual void NbcSetRelativePos(const Point& rPnt); virtual void NbcSetSnapRect(const Rectangle& rRect); diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx index 11e1a5cacb23..9be5e7e2e73b 100644 --- a/svx/inc/svx/svdomeas.hxx +++ b/svx/inc/svx/svdomeas.hxx @@ -77,7 +77,7 @@ protected: Point aPt1; Point aPt2; - int bTextDirty; + FASTBOOL bTextDirty; protected: void ImpTakeAttr(ImpMeasureRec& rRec) const; @@ -116,10 +116,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -128,7 +128,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); virtual long GetRotateAngle() const; virtual void RecalcSnapRect(); @@ -144,7 +144,7 @@ public: virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual const Size& GetTextSize() const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False, + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; @@ -152,8 +152,8 @@ public: virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); virtual OutlinerParaObject* GetOutlinerParaObject() const; - virtual int CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, - int bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; + virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, + FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; // #i97878# virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx index 9e037fdb4bf7..59327e85868d 100644 --- a/svx/inc/svx/svdoole2.hxx +++ b/svx/inc/svx/svdoole2.hxx @@ -85,10 +85,10 @@ protected: public: TYPEINFO(); - SdrOle2Obj(int bFrame_=sal_False); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, int bFrame_=sal_False); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, int bFrame_=sal_False); - SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, int bFrame_=sal_False); + SdrOle2Obj(FASTBOOL bFrame_=sal_False); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_=sal_False); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, FASTBOOL bFrame_=sal_False); + SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_=sal_False); virtual ~SdrOle2Obj(); // access to svt::EmbeddedObjectRef @@ -117,7 +117,7 @@ public: // spaeter wieder abfragen kann (SD braucht das fuer Praesentationsobjekte). void SetProgName(const String& rNam) { aProgName=rNam; } const String& GetProgName() const { return aProgName; } - int IsEmpty() const; + FASTBOOL IsEmpty() const; void SetObjRef(const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rNewObjRef); com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObjRef() const; diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx index 528e7170e231..0030d48d6d6c 100644 --- a/svx/inc/svx/svdopath.hxx +++ b/svx/inc/svx/svdopath.hxx @@ -115,10 +115,10 @@ public: virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; Pointer GetCreatePointer() const; @@ -131,7 +131,7 @@ public: virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact); virtual void NbcRotate(const Point& rRefPnt, long nAngle, double fSin, double fCos); virtual void NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2); - virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, int bVShear); + virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, FASTBOOL bVShear); virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx index 72382fde7d64..20fe1c3adc76 100644 --- a/svx/inc/svx/svdorect.hxx +++ b/svx/inc/svx/svdorect.hxx @@ -63,7 +63,7 @@ protected: protected: // Liefert sal_True, wenn das Painten ein Polygon erfordert. - int PaintNeedsXPoly(long nEckRad) const; + FASTBOOL PaintNeedsXPoly(long nEckRad) const; protected: XPolygon ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const; @@ -120,9 +120,9 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); - virtual int DoMacro(const SdrObjMacroHitRec& rRec); + virtual FASTBOOL DoMacro(const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx index 47b12451f84e..a9039c55d486 100644 --- a/svx/inc/svx/svdotable.hxx +++ b/svx/inc/svx/svdotable.hxx @@ -201,19 +201,19 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, int bNoEditText=sal_False, ::Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; + virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, ::Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; - virtual int IsAutoGrowHeight() const; + virtual FASTBOOL IsAutoGrowHeight() const; long GetMinTextFrameHeight() const; long GetMaxTextFrameHeight() const; - virtual int IsAutoGrowWidth() const; + virtual FASTBOOL IsAutoGrowWidth() const; long GetMinTextFrameWidth() const; long GetMaxTextFrameWidth() const; - virtual int IsFontwork() const; + virtual FASTBOOL IsFontwork() const; virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); @@ -221,8 +221,8 @@ public: virtual sal_uInt16 GetObjIdentifier() const; virtual void SetChanged(); - virtual int AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt=sal_True, int bWdt=sal_True) const; - virtual int AdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; + virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; virtual void operator=(const SdrObject& rObj); @@ -250,10 +250,10 @@ public: virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx index 5c66e793e67d..fe6d298af405 100644 --- a/svx/inc/svx/svdotext.hxx +++ b/svx/inc/svx/svdotext.hxx @@ -261,7 +261,7 @@ private: // #101029#: Extracted from ImpGetDrawOutliner() SVX_DLLPRIVATE void ImpInitDrawOutliner( SdrOutliner& rOutl ) const; // #101029#: Extracted from Paint() - SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( int bContourFrame, + SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( FASTBOOL bContourFrame, SdrOutliner& rOutliner, Rectangle& rTextRect, Rectangle& rAnchorRect, @@ -276,7 +276,7 @@ private: protected: bool ImpCanConvTextToCurve() const; SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, sal_Bool bClosed, sal_Bool bBezier, sal_Bool bNoSetAttr = sal_False) const; - SdrObject* ImpConvertAddText(SdrObject* pObj, int bBezier) const; + SdrObject* ImpConvertAddText(SdrObject* pObj, FASTBOOL bBezier) const; void ImpSetTextStyleSheetListeners(); void ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& rTextRect, const Rectangle& rAnchorRect, Fraction& rFitXKorreg) const; void ImpJustifyRect(Rectangle& rRect) const; @@ -291,14 +291,14 @@ protected: virtual SdrObjGeoData* NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); - int NbcSetEckenradius(long nRad); - int NbcSetAutoGrowHeight(bool bAuto); - int NbcSetMinTextFrameHeight(long nHgt); - int NbcSetMaxTextFrameHeight(long nHgt); - int NbcSetAutoGrowWidth(bool bAuto); - int NbcSetMinTextFrameWidth(long nWdt); - int NbcSetMaxTextFrameWidth(long nWdt); - int NbcSetFitToSize(SdrFitToSizeType eFit); + FASTBOOL NbcSetEckenradius(long nRad); + FASTBOOL NbcSetAutoGrowHeight(bool bAuto); + FASTBOOL NbcSetMinTextFrameHeight(long nHgt); + FASTBOOL NbcSetMaxTextFrameHeight(long nHgt); + FASTBOOL NbcSetAutoGrowWidth(bool bAuto); + FASTBOOL NbcSetMinTextFrameWidth(long nWdt); + FASTBOOL NbcSetMaxTextFrameWidth(long nWdt); + FASTBOOL NbcSetFitToSize(SdrFitToSizeType eFit); // Konstruktoren fuer beschriftete Zeichenobjekte SdrTextObj(); @@ -330,20 +330,20 @@ public: // Eine Attributierung kann nur am Textrahmen vollzogen werden. void SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); void ReleaseTextLink(); - int IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; } - int ReloadLinkedText(int bForceLoad=sal_False); - int LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); + FASTBOOL IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; } + FASTBOOL ReloadLinkedText(FASTBOOL bForceLoad=sal_False); + FASTBOOL LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet); - virtual int AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt=sal_True, int bWdt=sal_True) const; - virtual int NbcAdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True); - virtual int AdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True) const; + virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); + virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=sal_True, FASTBOOL bWdt=sal_True); void NbcResizeTextAttributes(const Fraction& xFact, const Fraction& yFact); - int IsTextFrame() const { return bTextFrame; } - int IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } + FASTBOOL IsTextFrame() const { return bTextFrame; } + FASTBOOL IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); } SdrObjKind GetTextKind() const { return eTextKind; } virtual bool HasText() const; - int HasEditText() const; + FASTBOOL HasEditText() const; sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); } /** returns the currently active text. */ @@ -364,8 +364,8 @@ public: /** returns the index of the text that contains the given point or -1 */ virtual sal_Int32 CheckTextHit(const Point& rPnt) const; - void SetDisableAutoWidthOnDragging(int bOn) { bDisableAutoWidthOnDragging=bOn; } - int IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; } + void SetDisableAutoWidthOnDragging(FASTBOOL bOn) { bDisableAutoWidthOnDragging=bOn; } + FASTBOOL IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; } void NbcSetText(const String& rStr); void SetText(const String& rStr); void NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); @@ -377,16 +377,16 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False, + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; const GeoStat& GetGeoStat() const { return aGeo; } long GetEckenradius() const; - virtual int IsAutoGrowHeight() const; + virtual FASTBOOL IsAutoGrowHeight() const; long GetMinTextFrameHeight() const; long GetMaxTextFrameHeight() const; - virtual int IsAutoGrowWidth() const; + virtual FASTBOOL IsAutoGrowWidth() const; long GetMinTextFrameWidth() const; long GetMaxTextFrameWidth() const; @@ -394,13 +394,13 @@ public: const Rectangle &GetGeoRect() const { return aRect; } // Feststellen, ob TextFontwork - virtual int IsFontwork() const; + virtual FASTBOOL IsFontwork() const; // Soll die Fontwork-Kontour versteckt werden? - int IsHideContour() const; + FASTBOOL IsHideContour() const; // Textfluss innerhalb Kontur - int IsContourTextFrame() const; + FASTBOOL IsContourTextFrame() const; // Horizontale Textausrichtung SdrTextHorzAdjust GetTextHorizontalAdjust(const SfxItemSet& rSet) const; @@ -435,7 +435,7 @@ public: virtual void NbcSetLogicRect(const Rectangle& rRect); virtual const Rectangle& GetLogicRect() const; virtual long GetRotateAngle() const; - virtual long GetShearAngle(int bVertical=sal_False) const; + virtual long GetShearAngle(FASTBOOL bVertical=sal_False) const; virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; @@ -448,10 +448,10 @@ public: virtual bool applySpecialDrag(SdrDragStat& rDrag); virtual String getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual int BegCreate(SdrDragStat& rStat); - virtual int MovCreate(SdrDragStat& rStat); - virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual int BckCreate(SdrDragStat& rStat); + virtual FASTBOOL BegCreate(SdrDragStat& rStat); + virtual FASTBOOL MovCreate(SdrDragStat& rStat); + virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); + virtual FASTBOOL BckCreate(SdrDragStat& rStat); virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; @@ -460,9 +460,9 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear); + virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear); - virtual int HasTextEdit() const; + virtual FASTBOOL HasTextEdit() const; virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit(SdrOutliner& rOutl); @@ -480,8 +480,8 @@ public: virtual void NbcReformatText(); virtual void ReformatText(); - virtual int CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, - int bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; + virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, + FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx index f85596251dd0..1554e5b84ebd 100644 --- a/svx/inc/svx/svdpage.hxx +++ b/svx/inc/svx/svdpage.hxx @@ -97,8 +97,8 @@ friend class SdrEditView; Rectangle aOutRect; Rectangle aSnapRect; SdrObjListKind eListKind; - int bObjOrdNumsDirty; - int bRectsDirty; + FASTBOOL bObjOrdNumsDirty; + FASTBOOL bRectsDirty; protected: virtual void RecalcRects(); @@ -131,7 +131,7 @@ public: virtual void SetModel(SdrModel* pNewModel); // Neuberechnung der Objekt-Ordnungsnummern void RecalcObjOrdNums(); - int IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } + FASTBOOL IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND , const SdrInsertReason* pReason=NULL ); @@ -169,7 +169,7 @@ public: SdrObject* GetObj(sal_uIntPtr nNum) const; // Gelinkte Seite oder gelinktes Gruppenobjekt - virtual int IsReadOnly() const; + virtual FASTBOOL IsReadOnly() const; // Zaehlt alle Objekte inkl. Objekte in Objektgruppen, ... sal_uIntPtr CountAllObjects() const; @@ -480,7 +480,7 @@ public: virtual SdrPage* Clone(SdrModel* pNewModel) const; bool IsMasterPage() const { return mbMaster; } void SetInserted(bool bNew = true); - int IsInserted() const { return mbInserted; } + FASTBOOL IsInserted() const { return mbInserted; } virtual void SetChanged(); // #i68775# React on PageNum changes (from Model in most cases) @@ -532,11 +532,11 @@ public: // GetBitmap und GetMetafile sind noch nicht implementiert. // Bitmap in Bildschirmaufloesung und -farbtiefe aus den Objekten der // Page erzeugen. - Bitmap GetBitmap(int bTrimBorders=sal_True) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); } - Bitmap GetBitmap(const SetOfByte& rVisibleLayers, int bTrimBorders=sal_True) const; + Bitmap GetBitmap(FASTBOOL bTrimBorders=sal_True) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); } + Bitmap GetBitmap(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=sal_True) const; // Metafile aus den Objekten der Page erzeugen - GDIMetaFile GetMetaFile(int bTrimBorders=sal_True) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); } - GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, int bTrimBorders=sal_True); + GDIMetaFile GetMetaFile(FASTBOOL bTrimBorders=sal_True) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); } + GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=sal_True); virtual String GetLayoutName() const; @@ -559,7 +559,7 @@ public: virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const; - int HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; + FASTBOOL HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const; /** *deprecated* returns an averaged background color of this page */ // #i75566# GetBackgroundColor -> GetPageBackgroundColor diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 29fea090bf68..5329be5973eb 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -145,9 +145,9 @@ protected: protected: SdrUndoObj(SdrObject& rNewObj); - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, int bRepeat=sal_False) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat=sal_False) const; - static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, int bRepeat = sal_False ); + static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, FASTBOOL bRepeat = sal_False ); // #94278# new method for evtl. PageChange at UNDO/REDO void ImpShowPageOfThisObject(); @@ -173,8 +173,8 @@ protected: SfxStyleSheet* pUndoStyleSheet; SfxStyleSheet* pRedoStyleSheet; SfxStyleSheet* pRepeatStyleSheet; - int bStyleSheet; - int bHaveToTakeRedoSet; + FASTBOOL bStyleSheet; + FASTBOOL bHaveToTakeRedoSet; // Bei Zuweisung von TextItems auf ein Zeichenobjekt mit Text: OutlinerParaObject* pTextUndo; @@ -186,7 +186,7 @@ protected: SdrUndoGroup* pUndoGroup; public: - SdrUndoAttrObj(SdrObject& rNewObj, int bStyleSheet1=sal_False, int bSaveText=sal_False); + SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1=sal_False, FASTBOOL bSaveText=sal_False); virtual ~SdrUndoAttrObj(); void SetRepeatAttr(const SfxItemSet& rSet); virtual void Undo(); @@ -295,7 +295,7 @@ protected: class SVX_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList { public: - SdrUndoRemoveObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False) + SdrUndoRemoveObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -314,7 +314,7 @@ public: class SVX_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList { public: - SdrUndoInsertObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False) + SdrUndoInsertObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -332,7 +332,7 @@ public: class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj { public: - SdrUndoDelObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False) + SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(sal_True); } virtual void Undo(); @@ -356,7 +356,7 @@ public: class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj { public: - SdrUndoNewObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False) + SdrUndoNewObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoInsertObj(rNewObj,bOrdNumDirect) {} virtual void Undo(); @@ -410,7 +410,7 @@ public: class SdrUndoCopyObj : public SdrUndoNewObj { public: - SdrUndoCopyObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False) + SdrUndoCopyObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=sal_False) : SdrUndoNewObj(rNewObj,bOrdNumDirect) {} virtual String GetComment() const; @@ -460,7 +460,7 @@ class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj protected: OutlinerParaObject* pOldText; OutlinerParaObject* pNewText; - int bNewTextAvailable; + FASTBOOL bNewTextAvailable; sal_Bool bEmptyPresObj; sal_Int32 mnText; @@ -468,7 +468,7 @@ public: SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText ); virtual ~SdrUndoObjSetText(); - int IsDifferent() const { return pOldText!=pNewText; } + FASTBOOL IsDifferent() const { return pOldText!=pNewText; } void AfterSetText(); virtual void Undo(); @@ -535,7 +535,7 @@ protected: SdrLayer* pLayer; SdrLayerAdmin* pLayerAdmin; sal_uInt16 nNum; - int bItsMine; + FASTBOOL bItsMine; protected: SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); @@ -633,7 +633,7 @@ protected: protected: SdrUndoPage(SdrPage& rNewPg); - void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, int bRepeat=sal_False) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, FASTBOOL bRepeat=sal_False) const; }; //************************************************************ @@ -651,7 +651,7 @@ protected: // Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page // statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE - int bItsMine; + FASTBOOL bItsMine; protected: SdrUndoPageList(SdrPage& rNewPg); diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx index 84ba0703d01a..5d8a4cf3e9a6 100644 --- a/svx/inc/svx/xflbmsxy.hxx +++ b/svx/inc/svx/xflbmsxy.hxx @@ -55,7 +55,7 @@ public: // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen // wir hier beruecksichtigen - SVX_DLLPRIVATE virtual int HasMetrics() const; + SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const; }; /************************************************************************* @@ -82,7 +82,7 @@ public: // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen // wir hier beruecksichtigen - SVX_DLLPRIVATE virtual int HasMetrics() const; + SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const; }; #endif diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx index f2754ca62cfc..a666381dd4e3 100644 --- a/svx/inc/svx/xflhtit.hxx +++ b/svx/inc/svx/xflhtit.hxx @@ -62,8 +62,8 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual int HasMetrics() const; - virtual int ScaleMetrics(long nMul, long nDiv); + virtual FASTBOOL HasMetrics() const; + virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); const XHatch& GetHatchValue(const XHatchTable* pTable = 0) const; // GetValue -> GetHatchValue void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx index 783c2922df06..0cfefadb550c 100644 --- a/svx/inc/svx/xlndsit.hxx +++ b/svx/inc/svx/xlndsit.hxx @@ -66,8 +66,8 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual int HasMetrics() const; - virtual int ScaleMetrics(long nMul, long nDiv); + virtual FASTBOOL HasMetrics() const; + virtual FASTBOOL ScaleMetrics(long nMul, long nDiv); const XDash& GetDashValue(const XDashTable* pTable = 0) const; // GetValue -> GetDashValue void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx index 4904aeb40a97..348e9ebe869a 100644 --- a/svx/inc/svx/zoomitem.hxx +++ b/svx/inc/svx/zoomitem.hxx @@ -61,7 +61,7 @@ public: void SetValueSet( sal_uInt16 nValues ) { nValueSet = nValues; } sal_uInt16 GetValueSet() const { return nValueSet; } - int IsValueAllowed( sal_uInt16 nValue ) const + FASTBOOL IsValueAllowed( sal_uInt16 nValue ) const { return nValue == ( nValue & nValueSet ); } SvxZoomType GetType() const { return eType; } |