CWS-TOOLING: integrate CWS fwk98

2008-12-12 22:28:04 +0100 pb  r265444 : fix: #i44211# precompiled directive was missed
2008-12-11 10:43:34 +0100 pb  r265262 : fix: #i87952# #i84982# SID_INSERT_APPLET and SID_CHAR_DLG_FOR_PARAGRAPH not configurable any longer
2008-12-11 10:40:05 +0100 pb  r265261 : fix: #i64346# SID_MAIL_SENDDOCASFORMAT not configurable any longer
2008-12-11 10:36:53 +0100 pb  r265260 : fix: #i41265# #i64346# ui name for MacroOrganizer and SendMailDocAs...
2008-12-11 10:29:07 +0100 pb  r265258 : fix: #i60617# #i92080# ui name for ContinueNumbering and SaveGraphic
2008-12-11 10:25:52 +0100 pb  r265256 : fix: #i80850# ui name for ToggleFormula and AssignMacro
2008-12-08 14:16:20 +0100 pb  r264996 : fix: #i44211# querytemplate.obj added
2008-12-08 12:54:02 +0100 pb  r264992 : fix: #i44211# use the new query template box
2008-12-08 12:50:45 +0100 pb  r264991 : fix: #i44211# STR_QRYTEMPL_... added
2008-12-08 12:48:21 +0100 pb  r264990 : fix: #i44211# new query box
2008-12-02 11:06:54 +0100 pb  r264681 : fix: #i88478# ScStyleFamilyObj: XPropertySet support added
2008-12-02 11:05:29 +0100 pb  r264680 : fix: #i88478# STR_STYLE_FAMILY_... added
2008-12-02 11:03:22 +0100 pb  r264679 : fix: #i88478# ScStyleFamilyObj: XPropertySet support added
2008-12-02 10:54:27 +0100 pb  r264678 : fix: #i88478# STR_STYLE_FAMILY_... added
2008-12-02 10:50:16 +0100 pb  r264677 : fix: #i88478# SwXStyleFamily: XpropertySet support added
2008-12-02 10:48:12 +0100 pb  r264676 : fix: #i88478# STR_STYLE_FAMILY_... added
2008-12-02 10:45:46 +0100 pb  r264674 : fix: #i88478# SwXStyleFamily: XpropertySet support added
2008-12-02 10:43:44 +0100 pb  r264673 : fix: #i88478# STR_STYLE_FAMILY_... added
2008-12-02 10:40:45 +0100 pb  r264671 : fix: #i88478# table.srs added
2008-12-02 10:37:45 +0100 pb  r264669 : fix: #i88478# dummy text of DisplayName replaced
2008-12-02 10:35:26 +0100 pb  r264668 : fix: #i88478# RID_SVXSTR_STYLEFAMILY_TABLEDESIGN added
2008-12-02 10:30:24 +0100 pb  r264666 : fix: #i88478# RID_SVXSTR_STYLEFAMILY_TABLEDESIGN added
2008-11-24 10:42:03 +0100 pb  r264214 : fix: #i92765# set search algorithm with sense
2008-11-24 07:02:31 +0100 pb  r264194 : fix: #i61775# dont display more than 100 fonts
2008-11-24 06:15:20 +0100 pb  r264193 : fix: #i96418# map module swxform to swriter for help
2008-11-20 11:34:21 +0100 pb  r264035 : fix: #i93453# map 'swform' and 'swreport' to 'sdatabase'
2008-11-20 09:55:30 +0100 pb  r264030 : fix: #i94023# after copy a ResId dont forget to set RT correctly

1 files changed, 6 insertions, 8 deletions

diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index 7f32c757526c..35250753de1e 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -77,20 +77,19 @@ void FontNameMenu::Highlight()
 
 void FontNameMenu::Fill( const FontList* pList )
 {
-    // Menu loeschen
+    // clear menu
     Clear();
 
-    // Fonts eintragen
-
+    // add fonts
     const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
-
-    USHORT          nFontCount = pList->GetFontNameCount();
+    // more than 100 fonts reduces the speed of opening the menu.
+    // So only the first 100 fonts will be displayed.
+    USHORT nFontCount = ::std::min( pList->GetFontNameCount(), static_cast< USHORT >(100) );
     for ( USHORT i = 0; i < nFontCount; i++ )
     {
         const XubString& rName = pList->GetFontName( i ).GetName();
 
-        // Sortieren, nach der in der Applikation eingestellten
-        // International-Klasse
+        // sort with the I18nHelper
         USHORT j = GetItemCount();
         while ( j )
         {
@@ -99,7 +98,6 @@ void FontNameMenu::Fill( const FontList* pList )
                 break;
             j--;
         }
-
         InsertItem( i+1, rName, MIB_RADIOCHECK | MIB_AUTOCHECK, j );
     }