summaryrefslogtreecommitdiff
path: root/svtools/source/graphic
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-07-10 23:45:20 +0200
committerMichael Stahl <mstahl@redhat.com>2012-07-11 00:15:06 +0200
commite0551af94dd3bac9c64abea3831587896d330a53 (patch)
tree0e08f3a9adb894b1f0145c4949c7383bc9b7077a /svtools/source/graphic
parentad36a0caadcfd3b8d44377689b539c370a25fb1c (diff)
warning C4805: '|=': unsafe mix of types 'bool' and 'sal_Bool'
Change-Id: I704347a19fac527b6bf7d43983a6336ac9282f49
Diffstat (limited to 'svtools/source/graphic')
-rw-r--r--svtools/source/graphic/grfmgr.cxx4
1 files changed, 2 insertions, 2 deletions
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;