diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-12-17 20:41:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-17 21:31:40 +0000 |
| commit | 6ad8c0815731ba82f28d38b76c11c86561dfc5f3 (patch) | |
| tree | 449bed73dfad578859e217eb0b88a146a4f7e54b /svx | |
| parent | f3706ff8ec7f52bc84b4aeeb063a809756a0be75 (diff) | |
WaE: C4805: Unsafe mix of bool and BOOL
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/svdmodel.hxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdmodel.cxx | 4 | ||||
| -rw-r--r-- | svx/source/unodraw/unomod.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index d375baff44..1c0aa523ee 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -691,8 +691,8 @@ public: // these functions are used by the api to disable repaints during a // set of api calls. - BOOL isLocked() const { return (BOOL)mbModelLocked; } - void setLock( BOOL bLock ); + bool isLocked() const { return mbModelLocked; } + void setLock( bool bLock ); void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index eee8feaca4..1daf585836 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -175,7 +175,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe nStarDrawPreviewMasterPageNum = SDRPAGE_NOTFOUND; pModelStorage = NULL; mpForbiddenCharactersTable = NULL; - mbModelLocked = FALSE; + mbModelLocked = false; mpOutlinerCache = NULL; mbKernAsianPunctuation = sal_False; mbAddExtLeading = sal_False; @@ -1887,7 +1887,7 @@ uno::Reference< uno::XInterface > SdrModel::createUnoModel() return xInt; } -void SdrModel::setLock( BOOL bLock ) +void SdrModel::setLock( bool bLock ) { if( mbModelLocked != bLock ) { diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 339ba79e41..be28dadd76 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -325,7 +325,7 @@ void SAL_CALL SvxUnoDrawingModel::lockControllers( ) throw(uno::RuntimeException) { if( mpDoc ) - mpDoc->setLock( sal_True ); + mpDoc->setLock(true); } void SAL_CALL SvxUnoDrawingModel::unlockControllers( ) @@ -333,7 +333,7 @@ void SAL_CALL SvxUnoDrawingModel::unlockControllers( ) { if( mpDoc && mpDoc->isLocked() ) { - mpDoc->setLock( sal_False ); + mpDoc->setLock(false); } } |