Fixed opening/creating shapefile with åäö in path/filename.

Author: sweco-sedahd

src/Shapefile/dbf.cpp

@@ -12,7 +12,7 @@
 
 DBFHandle SHPAPI_CALL DBFOpen_MW( CStringW pszFilename, const char * pszAccess )
 {
-	CStringA nameA = Utility::ConvertToUtf8(pszFilename);
+	CStringA nameA = Utility::ConvertToAnsi1252(pszFilename);
 	m_globalSettings.SetGdalUtf8(true);
 	DBFHandle handle = DBFOpen(nameA, pszAccess);
 	m_globalSettings.SetGdalUtf8(false);
@@ -21,7 +21,7 @@ DBFHandle SHPAPI_CALL DBFOpen_MW( CStringW pszFilename, const char * pszAccess )
 
 DBFHandle SHPAPI_CALL DBFCreate_MW( CStringW nameW )
 {
-	CStringA nameA = Utility::ConvertToUtf8(nameW);
+	CStringA nameA = Utility::ConvertToAnsi1252(nameW);
 	m_globalSettings.SetGdalUtf8(true);
 	DBFHandle handle = DBFCreate(nameA);
 	m_globalSettings.SetGdalUtf8(false);

src/Utilities/UtilityFunctions.cpp

@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "StdAfx.h"
 #include <iterator>
 #include <fstream>
 #include "macros.h"
@@ -39,6 +39,15 @@ namespace Utility
 		return utf8;
 	}
 
+	// ********************************************************
+	//    ConvertToAnsi1252()
+	// ********************************************************
+	CStringA ConvertToAnsi1252(CStringW unicode) {
+		USES_CONVERSION;
+		CStringA acp = CW2A(unicode, CP_ACP);
+		return acp;
+	}
+
 	// ********************************************************
 	//    ConvertFromUtf8()
 	// ********************************************************
@@ -705,6 +714,9 @@ namespace Utility
 				}
 				break;
 			}
+			case admMetricMeters:
+				localizedUnits = lsSquareMeters;
+				break;
 			case admHectars:
 			{
 				area /= 10000.0;

src/Utilities/UtilityFunctions.h

@@ -18,7 +18,8 @@ namespace Utility
 
 	CString UrlEncode(CString s);
 	CStringW XmlFilenameToUnicode(CStringA s, bool utf8);
-	CStringA ConvertToUtf8(CStringW unicode); 
+	CStringA ConvertToUtf8(CStringW unicode);
+	CStringA ConvertToAnsi1252(CStringW unicode);
 	CStringW ConvertFromUtf8(CStringA utf8);
 	CString GetSocketErrorMessage(DWORD socketError);