Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA

Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3

5 files changed, 21 insertions, 13 deletions

diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index 70579083fe2a..1fe6f9795900 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -20,6 +20,8 @@
 #ifndef _SW_APPLET_IMPL_HXX
 #define _SW_APPLET_IMPL_HXX
 
+#include <config_features.h>
+
 #define SWHTML_OPTTYPE_IGNORE 0
 #define SWHTML_OPTTYPE_TAG 1
 #define SWHTML_OPTTYPE_PARAM 2
@@ -55,7 +57,7 @@ public:
     void CreateApplet( const OUString& rCode, const OUString& rName,
                        sal_Bool bMayScript, const OUString& rCodeBase,
                        const OUString& rBaseURL );
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
     sal_Bool CreateApplet( const OUString& rBaseURL );
     void AppendParam( const OUString& rName, const OUString& rValue );
 #endif
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index a70bbce6e49c..6584f1eddc32 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -147,7 +147,7 @@ void SwApplet_Impl::CreateApplet( const OUString& rCode, const OUString& rName,
             xSet->setPropertyValue("AppletCodeBase", uno::makeAny( sDocBase ) );
     }
 }
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
 sal_Bool SwApplet_Impl::CreateApplet( const OUString& rBaseURL )
 {
     OUString aCode, aName, aCodeBase;
@@ -189,7 +189,7 @@ void SwApplet_Impl::FinishApplet()
     }
 }
 
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
 void SwApplet_Impl::AppendParam( const OUString& rName, const OUString& rValue )
 {
     aCommandList.Append( rName, rValue );
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index cdbb4711cbab..e47c6d11cb1b 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "hintids.hxx"
 #include <rtl/strbuf.hxx>
 #include <svl/urihelper.hxx>
@@ -484,7 +486,7 @@ void SwHTMLParser::InsertEmbed()
 }
 
 
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
 void SwHTMLParser::NewObject()
 {
     String aClassID, aName, aStandBy, aId, aStyle, aClass;
@@ -624,7 +626,7 @@ void SwHTMLParser::NewObject()
 
 void SwHTMLParser::EndObject()
 {
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
     if( !pAppletImpl )
         return;
     if( pAppletImpl->CreateApplet( sBaseURL ) )
@@ -654,7 +656,7 @@ void SwHTMLParser::EndObject()
 #endif
 }
 
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
 void SwHTMLParser::InsertApplet()
 {
     String aCodeBase, aCode, aName, aAlt, aId, aStyle, aClass;
@@ -757,7 +759,7 @@ void SwHTMLParser::InsertApplet()
 
 void SwHTMLParser::EndApplet()
 {
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
     if( !pAppletImpl )
         return;
 
@@ -787,7 +789,7 @@ void SwHTMLParser::EndApplet()
 
 void SwHTMLParser::InsertParam()
 {
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
     if( !pAppletImpl )
         return;
 
@@ -968,7 +970,7 @@ sal_uInt16 SwHTMLWriter::GuessOLENodeFrmType( const SwNode& rNode )
     {
         eType = HTML_FRMTYPE_IFRAME;
     }
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
     else if( aClass == SvGlobalName( SO3_APPLET_CLASSID ) )
     {
         eType = HTML_FRMTYPE_APPLET;
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 1f88229c5641..7fd0a1e27b67 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.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/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
@@ -1374,14 +1376,14 @@ void SwHTMLParser::NextToken( int nToken )
         break;
 
     case HTML_OBJECT_ON:
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
         NewObject();
         bCallNextToken = pAppletImpl!=0 && pTable!=0;
 #endif
         break;
 
     case HTML_APPLET_ON:
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
         InsertApplet();
         bCallNextToken = pAppletImpl!=0 && pTable!=0;
 #endif
diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx
index bb0ffb951e6e..f6e03fd2ced5 100644
--- a/sw/source/filter/html/swhtml.hxx
+++ b/sw/source/filter/html/swhtml.hxx
@@ -19,6 +19,8 @@
 #ifndef _SWHTML_HXX
 #define _SWHTML_HXX
 
+#include <config_features.h>
+
 #include <sfx2/sfxhtml.hxx>
 #include <svl/macitem.hxx>
 #include <editeng/svxenum.hxx>
@@ -705,11 +707,11 @@ private:
     void InsertImage();     // htmlgrin.cxx
     void InsertEmbed();     // htmlplug.cxx
 
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
     void NewObject();   // htmlplug.cxx
 #endif
     void EndObject();       // CommandLine mit Applet verkn. (htmlplug.cxx)
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
     void InsertApplet();    // htmlplug.cxx
 #endif
     void EndApplet();       // CommandLine mit Applet verkn. (htmlplug.cxx)