diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-29 15:25:13 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-29 15:25:13 +0200 |
| commit | a095da08d2f018c9354767543239d0d0962fe590 (patch) | |
| tree | eb37a06000bfd29153e3ed57ec513da930970840 /sd/source | |
| parent | e2fac33523d0d9a53fa6602dfbf11e0d246982ee (diff) | |
| parent | 2804c5b911ad772943a4905000d18d1521ac5dd6 (diff) | |
CWS-TOOLING: integrate CWS ka102
Notes
Notes:
split repo tag: impress_ooo/DEV300_m105
split repo tag: impress_ooo/DEV300_m106
Diffstat (limited to 'sd/source')
| -rwxr-xr-x | sd/source/ui/view/drviews6.cxx | 6 | ||||
| -rwxr-xr-x | 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 800ee2756c97..b888f563f02c 100755 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -449,8 +449,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 c7f460758499..476ae1271562 100755 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -223,6 +223,7 @@ if( aPreviewSizePixel.Width() && aPreviewSizePixel.Height() ) case META_GRADIENTEX_ACTION: case META_BMPSCALEPART_ACTION: case META_BMPEXSCALEPART_ACTION: + case META_RENDERGRAPHIC_ACTION: bVector = true; break; case META_BMP_ACTION: |