diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-17 18:39:33 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-17 18:40:19 +0300 |
| commit | c0b3d5be8fcec28190b1f25c9c0fd99916299249 (patch) | |
| tree | fadeedc2014c52509db7a02638ddd365a2cd3525 /svx | |
| parent | dfd893ddd3f3f28e2c6856dce8d74189e55a9e3b (diff) | |
Try harder to bypass avmedia on non-desktop for now
Change-Id: I8a45f7436383cb904d375d0f0d86416f3ce56567
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 4 | ||||
| -rw-r--r-- | svx/source/unodraw/unopage.cxx | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index eaf24ac4ce3d..9b82f1089f4c 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "sal/config.h" #include <com/sun/star/lang/XComponent.hpp> @@ -3394,7 +3396,9 @@ SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, S case sal_uInt16(OBJ_PAGE ): pObj=new SdrPageObj; break; case sal_uInt16(OBJ_UNO ): pObj=new SdrUnoObj(OUString()); break; case sal_uInt16(OBJ_CUSTOMSHAPE ): pObj=new SdrObjCustomShape(); break; +#if HAVE_FEATURE_DESKTOP case sal_uInt16(OBJ_MEDIA ): pObj=new SdrMediaObj(); break; +#endif case sal_uInt16(OBJ_TABLE ): pObj=new ::sdr::table::SdrTableObj(pModel); break; case sal_uInt16(OBJ_OPENGL ): pObj=new SdrOpenGLObj; break; } diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 43522065986d..52c1fc9752a4 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include <com/sun/star/document/EventObject.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <osl/mutex.hxx> @@ -536,11 +538,13 @@ void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, rInventor = SdrInventor; rType = OBJ_TABLE; } +#if HAVE_FEATURE_DESKTOP else if ( aName == "com.sun.star.presentation.MediaShape" ) { rInventor = SdrInventor; rType = OBJ_MEDIA; } +#endif } else if(nTempType & E3D_INVENTOR_FLAG) { @@ -732,9 +736,11 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3 case OBJ_CUSTOMSHAPE: pRet = new SvxCustomShape( pObj ); break; +#if HAVE_FEATURE_DESKTOP case OBJ_MEDIA: pRet = new SvxMediaShape( pObj, referer ); break; +#endif case OBJ_TABLE: pRet = new SvxTableShape( pObj ); break; |