diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:15:54 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:15:54 +0000 |
| commit | bae397779f8918ec4a5fdca6568672b06693e701 (patch) | |
| tree | a086afd192634dc89776c3c8f5cfb6e03341c804 /desktop | |
| parent | c4aaa369a361d1ab1367e7727cfd8c8790337fec (diff) | |
INTEGRATION: CWS os2port03 (1.15.48); FILE MERGED
2008/07/16 12:30:15 obr 1.15.48.2: RESYNC: (1.15-1.19); FILE MERGED
2008/01/14 16:25:08 ydario 1.15.48.1: new deliveries, use short name for dp_misc
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index c5fe8948f6..bc94fde3fc 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dp_misc.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.20 $ * * This file is part of OpenOffice.org. * @@ -230,7 +230,7 @@ bool office_is_running() if ( #if defined UNIX sFile.equals(OUString(RTL_CONSTASCII_USTRINGPARAM(SOFFICE2))) -#elif defined WNT +#elif defined WNT || defined OS2 //osl_getExecutableFile should deliver "soffice.bin" on windows //even if swriter.exe, scalc.exe etc. was started. This is a bug //in osl_getExecutableFile |