[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - connectivity/source

[Tor Lillqvist]

 connectivity/source/drivers/adabas/BDriver.cxx |    2 +-
 connectivity/source/drivers/ado/makefile.mk    |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 00bdddc99cebb65b556ad3c19b15e38c732719df
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Nov 3 10:21:33 2010 +0200

    Fix typo

diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 7e603c5..0513f2a 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -1180,7 +1180,7 @@ int ODriver::X_STOP(const ::rtl::OUString& sDBName)
     ::rtl::OUString sArg2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
 
     const sal_uInt32 nArgsCount = 3;
-    rtl_uString* pArgs[nArgsCount] = { sArg1.pData, sDBName.pData, sArg3.pData };
+    rtl_uString* pArgs[nArgsCount] = { sArg1.pData, sDBName.pData, sArg2.pData };
     sCommand =	::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stp.exe"));
 #else
     const sal_uInt32 nArgsCount = 1;
commit 9fe0680782dc0ff92ef6344cab9ab9534a52017b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Nov 3 10:20:10 2010 +0200

    Link with SALHELPERLIB

diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index 8fdae27..54bebe6 100644
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -86,6 +86,7 @@ SHL1STDLIBS=\
     $(CPPULIB)					\
     $(CPPUHELPERLIB)			\
     $(SALLIB)					\
+    $(SALHELPERLIB)				\
     $(OLE32LIB)					\
     $(OLEAUT32LIB)				\
     $(UUIDLIB)					\