diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:17:18 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:17:18 +0100 |
| commit | ad11d85818a1446d1c73954f3eb5e83fc091163e (patch) | |
| tree | 5646801724c303966a8166519310d9a2a22aecb0 /sd/source/ui/view | |
| parent | 4f3f5e15f77272291946671fdf98a1cfb530dd2e (diff) | |
| parent | be106b6335eee8e63d4789d4be4494eb3fb86a18 (diff) | |
Merge commit 'libreoffice-3.3.0.2'
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/sdview4.cxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview5.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 3efad22af221..055d2366e947 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -100,6 +100,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, SdrGrafObj* pNewGrafObj = NULL; SdrPageView* pPV = GetSdrPageView(); SdrObject* pPickObj = pObj; + const bool bOnMaster = pPV && pPV->GetPage() && pPV->GetPage()->IsMasterPage(); if(pPV && this->ISA(::sd::slidesorter::view::SlideSorterView)) { @@ -116,7 +117,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, if( mnAction == DND_ACTION_LINK && pPickObj && pPV ) { const bool bIsGraphic = pPickObj->ISA( SdrGrafObj ); - if( bIsGraphic || pObj->IsEmptyPresObj() ) + if( bIsGraphic || (pObj->IsEmptyPresObj() && !bOnMaster) ) { if( IsUndoEnabled() ) BegUndo(String(SdResId(STR_INSERTGRAPHIC))); diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx index a3c48e6c6a13..de9e8dc3161a 100644 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx @@ -61,7 +61,7 @@ SdrObject* View::GetEmptyPresentationObject( PresObjKind eKind ) if( pPV ) { SdPage* pPage = static_cast< SdPage* >( pPV->GetPage() ); - if( pPage ) + if( pPage && !pPage->IsMasterPage() ) { // first try selected shape if ( AreObjectsMarked() ) |