[Libreoffice-commits] .: 2 commits - basic/source connectivity/source

[Libreoffice Gerrit user]

 basic/source/runtime/dllmgr-x64.cxx              |    6 +++---
 connectivity/source/drivers/mozab/MStatement.cxx |    4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f0e797a351babf2282bac801c33a485671accf1b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 7 12:09:00 2012 +0100

    basic: adapt dllmgr-x64.cxx to OUString changes
    
    Change-Id: I9e5ff5be1f001a9f55953fd516fb5ef7fe94bf44

diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index c7a7729..14d782a 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -185,7 +185,7 @@ SbError marshalString(
 {
     OSL_ASSERT(variable != 0 && buffer != 0);
     rtl::OString str;
-    SbError e = convert(variable->GetString(), &str);
+    SbError e = convert(variable->GetOUString(), &str);
     if (e != ERRCODE_NONE) {
         return e;
     }
@@ -448,7 +448,7 @@ SbError unmarshalString(StringData const & data, SbxVariable & result) {
             return e;
         }
     }
-    data.variable->PutString(String(str));
+    data.variable->PutString(str);
     return ERRCODE_NONE;
 }
 
@@ -575,7 +575,7 @@ SbError call(
             if (e != ERRCODE_NONE) {
                 return e;
             }
-            result.PutString(String(s2));
+            result.PutString(s2);
             break;
         }
     case SbxOBJECT:
commit 8479ff19d9df5ad3f88bc370b49c4003e8bcd39c
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 7 12:05:24 2012 +0100

    mozab: adapt to XComponentContext changes
    
    Change-Id: I6b8cdd69edb1e25cd7545cea5a3ffdfcff5000a0

diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index c1041d9..9f6b2d5 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -32,6 +32,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
+#include <comphelper/processfactory.hxx>
 #include <connectivity/dbexception.hxx>
 #include <com/sun/star/container/XIndexAccess.hpp>
 
@@ -73,7 +74,8 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection )
     ,m_xDBMetaData(_pConnection->getMetaData())
     ,m_pTable(NULL)
     ,m_pConnection(_pConnection)
-    ,m_aParser(_pConnection->getDriver()->getMSFactory())
+    ,m_aParser(::comphelper::getComponentContext(
+                _pConnection->getDriver()->getMSFactory()))
     ,m_pSQLIterator( new OSQLParseTreeIterator( _pConnection, _pConnection->createCatalog()->getTables(), m_aParser, NULL ) )
     ,m_pParseTree(NULL)
     ,rBHelper(OCommonStatement_IBASE::rBHelper)