Fix --disable-avmedia for DESKTOP build

Probably additional bits can be removed, but this now passes.

Change-Id: I366bec43cfd6fb02e914c85c711b3b19586d534d

19 files changed, 89 insertions, 56 deletions

diff --git a/Repository.mk b/Repository.mk
index 606b6f05926b..b186990a0446 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -318,10 +318,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ogltrans, \
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	acc \
-	$(call gb_Helper_optional,AVMEDIA,avmedia) \
+    avmedia \
+    $(call gb_Helper_optional,AVMEDIA, \
 	$(if $(filter MACOSX,$(OS)),\
 		avmediaMacAVF \
 	) \
+    ) \
 	$(call gb_Helper_optional,SCRIPTING, \
 		basctl \
 		basprov \
@@ -587,8 +589,10 @@ $(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
-	$(if $(ENABLE_GSTREAMER_1_0),avmediagst) \
-	$(if $(filter WNT,$(OS)),avmediawin) \
+    $(call gb_Helper_optional,AVMEDIA, \
+        $(if $(ENABLE_GSTREAMER_1_0),avmediagst) \
+        $(if $(filter WNT,$(OS)),avmediawin) \
+    ) \
 	cached1 \
 	collator_data \
 	comphelper \
@@ -1101,7 +1105,7 @@ $(eval $(call gb_ExternalExecutable_register_executables,\
 # Resources
 $(eval $(call gb_Helper_register_mos,\
 	acc \
-	avmedia \
+    $(call gb_Helper_optional,AVMEDIA,avmedia) \
 	$(call gb_Helper_optional,SCRIPTING,basctl) \
 	chart \
 	cnr \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a13278563270..021fdeb92635 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	android \
 	animations \
 	apple_remote \
-	$(call gb_Helper_optional,AVMEDIA,avmedia) \
+	avmedia \
 	basctl \
 	basegfx \
 	basic \
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index b27b9bae8c80..db85a2844328 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -9,52 +9,47 @@
 
 $(eval $(call gb_Library_Library,avmedia))
 
-$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
-
 $(eval $(call gb_Library_set_include,avmedia,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/avmedia/inc \
 	-I$(SRCDIR)/avmedia/source/inc \
 ))
 
-$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
+$(eval $(call gb_Library_use_libraries,avmedia,\
+    sal \
+    svl \
+))
 
 $(eval $(call gb_Library_use_sdk_api,avmedia,))
 
-$(eval $(call gb_Library_use_externals,avmedia,\
-	boost_headers \
-))
+ifeq (,$(filter AVMEDIA,$(BUILD_TYPE)))
 
-ifeq ($(USE_AVMEDIA_DUMMY),TRUE)
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
 	avmedia/source/avmediadummy \
 ))
 
+else # AVMEDIA
 
-else
-
+ifeq (,$(DISABLE_GUI))
 
 $(eval $(call gb_Library_add_defs,avmedia,\
 	-DAVMEDIA_DLLIMPLEMENTATION \
 ))
 
-ifeq ($(DISABLE_GUI),)
+$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
+
 $(eval $(call gb_Library_use_externals,avmedia,\
+    boost_headers \
     epoxy \
 ))
-endif
-
 
 $(eval $(call gb_Library_use_libraries,avmedia,\
 	comphelper \
 	ucbhelper \
 	cppu \
 	cppuhelper \
-	sal \
 	i18nlangtag \
 	sfx \
-	svl \
-	svt \
 	tl \
 	utl \
 	vcl \
@@ -71,6 +66,8 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
 	avmedia/source/viewer/mediawindow \
 	avmedia/source/viewer/mediawindow_impl \
 ))
-endif
+
+endif # !DISABLE_GUI
+endif # AVMEDIA
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index aeb3176544bf..d01201582a78 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -13,7 +13,8 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmedia \
 ))
 
-ifneq ($(USE_AVMEDIA_DUMMY),TRUE)
+ifneq (,$(filter AVMEDIA,$(BUILD_TYPE)))
+
 $(eval $(call gb_Module_add_l10n_targets,avmedia,\
     AllLangMoTarget_avmedia \
 ))
@@ -36,6 +37,6 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 ))
 endif
 
-endif
+endif # AVMEDIA
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/source/avmediadummy.cxx b/avmedia/source/avmediadummy.cxx
index 6c6ada0163e9..4bf717627c76 100644
--- a/avmedia/source/avmediadummy.cxx
+++ b/avmedia/source/avmediadummy.cxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <osl/file.hxx>
 
 using namespace ::com::sun::star;
 
@@ -69,7 +70,6 @@ SfxPoolItem* MediaItem::CreateDefault()
     return new MediaItem;
 }
 
-
 MediaItem* MediaItem::Clone( SfxItemPool*) const
 {
   return nullptr;
@@ -81,12 +81,11 @@ bool MediaItem::operator==( const SfxPoolItem& rItem ) const
     return false;
 }
 
-} // namespace avmedia
-
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
-com_sun_star_comp_framework_SoundHandler_get_implementation(css::uno::XComponentContext*,
-                                                            css::uno::Sequence<css::uno::Any> const &)
+MediaTempFile::~MediaTempFile()
 {
-    return NULL;
+    ::osl::File::remove(m_TempFileURL);
 }
+
+} // namespace avmedia
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/config_host.mk.in b/config_host.mk.in
index f7fa8ca12f9f..74d575b8d96e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -702,7 +702,6 @@ export ZLIB_CFLAGS=$(gb_SPACE)@ZLIB_CFLAGS@
 export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@
 export ZMF_CFLAGS=$(gb_SPACE)@ZMF_CFLAGS@
 export ZMF_LIBS=$(gb_SPACE)@ZMF_LIBS@
-export USE_AVMEDIA_DUMMY=@USE_AVMEDIA_DUMMY@
 
 # lang-related stuff
 include $(BUILDDIR)/config_$(gb_Side)_lang.mk
diff --git a/configure.ac b/configure.ac
index 7340f40c34d6..7bfb94047a00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2900,17 +2900,10 @@ fi
 
 # Whether to build "avmedia" functionality or not.
 
-if test -z "$enable_avmedia"; then
-    enable_avmedia=yes
-fi
-
-BUILD_TYPE="$BUILD_TYPE AVMEDIA"
 if test "$enable_avmedia" = yes; then
+    BUILD_TYPE="$BUILD_TYPE AVMEDIA"
     AC_DEFINE(HAVE_FEATURE_AVMEDIA)
-else
-    USE_AVMEDIA_DUMMY='TRUE'
 fi
-AC_SUBST(USE_AVMEDIA_DUMMY)
 
 # Decide whether to build database connectivity stuff (including
 # Base) or not. We probably don't want to on non-desktop OSes.
diff --git a/oox/CppunitTest_oox_tokenmap.mk b/oox/CppunitTest_oox_tokenmap.mk
index 8019da7a2301..46294ecab965 100644
--- a/oox/CppunitTest_oox_tokenmap.mk
+++ b/oox/CppunitTest_oox_tokenmap.mk
@@ -35,7 +35,7 @@ endif
 endif
 
 $(eval $(call gb_CppunitTest_use_libraries,oox_tokenmap,\
-    avmedia \
+    $(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     comphelper \
     cppu \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 1faf14a374a0..6e37e847257a 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -158,21 +158,19 @@ $(eval $(call gb_Rdb_add_components,services,\
 		lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \
 	) \
 	$(if $(filter WNT,$(OS)), \
-		avmedia/source/win/avmediawin \
+		$(call gb_Helper_optional,AVMEDIA,avmedia/source/win/avmediawin) \
+		embeddedobj/source/msole/emboleobj.windows \
+		embedserv/util/emser \
+		extensions/source/ole/oleautobridge \
 		fpicker/source/win32/fps \
 		shell/source/backends/wininetbe/wininetbe1 \
 		shell/source/win32/simplemail/smplmail \
 		shell/source/win32/syssh \
+		winaccessibility/source/service/winaccessibility \
 	) \
 	$(if $(filter-out WNT,$(OS)), \
 		embeddedobj/source/msole/emboleobj \
 	) \
-	$(if $(filter WNT,$(OS)), \
-		embeddedobj/source/msole/emboleobj.windows \
-		embedserv/util/emser \
-		extensions/source/ole/oleautobridge \
-		winaccessibility/source/service/winaccessibility \
-	) \
 	$(if $(filter neon,$(WITH_WEBDAV)), \
 		ucb/source/ucp/webdav-neon/ucpdav1 \
 	) \
@@ -202,7 +200,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 		ucb/source/ucp/gio/ucpgio \
 	) \
 	$(if $(ENABLE_GSTREAMER_1_0), \
-		avmedia/source/gstreamer/avmediagstreamer \
+		$(call gb_Helper_optional,AVMEDIA,avmedia/source/gstreamer/avmediagstreamer) \
 	) \
 	$(if $(ENABLE_KF5), \
 		shell/source/backends/kf5be/kf5be1 \
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 1b3cead83beb..96ffdeb19585 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -64,7 +64,7 @@ $(eval $(call gb_Library_use_externals,sc,orcus-parser))
 endif
 
 $(eval $(call gb_Library_use_libraries,sc,\
-    $(call gb_Helper_optional,AVMEDIA,avmedia) \
+    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 092dc70da1ef..647f975e1f16 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -67,7 +67,7 @@ $(eval $(call gb_Library_use_custom_headers,sd,\
 $(eval $(call gb_Library_use_sdk_api,sd))
 
 $(eval $(call gb_Library_use_libraries,sd,\
-	$(call gb_Helper_optional,AVMEDIA,avmedia) \
+	avmedia \
 	basegfx \
 	canvastools \
 	comphelper \
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 5647170f9c4d..34fa9dca498c 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -18,6 +18,7 @@
  */
 
 
+#include <config_features.h>
 #include <tools/diagnose_ex.h>
 
 #include <cppuhelper/basemutex.hxx>
@@ -2349,6 +2350,9 @@ std::shared_ptr<avmedia::MediaTempFile> SlideShowImpl::getMediaTempFile(const OU
 {
     std::shared_ptr<avmedia::MediaTempFile> aRet;
 
+#if !HAVE_FEATURE_AVMEDIA
+    (void)aUrl;
+#else
     if (!mxSBD.is())
         return aRet;
 
@@ -2372,6 +2376,7 @@ std::shared_ptr<avmedia::MediaTempFile> SlideShowImpl::getMediaTempFile(const OU
 
         xInStream->closeInput();
     }
+#endif
 
     return aRet;
 }
diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx
index c9386192e8d6..c0ae300c1e78 100644
--- a/slideshow/source/engine/soundplayer.cxx
+++ b/slideshow/source/engine/soundplayer.cxx
@@ -18,6 +18,7 @@
  */
 
 
+#include <config_features.h>
 #include <tools/diagnose_ex.h>
 
 #include <com/sun/star/lang/NoSupportException.hpp>
@@ -90,6 +91,9 @@ namespace slideshow::internal
             ENSURE_OR_THROW( rComponentContext.is(),
                               "SoundPlayer::SoundPlayer(): Invalid component context" );
 
+#if !HAVE_FEATURE_AVMEDIA
+            (void) rMediaFileManager;
+#else
             try
             {
                 if (rSoundURL.startsWithIgnoreAsciiCase("vnd.sun.star.Package:"))
@@ -107,6 +111,7 @@ namespace slideshow::internal
             catch( uno::Exception& )
             {
             }
+#endif
 
             if( !mxPlayer.is() )
                 throw lang::NoSupportException(
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index d56e8a446292..7e1f7101699e 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_Library_add_defs,svxcore,\
 ))
 
 $(eval $(call gb_Library_use_libraries,svxcore,\
-    $(call gb_Helper_optional,AVMEDIA,avmedia) \
+    avmedia \
     basegfx \
     sb \
     comphelper \
@@ -211,7 +211,7 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/sdr/contact/viewobjectcontactofsdrole2obj \
     svx/source/sdr/contact/viewobjectcontactofunocontrol \
     svx/source/sdr/contact/viewobjectcontactofgraphic \
-    svx/source/sdr/contact/sdrmediawindow \
+    $(call gb_Helper_optional,AVMEDIA,svx/source/sdr/contact/sdrmediawindow) \
     svx/source/sdr/contact/viewobjectcontactofsdrmediaobj \
     svx/source/sdr/contact/viewcontactofsdrcaptionobj \
     svx/source/sdr/contact/viewcontactofvirtobj \
diff --git a/svx/source/core/svmediashell.cxx b/svx/source/core/svmediashell.cxx
index 0402dbba4caa..c26a29fb2fd5 100644
--- a/svx/source/core/svmediashell.cxx
+++ b/svx/source/core/svmediashell.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 #include <svx/svmediashell.hxx>
 #include <avmedia/mediaitem.hxx>
 #include <sfx2/request.hxx>
@@ -41,6 +42,7 @@ void SvMediaShellBase::GetState(SdrMarkView* pSdrView, SfxItemSet& rSet)
         if (SID_AVMEDIA_TOOLBOX != nWhich)
             continue;
 
+#if HAVE_FEATURE_AVMEDIA
         std::unique_ptr<SdrMarkList> pMarkList(new SdrMarkList(pSdrView->GetMarkedObjectList()));
         bool bDisable = true;
 
@@ -60,12 +62,18 @@ void SvMediaShellBase::GetState(SdrMarkView* pSdrView, SfxItemSet& rSet)
         }
 
         if (bDisable)
+#endif
             rSet.DisableItem(SID_AVMEDIA_TOOLBOX);
     }
 }
 
 const ::avmedia::MediaItem* SvMediaShellBase::Execute(SdrMarkView* pSdrView, SfxRequest const& rReq)
 {
+#if !HAVE_FEATURE_AVMEDIA
+    (void)pSdrView;
+    (void)rReq;
+    return nullptr;
+#else
     if (!pSdrView)
         return nullptr;
 
@@ -96,6 +104,7 @@ const ::avmedia::MediaItem* SvMediaShellBase::Execute(SdrMarkView* pSdrView, Sfx
         .executeMediaItem(*pMediaItem);
 
     return pMediaItem;
+#endif
 }
 
 } // end of namespace svx
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 515bdff11b42..ca17a18aa2d3 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -44,10 +44,12 @@ using namespace ::com::sun::star;
 struct SdrMediaObj::Impl
 {
     ::avmedia::MediaItem                  m_MediaProperties;
+#if HAVE_FEATURE_AVMEDIA
     // Note: the temp file is read only, until it is deleted!
     // It may be shared between multiple documents in case of copy/paste,
     // hence the shared_ptr.
     std::shared_ptr< ::avmedia::MediaTempFile >  m_pTempFile;
+#endif
     uno::Reference< graphic::XGraphic >   m_xCachedSnapshot;
     OUString m_LastFailedPkgURL;
 };
@@ -62,7 +64,9 @@ SdrMediaObj::SdrMediaObj(SdrModel& rSdrModel, SdrMediaObj const & rSource)
 :   SdrRectObj(rSdrModel, rSource)
     ,m_xImpl( new Impl )
 {
+#if HAVE_FEATURE_AVMEDIA
     m_xImpl->m_pTempFile = rSource.m_xImpl->m_pTempFile; // before props
+#endif
     setMediaProperties( rSource.getMediaProperties() );
     m_xImpl->m_xCachedSnapshot = rSource.m_xImpl->m_xCachedSnapshot;
 }
@@ -236,6 +240,7 @@ const ::avmedia::MediaItem& SdrMediaObj::getMediaProperties() const
 
 uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream() const
 {
+#if HAVE_FEATURE_AVMEDIA
     if (!m_xImpl->m_pTempFile)
     {
         SAL_WARN("svx", "this is only intended for embedded media");
@@ -245,10 +250,16 @@ uno::Reference<io::XInputStream> SdrMediaObj::GetInputStream() const
                 uno::Reference<ucb::XCommandEnvironment>(),
                 comphelper::getProcessComponentContext());
     return tempFile.openStream();
+#else
+    return nullptr;
+#endif
 }
 
 void SdrMediaObj::SetInputStream(uno::Reference<io::XInputStream> const& xStream)
 {
+#if !HAVE_FEATURE_AVMEDIA
+    (void) xStream;
+#else
     if (m_xImpl->m_pTempFile || m_xImpl->m_LastFailedPkgURL.isEmpty())
     {
         SAL_WARN("svx", "this is only intended for embedded media");
@@ -265,12 +276,11 @@ void SdrMediaObj::SetInputStream(uno::Reference<io::XInputStream> const& xStream
     if (bSuccess)
     {
         m_xImpl->m_pTempFile = std::make_shared<::avmedia::MediaTempFile>(tempFileURL);
-#if HAVE_FEATURE_AVMEDIA
         m_xImpl->m_MediaProperties.setURL(
             m_xImpl->m_LastFailedPkgURL, tempFileURL, "");
-#endif
     }
     m_xImpl->m_LastFailedPkgURL.clear(); // once only
+#endif
 }
 
 /// copy a stream from XStorage to temp file
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 9274a60a2e28..94d6cb29335f 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -782,9 +782,11 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr
         || (pProperty->nWID == OWN_ATTR_MEDIA_MIMETYPE)
         || (pProperty->nWID == OWN_ATTR_VALUE_GRAPHIC))
     {
+#if HAVE_FEATURE_AVMEDIA
         SdrMediaObj* pMedia = static_cast< SdrMediaObj* >( GetSdrObject() );
         ::avmedia::MediaItem aItem;
         bool bOk = false;
+#endif
 
         switch( pProperty->nWID )
         {
@@ -916,11 +918,13 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr
             OSL_FAIL("SvxMediaShape::setPropertyValueImpl(), unknown argument!");
         }
 
+#if HAVE_FEATURE_AVMEDIA
         if( bOk )
         {
             pMedia->setMediaProperties( aItem );
             return true;
         }
+#endif
     }
     else
     {
@@ -942,7 +946,9 @@ bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPr
         || (pProperty->nWID == OWN_ATTR_VALUE_GRAPHIC))
     {
         SdrMediaObj* pMedia = static_cast< SdrMediaObj* >( GetSdrObject() );
+#if HAVE_FEATURE_AVMEDIA
         const ::avmedia::MediaItem aItem( pMedia->getMediaProperties() );
+#endif
 
         switch( pProperty->nWID )
         {
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 3ba73c8ae9af..9b379516bf97 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_defs,sw,\
 ))
 
 $(eval $(call gb_Library_use_libraries,sw,\
-    $(call gb_Helper_optional,AVMEDIA,avmedia) \
+    avmedia \
     basegfx \
     comphelper \
     cppu \
diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx
index c3aa1c980505..2fe098dba3a2 100644
--- a/sw/source/uibase/shells/grfshex.cxx
+++ b/sw/source/uibase/shells/grfshex.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
 #include <wrtsh.hxx>
 #include <view.hxx>
 #include <textsh.hxx>
@@ -38,10 +39,15 @@ using namespace ::sfx2;
 
 bool SwTextShell::InsertMediaDlg( SfxRequest const & rReq )
 {
+    bool bRet = false;
+
+#if !HAVE_FEATURE_AVMEDIA
+    (void) rReq;
+#else
     OUString     aURL;
     const SfxItemSet*   pReqArgs = rReq.GetArgs();
     vcl::Window&        rWindow = GetView().GetViewFrame()->GetWindow();
-    bool                bAPI = false, bRet = false;
+    bool bAPI = false;
 
     if( pReqArgs )
     {
@@ -115,6 +121,7 @@ bool SwTextShell::InsertMediaDlg( SfxRequest const & rReq )
             rWindow.LeaveWait();
         }
     }
+#endif
 
     return bRet;
 }