diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-10-29 09:08:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-29 10:40:08 +0000 |
| commit | 836023dedc36cbfe946c42d629ece34174c6bd2b (patch) | |
| tree | 4348c53ae2e8e3af5cc3f50264ecad1703bbb1ad /sd | |
| parent | 9b8f91d348a51b0f0cd1bedb5168c2ca0888505a (diff) | |
coverity#1242433 SdrMakeOutliner alway derefs pMod
so change from a pointer to a reference
Change-Id: I81eb2c9e4df8353fbbdad7058c6ca7ea22286e62
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuexpand.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/func/futext.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index dc349d837c6a..5d58d83d875a 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -190,7 +190,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) if( pOutlinerParaObject->GetDepth(0) != -1 ) { - SdrOutliner* pTempOutl = SdrMakeOutliner( OUTLINERMODE_TITLEOBJECT, mpDoc ); + SdrOutliner* pTempOutl = SdrMakeOutliner(OUTLINERMODE_TITLEOBJECT, *mpDoc); pTempOutl->SetText( *pOutlinerParaObject ); @@ -218,7 +218,7 @@ void FuExpandPage::DoExecute( SfxRequest& ) // create structuring text objects OutlinerParaObject* pOPO = pOutl->CreateParaObject(++nParaPos, nChildCount); - SdrOutliner* pTempOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpDoc ); + SdrOutliner* pTempOutl = SdrMakeOutliner(OUTLINERMODE_OUTLINEOBJECT, *mpDoc); pTempOutl->SetText( *pOPO ); sal_Int32 nParaCount2 = pTempOutl->GetParagraphCount(); diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index d4aa31ac756a..be1ac08a9812 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1038,7 +1038,7 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag) nSdrObjKind == OBJ_OUTLINETEXT || !mxTextObj->IsEmptyPresObj() ) ) { // create new outliner (owned by SdrObjEditView) - SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpDoc ); + SdrOutliner* pOutl = SdrMakeOutliner(OUTLINERMODE_OUTLINEOBJECT, *mpDoc); if (bEmptyOutliner) mpView->SdrEndTextEdit(true); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 899506492db4..9f6d25b8dd14 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -672,7 +672,7 @@ bool View::SdrBeginTextEdit( sd::tools::EventMultiplexerEvent::EID_BEGIN_TEXT_EDIT, (void*)pObj ); if( pOutl==NULL && pObj ) - pOutl = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, pObj->GetModel() ); + pOutl = SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pObj->GetModel()); // make draw&impress specific initialisations if( pOutl ) @@ -1258,7 +1258,7 @@ bool View::ShouldToggleOn( return false; bool bToggleOn = false; - boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, pSdrModel)); + boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel)); const size_t nMarkCount = GetMarkedObjectCount(); for (size_t nIndex = 0; nIndex < nMarkCount && !bToggleOn; ++nIndex) { @@ -1330,7 +1330,7 @@ void View::ChangeMarkedObjectsBulletsNumbering( ? false : ShouldToggleOn( bToggle, bHandleBullets ); - boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, pSdrModel)); + boost::scoped_ptr<SdrOutliner> pOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel)); boost::scoped_ptr<OutlinerView> pOutlinerView(new OutlinerView(pOutliner.get(), pWindow)); const size_t nMarkCount = GetMarkedObjectCount(); |