summaryrefslogtreecommitdiff
path: root/desktop/source/app/app.cxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-19 00:41:12 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-19 10:29:04 +0300
commit08452f1208a2ecbf7c6f15a96efeedbe5210ec83 (patch)
treefb09bce47d74d368ae9449bf4a5dc9e33c1ac1a8 /desktop/source/app/app.cxx
parenta3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff)
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'desktop/source/app/app.cxx')
-rw-r--r--desktop/source/app/app.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c11909f9edd9..d75b35238b49 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1689,7 +1689,7 @@ int Desktop::Main()
try
{
-#ifdef SOLAR_JAVA
+#if HAVE_FEATURE_JAVA
// The JavaContext contains an interaction handler which is used when
// the creation of a Java Virtual Machine fails
com::sun::star::uno::ContextLayer layer2(