[mapguide-commits] r9430 - in branches/3.1/MgDev: . Common/Foundation/System

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-12-31 06:37:31 -0800 (Mon, 31 Dec 2018)
New Revision: 9430

Modified:
   branches/3.1/MgDev/
   branches/3.1/MgDev/Common/Foundation/System/Util.cpp
   branches/3.1/MgDev/Common/Foundation/System/Util.h
Log:
Merged revision(s) 9413 from trunk/MgDev:
#2784: Add MgUtil::copyString, which is a pass-through wrapper for XMLString::copyString
........


Index: branches/3.1/MgDev
===================================================================
--- branches/3.1/MgDev	2018-12-31 09:00:41 UTC (rev 9429)
+++ branches/3.1/MgDev	2018-12-31 14:37:31 UTC (rev 9430)

Property changes on: branches/3.1/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -16,4 +16,4 ##
 /sandbox/jng/tiling:8174-8208
 /sandbox/jng/v30:8212-8227
 /sandbox/rfc94:5099-5163
-/trunk/MgDev:8955-8956,8969,8980-8981,8986,8996,9000,9004-9006,9010,9018-9021,9034,9038,9042,9094,9106-9107,9147,9339-9343,9353,9360,9363,9369,9375,9397-9399,9407
\ No newline at end of property
+/trunk/MgDev:8955-8956,8969,8980-8981,8986,8996,9000,9004-9006,9010,9018-9021,9034,9038,9042,9094,9106-9107,9147,9339-9343,9353,9360,9363,9369,9375,9397-9399,9407,9413
\ No newline at end of property
Modified: branches/3.1/MgDev/Common/Foundation/System/Util.cpp
===================================================================
--- branches/3.1/MgDev/Common/Foundation/System/Util.cpp	2018-12-31 09:00:41 UTC (rev 9429)
+++ branches/3.1/MgDev/Common/Foundation/System/Util.cpp	2018-12-31 14:37:31 UTC (rev 9430)
@@ -18,6 +18,7 @@
 #include "Foundation.h"
 #include "UnicodeString.h"
 #include "SetLocale.h"
+#include "XmlDefs.h"
 #include <math.h>
 
 #include <algorithm>
@@ -1249,4 +1250,9 @@
 {
     if (numChars > str.size())
         str.insert(0, numChars - str.size(), ch);
+}
+
+void MgUtil::copyString(XMLCh* const target, const XMLCh* const src)
+{
+    XMLString::copyString(target, src);
 }
\ No newline at end of file

Modified: branches/3.1/MgDev/Common/Foundation/System/Util.h
===================================================================
--- branches/3.1/MgDev/Common/Foundation/System/Util.h	2018-12-31 09:00:41 UTC (rev 9429)
+++ branches/3.1/MgDev/Common/Foundation/System/Util.h	2018-12-31 14:37:31 UTC (rev 9430)
@@ -573,6 +573,9 @@
     static const STRING sm_classNameQualifier;
     static const STRING sm_classPropertyQualifier;
 
+    //Wraps XMLString::copyString in xerces
+    static void copyString(XMLCh* const target, const XMLCh* const src);
+
 private:
 
     static bool StaticInitialize();