diff -u -r -N -x CVS -x WIN32_20.1_i386_DBG --minimal abi.org/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp abi/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp --- abi.org/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp Sat May 1 10:45:48 1999 +++ abi/src/af/xap/win/xap_Win32Dlg_FontChooser.cpp Fri Jan 14 15:07:00 2000 @@ -1,5 +1,5 @@ /* AbiSource Application Framework - * Copyright (C) 1998 AbiSource, Inc. + * Copyright (C) 1998,1999 AbiSource, Inc. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -188,7 +188,7 @@ m_bChangedUnderline = (lf.lfUnderline != m_bUnderline); m_bChangedStrikeOut = (lf.lfStrikeOut != m_bStrikeOut); if (m_bChangedUnderline || m_bChangedStrikeOut) - setFontDecoration(lf.lfUnderline,lf.lfStrikeOut); + setFontDecoration(lf.lfUnderline,0,lf.lfStrikeOut); } UT_DEBUGMSG(("FontChooserEnd: Family[%s%s] Size[%s%s] Weight[%s%s] Style[%s%s] Color[%s%s] Underline[%d%s] StrikeOut[%d%s]\n", diff -u -r -N -x CVS -x WIN32_20.1_i386_DBG --minimal abi.org/src/wp/ap/xp/ap_Menu_LabelSet_SvSE.h abi/src/wp/ap/xp/ap_Menu_LabelSet_SvSE.h --- abi.org/src/wp/ap/xp/ap_Menu_LabelSet_SvSE.h Mon Dec 13 20:43:21 1999 +++ abi/src/wp/ap/xp/ap_Menu_LabelSet_SvSE.h Fri Jan 14 22:39:40 2000 @@ -101,6 +101,7 @@ MenuLabel(AP_MENU_ID_FMT_BOLD, "&Fet", "G�r aktuell markering fetstil (v�xlande)") MenuLabel(AP_MENU_ID_FMT_ITALIC, "&Kursiv", "G�r aktuell markering kursiv (v�xlande)") MenuLabel(AP_MENU_ID_FMT_UNDERLINE, "&Understruken", "G�r aktuell markering understruken (v�xlande)") + MenuLabel(AP_MENU_ID_FMT_OVERLINE, "&�verstruken", "G�r aktuell markering �verstruken (v�xlande)") MenuLabel(AP_MENU_ID_FMT_STRIKE, "&Genomstruken", "G�r aktuell markering genomstruken (v�xlande)") MenuLabel(AP_MENU_ID_FMT_SUPERSCRIPT, "Upp&h�jd", "G�r aktuell markering upph�jd (v�xlande)") MenuLabel(AP_MENU_ID_FMT_SUBSCRIPT, "Neds&�nkt", "G�r aktuell markering neds�nkt (v�xlande)") diff -u -r -N -x CVS -x WIN32_20.1_i386_DBG --minimal abi.org/src/wp/ap/xp/ap_TB_LabelSet_SvSE.h abi/src/wp/ap/xp/ap_TB_LabelSet_SvSE.h --- abi.org/src/wp/ap/xp/ap_TB_LabelSet_SvSE.h Mon Dec 13 20:43:21 1999 +++ abi/src/wp/ap/xp/ap_TB_LabelSet_SvSE.h Fri Jan 14 22:39:48 2000 @@ -67,6 +67,7 @@ ToolbarLabel(AP_TOOLBAR_ID_FMT_BOLD, "Fet", tb_text_bold_F_xpm, NULL, "Fet") ToolbarLabel(AP_TOOLBAR_ID_FMT_ITALIC, "Kursiv", tb_text_italic_K_xpm, NULL, "Kursiv") ToolbarLabel(AP_TOOLBAR_ID_FMT_UNDERLINE, "Under", tb_text_underline_xpm, NULL, "Understruken") + ToolbarLabel(AP_TOOLBAR_ID_FMT_OVERLINE, "�ver", tb_text_overline_xpm, NULL, "�verstruken") ToolbarLabel(AP_TOOLBAR_ID_FMT_STRIKE, "Genom", tb_text_strikeout_G_xpm, NULL, "Genomstruken") ToolbarLabel(AP_TOOLBAR_ID_FMT_SUPERSCRIPT, "Upph�jd", tb_text_superscript_xpm, NULL, "Upph�jd")