summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
Diffstat (limited to 'sd')
-rw-r--r--[-rwxr-xr-x]sd/qa/unoapi/sd.sce0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/annotations/annotations.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/menuids3_tmpl.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/menuids4_tmpl.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/menuids_tmpl.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/popup.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/popup2_tmpl.src0
-rwxr-xr-x[-rw-r--r--]sd/source/ui/app/toolbox.src0
-rwxr-xr-xsd/source/ui/view/drviews6.cxx6
-rwxr-xr-xsd/source/ui/view/sdview3.cxx1
10 files changed, 6 insertions, 1 deletions
diff --git a/sd/qa/unoapi/sd.sce b/sd/qa/unoapi/sd.sce
index c964c1ba0090..c964c1ba0090 100755..100644
--- a/sd/qa/unoapi/sd.sce
+++ b/sd/qa/unoapi/sd.sce
diff --git a/sd/source/ui/annotations/annotations.src b/sd/source/ui/annotations/annotations.src
index 536d10f9a417..536d10f9a417 100644..100755
--- a/sd/source/ui/annotations/annotations.src
+++ b/sd/source/ui/annotations/annotations.src
diff --git a/sd/source/ui/app/menuids3_tmpl.src b/sd/source/ui/app/menuids3_tmpl.src
index aae782b5fe1e..aae782b5fe1e 100644..100755
--- a/sd/source/ui/app/menuids3_tmpl.src
+++ b/sd/source/ui/app/menuids3_tmpl.src
diff --git a/sd/source/ui/app/menuids4_tmpl.src b/sd/source/ui/app/menuids4_tmpl.src
index 61a43aa6d8ba..61a43aa6d8ba 100644..100755
--- a/sd/source/ui/app/menuids4_tmpl.src
+++ b/sd/source/ui/app/menuids4_tmpl.src
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index 1e313bbee2fc..1e313bbee2fc 100644..100755
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src
index 27f91bab3c6d..27f91bab3c6d 100644..100755
--- a/sd/source/ui/app/popup.src
+++ b/sd/source/ui/app/popup.src
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index c76c09df62e6..c76c09df62e6 100644..100755
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src
index 0f3b3c69aeef..0f3b3c69aeef 100644..100755
--- a/sd/source/ui/app/toolbox.src
+++ b/sd/source/ui/app/toolbox.src
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: