mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

impress206: #i115898# take into account new presentation shapes(cherry picked from commit c8c648474da56e2ecdbdcc11c269366716fe88c9)

Browse Source
This commit is contained in:
Christian Lippka ORACLE
2010-12-06 13:49:27 +01:00
committed by Thorsten Behrens
parent 2a8043bab8
commit 977fa1655c
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slideshow/source/engine/shapes/shapeimporter.cxx
View File

@@ -286,7 +286,9 @@ ShapeSharedPtr ShapeImporter::createShape(
rtl::OUString const& shapeType ) const rtl::OUString const& shapeType ) const
{ {
if( shapeType.equalsAsciiL( if( shapeType.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") )) RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MediaShape") ) ||
shapeType.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.MediaShape") ) )
{ {
// Media shape (video etc.). This is a special object // Media shape (video etc.). This is a special object
return createMediaShape(xCurrShape, return createMediaShape(xCurrShape,
@@ -338,7 +340,9 @@ ShapeSharedPtr ShapeImporter::createShape(
mrContext ); mrContext );
} }
else if( shapeType.equalsAsciiL( else if( shapeType.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape") )) RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.OLE2Shape") ) ||
shapeType.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM("com.sun.star.presentation.OLE2Shape") ) )
{ {
// #i46224# Mark OLE shapes as foreign content - scan them for // #i46224# Mark OLE shapes as foreign content - scan them for
// unsupported actions, and fallback to bitmap, if necessary // unsupported actions, and fallback to bitmap, if necessary
@@ -350,7 +354,10 @@ ShapeSharedPtr ShapeImporter::createShape(
} }
else if( shapeType.equalsAsciiL( else if( shapeType.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.drawing.GraphicObjectShape") )) "com.sun.star.drawing.GraphicObjectShape") ) ||
shapeType.equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.presentation.GraphicObjectShape") ) )
{ {
GraphicObject aGraphicObject; GraphicObject aGraphicObject;