diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/xbitmap.hxx | 8 | ||||
-rw-r--r-- | include/svx/xbtmpit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xflbckit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xflbmsli.hxx | 2 | ||||
-rw-r--r-- | include/svx/xflbmtit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xflbstit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xflftrit.hxx | 12 | ||||
-rw-r--r-- | include/svx/xflgrit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xflhtit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xftmrit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xftouit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xit.hxx | 4 | ||||
-rw-r--r-- | include/svx/xlndsit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xlnedcit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xlnstcit.hxx | 2 | ||||
-rw-r--r-- | include/svx/xmleohlp.hxx | 18 | ||||
-rw-r--r-- | include/svx/xmlgrhlp.hxx | 12 | ||||
-rw-r--r-- | include/svx/xoutbmp.hxx | 4 | ||||
-rw-r--r-- | include/svx/xpoly.hxx | 18 | ||||
-rw-r--r-- | include/svx/xpool.hxx | 2 | ||||
-rw-r--r-- | include/svx/xtextit0.hxx | 2 |
21 files changed, 52 insertions, 52 deletions
diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx index 4ff5e77d0f6b..4229d62964a1 100644 --- a/include/svx/xbitmap.hxx +++ b/include/svx/xbitmap.hxx @@ -35,7 +35,7 @@ private: Size aArraySize; Color aPixelColor; Color aBckgrColor; - sal_Bool bGraphicDirty; + bool bGraphicDirty; const GraphicObject& GetGraphicObject() const; @@ -51,9 +51,9 @@ public: void Array2Bitmap(); void SetBitmapType( XBitmapType eNewType ) { eType = eNewType; } - void SetPixelColor( const Color& rColor ) { aPixelColor = rColor; bGraphicDirty = sal_True; } - void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = sal_True; } - void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = sal_True; } + void SetPixelColor( const Color& rColor ) { aPixelColor = rColor; bGraphicDirty = true; } + void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = true; } + void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = true; } XBitmapType GetBitmapType() const { return eType; } Bitmap GetBitmap() const; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index d2729dc772d3..4c612cda1ca2 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -66,7 +66,7 @@ public: const GraphicObject& GetGraphicObject() const; void SetGraphicObject(const GraphicObject& rGraphicObject); - static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillBitmapItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index cc84ce51a767..0ed1bfb6a0bf 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem public: TYPEINFO(); - XFillBackgroundItem( sal_Bool bFill = sal_False ); + XFillBackgroundItem( bool bFill = false ); SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn ); diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index 029bfe668dc1..11b4a15048b1 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -27,7 +27,7 @@ class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem { public: TYPEINFO(); - XFillBmpSizeLogItem( sal_Bool bLog = sal_True ); + XFillBmpSizeLogItem( bool bLog = true ); SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index 3667ffd56e47..a60458e73cb4 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -27,7 +27,7 @@ class SVX_DLLPUBLIC XFillBmpTileItem : public SfxBoolItem { public: TYPEINFO(); - XFillBmpTileItem( sal_Bool bTile = sal_True ); + XFillBmpTileItem( bool bTile = true ); XFillBmpTileItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 111058cead48..e2cea6a3b4a4 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -27,7 +27,7 @@ class SVX_DLLPUBLIC XFillBmpStretchItem : public SfxBoolItem { public: TYPEINFO(); - XFillBmpStretchItem( sal_Bool bStretch = sal_True ); + XFillBmpStretchItem( bool bStretch = true ); XFillBmpStretchItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index 55c9a201a3e6..a5d74affe0ab 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -31,14 +31,14 @@ class SVX_DLLPUBLIC XFillFloatTransparenceItem : public XFillGradientItem { private: - sal_Bool bEnabled; + bool bEnabled; public: TYPEINFO(); XFillFloatTransparenceItem(); - XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, sal_Bool bEnable = sal_True ); - XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, sal_Bool bEnable = sal_True ); + XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, bool bEnable = true ); + XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, bool bEnable = true ); XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem ); virtual bool operator==( const SfxPoolItem& rItem ) const; @@ -50,10 +50,10 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = 0 ) const; - sal_Bool IsEnabled() const { return bEnabled; } - void SetEnabled( sal_Bool bEnable ) { bEnabled = bEnable; } + bool IsEnabled() const { return bEnabled; } + void SetEnabled( bool bEnable ) { bEnabled = bEnable; } - static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillFloatTransparenceItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 34152b122310..110ce064f5a6 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -58,7 +58,7 @@ public: const XGradient& GetGradientValue() const; // GetValue -> GetGradientValue void SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue - static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillGradientItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 84be34942e7d..bcf6d659b9bb 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -58,7 +58,7 @@ public: const XHatch& GetHatchValue() const; // GetValue -> GetHatchValue void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue - static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillHatchItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx index caf9e36e78b0..9f0f6d330eeb 100644 --- a/include/svx/xftmrit.hxx +++ b/include/svx/xftmrit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFormTextMirrorItem : public SfxBoolItem { public: TYPEINFO(); - XFormTextMirrorItem(sal_Bool bMirror = sal_False); + XFormTextMirrorItem(bool bMirror = false); XFormTextMirrorItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx index 596cab1f9ac7..18c94d649874 100644 --- a/include/svx/xftouit.hxx +++ b/include/svx/xftouit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFormTextOutlineItem : public SfxBoolItem { public: TYPEINFO(); - XFormTextOutlineItem(sal_Bool bOutline = sal_False); + XFormTextOutlineItem(bool bOutline = false); XFormTextOutlineItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 337467971ad4..2a83d5d90f56 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -30,7 +30,7 @@ class SfxItemPool; class NameOrIndex; -typedef sal_Bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 ); +typedef bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 ); // class NameOrIndex @@ -61,7 +61,7 @@ public: void SetName(const OUString& rName) { SetValue(rName); } sal_Int32 GetIndex() const { return nPalIndex; } void SetIndex(sal_Int32 nIndex) { nPalIndex = nIndex; } - sal_Bool IsIndex() const { return (nPalIndex >= 0); } + bool IsIndex() const { return (nPalIndex >= 0); } /** this static checks if the given NameOrIndex item has a unique name for its value. The returned String is a unique name for an item with this value in both given pools. diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 21809d5ad9fe..f8b7a01a0547 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -60,7 +60,7 @@ public: const XDash& GetDashValue() const; void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue - static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XLineDashItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index 8ef4e4eaf3f5..8212865078bc 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem { public: TYPEINFO(); - XLineEndCenterItem(sal_Bool bEndCenter = sal_False); + XLineEndCenterItem(bool bEndCenter = false); XLineEndCenterItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index 0ac4b0917402..ea9ea4b09a8d 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem { public: TYPEINFO(); - XLineStartCenterItem(sal_Bool bStartCenter = sal_False); + XLineStartCenterItem(bool bStartCenter = false); XLineStartCenterItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index 27951556a9a3..1891523060ae 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -74,18 +74,18 @@ private: SvXMLEmbeddedObjectHelperMode meCreateMode; SvXMLEmbeddedObjectHelper_Impl *mpStreamMap; - SVX_DLLPRIVATE sal_Bool ImplGetStorageNames( - const OUString& rURLStr, - OUString& rContainerStorageName, - OUString& rObjectStorageName, - sal_Bool bInternalToExternal, - sal_Bool *pGraphicRepl=0, - sal_Bool *pOasisFormat=0 ) const; + SVX_DLLPRIVATE bool ImplGetStorageNames( + const OUString& rURLStr, + OUString& rContainerStorageName, + OUString& rObjectStorageName, + bool bInternalToExternal, + bool *pGraphicRepl=0, + bool *pOasisFormat=0 ) const; SVX_DLLPRIVATE com::sun::star::uno::Reference < com::sun::star::embed::XStorage > ImplGetContainerStorage( const OUString& rStorageName ); - SVX_DLLPRIVATE sal_Bool ImplReadObject( + SVX_DLLPRIVATE bool ImplReadObject( const OUString& rContainerStorageName, OUString& rObjName, const SvGlobalName *pClassId, @@ -116,7 +116,7 @@ public: const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode, - sal_Bool bDirect = sal_True ); + bool bDirect = true ); static SvXMLEmbeddedObjectHelper* Create( ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ); diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index 40a6932ca49f..bd5a2a79ca40 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -62,9 +62,9 @@ private: GraphicOutputStreamVector maGrfStms; URLSet maURLSet; SvXMLGraphicHelperMode meCreateMode; - sal_Bool mbDirect; + bool mbDirect; - SVX_DLLPRIVATE sal_Bool ImplGetStreamNames( const OUString& rURLStr, + SVX_DLLPRIVATE bool ImplGetStreamNames( const OUString& rURLStr, OUString& rPictureStorageName, OUString& rPictureStreamName ); SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage > @@ -72,11 +72,11 @@ private: SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const OUString& rPictureStorageName, const OUString& rPictureStreamName, - sal_Bool bTruncate ); + bool bTruncate ); SVX_DLLPRIVATE OUString ImplGetGraphicMimeType( const OUString& rFileName ) const; SVX_DLLPRIVATE Graphic ImplReadGraphic( const OUString& rPictureStorageName, const OUString& rPictureStreamName ); - SVX_DLLPRIVATE sal_Bool ImplWriteGraphic( const OUString& rPictureStorageName, + SVX_DLLPRIVATE bool ImplWriteGraphic( const OUString& rPictureStorageName, const OUString& rPictureStreamName, const OUString& rGraphicId, bool bUseGfxLink ); @@ -87,7 +87,7 @@ protected: ~SvXMLGraphicHelper(); void Init( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& xXMLStorage, SvXMLGraphicHelperMode eCreateMode, - sal_Bool bDirect ); + bool bDirect ); virtual void SAL_CALL disposing(); @@ -96,7 +96,7 @@ public: static SvXMLGraphicHelper* Create( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, - sal_Bool bDirect = sal_True ); + bool bDirect = true ); static SvXMLGraphicHelper* Create( SvXMLGraphicHelperMode eCreateMode ); static void Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ); diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index 4a0539af0d51..0f802210ace2 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -50,7 +50,7 @@ public: static GraphicFilter* pGrfFilter; static Graphic MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags ); - static Animation MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr ); + static Animation MirrorAnimation( const Animation& rAnimation, bool bHMirr, bool bVMirr ); static sal_uInt16 WriteGraphic( const Graphic& rGraphic, OUString& rFileName, const OUString& rFilterName, const sal_uIntPtr nFlags = 0L, const Size* pMtfSize_100TH_MM = NULL ); @@ -67,7 +67,7 @@ public: const Rectangle* pWorkRect = NULL ); }; -SVX_DLLPUBLIC sal_Bool DitherBitmap( Bitmap& rBitmap ); +SVX_DLLPUBLIC bool DitherBitmap( Bitmap& rBitmap ); #endif // INCLUDED_SVX_XOUTBMP_HXX diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx index a60e69c53536..a57fb8938622 100644 --- a/include/svx/xpoly.hxx +++ b/include/svx/xpoly.hxx @@ -56,11 +56,11 @@ protected: void CheckReference(); // Hilfsfunktionen fuer Bezierkonvertierung - void SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT); + void SubdivideBezier(sal_uInt16 nPos, bool bCalcFirst, double fT); void GenBezArc(const Point& rCenter, long nRx, long nRy, long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd, sal_uInt16 nQuad, sal_uInt16 nFirst); - sal_Bool CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2); + bool CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2); public: XPolygon( sal_uInt16 nSize=16, sal_uInt16 nResize=16 ); @@ -69,7 +69,7 @@ public: XPolygon( const Rectangle& rRect, long nRx = 0, long nRy = 0 ); XPolygon( const Point& rCenter, long nRx, long nRy, sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600, - sal_Bool bClose = sal_True ); + bool bClose = true ); ~XPolygon(); @@ -87,13 +87,13 @@ public: const Point& operator[]( sal_uInt16 nPos ) const; Point& operator[]( sal_uInt16 nPos ); XPolygon& operator=( const XPolygon& rXPoly ); - sal_Bool operator==( const XPolygon& rXPoly ) const; - sal_Bool operator!=( const XPolygon& rXPoly ) const; + bool operator==( const XPolygon& rXPoly ) const; + bool operator!=( const XPolygon& rXPoly ) const; XPolyFlags GetFlags( sal_uInt16 nPos ) const; void SetFlags( sal_uInt16 nPos, XPolyFlags eFlags ); - sal_Bool IsControl(sal_uInt16 nPos) const; - sal_Bool IsSmooth(sal_uInt16 nPos) const; + bool IsControl(sal_uInt16 nPos) const; + bool IsSmooth(sal_uInt16 nPos) const; // Abstand zwischen zwei Punkten double CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2); @@ -152,8 +152,8 @@ public: XPolygon& operator[]( sal_uInt16 nPos ); XPolyPolygon& operator=( const XPolyPolygon& rXPolyPoly ); - sal_Bool operator==( const XPolyPolygon& rXPolyPoly ) const; - sal_Bool operator!=( const XPolyPolygon& rXPolyPoly ) const; + bool operator==( const XPolyPolygon& rXPolyPoly ) const; + bool operator!=( const XPolyPolygon& rXPolyPoly ) const; // Transformationen void Distort(const Rectangle& rRefRect, const XPolygon& rDistortedRect); diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx index a53dbbd49ed2..396578040c0a 100644 --- a/include/svx/xpool.hxx +++ b/include/svx/xpool.hxx @@ -41,7 +41,7 @@ public: SfxItemPool* pMaster = 0L, sal_uInt16 nAttrStart = XATTR_START, sal_uInt16 nAttrEnd = XATTR_END, - sal_Bool bLoadRefCounts = sal_True); + bool bLoadRefCounts = true); XOutdevItemPool(const XOutdevItemPool& rPool); virtual SfxItemPool* Clone() const; diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx index 65d50c7215c0..80b75e52cf30 100644 --- a/include/svx/xtextit0.hxx +++ b/include/svx/xtextit0.hxx @@ -55,7 +55,7 @@ class SVX_DLLPUBLIC XFormTextHideFormItem : public SfxBoolItem { public: TYPEINFO(); - XFormTextHideFormItem(sal_Bool bHide = sal_False); + XFormTextHideFormItem(bool bHide = false); XFormTextHideFormItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; |