diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:23:13 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:23:13 +0200 |
commit | d7b2fe39be4b65af4cebe87a38786e4843e58329 (patch) | |
tree | 871623a7de4bd01a054b9a3a22958d205151660e /basctl | |
parent | 84bf617f32d9f1de573e6c760911ec5740db0843 (diff) |
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: I6ea774c635335106a7a8ddc4214c20bdf3f021ba
Diffstat (limited to 'basctl')
-rw-r--r-- | basctl/source/accessibility/accessibledialogcontrolshape.cxx | 2 | ||||
-rw-r--r-- | basctl/source/basicide/baside2b.cxx | 4 | ||||
-rw-r--r-- | basctl/source/basicide/baside3.cxx | 2 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedfunc.cxx | 6 | ||||
-rw-r--r-- | basctl/source/dlged/dlgedobj.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index 34545917f35a..9e3955348db7 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -377,7 +377,7 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) throw (Ru if ( xChild.is() ) { Reference< XAccessibleContext > xChildContext = xChild->getAccessibleContext(); - if ( xChildContext == (XAccessibleContext*)this ) + if ( xChildContext == static_cast<XAccessibleContext*>(this) ) { nIndexInParent = i; break; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 8c949c78829b..cec923e3d0d3 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -109,7 +109,7 @@ void setTextEngineText (ExtTextEngine& rEngine, OUString const& aStr) { rEngine.SetText(OUString()); OString aUTF8Str = OUStringToOString( aStr, RTL_TEXTENCODING_UTF8 ); - SvMemoryStream aMemStream( (void*)aUTF8Str.getStr(), aUTF8Str.getLength(), + SvMemoryStream aMemStream( const_cast<char *>(aUTF8Str.getStr()), aUTF8Str.getLength(), StreamMode::READ ); aMemStream.SetStreamCharSet( RTL_TEXTENCODING_UTF8 ); aMemStream.SetLineDelimiter( LINEEND_LF ); @@ -2862,7 +2862,7 @@ void CodeCompleteWindow::ResizeAndPositionListBox() if( pListBox->GetEntryCount() >= 1 ) {// if there is at least one element inside // calculate basic position: under the current line - Rectangle aRect = ( (TextEngine*) pParent->GetEditEngine() )->PaMtoEditCursor( pParent->GetEditView()->GetSelection().GetEnd() , false ); + Rectangle aRect = static_cast<TextEngine*>(pParent->GetEditEngine())->PaMtoEditCursor( pParent->GetEditView()->GetSelection().GetEnd() , false ); long nViewYOffset = pParent->GetEditView()->GetStartDocPos().Y(); Point aPos = aRect.BottomRight();// this variable will be used later (if needed) aPos.Y() = (aPos.Y() - nViewYOffset) + nBasePad; diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 19c052d928b4..7d2e4f3f2703 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -1364,7 +1364,7 @@ void DialogWindow::InitSettings(bool bFont, bool bForeground, bool bBackground) ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > DialogWindow::CreateAccessible() { - return (::com::sun::star::accessibility::XAccessible*) new AccessibleDialogWindow( this ); + return static_cast<com::sun::star::accessibility::XAccessible*>(new AccessibleDialogWindow( this )); } char const* DialogWindow::GetHid () const diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 3840ba98390e..7e31ae7c9f32 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -363,7 +363,7 @@ bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt ) // if selected object was hit, drag object if ( pHdl!=NULL || rView.IsMarkedHit(aPos, nHitLog) ) - rView.BegDragObj(aPos, (OutputDevice*) NULL, pHdl, nDrgLog); + rView.BegDragObj(aPos, nullptr, pHdl, nDrgLog); else if ( rView.AreObjectsMarked() ) rView.UnmarkAll(); @@ -461,7 +461,7 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) // hit selected object? if ( pHdl!=NULL || rView.IsMarkedHit(aMDPos, nHitLog) ) { - rView.BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); + rView.BegDragObj(aMDPos, nullptr, pHdl, nDrgLog); } else { @@ -485,7 +485,7 @@ bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt ) { // drag object pHdl = rView.PickHandle(aMDPos); - rView.BegDragObj(aMDPos, (OutputDevice*) NULL, pHdl, nDrgLog); + rView.BegDragObj(aMDPos, nullptr, pHdl, nDrgLog); } else { diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index b4cbb9a78e63..347d6f29014b 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -921,7 +921,7 @@ SdrObject* DlgEdObj::getFullDragClone() const // no need to really add the clone for dragging, it's a temporary // object SdrObject* pObj = new SdrUnoObj(OUString()); - *pObj = *((const SdrUnoObj*)this); + *pObj = *(static_cast<const SdrUnoObj*>(this)); return pObj; } |