Some time ago, when my medication was running low or something, I put
some literal strings into some getPref() calls instead of the #define
names.  My bad.  This patch (against 090100 sources) corrects that
coding sloppiness.
-- 
[EMAIL PROTECTED] (WJCarpenter)    PGP 0x91865119
38 95 1B 69 C9 C6 3D 25    73 46 32 04 69 D6 ED F3

       Buy my house in Woodinville (near Seattle):
                 <http://www.johnlscott.com/57554>

diff -ru abi-090100-ORIG/src/af/gr/xp/gr_Graphics.cpp 
abi-090100/src/af/gr/xp/gr_Graphics.cpp
--- abi-090100-ORIG/src/af/gr/xp/gr_Graphics.cpp        Tue Aug  8 18:38:11 2000
+++ abi-090100/src/af/gr/xp/gr_Graphics.cpp     Tue Sep  5 20:25:09 2000
@@ -169,20 +169,20 @@
                UT_DEBUGMSG(("GR_Graphics::remapGlyph() refreshing cached values\n"));
                m_pPrefsScheme = s;
                m_uTick = t;
-               p->getPrefsValueBool((XML_Char*)"RemapGlyphsMasterSwitch", 
&m_bRemapGlyphsMasterSwitch);
-               p->getPrefsValueBool((XML_Char*)"RemapGlyphsNoMatterWhat", 
&m_bRemapGlyphsNoMatterWhat);
+               p->getPrefsValueBool((XML_Char*)XAP_PREF_KEY_RemapGlyphsMasterSwitch, 
+&m_bRemapGlyphsMasterSwitch);
+               p->getPrefsValueBool((XML_Char*)XAP_PREF_KEY_RemapGlyphsNoMatterWhat, 
+&m_bRemapGlyphsNoMatterWhat);
 
                const XML_Char *table_utf8, *default_utf8;
                UT_GrowBuf gb;
                const UT_UCSChar *tbl;
 
-               p->getPrefsValue((XML_Char*)"RemapGlyphsDefault", &default_utf8);
-               UT_ASSERT(p->getPrefsValue((XML_Char*)"RemapGlyphsDefault", 
&default_utf8));
+               p->getPrefsValue((XML_Char*)XAP_PREF_KEY_RemapGlyphsDefault, 
+&default_utf8);
+               UT_ASSERT(p->getPrefsValue((XML_Char*)XAP_PREF_KEY_RemapGlyphsDefault, 
+&default_utf8));
                UT_decodeUTF8string(default_utf8, UT_XML_strlen(default_utf8), &gb);
                m_ucRemapGlyphsDefault = *(gb.getPointer(0));  // might be null
 
-               p->getPrefsValue((XML_Char*)"RemapGlyphsTable", &table_utf8);
-               UT_ASSERT(p->getPrefsValue((XML_Char*)"RemapGlyphsTable", 
&table_utf8));
+               p->getPrefsValue((XML_Char*)XAP_PREF_KEY_RemapGlyphsTable, 
+&table_utf8);
+               UT_ASSERT(p->getPrefsValue((XML_Char*)XAP_PREF_KEY_RemapGlyphsTable, 
+&table_utf8));
                gb.truncate(0);
                UT_decodeUTF8string(table_utf8, UT_XML_strlen(table_utf8), &gb);
 

Reply via email to