diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-08-18 07:10:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-08-18 07:10:26 +0000 |
| commit | b06814694301cb87b5a3a1a9b90c7af16008e968 (patch) | |
| tree | 7157bf09114cff0a6b510ee43cf72e80c341207d /svx | |
| parent | 1b9592357f1b7199094755c9a355e43462ef73c3 (diff) | |
INTEGRATION: CWS macosx10 (1.13.176); FILE MERGED
2005/07/21 16:55:09 ericb 1.13.176.1: #i51851# second part for linnpsoplugin in Mac OS X
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/optinet2.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/svx/source/dialog/optinet2.cxx b/svx/source/dialog/optinet2.cxx index 673168abe6cb..c88716de10c0 100644 --- a/svx/source/dialog/optinet2.cxx +++ b/svx/source/dialog/optinet2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: optinet2.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: hr $ $Date: 2005-04-04 15:29:01 $ + * last change: $Author: rt $ $Date: 2005-08-18 08:10:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -271,6 +271,8 @@ using namespace ::sfx2; #define RET_ALL ((short)200) #define CFG_READONLY_DEFAULT FALSE +#include <sal/config.h> + SV_IMPL_PTRARR( SfxFilterPtrArr, SfxFilterPtr ) const char* SEARCHENGINE_INI = "srcheng.ini"; @@ -1757,7 +1759,7 @@ BOOL MozPluginTabPage::isInstalled() char lnkReferFilePath[NPP_PATH_MAX] = {0}; char* pHome = getpwuid(getuid())->pw_dir; strcat(lnkFilePath, pHome); - strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin.so"); + strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION); struct stat sBuf; if (0 > lstat(lnkFilePath, &sBuf)) @@ -1775,7 +1777,7 @@ BOOL MozPluginTabPage::isInstalled() ::rtl::OString tempString; tempString = getDllURL(); strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX); - strcat(realFilePath, "/libnpsoplugin.so"); + strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION); if (0 != strcmp(lnkReferFilePath, realFilePath)) return false; @@ -1803,7 +1805,7 @@ BOOL MozPluginTabPage::installPlugin() char lnkFilePath[NPP_PATH_MAX] = {0}; char* pHome = getpwuid(getuid())->pw_dir; strcat(lnkFilePath, pHome); - strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin.so"); + strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION); remove(lnkFilePath); // create the dirs if necessary @@ -1822,7 +1824,7 @@ BOOL MozPluginTabPage::installPlugin() ::rtl::OString tempString; tempString = getDllURL(); strncpy(realFilePath, tempString.getStr(), NPP_PATH_MAX); - strcat(realFilePath, "/libnpsoplugin.so"); + strcat(realFilePath, "/libnpsoplugin" SAL_DLLEXTENSION); // create the link if (0 != symlink(realFilePath, lnkFilePath)) @@ -1848,7 +1850,7 @@ BOOL MozPluginTabPage::uninstallPlugin() char lnkFilePath[NPP_PATH_MAX] = {0}; char* pHome = getpwuid(getuid())->pw_dir; strcat(lnkFilePath, pHome); - strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin.so"); + strcat(lnkFilePath, "/.mozilla/plugins/libnpsoplugin" SAL_DLLEXTENSION); if(0 > remove(lnkFilePath)) return false; |