diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-21 10:39:12 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-21 10:39:12 +0100 |
| commit | 98fba37bb1e2c5fd10d57d20d6e139765eb69751 (patch) | |
| tree | 14f77c32abc948c109622f72b31e666dc5952611 /sw | |
| parent | 9d4a40f108e24422dc7aad60f4d17bff08449e90 (diff) | |
Consistently let SetDesingMode functions take bool argument
...to avoid "warning C4805: '!=' : unsafe mix of type 'bool' and type 'sal_Bool'
in opertaion" style errors. Additionally, mark those functions that are virtual
overrides as such.
Change-Id: I64f919f7e2d8f6224303f9bac67f6270d58de014
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/frmedt/fecopy.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/ribbar/conform.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/shells/textdrw.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index af1dc822f312..b9d5a65fb7c2 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -1504,7 +1504,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt ) sal_Bool bDesignMode = pView->IsDesignMode(); if( !bDesignMode ) - pView->SetDesignMode( sal_True ); + pView->SetDesignMode( true ); // #i50824# // method <lcl_RemoveOleObjsFromSdrModel> replaced by <lcl_ConvertSdrOle2ObjsToSdrGrafObjs> @@ -1537,7 +1537,7 @@ void SwFEShell::Paste( SvStream& rStrm, sal_uInt16 nAction, const Point* pPt ) pView->MoveMarkedObj( aDiff ); ImpEndCreate(); if( !bDesignMode ) - pView->SetDesignMode( sal_False ); + pView->SetDesignMode( false ); } } EndUndo(); diff --git a/sw/source/ui/ribbar/conform.cxx b/sw/source/ui/ribbar/conform.cxx index d74065da9208..2b15f5f8e9e4 100644 --- a/sw/source/ui/ribbar/conform.cxx +++ b/sw/source/ui/ribbar/conform.cxx @@ -101,7 +101,7 @@ void ConstFormControl::CreateDefaultObject() m_pSh->MakeDrawView(); SdrView *pSdrView = m_pSh->GetDrawView(); - pSdrView->SetDesignMode(sal_True); + pSdrView->SetDesignMode(true); m_pSh->BeginCreate( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), FmFormInventor, aStartPos); m_pSh->MoveCreate(aEndPos); m_pSh->EndCreate(SDRCREATE_FORCEEND); diff --git a/sw/source/ui/shells/textdrw.cxx b/sw/source/ui/shells/textdrw.cxx index 5b49b0e4597f..b99cadb63f7e 100644 --- a/sw/source/ui/shells/textdrw.cxx +++ b/sw/source/ui/shells/textdrw.cxx @@ -50,7 +50,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget, SdrView *pSdrView = rSh.GetDrawView(); // OBJ_FM_BUTTON - pSdrView->SetDesignMode(sal_True); + pSdrView->SetDesignMode(true); pSdrView->SetCurrentObj(OBJ_FM_BUTTON); pSdrView->SetEditMode(sal_False); |