[Libreoffice-commits] .: ucb/source

[Jan Holesovsky]

 ucb/source/ucp/odma/odma_datasupplier.cxx |    4 ++--
 ucb/source/ucp/odma/odma_provider.cxx     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a8f868af45d4d2ed24dec2bc20bed4b9a78f93c4
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Oct 5 14:44:14 2011 +0200

    Fix MinGW build.

diff --git a/ucb/source/ucp/odma/odma_datasupplier.cxx b/ucb/source/ucp/odma/odma_datasupplier.cxx
index 0003d93..50a1c8b 100644
--- a/ucb/source/ucp/odma/odma_datasupplier.cxx
+++ b/ucb/source/ucp/odma/odma_datasupplier.cxx
@@ -281,10 +281,10 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
     ODMSTATUS odm = NODMGetDMS(ODMA_ODMA_REGNAME, lpszDMSList);
     lpszDMSList[strlen(lpszDMSList)+1] = '\0';
 
-    ::rtl::OString sQuery("SELECT ODM_DOCID_LATEST, ODM_NAME");
+    const char sQuery[] = "SELECT ODM_DOCID_LATEST, ODM_NAME";
 
     DWORD dwFlags = ODM_SPECIFIC;
-    odm = NODMQueryExecute(ContentProvider::getHandle(), sQuery,dwFlags, lpszDMSList, pQueryId );
+    odm = NODMQueryExecute(ContentProvider::getHandle(), sQuery, dwFlags, lpszDMSList, pQueryId );
     if(odm != ODM_SUCCESS) {
         delete[] pQueryId;
         delete[] lpszDMSList;
diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx
index 20da599..7ad0a14 100644
--- a/ucb/source/ucp/odma/odma_provider.cxx
+++ b/ucb/source/ucp/odma/odma_provider.cxx
@@ -444,7 +444,7 @@ void ContentProvider::append(const ::rtl::Reference<ContentProperties>& _rProp)
         sQuery += "'";
 
         DWORD dwFlags = ODM_SPECIFIC;
-        odm = NODMQueryExecute(getHandle(), sQuery,dwFlags, lpszDMSList, pQueryId );
+        odm = NODMQueryExecute(getHandle(), sQuery.getStr(), dwFlags, lpszDMSList, pQueryId );
         if(odm == ODM_SUCCESS)
         {
             sal_uInt16 nCount       = 10;