summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/odma/odma_datasupplier.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source/ucp/odma/odma_datasupplier.cxx')
-rwxr-xr-x[-rw-r--r--]ucb/source/ucp/odma/odma_datasupplier.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/ucb/source/ucp/odma/odma_datasupplier.cxx b/ucb/source/ucp/odma/odma_datasupplier.cxx
index aab2a3d8663c..817a4f4decf8 100644..100755
--- a/ucb/source/ucp/odma/odma_datasupplier.cxx
+++ b/ucb/source/ucp/odma/odma_datasupplier.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -41,7 +42,6 @@
#include "odma_content.hxx"
#include "odma_contentprops.hxx"
#include "odma_provider.hxx"
-#include "odma_lib.hxx"
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
@@ -115,7 +115,7 @@ DataSupplier_Impl::~DataSupplier_Impl()
while ( it != end )
{
delete (*it);
- it++;
+ ++it;
}
}
@@ -284,12 +284,15 @@ 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, ODM_NAME");
+ ::rtl::OString sQuery("SELECT ODM_DOCID_LATEST, ODM_NAME");
DWORD dwFlags = ODM_SPECIFIC;
odm = NODMQueryExecute(ContentProvider::getHandle(), sQuery,dwFlags, lpszDMSList, pQueryId );
- if(odm != ODM_SUCCESS)
+ if(odm != ODM_SUCCESS) {
+ delete[] pQueryId;
+ delete[] lpszDMSList;
return sal_False;
+ }
sal_uInt16 nCount = 10;
sal_uInt16 nMaxCount = 10;
@@ -453,3 +456,5 @@ void DataSupplier::validate()
throw( ResultSetException )
{
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */