Index: Utils/ClipboardHelper.h
===================================================================
--- Utils/ClipboardHelper.h	(revision 18429)
+++ Utils/ClipboardHelper.h	(working copy)
@@ -24,13 +24,19 @@
 public:
 	CClipboardHelper() : bClipBoardOpen(false) {}
 	~CClipboardHelper();
-	bool Open(HWND hOwningWnd) { return ((bClipBoardOpen = !!OpenClipboard(hOwningWnd)) == true); }
+	bool Open(HWND hOwningWnd);
 private:
 	bool bClipBoardOpen;
 };
 
-CClipboardHelper::~CClipboardHelper()
+inline CClipboardHelper::~CClipboardHelper()
 {
 	if (bClipBoardOpen)
 		CloseClipboard();
 }
+
+inline bool CClipboardHelper::Open(HWND hOwningWnd)
+{
+	bClipBoardOpen = (OpenClipboard(hOwningWnd) != 0);
+	return bClipBoardOpen;
+}
Index: Utils/StringUtils.cpp
===================================================================
--- Utils/StringUtils.cpp	(revision 18429)
+++ Utils/StringUtils.cpp	(working copy)
@@ -212,12 +212,10 @@
 	if (clipboardHelper.Open(hOwningWnd))
 	{
 		EmptyClipboard();
-		HGLOBAL hClipboardData;
-		hClipboardData = GlobalAlloc(GMEM_DDESHARE, sClipdata.GetLength()+1);
+		HGLOBAL hClipboardData = GlobalAlloc(GMEM_DDESHARE, sClipdata.GetLength()+1);
 		if (hClipboardData)
 		{
-			char * pchData;
-			pchData = (char*)GlobalLock(hClipboardData);
+			char* pchData = (char*)GlobalLock(hClipboardData);
 			if (pchData)
 			{
 				strcpy_s(pchData, sClipdata.GetLength()+1, (LPCSTR)sClipdata);
@@ -251,12 +249,10 @@
 	if (clipboardHelper.Open(hOwningWnd))
 	{
 		EmptyClipboard();
-		HGLOBAL hClipboardData;
-		hClipboardData = GlobalAlloc(GMEM_DDESHARE, (sClipdata.GetLength()+1)*sizeof(WCHAR));
+		HGLOBAL hClipboardData = GlobalAlloc(GMEM_DDESHARE, (sClipdata.GetLength()+1)*sizeof(WCHAR));
 		if (hClipboardData)
 		{
-			WCHAR * pchData;
-			pchData = (WCHAR*)GlobalLock(hClipboardData);
+			WCHAR* pchData = (WCHAR*)GlobalLock(hClipboardData);
 			if (pchData)
 			{
 				_tcscpy_s(pchData, sClipdata.GetLength()+1, (LPCWSTR)sClipdata);
@@ -284,12 +280,10 @@
 	if (clipboardHelper.Open(hOwningWnd))
 	{
 		EmptyClipboard();
-		HGLOBAL hClipboardData;
-		hClipboardData = GlobalAlloc(GMEM_DDESHARE, sClipdata.GetLength()+1);
+		HGLOBAL hClipboardData = GlobalAlloc(GMEM_DDESHARE, sClipdata.GetLength()+1);
 		if (hClipboardData)
 		{
-			char * pchData;
-			pchData = (char*)GlobalLock(hClipboardData);
+			char* pchData = (char*)GlobalLock(hClipboardData);
 			if (pchData)
 			{
 				strcpy_s(pchData, sClipdata.GetLength()+1, (LPCSTR)sClipdata);
