diff options
| author | obo <obo@openoffice.org> | 2010-12-10 09:23:24 +0100 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-12-10 09:23:24 +0100 |
| commit | d5e448b884806256606e5eaaa34138864579ce27 (patch) | |
| tree | 6bee45ee544d2cba99a9966865ca5f251245c645 | |
| parent | 1de898d9d576561e3e29074d29fb900432cd824a (diff) | |
| parent | f47680bc0f25ce214637ae7e0b0ce4d4df110ec3 (diff) | |
CWS-TOOLING: integrate CWS impress207
Notes
split repo tag: impress_ooo/OOO330_m18
split repo tag: impress_ooo/OOO330_m19
split repo tag: impress_ooo/OOO330_m20
| -rwxr-xr-x | sd/source/ui/view/sdview4.cxx | 3 | ||||
| -rwxr-xr-x | 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 9fbe223c276a..9932628c4f86 100755 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -99,6 +99,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)) { @@ -115,7 +116,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 156544c235ab..c84f098b3269 100755 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx @@ -60,7 +60,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() ) |