summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-09 11:32:34 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-09 11:32:34 +0000
commit45f4560e37598ed9e3d8cf8f0e7ead059d2f0239 (patch)
treed8263b4d39226ccbc2c09bf606d06d8ba07cf608 /extensions
parent9e2ba9536bf5a079f7099d2e40e1491d8168d673 (diff)
INTEGRATION: CWS sb87 (1.8.52); FILE MERGED
2008/04/24 13:12:58 sb 1.8.52.2: RESYNC: (1.8-1.9); FILE MERGED 2008/04/04 11:53:50 sb 1.8.52.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_instance.cxx10
1 files changed, 2 insertions, 8 deletions
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index b0a508e3b241..cfcbc763c5aa 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: so_instance.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
* This file is part of OpenOffice.org.
*
@@ -123,13 +123,7 @@ sal_Bool SoPluginInstance::Connect()
//create local service manager
if(!mxLocalMSF.is())
{
-#ifdef WNT
- xComponentContext = defaultBootstrap_InitialComponentContext(
- OUString(RTL_CONSTASCII_USTRINGPARAM("uno.ini")) );
-#else
- xComponentContext = defaultBootstrap_InitialComponentContext(
- OUString(RTL_CONSTASCII_USTRINGPARAM("unorc")) );
-#endif
+ xComponentContext = defaultBootstrap_InitialComponentContext();
if (xComponentContext.is())
{
debug_fprintf(NSP_LOG_APPEND, "print by Nsplugin, try to create mxLocalMSF.\n");