Anonymous avatar Anonymous committed 975ac96

impress207: #i115993# do not insert objects as presentation objects on master pages

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() )
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.