From 20dcb39a743cb083e55b9cdb72b2d93b95a3f744 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <cmc@openoffice.org>
Date: Fri, 6 Nov 2009 11:03:40 +0000
Subject: cmcfixes66: #i106674# fix remaining new[]/delete mismatches

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

(limited to 'ucb/source/ucp')

diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
index 80d5114e09..fc4be63462 100644
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_content.cxx
@@ -565,7 +565,7 @@ uno::Any SAL_CALL Content::execute(
                                  ODM_DELETE,
                                  lpszNewDocId);
 
-                delete lpszNewDocId;
+                delete [] lpszNewDocId;
             }
             if(bError)
                 ucbhelper::cancelCommandExecution(
diff --git a/ucb/source/ucp/odma/odma_datasupplier.cxx b/ucb/source/ucp/odma/odma_datasupplier.cxx
index ad1d6151e2..a047921752 100644
--- a/ucb/source/ucp/odma/odma_datasupplier.cxx
+++ b/ucb/source/ucp/odma/odma_datasupplier.cxx
@@ -329,10 +329,10 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
     // now close the query
     odm = NODMQueryClose(ContentProvider::getHandle(), pQueryId);
 
-    delete lpszDMSList;
-    delete pQueryId;
-    delete lpszDocId;
-    delete lpszDocName;
+    delete [] lpszDMSList;
+    delete [] pQueryId;
+    delete [] lpszDocId;
+    delete [] lpszDocName;
 
     if ( !bFound )
         m_pImpl->m_bCountFinal = sal_True;
diff --git a/ucb/source/ucp/odma/odma_provider.cxx b/ucb/source/ucp/odma/odma_provider.cxx
index a124ff077b..988af49933 100644
--- a/ucb/source/ucp/odma/odma_provider.cxx
+++ b/ucb/source/ucp/odma/odma_provider.cxx
@@ -230,7 +230,7 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent(
             aProp->m_sContentType  = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODMA_CONTENT_TYPE));
             append(aProp);
         }
-        delete lpszDocName;
+        delete [] lpszDocName;
     }
     else // we got an already fetched name here so look for it
     {
@@ -298,11 +298,11 @@ void ContentProvider::saveDocument(const ::rtl::OString& _sDocumentId)
         OSL_ENSURE(odm == ODM_SUCCESS,"Could not save document!");
         if(odm != ODM_SUCCESS)
         {
-            delete lpszDocId;
+            delete [] lpszDocId;
             throw uno::Exception();
         }
         aIter->second->m_sDocumentId = rtl::OString(lpszDocId);
-        delete lpszDocId;
+        delete [] lpszDocId;
     }
 }
 // -----------------------------------------------------------------------------
@@ -414,7 +414,7 @@ void ContentProvider::fillDocumentProperties(const ::rtl::Reference<ContentPrope
                                     lpszDocInfo,
                                     ODM_DOCID_MAX);
 */
-    delete lpszDocInfo;
+    delete [] lpszDocInfo;
 }
 // -----------------------------------------------------------------------------
 void ContentProvider::append(const ::rtl::Reference<ContentProperties>& _rProp)
@@ -482,16 +482,16 @@ void ContentProvider::append(const ::rtl::Reference<ContentProperties>& _rProp)
             }
             while(nCount > nMaxCount);
 
-            delete lpszDocInfo;
-            delete lpszDocId;
-            delete lpszDocName;
+            delete [] lpszDocInfo;
+            delete [] lpszDocId;
+            delete [] lpszDocName;
         }
 
         // now close the query
         odm = NODMQueryClose(ContentProvider::getHandle(), pQueryId);
-        delete pQueryId;
+        delete [] pQueryId;
     }
-    delete lpszDMSList;
+    delete [] lpszDMSList;
     
 
     return aReturn;
@@ -547,11 +547,11 @@ void ContentProvider::append(const ::rtl::Reference<ContentProperties>& _rProp)
                 _rProp->m_bIsOpen = sal_True;
                 break;
             default:
-                delete pFileName;
+                delete [] pFileName;
                 throw uno::Exception();  // TODO give a more precise error message here
         }
 
-        delete pFileName;
+        delete [] pFileName;
     }
     return _rProp->m_sFileURL;
 }
-- 
cgit v1.2.3