Commits

Anonymous committed 0a162ed Merge

CWS-TOOLING: integrate CWS impress207

Comments (0)

Files changed (2)

sd/source/ui/view/sdview4.cxx

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

sd/source/ui/view/sdview5.cxx

 	if( pPV )
 	{
 		SdPage* pPage = static_cast< SdPage* >( pPV->GetPage() );
-		if( pPage )
+		if( pPage && !pPage->IsMasterPage() )
 		{
 			// first try selected shape
 			if ( AreObjectsMarked() )