[sword-svn] r3167 - in branches/sword-1-7-x: . utilities/diatheke

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-04-16 21:12:12 -0700 (Wed, 16 Apr 2014)
New Revision: 3167

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/utilities/diatheke/diathekemgr.cpp
Log:
Merging r3106 - fixed ICU warning in diatheke



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3013,3015-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106

Modified: branches/sword-1-7-x/utilities/diatheke/diathekemgr.cpp
===================================================================
--- branches/sword-1-7-x/utilities/diatheke/diathekemgr.cpp	2014-04-17 04:08:45 UTC (rev 3166)
+++ branches/sword-1-7-x/utilities/diatheke/diathekemgr.cpp	2014-04-17 04:12:12 UTC (rev 3167)
@@ -76,13 +76,14 @@
 void DiathekeMgr::AddRenderFilters(SWModule *module, ConfigEntMap &section)
 {
 	SWBuf lang;
-	bool rtl;
 	ConfigEntMap::iterator entry;
 
 	lang = ((entry = section.find("Lang")) != section.end()) ? (*entry).second : (SWBuf)"en";
+
+#ifdef _ICU_
+	bool rtl;
 	rtl = ((entry = section.find("Direction")) != section.end()) ? ((*entry).second == "RtoL") : false;
 
-#ifdef _ICU_
 	if (shape) {
 		module->addRenderFilter(arshaping);
 	}