diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-10 23:45:20 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-11 00:15:06 +0200 |
| commit | e0551af94dd3bac9c64abea3831587896d330a53 (patch) | |
| tree | 0e08f3a9adb894b1f0145c4949c7383bc9b7077a /svtools | |
| parent | ad36a0caadcfd3b8d44377689b539c370a25fb1c (diff) | |
warning C4805: '|=': unsafe mix of types 'bool' and 'sal_Bool'
Change-Id: I704347a19fac527b6bf7d43983a6336ac9282f49
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/svtools/grfmgr.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx index e9d470beb8e5..775d903660df 100644 --- a/svtools/inc/svtools/grfmgr.hxx +++ b/svtools/inc/svtools/grfmgr.hxx @@ -458,7 +458,7 @@ public: sal_Bool IsSwappedOut() const { return( mbAutoSwapped || maGraphic.IsSwapOut() ); } void SetSwapState(); - sal_Bool Draw( + bool Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index bd83f38e201c..de70efbe4201 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -513,7 +513,7 @@ void GraphicObject::ReleaseFromCache() mpMgr->ReleaseFromCache( *this ); } -sal_Bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, +bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicAttr* pAttr, sal_uLong nFlags ) { GraphicAttr aAttr( pAttr ? *pAttr : GetAttr() ); @@ -522,7 +522,7 @@ sal_Bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& const sal_uInt32 nOldDrawMode = pOut->GetDrawMode(); sal_Bool bCropped = aAttr.IsCropped(); sal_Bool bCached = sal_False; - sal_Bool bRet; + bool bRet; // #i29534# Provide output rects for PDF writer Rectangle aCropRect; |