? @Ñ|tled1.CRASHED ? autom4te-2.53.cache ? localized_styles_unix.diff ? merge.abw ? merge.wml ? pSS ? wierd_merge.abw ? src/other/ttftool/GNUmakefile.in ? src/other/ttftool/unix/GNUmakefile.in ? src/wp/impexp/xp/Untitled1.CRASHED ? src/wp/impexp/xp/merged_cells.abw ? src/wp/impexp/xp/merged_cells.dbk ? src/wp/impexp/xp/merged_cells.xhtml ? src/wp/impexp/xp/nested_tables.abw ? src/wp/impexp/xp/nested_tables.xhtml ? src/wp/impexp/xp/simple_table.abw ? src/wp/impexp/xp/simple_table.dbk ? src/wp/impexp/xp/simple_table.xhtml ? src/wp/main/cocoa/AbiWord.app/GNUmakefile.in ? src/wp/main/cocoa/AbiWord.app/Contents/GNUmakefile.in ? src/wp/main/cocoa/AbiWord.app/Contents/Frameworks/GNUmakefile.in ? src/wp/main/cocoa/AbiWord.app/Contents/MacOS/GNUmakefile.in ? src/wp/main/cocoa/AbiWord.app/Contents/Resources/GNUmakefile.in ? src/wp/main/cocoa/AbiWord.app/Contents/Resources/English.lproj/GNUmakefile.in Index: src/wp/ap/unix/ap_UnixDialog_Styles.cpp =================================================================== RCS file: /cvsroot/abi/src/wp/ap/unix/ap_UnixDialog_Styles.cpp,v retrieving revision 1.48 diff -u -r1.48 ap_UnixDialog_Styles.cpp --- src/wp/ap/unix/ap_UnixDialog_Styles.cpp 6 Sep 2002 16:32:59 -0000 1.48 +++ src/wp/ap/unix/ap_UnixDialog_Styles.cpp 10 Sep 2002 03:21:29 -0000 @@ -39,6 +39,7 @@ #include "fv_View.h" #include "pd_Style.h" #include "ut_string_class.h" +#include "pt_PieceTable.h" // define to 0 to popup dialogs on top of each other, 1 to hide them #define HIDE_MAIN_DIALOG 0 @@ -734,12 +735,14 @@ getDoc()->enumStyles((UT_uint32)i, &name, &pStyle); + const char * localized = pt_PieceTable::s_getLocalisedStyleName(name); + // style has been deleted probably if (!pStyle) continue; // all of this is safe to do... append should take a const char ** - data[0] = name; + data[0] = localized; if ((m_whichType == ALL_STYLES) || (m_whichType == USED_STYLES && pStyle->isUsed()) || @@ -1511,18 +1514,20 @@ { getDoc()->enumStyles(i, &name, &pcStyle); + const char * localized = pt_PieceTable::s_getLocalisedStyleName(name); + if(pBasedOnStyle && pcStyle == pBasedOnStyle) { - szBasedOn = name; + szBasedOn = localized; } if(pFollowedByStyle && pcStyle == pFollowedByStyle) - szFollowedBy = name; + szFollowedBy = localized; if(szCurrentStyle && strcmp(name,szCurrentStyle) != 0) - m_gbasedOnStyles = g_list_append (m_gbasedOnStyles, (gpointer) name); + m_gbasedOnStyles = g_list_append (m_gbasedOnStyles, (gpointer) localized); else if(szCurrentStyle == NULL) - m_gbasedOnStyles = g_list_append (m_gbasedOnStyles, (gpointer) name); + m_gbasedOnStyles = g_list_append (m_gbasedOnStyles, (gpointer) localized); - m_gfollowedByStyles = g_list_append (m_gfollowedByStyles, (gpointer) name); + m_gfollowedByStyles = g_list_append (m_gfollowedByStyles, (gpointer) localized); } m_gfollowedByStyles = g_list_append (m_gfollowedByStyles, (gpointer) pSS->getValue(AP_STRING_ID_DLG_Styles_DefCurrent)); m_gbasedOnStyles = g_list_append (m_gbasedOnStyles, (gpointer) pSS->getValue(AP_STRING_ID_DLG_Styles_DefNone));