diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 19:21:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 19:21:39 +0000 |
| commit | b68f9e217847d4bc6d6da714ad9848d1e9ff423a (patch) | |
| tree | 739b157d5b27265859b91e1a3e25cd78fea8d910 /psprint | |
| parent | 4bf8f69db6a2445b182fa43a66b12d66f8323c07 (diff) | |
INTEGRATION: CWS geordi2q11 (1.14.66); FILE MERGED
2003/12/16 14:01:53 hr 1.14.66.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/helper/helper.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/psprint/source/helper/helper.cxx b/psprint/source/helper/helper.cxx index 33a1de1858ae..7d2c150a515a 100644 --- a/psprint/source/helper/helper.cxx +++ b/psprint/source/helper/helper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: helper.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2003-04-15 16:14:38 $ + * last change: $Author: vg $ $Date: 2003-12-17 20:21:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,7 +72,9 @@ #include <tools/config.hxx> #include <rtl/bootstrap.hxx> #include <sal/config.h> +#ifdef SOLAR_JAVA #include "jvmaccess/javainfo.hxx" +#endif // SOLAR_JAVA using namespace rtl; @@ -263,6 +265,7 @@ const OUString& psp::getFontPath() } } +#ifdef SOLAR_JAVA // if no javarc (e.g. in setup) exists or it failed try the UDK method if( ! aJREpath.getLength() ) { @@ -299,6 +302,7 @@ const OUString& psp::getFontPath() } } } +#endif // SOLAR_JAVA if( aJREpath.getLength() ) { |