summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-09 12:17:43 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-09 12:17:43 +0000
commitb55de2ca8d05e459612e35e60644021e80f00aa1 (patch)
treea9a350c990d5cd2a0799dd8345ca117af832730f /extensions
parentd29cf7aff29953ee33c5cf58a538fe7a163a1558 (diff)
INTEGRATION: CWS sb87 (1.4.476); FILE MERGED
2008/06/09 08:02:41 sb 1.4.476.3: resolved conflict against DEV300m17 2008/04/24 13:12:55 sb 1.4.476.2: RESYNC: (1.4-1.5); FILE MERGED 2008/04/04 11:53:50 sb 1.4.476.1: #i87548# moved npsoplugin dynamic library to brand layer, kept nsplugin executable (called from plugin, in turn calling soffice) in basis layer
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/nsplugin/source/so_env.hxx7
1 files changed, 1 insertions, 6 deletions
diff --git a/extensions/source/nsplugin/source/so_env.hxx b/extensions/source/nsplugin/source/so_env.hxx
index e99f4ac95bcc..d7dca0a7f17b 100644
--- a/extensions/source/nsplugin/source/so_env.hxx
+++ b/extensions/source/nsplugin/source/so_env.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: so_env.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
* This file is part of OpenOffice.org.
*
@@ -54,12 +54,10 @@
#ifdef UNIX
#define STAROFFICE_VERSION_FILE "/.sversionrc"
-#define PLUGIN_EXE_FILE_NAME "nsplugin"
#define STAROFFICE_EXE_FILE_NAME "soffice"
#endif
#ifdef WNT
#define STAROFFICE_VERSION_FILE "\\sversion.ini"
-#define PLUGIN_EXE_FILE_NAME "nsplugin.exe"
#define STAROFFICE_EXE_FILE_NAME "soffice.exe"
#endif
@@ -80,9 +78,6 @@ const char* getNewLibraryPath();
// return SO program dir absolute path, like "/home/build/staroffice/program"
const char* findProgramDir();
-// return nsplugin executable absolute path, like "/home/build/staroffice/program/nsplugin"
-const char* findNsExeFile();
-
#ifdef WNT
// return SO executable absolute path, like "/home/build/staroffice/program/soffice"
const char* findSofficeExecutable();