diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-11 12:36:26 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-13 00:31:24 +0200 |
| commit | 3ba25e534d5a433778a6d6c77117a13c6d796761 (patch) | |
| tree | ecafdd0be51b42ab032ddb60c56f2c6bd8633db4 /svx | |
| parent | 053fbcfdbe572f4e18f35d66dd365c78a1e6e54e (diff) | |
Introduce HAVE_FEATURE_GLTF to enable/disable gltf related code
When it is a release build then enable it only on Windows and
Linux.
Change-Id: I7c462aeb75e6ab60eeaa0fa42ca7853a6369b742
(cherry picked from commit fe70101856332663f600df144b39d2638b3d0570)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdomedia.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index c05da8cdcc4f..e34a7285c90e 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include <svx/svdomedia.hxx> #include <rtl/ustring.hxx> @@ -263,6 +265,7 @@ uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream() return tempFile.openStream(); } +#if HAVE_FEATURE_GLTF static bool lcl_HandleJsonPackageURL( const OUString& rURL, SdrModel* const pModel, @@ -321,6 +324,7 @@ static bool lcl_HandleJsonPackageURL( } return true; } +#endif /// copy a stream from XStorage to temp file static bool lcl_HandlePackageURL( @@ -401,9 +405,11 @@ void SdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewProper { OUString tempFileURL; bool bSuccess; +#if HAVE_FEATURE_GLTF if( url.endsWith(".json") ) bSuccess = lcl_HandleJsonPackageURL(url, GetModel(), tempFileURL); else +#endif bSuccess = lcl_HandlePackageURL( url, GetModel(), tempFileURL); if (bSuccess) { |