strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Christian Lippka 2010-02-24 13:13:31 +01:00
commit 3c69551e77
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sd/source/core/sdpage.cxx
View file

@ -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;

1
sd/source/ui/func/fuinsert.cxx
View file

@ -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 )
{

4
sd/source/ui/view/drawview.cxx
View file

@ -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 )