renamed variables to make it clearer if we are using the dataId or parentId from the data table. This caused the delete clip format delete in clip properties to not work

git-svn-id: svn://svn.code.sf.net/p/ditto-cp/code/trunk@767 595ec19a-5cb4-439b-94a8-42fb3063c22c

CP_Main.cpp

@@ -992,13 +992,13 @@ void CCP_MainApp::ShowCommandLineError(CString csTitle, CString csMessage)
 	pErrorWnd->DestroyWindow();
 }
 
-BOOL CCP_MainApp::GetClipData(long lID, CClipFormat &Clip)
+BOOL CCP_MainApp::GetClipData(long parentId, CClipFormat &Clip)
 {
 	BOOL bRet = FALSE;
 
 	try
 	{
-		CppSQLite3Query q = theApp.m_db.execQueryEx(_T("SELECT ooData FROM Data WHERE lParentID = %d AND strClipboardFormat = '%s'"), lID, GetFormatName(Clip.m_cfType));
+		CppSQLite3Query q = theApp.m_db.execQueryEx(_T("SELECT ooData FROM Data WHERE lParentID = %d AND strClipboardFormat = '%s'"), parentId, GetFormatName(Clip.m_cfType));
 		if(q.eof() == false)
 		{
 			int nDataLen = 0;

Clip.cpp

@@ -98,12 +98,12 @@ HGLOBAL COleDataObjectEx::GetGlobalData(CLIPFORMAT cfFormat, LPFORMATETC lpForma
 /*----------------------------------------------------------------------------*\
 CClipFormat - holds the data of one clip format.
 \*----------------------------------------------------------------------------*/
-CClipFormat::CClipFormat(CLIPFORMAT cfType, HGLOBAL hgData, int dbId)
+CClipFormat::CClipFormat(CLIPFORMAT cfType, HGLOBAL hgData, int parentId)
 {
 	m_cfType = cfType;
 	m_hgData = hgData;
 	m_autoDeleteData = true;
-	m_dbId = dbId;
+	m_parentId = parentId;
 }
 
 CClipFormat::~CClipFormat() 
@@ -115,7 +115,8 @@ void CClipFormat::Clear()
 {
 	m_cfType = 0;
 	m_hgData = 0;
-	m_dbId = -1;
+	m_dataId = -1;
+	m_parentId = -1;
 }
 
 void CClipFormat::Free()
@@ -744,9 +745,9 @@ bool CClip::AddToDataTable()
 			stmt.execDML();
 			stmt.reset();
 
-			pCF->m_dbId = (long)theApp.m_db.lastRowId();
+			pCF->m_dataId = (long)theApp.m_db.lastRowId();
 
-			Log(StrF(_T("Added ClipData to DB, Id: %d, ParentId: %d Type: %s, size: %d"), pCF->m_dbId, m_id, formatName, clipSize));
+			Log(StrF(_T("Added ClipData to DB, Id: %d, ParentId: %d Type: %s, size: %d"), pCF->m_dataId, m_id, formatName, clipSize));
 		}
 	}
 	CATCH_SQLITE_EXCEPTION_AND_RETURN(false)
@@ -1047,14 +1048,15 @@ bool CClip::LoadFormats(int id, bool bOnlyLoad_CF_TEXT)
 		}
 
 		csSQL.Format(
-			_T("SELECT lParentID, strClipBoardFormat, ooData FROM Data ")
+			_T("SELECT lID, lParentID, strClipBoardFormat, ooData FROM Data ")
 			_T("WHERE %s lParentID = %d ORDER BY Data.lID desc"), textFilter, id);
 
 		CppSQLite3Query q = theApp.m_db.execQuery(csSQL);
 
 		while(q.eof() == false)
 		{
-			cf.m_dbId = q.getIntField(_T("lParentID"));
+			cf.m_dataId = q.getIntField(_T("lID"));
+			cf.m_parentId = q.getIntField(_T("lParentID"));
 			cf.m_cfType = GetFormatID(q.getStringField(_T("strClipBoardFormat")));
 			
 			if(bOnlyLoad_CF_TEXT)

Clip.h

@@ -37,9 +37,10 @@ public:
 	CLIPFORMAT m_cfType;
     HGLOBAL m_hgData;
 	bool m_autoDeleteData;
-	int m_dbId;
+	int m_dataId;
+	int m_parentId;
 
-	CClipFormat(CLIPFORMAT cfType = 0, HGLOBAL hgData = 0, int dbId = -1);
+	CClipFormat(CLIPFORMAT cfType = 0, HGLOBAL hgData = 0, int parentId = -1);
 	~CClipFormat();
 
 	void Clear();

CopyProperties.cpp

@@ -160,10 +160,10 @@ void CCopyProperties::LoadDataFromCClip(CClip &Clip)
 			cs.Format(_T("%s, %d"), GetFormatName(pCF->m_cfType), GlobalSize(pCF->m_hgData));
 			int nIndex = m_lCopyData.AddString(cs);
 			
-			if(m_lCopyID == -1 && pCF->m_dbId == -1)
+			if(m_lCopyID == -1 && pCF->m_dataId == -1)
 				m_lCopyData.SetItemData(nIndex, i);
 			else
-				m_lCopyData.SetItemData(nIndex, pCF->m_dbId);
+				m_lCopyData.SetItemData(nIndex, pCF->m_dataId);
 		}
 	}
 

QPasteWnd.cpp

@@ -3869,7 +3869,7 @@ void CQPasteWnd::GetDispInfo(NMHDR *pNMHDR, LRESULT *pResult)
                 bool exists = false;
 				for (std::list<CClipFormatQListCtrl>::iterator it = m_ExtraDataLoadItems.begin(); it != m_ExtraDataLoadItems.end(); it++)
 				{
-					if(it->m_cfType == CF_DIB && it->m_dbId == m_listItems[pItem->iItem].m_lID)
+					if(it->m_cfType == CF_DIB && it->m_parentId == m_listItems[pItem->iItem].m_lID)
 					{
 						exists = true;
 						break;
@@ -3880,7 +3880,7 @@ void CQPasteWnd::GetDispInfo(NMHDR *pNMHDR, LRESULT *pResult)
                 {
                     CClipFormatQListCtrl format;
                     format.m_cfType = CF_DIB;
-                    format.m_dbId = m_listItems[pItem->iItem].m_lID;
+                    format.m_parentId = m_listItems[pItem->iItem].m_lID;
                     format.m_clipRow = pItem->iItem;
                     format.m_autoDeleteData = false;
                     m_ExtraDataLoadItems.push_back(format);
@@ -3910,7 +3910,7 @@ void CQPasteWnd::GetDispInfo(NMHDR *pNMHDR, LRESULT *pResult)
                 bool exists = false;
 				for (std::list<CClipFormatQListCtrl>::iterator it = m_ExtraDataLoadItems.begin(); it != m_ExtraDataLoadItems.end(); it++)
 				{
-					if(it->m_cfType == theApp.m_RTFFormat && it->m_dbId == m_listItems[pItem->iItem].m_lID)
+					if(it->m_cfType == theApp.m_RTFFormat && it->m_parentId == m_listItems[pItem->iItem].m_lID)
 					{
 						exists = true;
 						break;
@@ -3921,7 +3921,7 @@ void CQPasteWnd::GetDispInfo(NMHDR *pNMHDR, LRESULT *pResult)
                 {
                     CClipFormatQListCtrl format;
                     format.m_cfType = theApp.m_RTFFormat;
-                    format.m_dbId = m_listItems[pItem->iItem].m_lID;
+                    format.m_parentId = m_listItems[pItem->iItem].m_lID;
                     format.m_clipRow = pItem->iItem;
                     format.m_autoDeleteData = false;
                     m_ExtraDataLoadItems.push_back(format);

QPasteWndThread.cpp

@@ -245,26 +245,26 @@ void CQPasteWndThread::OnLoadExtraData(void *param)
 
 	for (std::list<CClipFormatQListCtrl>::iterator it = localFormats.begin(); it != localFormats.end(); it++)
     {
-        if(theApp.GetClipData(it->m_dbId, *it))
+        if(theApp.GetClipData(it->m_parentId, *it))
         {
-            Log(StrF(_T("Loaded, extra data for clip %d, type: %d"), it->m_dbId, it->m_cfType));
+            Log(StrF(_T("Loaded, extra data for clip %d, type: %d"), it->m_parentId, it->m_cfType));
 
 			ATL::CCritSecLock csLock(pasteWnd->m_CritSection.m_sect);
 
             if(it->m_cfType == CF_DIB)
             {
-                pasteWnd->m_cf_dibCache[it->m_dbId] = *it;
+                pasteWnd->m_cf_dibCache[it->m_parentId] = *it;
                 //the cache now owns the format data, set it to delete the data in the destructor
-                pasteWnd->m_cf_dibCache[it->m_dbId].m_autoDeleteData = true;
+                pasteWnd->m_cf_dibCache[it->m_parentId].m_autoDeleteData = true;
             }
             else if(it->m_cfType == theApp.m_RTFFormat)
             {
-                pasteWnd->m_cf_rtfCache[it->m_dbId] = *it;
+                pasteWnd->m_cf_rtfCache[it->m_parentId] = *it;
                 //the cache now owns the format data, set it to delete the data in the destructor
-                pasteWnd->m_cf_rtfCache[it->m_dbId].m_autoDeleteData = true;
+                pasteWnd->m_cf_rtfCache[it->m_parentId].m_autoDeleteData = true;
             }
 
-            ::PostMessage(pasteWnd->m_hWnd, NM_REFRESH_ROW, it->m_dbId, it->m_clipRow);
+            ::PostMessage(pasteWnd->m_hWnd, NM_REFRESH_ROW, it->m_parentId, it->m_clipRow);
         }
         else
         {
@@ -273,12 +273,12 @@ void CQPasteWndThread::OnLoadExtraData(void *param)
             if(it->m_cfType == CF_DIB)
             {
                 CClipFormatQListCtrl localFormat;
-                pasteWnd->m_cf_dibCache[it->m_dbId] = *it;
+                pasteWnd->m_cf_dibCache[it->m_parentId] = *it;
             }
             else if(it->m_cfType == theApp.m_RTFFormat)
             {
                 CClipFormatQListCtrl localFormat;
-                pasteWnd->m_cf_rtfCache[it->m_dbId] = *it;
+                pasteWnd->m_cf_rtfCache[it->m_parentId] = *it;
             }
         }
     }