summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2011-10-21 17:18:13 +0200
committerStephan Bergmann <sbergman@redhat.com>2011-10-24 13:59:58 +0200
commitb786a33cfdca2e8a4114ddef0340e0e0628dd09c (patch)
treea0adbba80933544e1912adeb29a8e79797b7fc1c /connectivity
parent3535ceeac6f1b4277279082998663feb84d05487 (diff)
Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx7
1 files changed, 1 insertions, 6 deletions
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index d70e1e2db5ac..e06462cbe573 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -126,12 +126,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
nsCOMPtr<nsILocalFile> binDir;
// Note: if path3 construction fails, mozilla will default to using MOZILLA_FIVE_HOME in the NS_InitXPCOM2()
rtl::OUString path1(
-#if defined WNT
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")
-#else
- RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program")
-#endif
- );
+ RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program"));
rtl::Bootstrap::expandMacros(path1);
rtl::OString path2;
if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) ==