summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorka <kai.ahrens@oracle.com>2011-02-04 14:49:25 +0100
committerka <kai.ahrens@oracle.com>2011-02-04 14:49:25 +0100
commit78a83ae536b338c37fa4dfe11c4d9a738cd23ad7 (patch)
tree813d9a66b295a1e21a39b1649238d3217c9e24ed
parent1a0a7970636e093d015267b828ecd8d5c2543541 (diff)
ka102: SVG import implementation
-rwxr-xr-xsd/source/ui/view/drviews6.cxx6
-rwxr-xr-xsd/source/ui/view/sdview3.cxx1
2 files changed, 6 insertions, 1 deletions
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 681192ff351b..fa06b5c6522d 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 = 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 fd709dc22038..ba9b0cb0c003 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: