[mapguide-commits] r1391 - trunk/MgDev/Common/Stylization

[svn_mapguide at osgeo.org]

Author: traianstanev
Date: 2007-03-27 17:30:25 -0400 (Tue, 27 Mar 2007)
New Revision: 1391

Modified:
   trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp
Log:
Tortoise SVN has some seriously messed up merge tools.

Modified: trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp	2007-03-27 21:16:51 UTC (rev 1390)
+++ trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp	2007-03-27 21:30:25 UTC (rev 1391)
@@ -185,6 +185,8 @@
         ret->tdef.halign() = RS_HAlignment_Left;
     else if (wcscmp(hAlign, L"Right") == 0)
         ret->tdef.halign() = RS_HAlignment_Right;
+    else if (wcscmp(hAlign, L"Center") == 0)
+        ret->tdef.halign() = RS_HAlignment_Center;
     else // default is Center
         ret->tdef.halign() = RS_HAlignment_Center;
 
@@ -197,6 +199,8 @@
         ret->tdef.valign() = RS_VAlignment_Cap;
     else if (wcscmp(vAlign, L"Top") == 0)
         ret->tdef.valign() = RS_VAlignment_Ascent;
+    else if (wcscmp(vAlign, L"Baseline") == 0)
+        ret->tdef.valign() = RS_VAlignment_Base;
     else // default is Halfline
         ret->tdef.valign() = RS_VAlignment_Half;