From b55de2ca8d05e459612e35e60644021e80f00aa1 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Mon, 9 Jun 2008 12:17:43 +0000 Subject: 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 --- extensions/source/nsplugin/source/so_env.hxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'extensions') 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(); -- cgit v1.2.3