summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-12-17 20:43:04 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-12-17 20:43:04 +0000
commitb2ac2cabc88550b2211c2fa100f6c2d6979f3743 (patch)
tree63faf747d755d39091d71f3a1cb3ba9cb442c100 /sd/source
parent63f23271a6af3c1fb34db3a7e8ad0414d0ed3e8a (diff)
WaE: C4805: Unsafe mix of bool and BOOL
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/core/drawdoc4.cxx6
-rw-r--r--sd/source/filter/ppt/pptin.cxx4
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx4
3 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 447c6c436..147e5fa35 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -963,18 +963,18 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj)
{
sd::ModifyGuard aGuard( this );
SdrModel* pModel = pObj->GetModel();
- sal_Bool bLock = sal_False;
+ bool bLock = sal_False;
if ( pModel )
{
bLock = pModel->isLocked();
- pModel->setLock( sal_True );
+ pModel->setLock(true);
}
// taking text from the outliner
((SdrTextObj*) pObj)->SetOutlinerParaObject( pOutl->CreateParaObject() );
pObj->BroadcastObjectChange();
if ( pModel )
- pModel->setLock( bLock );
+ pModel->setLock(bLock);
}
}
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 749b8cc4d..a99f9e476 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -255,7 +255,7 @@ sal_Bool ImplSdPPTImport::Import()
if ( !bOk )
return FALSE;
- pSdrModel->setLock( sal_True );
+ pSdrModel->setLock(true);
pSdrModel->EnableUndo(false);
SdrOutliner& rOutl = mpDoc->GetDrawOutliner();
@@ -1407,7 +1407,7 @@ sal_Bool ImplSdPPTImport::Import()
sfx2::LoadOlePropertySet(xDocProps, &mrStorage);
xDocProps->setTemplateName(::rtl::OUString());
- pSdrModel->setLock( sal_False );
+ pSdrModel->setLock(false);
pSdrModel->EnableUndo(true);
return bOk;
}
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 7c8606e88..89bb45802 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -587,7 +587,7 @@ void SAL_CALL SdXImpressDocument ::lockControllers( )
if( NULL == mpDoc )
throw lang::DisposedException();
- mpDoc->setLock( sal_True );
+ mpDoc->setLock(true);
}
void SAL_CALL SdXImpressDocument::unlockControllers( )
@@ -600,7 +600,7 @@ void SAL_CALL SdXImpressDocument::unlockControllers( )
if( mpDoc->isLocked() )
{
- mpDoc->setLock( sal_False );
+ mpDoc->setLock(false);
}
}