diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:18 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:08:18 +0200 |
| commit | c8d090428ba2a9d710499baf62ddfe252c16aa1f (patch) | |
| tree | bcfd816b53c19e6925f5ae0f450e466fc34e3742 /sd/source/ui/view | |
| parent | 48fa46fd02b8d1633a7b078e34afe4acc18a0d74 (diff) | |
| parent | a095da08d2f018c9354767543239d0d0962fe590 (diff) | |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
sd/source/ui/app/res_bmp.src
Diffstat (limited to 'sd/source/ui/view')
| -rw-r--r-- | sd/source/ui/view/drviews6.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index b178aa5fef1c..73c4eded2346 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -428,8 +428,12 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet ) pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); // valid graphic object? - if( pObj && pObj->ISA( SdrGrafObj ) && !( (SdrGrafObj*) pObj )->IsEPS() && !mpDrawView->IsTextEdit() ) + if( pObj && pObj->ISA( SdrGrafObj ) && + !( ((SdrGrafObj*) pObj)->IsEPS() || ((SdrGrafObj*) pObj)->IsRenderGraphic() ) && + !mpDrawView->IsTextEdit() ) + { bEnable = sal_True; + } // put value rSet.Put( SfxBoolItem( SID_BMPMASK_EXEC, bEnable ) ); diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 5b74b8e1494d..f1755308cc9c 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -199,6 +199,7 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo case META_GRADIENTEX_ACTION: case META_BMPSCALEPART_ACTION: case META_BMPEXSCALEPART_ACTION: + case META_RENDERGRAPHIC_ACTION: bVector = true; break; case META_BMP_ACTION: |