diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-02-24 13:13:31 +0100 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-02-24 13:13:31 +0100 |
| commit | 3c69551e7713eb9ad2da6e55d17c3de501d4c907 (patch) | |
| tree | d5dbbd2d7a5bb4da823ce151c07b00bea78aa25f | |
| parent | 1294294cc6db6560140b3ebc7aed82f77e58dd44 (diff) | |
| parent | 8ebd9d44d4d0ed08df12eaf356df1331bd0603e8 (diff) | |
merge
| -rw-r--r-- | sd/source/core/sdpage.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/drawview.cxx | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 360ac670de6c..97e936a092b8 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -220,7 +220,7 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc if( nIndex > 0 ) nIndex--; - if( aMatches.size() > nIndex ) + if( (nIndex >= 0) && ( aMatches.size() > static_cast<unsigned int>(nIndex)) ) return aMatches[nIndex]; return 0; diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index ce0dc8f67a58..df537fa8bb03 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -361,7 +361,6 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) SdrOle2Obj* pOleObj = new SdrOle2Obj( svt::EmbeddedObjectRef( xObj, nAspect ), aObjName, aRect ); SdrPageView* pPV = mpView->GetSdrPageView(); - bool bUndo = false; // if we have a pick obj we need to make this new ole a pres obj replacing the current pick obj if( pPickObj ) { diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index e6fb02a06c3d..9c6273085b51 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -1,4 +1,4 @@ -/************************************************************************* + /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -650,7 +650,7 @@ void DrawView::DeleteMarked() ::sd::View::DeleteMarked(); - if( pPage &&& bResetLayout ) + if( pPage && bResetLayout ) pPage->SetAutoLayout( pPage->GetAutoLayout() ); if( pUndoManager ) |