CWS gnumake2: resync to DEV300_m84

25 files changed, 423 insertions, 651 deletions

diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index e2814e6eddab..e0f4b1835f95 100644
--- a/svl/Package_inc.mk
+++ b/svl/Package_inc.mk
@@ -83,7 +83,6 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svdde.hxx,svl/svdde.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldata.hxx,svl/svldata.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svstdarr.hxx,svl/svstdarr.hxx))
-$(eval $(call gb_Package_add_file,svl_inc,inc/svl/svtools.hrc,svl/svtools.hrc))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/szitem.hxx,svl/szitem.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/undo.hxx,svl/undo.hxx))
 $(eval $(call gb_Package_add_file,svl_inc,inc/svl/urlfilter.hxx,svl/urlfilter.hxx))
diff --git a/svl/inc/svl/solar.hrc b/svl/inc/svl/solar.hrc
index b559766b982b..6d13d46ec759 100644
--- a/svl/inc/svl/solar.hrc
+++ b/svl/inc/svl/solar.hrc
@@ -99,8 +99,8 @@
 #define RID_GOODIES_START           (RID_LIB_START+7400)
 #define RID_GOODIES_END             (RID_LIB_START+7449)
 
-#define RID_CHANNEL_START           (RID_LIB_START+7450)
-#define RID_CHANNEL_END             (RID_LIB_START+7899)
+#define RID_SVL_START               (RID_LIB_START+7450)
+#define RID_SVL_END                 (RID_LIB_START+7899)
 
 #define RID_CHAOS_START             (RID_LIB_START+7900)
 #define RID_CHAOS_END               (RID_LIB_START+7999)
diff --git a/svl/inc/svl/svl.hrc b/svl/inc/svl/svl.hrc
new file mode 100644
index 000000000000..d63e84f2b91f
--- /dev/null
+++ b/svl/inc/svl/svl.hrc
@@ -0,0 +1,160 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: svtools.hrc,v $
+ * $Revision: 1.7 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _SVL_HRC
+#define _SVL_HRC
+
+#include <svl/solar.hrc>
+
+#define STR_SVT_MIMETYPE_START              (RID_SVL_START)
+#define STR_SVT_MIMETYPE_APP_OCTSTREAM      (STR_SVT_MIMETYPE_START+0)
+#define STR_SVT_MIMETYPE_APP_PDF            (STR_SVT_MIMETYPE_START+1)
+#define STR_SVT_MIMETYPE_APP_RTF            (STR_SVT_MIMETYPE_START+2)
+#define STR_SVT_MIMETYPE_APP_MSWORD         (STR_SVT_MIMETYPE_START+3)
+#define STR_SVT_MIMETYPE_APP_STARCALC       (STR_SVT_MIMETYPE_START+4)
+#define STR_SVT_MIMETYPE_APP_STARCHART      (STR_SVT_MIMETYPE_START+5)
+#define STR_SVT_MIMETYPE_APP_STARDRAW       (STR_SVT_MIMETYPE_START+6)
+#define STR_SVT_MIMETYPE_APP_STARIMAGE      (STR_SVT_MIMETYPE_START+7)
+#define STR_SVT_MIMETYPE_APP_STARMATH       (STR_SVT_MIMETYPE_START+8)
+#define STR_SVT_MIMETYPE_APP_STARWRITER     (STR_SVT_MIMETYPE_START+9)
+#define STR_SVT_MIMETYPE_APP_ZIP            (STR_SVT_MIMETYPE_START+10)
+#define STR_SVT_MIMETYPE_AUDIO_AIFF         (STR_SVT_MIMETYPE_START+11)
+#define STR_SVT_MIMETYPE_AUDIO_BASIC        (STR_SVT_MIMETYPE_START+12)
+#define STR_SVT_MIMETYPE_AUDIO_MIDI         (STR_SVT_MIMETYPE_START+13)
+#define STR_SVT_MIMETYPE_AUDIO_WAV          (STR_SVT_MIMETYPE_START+14)
+#define STR_SVT_MIMETYPE_IMAGE_GIF          (STR_SVT_MIMETYPE_START+15)
+#define STR_SVT_MIMETYPE_IMAGE_JPEG         (STR_SVT_MIMETYPE_START+16)
+#define STR_SVT_MIMETYPE_IMAGE_PCX          (STR_SVT_MIMETYPE_START+17)
+#define STR_SVT_MIMETYPE_IMAGE_BMP          (STR_SVT_MIMETYPE_START+18)
+#define STR_SVT_MIMETYPE_TEXT_HTML          (STR_SVT_MIMETYPE_START+19)
+#define STR_SVT_MIMETYPE_TEXT_PLAIN         (STR_SVT_MIMETYPE_START+20)
+#define STR_SVT_MIMETYPE_TEXT_URL           (STR_SVT_MIMETYPE_START+21)
+#define STR_SVT_MIMETYPE_TEXT_VCARD         (STR_SVT_MIMETYPE_START+22)
+#define STR_SVT_MIMETYPE_VIDEO_VDO          (STR_SVT_MIMETYPE_START+23)
+#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO      (STR_SVT_MIMETYPE_START+24)
+#define STR_SVT_MIMETYPE_X_STARMAIL         (STR_SVT_MIMETYPE_START+25)
+#define STR_SVT_MIMETYPE_X_VRML             (STR_SVT_MIMETYPE_START+26)
+#define STR_SVT_MIMETYPE_APP_STARHELP       (STR_SVT_MIMETYPE_START+27)
+#define STR_SVT_MIMETYPE_APP_STARIMPRESS    (STR_SVT_MIMETYPE_START+28)
+#define STR_SVT_MIMETYPE_APP_SCHED_CMB      (STR_SVT_MIMETYPE_START+29)
+#define STR_SVT_MIMETYPE_APP_SCHED_EVT      (STR_SVT_MIMETYPE_START+30)
+#define STR_SVT_MIMETYPE_APP_SCHED_TASK     (STR_SVT_MIMETYPE_START+31)
+#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW    (STR_SVT_MIMETYPE_START+32)
+
+#define STR_SVT_MIMETYPE_CNT_MSG            (STR_SVT_MIMETYPE_START+33)
+#define STR_SVT_MIMETYPE_CNT_DOCUMENT       (STR_SVT_MIMETYPE_START+34)
+#define STR_SVT_MIMETYPE_CNT_POP3BOX        (STR_SVT_MIMETYPE_START+35)
+#define STR_SVT_MIMETYPE_CNT_IMAPBOX        (STR_SVT_MIMETYPE_START+36)
+#define STR_SVT_MIMETYPE_CNT_IMAPFLD        (STR_SVT_MIMETYPE_START+37)
+#define STR_SVT_MIMETYPE_CNT_VIMBOX         (STR_SVT_MIMETYPE_START+38)
+#define STR_SVT_MIMETYPE_CNT_VIMINBOX       (STR_SVT_MIMETYPE_START+39)
+#define STR_SVT_MIMETYPE_CNT_BBBOX          (STR_SVT_MIMETYPE_START+40)
+#define STR_SVT_MIMETYPE_CNT_VIM_BB         (STR_SVT_MIMETYPE_START+41)
+#define STR_SVT_MIMETYPE_CNT_NEWSBOX        (STR_SVT_MIMETYPE_START+42)
+#define STR_SVT_MIMETYPE_CNT_NEWSGRP        (STR_SVT_MIMETYPE_START+43)
+#define STR_SVT_MIMETYPE_CNT_OUTBOX         (STR_SVT_MIMETYPE_START+44)
+#define STR_SVT_MIMETYPE_CNT_FTPBOX         (STR_SVT_MIMETYPE_START+45)
+#define STR_SVT_MIMETYPE_CNT_FTPFLD         (STR_SVT_MIMETYPE_START+46)
+#define STR_SVT_MIMETYPE_CNT_FTPFILE        (STR_SVT_MIMETYPE_START+47)
+#define STR_SVT_MIMETYPE_CNT_FTPLINK        (STR_SVT_MIMETYPE_START+48)
+#define STR_SVT_MIMETYPE_CNT_HTTPBOX        (STR_SVT_MIMETYPE_START+49)
+#define STR_SVT_MIMETYPE_CNT_FSYSBOX        (STR_SVT_MIMETYPE_START+50)
+#define STR_SVT_MIMETYPE_CNT_FSYSFLD        (STR_SVT_MIMETYPE_START+51)
+#define STR_SVT_MIMETYPE_CNT_FSYSFILE       (STR_SVT_MIMETYPE_START+52)
+#define STR_SVT_MIMETYPE_CNT_FSYSURLFILE    (STR_SVT_MIMETYPE_START+53)
+#define STR_SVT_MIMETYPE_CNT_PUBLBOX        (STR_SVT_MIMETYPE_START+54)
+#define STR_SVT_MIMETYPE_CNT_SRCHBOX        (STR_SVT_MIMETYPE_START+55)
+#define STR_SVT_MIMETYPE_CNT_SUBSCRBOX      (STR_SVT_MIMETYPE_START+56)
+#define STR_SVT_MIMETYPE_CNT_BOOKMARK       (STR_SVT_MIMETYPE_START+57)
+#define STR_SVT_MIMETYPE_CNT_CDF            (STR_SVT_MIMETYPE_START+58)
+#define STR_SVT_MIMETYPE_CNT_CDFSUB         (STR_SVT_MIMETYPE_START+59)
+#define STR_SVT_MIMETYPE_CNT_CDFITEM        (STR_SVT_MIMETYPE_START+60)
+#define STR_SVT_MIMETYPE_CNT_STARCHANNEL    (STR_SVT_MIMETYPE_START+61)
+#define STR_SVT_MIMETYPE_CNT_TRASHBOX       (STR_SVT_MIMETYPE_START+62)
+#define STR_SVT_MIMETYPE_CNT_TRASH          (STR_SVT_MIMETYPE_START+63)
+#define STR_SVT_MIMETYPE_CNT_REMOV_VOL      (STR_SVT_MIMETYPE_START+64)
+#define STR_SVT_MIMETYPE_CNT_FIX_VOL        (STR_SVT_MIMETYPE_START+65)
+#define STR_SVT_MIMETYPE_CNT_REM_VOL        (STR_SVT_MIMETYPE_START+66)
+#define STR_SVT_MIMETYPE_CNT_RAM_VOL        (STR_SVT_MIMETYPE_START+67)
+#define STR_SVT_MIMETYPE_CNT_CDROM          (STR_SVT_MIMETYPE_START+68)
+#define STR_SVT_MIMETYPE_CNT_DISK_35        (STR_SVT_MIMETYPE_START+69)
+#define STR_SVT_MIMETYPE_CNT_DISK_525       (STR_SVT_MIMETYPE_START+70)
+#define STR_SVT_MIMETYPE_CNT_TAPEDRIVE      (STR_SVT_MIMETYPE_START+71)
+#define STR_SVT_MIMETYPE_APP_GAL            (STR_SVT_MIMETYPE_START+72)
+#define STR_SVT_MIMETYPE_APP_GAL_THEME      (STR_SVT_MIMETYPE_START+73)
+#define STR_SVT_MIMETYPE_CNT_SEPARATOR      (STR_SVT_MIMETYPE_START+74)
+#define STR_SVT_MIMETYPE_APP_STARW_GLOB     (STR_SVT_MIMETYPE_START+75)
+#define STR_SVT_MIMETYPE_APP_SDM            (STR_SVT_MIMETYPE_START+76)
+#define STR_SVT_MIMETYPE_APP_SMD            (STR_SVT_MIMETYPE_START+77)
+#define STR_SVT_MIMETYPE_APP_STARW_WEB      (STR_SVT_MIMETYPE_START+78)
+#define STR_SVT_MIMETYPE_SCHEDULE           (STR_SVT_MIMETYPE_START+79)
+#define STR_SVT_MIMETYPE_SCHEDULE_EVT       (STR_SVT_MIMETYPE_START+80)
+#define STR_SVT_MIMETYPE_SCHEDULE_TASK      (STR_SVT_MIMETYPE_START+81)
+#define STR_SVT_MIMETYPE_SCHEDULE_FEVT      (STR_SVT_MIMETYPE_START+82)
+#define STR_SVT_MIMETYPE_SCHEDULE_FTASK     (STR_SVT_MIMETYPE_START+83)
+#define STR_SVT_MIMETYPE_FRAMESET           (STR_SVT_MIMETYPE_START+84)
+#define STR_SVT_MIMETYPE_MACRO              (STR_SVT_MIMETYPE_START+85)
+#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER    (STR_SVT_MIMETYPE_START+86)
+#define STR_SVT_MIMETYPE_CNT_SFSYSFILE      (STR_SVT_MIMETYPE_START+87)
+#define STR_SVT_MIMETYPE_APP_TEMPLATE       (STR_SVT_MIMETYPE_START+88)
+#define STR_SVT_MIMETYPE_IMAGE_GENERIC      (STR_SVT_MIMETYPE_START+89)
+#define STR_SVT_MIMETYPE_APP_MSEXCEL        (STR_SVT_MIMETYPE_START+90)
+#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL  (STR_SVT_MIMETYPE_START+91)
+#define STR_SVT_MIMETYPE_APP_MSPPOINT       (STR_SVT_MIMETYPE_START+92)
+#define STR_SVT_MIMETYPE_TEXT_VCALENDAR     (STR_SVT_MIMETYPE_START+93)
+#define STR_SVT_MIMETYPE_TEXT_ICALENDAR     (STR_SVT_MIMETYPE_START+94)
+#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR  (STR_SVT_MIMETYPE_START+95)
+#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP  (STR_SVT_MIMETYPE_START+96)
+#define STR_SVT_MIMETYPE_INET_MSG_RFC822        (STR_SVT_MIMETYPE_START+97)
+#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+98)
+#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST      (STR_SVT_MIMETYPE_START+99)
+#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL    (STR_SVT_MIMETYPE_START+100)
+#define STR_SVT_MIMETYPE_INET_MULTI_RELATED     (STR_SVT_MIMETYPE_START+101)
+#define STR_SVT_MIMETYPE_INET_MULTI_MIXED       (STR_SVT_MIMETYPE_START+102)
+#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED      (STR_SVT_MIMETYPE_START+103)
+#define STR_SVT_MIMETYPE_APP_JAR                (STR_SVT_MIMETYPE_START+104)
+#define STR_SVT_MIMETYPE_IMAGE_PNG              (STR_SVT_MIMETYPE_START+105)
+#define STR_SVT_MIMETYPE_IMAGE_TIFF             (STR_SVT_MIMETYPE_START+106)
+
+#define STR_SVT_MIMETYPE_APP_SXCALC         (STR_SVT_MIMETYPE_START+107)
+#define STR_SVT_MIMETYPE_APP_SXCHART        (STR_SVT_MIMETYPE_START+108)
+#define STR_SVT_MIMETYPE_APP_SXDRAW         (STR_SVT_MIMETYPE_START+109)
+#define STR_SVT_MIMETYPE_APP_SXMATH         (STR_SVT_MIMETYPE_START+110)
+#define STR_SVT_MIMETYPE_APP_SXWRITER       (STR_SVT_MIMETYPE_START+111)
+#define STR_SVT_MIMETYPE_APP_SXIMPRESS      (STR_SVT_MIMETYPE_START+112)
+#define STR_SVT_MIMETYPE_APP_SXGLOBAL       (STR_SVT_MIMETYPE_START+113)
+#define STR_SVT_MIMETYPE_APP_SXIPACKED      (STR_SVT_MIMETYPE_START+114)
+#define STR_SVT_MIMETYPE_END                (STR_SVT_MIMETYPE_APP_SXIPACKED)
+
+#define STR_COLUM_DT_AUTO                   (STR_SVT_MIMETYPE_END+1)
+
+#endif  // #ifndef _SVTOOLS_HRC
+
+// ******************************************************************* EOF
+
diff --git a/svl/inc/svl/svtools.hrc b/svl/inc/svl/svtools.hrc
deleted file mode 100644
index a95f09662860..000000000000
--- a/svl/inc/svl/svtools.hrc
+++ /dev/null
@@ -1,516 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVTOOLS_HRC
-#define _SVTOOLS_HRC "$Revision:   1.0"
-
-#include <svl/solar.hrc>
-
-#define RID_SVTOOLS_BITMAP_START        (RID_SVTOOLS_START + 0)
-#define RID_SVTOOLS_IMAGELIST_START     (RID_SVTOOLS_START + 0)
-
-//.............................................................................
-// various unsorted stuff
-
-#define DLG_EXPORT_PIX                  (RID_SVTOOLS_START+1)
-#define DLG_EXPORT_VEC                  (RID_SVTOOLS_START+2)
-#define DLG_TWAIN_SOURCE                (RID_SVTOOLS_START+3)
-
-#define DLG_SVT_EXPLORERFILE            (RID_SVTOOLS_START+4)
-#define DLG_SVT_QUERYFOLDERNAME         (RID_SVTOOLS_START+5)
-#define DLG_SVT_QUERYDELETE             (RID_SVTOOLS_START+6)
-
-#define EXPORT_DIALOG_TITLE             (RID_SVTOOLS_START+4)
-#define KEY_MODE                        (RID_SVTOOLS_START+5)
-#define KEY_RES                         (RID_SVTOOLS_START+6)
-#define KEY_SIZE                        (RID_SVTOOLS_START+7)
-
-#define KEY_COLORS                      (RID_SVTOOLS_START+9)
-#define KEY_RLE_CODING                  (RID_SVTOOLS_START+10)
-
-#define STR_SVT_AUTOMATIC_COLOR         (RID_SVTOOLS_START+16)
-
-#define STR_SVT_FILEVIEW_COLUMN_TITLE   (RID_SVTOOLS_START + 20)
-#define STR_SVT_FILEVIEW_COLUMN_SIZE    (RID_SVTOOLS_START + 21)
-#define STR_SVT_FILEVIEW_COLUMN_DATE    (RID_SVTOOLS_START + 22)
-#define STR_SVT_FOLDER                  (RID_SVTOOLS_START + 23)
-#define STR_SVT_FILEVIEW_ERR_MAKEFOLDER (RID_SVTOOLS_START + 24)
-#define STR_SVT_BYTES                   (RID_SVTOOLS_START + 25)
-#define STR_SVT_KB                      (RID_SVTOOLS_START + 26)
-#define STR_SVT_MB                      (RID_SVTOOLS_START + 27)
-#define STR_SVT_GB                      (RID_SVTOOLS_START + 28)
-#define STR_FILTERNAME_ALL              (RID_SVTOOLS_START + 29)
-#define STR_SVT_NEW_FOLDER              (RID_SVTOOLS_START + 30)
-#define STR_SVT_ALREADYEXISTOVERWRITE   (RID_SVTOOLS_START + 31)
-#define STR_SVT_FILEVIEW_COLUMN_TYPE    (RID_SVTOOLS_START + 32)
-#define RID_FILEVIEW_CONTEXTMENU        (RID_SVTOOLS_START + 33)
-#define RID_FILEOPEN_INVALIDFOLDER      (RID_SVTOOLS_START + 34)
-#define RID_FILEOPEN_NOTEXISTENTFILE    (RID_SVTOOLS_START + 35)
-#define STR_SVT_NOREMOVABLEDEVICE       (RID_SVTOOLS_START + 36)
-
-// doc template dialog
-#define DLG_DOCTEMPLATE                 (RID_SVTOOLS_START+50)
-#define CTRL_FILEVIEW                   (RID_SVTOOLS_START+51)
-#define STR_SVT_NEWDOC                  (RID_SVTOOLS_START+52)
-#define STR_SVT_MYDOCS                  (RID_SVTOOLS_START+53)
-#define STR_SVT_TEMPLATES               (RID_SVTOOLS_START+54)
-#define STR_SVT_SAMPLES                 (RID_SVTOOLS_START+55)
-#define TB_SVT_FILEVIEW                 (RID_SVTOOLS_START+56)
-#define TB_SVT_FRAMEWIN                 (RID_SVTOOLS_START+57)
-#define STRARY_SVT_DOCINFO              (RID_SVTOOLS_START+58)
-#define STR_SVT_NEWDOC_HELP             (RID_SVTOOLS_START+63)
-#define STR_SVT_MYDOCS_HELP             (RID_SVTOOLS_START+64)
-#define STR_SVT_TEMPLATES_HELP          (RID_SVTOOLS_START+65)
-#define STR_SVT_SAMPLES_HELP            (RID_SVTOOLS_START+66)
-
-#define STR_WARNING_ITEM                (RID_SVTOOLS_START+90)
-#define STR_COLUM_DT_AUTO               (RID_SVTOOLS_START+99)
-
-#define CONFIG_BASIC_FORMAT_START       (RID_SVTOOLS_START+102)
-#define STR_BASICKEY_FORMAT_ON          (RID_SVTOOLS_START+103)
-#define STR_BASICKEY_FORMAT_OFF         (RID_SVTOOLS_START+104)
-#define STR_BASICKEY_FORMAT_YES         (RID_SVTOOLS_START+105)
-#define STR_BASICKEY_FORMAT_NO          (RID_SVTOOLS_START+106)
-#define STR_BASICKEY_FORMAT_TRUE        (RID_SVTOOLS_START+107)
-#define STR_BASICKEY_FORMAT_FALSE       (RID_SVTOOLS_START+108)
-#define CONFIG_BASIC_FORMAT_END         (RID_SVTOOLS_START+109)
-#define STR_UNDO                        (RID_SVTOOLS_START+110)
-#define STR_REDO                        (RID_SVTOOLS_START+111)
-#define STR_REPEAT                      (RID_SVTOOLS_START+112)
-
-#define STR_INVALIDTRYBUY               (RID_SVTOOLS_START+120)
-#define STR_OLDTRYBUY                   (RID_SVTOOLS_START+121)
-#define STR_TRYBUY                      (RID_SVTOOLS_START+122)
-#define STR_PVER_LANGUAGECODE           (RID_SVTOOLS_START+124)
-#define STR_PVER_LONG_LANGUAGECODE      (RID_SVTOOLS_START+125)
-#define STR_INVALIDPUFF                 (RID_SVTOOLS_START+126)
-#define STR_LIMITEDPUFF                 (RID_SVTOOLS_START+127)
-#define STR_OLDLIMITEDPUFF              (RID_SVTOOLS_START+128)
-#define RID_REGISTER_DIALOG             (RID_SVTOOLS_START+129)
-#define STR_BASICKEY_FORMAT_CURRENCY    (RID_SVTOOLS_START+130)
-#define STR_KEYERR_GENERAL_HELP         (RID_SVTOOLS_START+131)
-#define STR_KEYERR_INVALID_KEY          (RID_SVTOOLS_START+132)
-#define STR_KEYERR_INVALID_USERDATA     (RID_SVTOOLS_START+133)
-#define STR_KEYERR_INVALID_ADDRESSDATA  (RID_SVTOOLS_START+134)
-#define STR_KEYERR_INVALID_LICENSE      (RID_SVTOOLS_START+135)
-#define STR_KEYERR_INVALID_LANGUAGE     (RID_SVTOOLS_START+136)
-#define STR_KEYERR_INVALID_OS           (RID_SVTOOLS_START+137)
-#define STR_KEYERR_INVALID_NO_CNR       (RID_SVTOOLS_START+138)
-#define STR_KEYERR_INVALID_CNR          (RID_SVTOOLS_START+139)
-#define RID_LIMITED_DIALOG              (RID_SVTOOLS_START+140)
-
-#define STR_SVT_MIMETYPE_START              (RID_SVTOOLS_START+141)
-#define STR_SVT_MIMETYPE_APP_OCTSTREAM      (STR_SVT_MIMETYPE_START+0)
-#define STR_SVT_MIMETYPE_APP_PDF            (STR_SVT_MIMETYPE_START+1)
-#define STR_SVT_MIMETYPE_APP_RTF            (STR_SVT_MIMETYPE_START+2)
-#define STR_SVT_MIMETYPE_APP_MSWORD         (STR_SVT_MIMETYPE_START+3)
-#define STR_SVT_MIMETYPE_APP_STARCALC       (STR_SVT_MIMETYPE_START+4)
-#define STR_SVT_MIMETYPE_APP_STARCHART      (STR_SVT_MIMETYPE_START+5)
-#define STR_SVT_MIMETYPE_APP_STARDRAW       (STR_SVT_MIMETYPE_START+6)
-#define STR_SVT_MIMETYPE_APP_STARIMAGE      (STR_SVT_MIMETYPE_START+7)
-#define STR_SVT_MIMETYPE_APP_STARMATH       (STR_SVT_MIMETYPE_START+8)
-#define STR_SVT_MIMETYPE_APP_STARWRITER     (STR_SVT_MIMETYPE_START+9)
-#define STR_SVT_MIMETYPE_APP_ZIP            (STR_SVT_MIMETYPE_START+10)
-#define STR_SVT_MIMETYPE_AUDIO_AIFF         (STR_SVT_MIMETYPE_START+11)
-#define STR_SVT_MIMETYPE_AUDIO_BASIC        (STR_SVT_MIMETYPE_START+12)
-#define STR_SVT_MIMETYPE_AUDIO_MIDI         (STR_SVT_MIMETYPE_START+13)
-#define STR_SVT_MIMETYPE_AUDIO_WAV          (STR_SVT_MIMETYPE_START+14)
-#define STR_SVT_MIMETYPE_IMAGE_GIF          (STR_SVT_MIMETYPE_START+15)
-#define STR_SVT_MIMETYPE_IMAGE_JPEG         (STR_SVT_MIMETYPE_START+16)
-#define STR_SVT_MIMETYPE_IMAGE_PCX          (STR_SVT_MIMETYPE_START+17)
-#define STR_SVT_MIMETYPE_IMAGE_BMP          (STR_SVT_MIMETYPE_START+18)
-#define STR_SVT_MIMETYPE_TEXT_HTML          (STR_SVT_MIMETYPE_START+19)
-#define STR_SVT_MIMETYPE_TEXT_PLAIN         (STR_SVT_MIMETYPE_START+20)
-#define STR_SVT_MIMETYPE_TEXT_URL           (STR_SVT_MIMETYPE_START+21)
-#define STR_SVT_MIMETYPE_TEXT_VCARD         (STR_SVT_MIMETYPE_START+22)
-#define STR_SVT_MIMETYPE_VIDEO_VDO          (STR_SVT_MIMETYPE_START+23)
-#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO      (STR_SVT_MIMETYPE_START+24)
-#define STR_SVT_MIMETYPE_X_STARMAIL         (STR_SVT_MIMETYPE_START+25)
-#define STR_SVT_MIMETYPE_X_VRML             (STR_SVT_MIMETYPE_START+26)
-#define STR_SVT_MIMETYPE_APP_STARHELP       (STR_SVT_MIMETYPE_START+27)
-#define STR_SVT_MIMETYPE_APP_STARIMPRESS    (STR_SVT_MIMETYPE_START+28)
-#define STR_SVT_MIMETYPE_APP_SCHED_CMB      (STR_SVT_MIMETYPE_START+29)
-#define STR_SVT_MIMETYPE_APP_SCHED_EVT      (STR_SVT_MIMETYPE_START+30)
-#define STR_SVT_MIMETYPE_APP_SCHED_TASK     (STR_SVT_MIMETYPE_START+31)
-#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW    (STR_SVT_MIMETYPE_START+32)
-
-#define STR_SVT_MIMETYPE_CNT_MSG            (STR_SVT_MIMETYPE_START+33)
-#define STR_SVT_MIMETYPE_CNT_DOCUMENT       (STR_SVT_MIMETYPE_START+34)
-#define STR_SVT_MIMETYPE_CNT_POP3BOX        (STR_SVT_MIMETYPE_START+35)
-#define STR_SVT_MIMETYPE_CNT_IMAPBOX        (STR_SVT_MIMETYPE_START+36)
-#define STR_SVT_MIMETYPE_CNT_IMAPFLD        (STR_SVT_MIMETYPE_START+37)
-#define STR_SVT_MIMETYPE_CNT_VIMBOX         (STR_SVT_MIMETYPE_START+38)
-#define STR_SVT_MIMETYPE_CNT_VIMINBOX       (STR_SVT_MIMETYPE_START+39)
-#define STR_SVT_MIMETYPE_CNT_BBBOX          (STR_SVT_MIMETYPE_START+40)
-#define STR_SVT_MIMETYPE_CNT_VIM_BB         (STR_SVT_MIMETYPE_START+41)
-#define STR_SVT_MIMETYPE_CNT_NEWSBOX        (STR_SVT_MIMETYPE_START+42)
-#define STR_SVT_MIMETYPE_CNT_NEWSGRP        (STR_SVT_MIMETYPE_START+43)
-#define STR_SVT_MIMETYPE_CNT_OUTBOX         (STR_SVT_MIMETYPE_START+44)
-#define STR_SVT_MIMETYPE_CNT_FTPBOX         (STR_SVT_MIMETYPE_START+45)
-#define STR_SVT_MIMETYPE_CNT_FTPFLD         (STR_SVT_MIMETYPE_START+46)
-#define STR_SVT_MIMETYPE_CNT_FTPFILE        (STR_SVT_MIMETYPE_START+47)
-#define STR_SVT_MIMETYPE_CNT_FTPLINK        (STR_SVT_MIMETYPE_START+48)
-#define STR_SVT_MIMETYPE_CNT_HTTPBOX        (STR_SVT_MIMETYPE_START+49)
-#define STR_SVT_MIMETYPE_CNT_FSYSBOX        (STR_SVT_MIMETYPE_START+50)
-#define STR_SVT_MIMETYPE_CNT_FSYSFLD        (STR_SVT_MIMETYPE_START+51)
-#define STR_SVT_MIMETYPE_CNT_FSYSFILE       (STR_SVT_MIMETYPE_START+52)
-#define STR_SVT_MIMETYPE_CNT_FSYSURLFILE    (STR_SVT_MIMETYPE_START+53)
-#define STR_SVT_MIMETYPE_CNT_PUBLBOX        (STR_SVT_MIMETYPE_START+54)
-#define STR_SVT_MIMETYPE_CNT_SRCHBOX        (STR_SVT_MIMETYPE_START+55)
-#define STR_SVT_MIMETYPE_CNT_SUBSCRBOX      (STR_SVT_MIMETYPE_START+56)
-#define STR_SVT_MIMETYPE_CNT_BOOKMARK       (STR_SVT_MIMETYPE_START+57)
-#define STR_SVT_MIMETYPE_CNT_CDF            (STR_SVT_MIMETYPE_START+58)
-#define STR_SVT_MIMETYPE_CNT_CDFSUB         (STR_SVT_MIMETYPE_START+59)
-#define STR_SVT_MIMETYPE_CNT_CDFITEM        (STR_SVT_MIMETYPE_START+60)
-#define STR_SVT_MIMETYPE_CNT_STARCHANNEL    (STR_SVT_MIMETYPE_START+61)
-#define STR_SVT_MIMETYPE_CNT_TRASHBOX       (STR_SVT_MIMETYPE_START+62)
-#define STR_SVT_MIMETYPE_CNT_TRASH          (STR_SVT_MIMETYPE_START+63)
-#define STR_SVT_MIMETYPE_CNT_REMOV_VOL      (STR_SVT_MIMETYPE_START+64)
-#define STR_SVT_MIMETYPE_CNT_FIX_VOL        (STR_SVT_MIMETYPE_START+65)
-#define STR_SVT_MIMETYPE_CNT_REM_VOL        (STR_SVT_MIMETYPE_START+66)
-#define STR_SVT_MIMETYPE_CNT_RAM_VOL        (STR_SVT_MIMETYPE_START+67)
-#define STR_SVT_MIMETYPE_CNT_CDROM          (STR_SVT_MIMETYPE_START+68)
-#define STR_SVT_MIMETYPE_CNT_DISK_35        (STR_SVT_MIMETYPE_START+69)
-#define STR_SVT_MIMETYPE_CNT_DISK_525       (STR_SVT_MIMETYPE_START+70)
-#define STR_SVT_MIMETYPE_CNT_TAPEDRIVE      (STR_SVT_MIMETYPE_START+71)
-#define STR_SVT_MIMETYPE_APP_GAL            (STR_SVT_MIMETYPE_START+72)
-#define STR_SVT_MIMETYPE_APP_GAL_THEME      (STR_SVT_MIMETYPE_START+73)
-#define STR_SVT_MIMETYPE_CNT_SEPARATOR      (STR_SVT_MIMETYPE_START+74)
-#define STR_SVT_MIMETYPE_APP_STARW_GLOB     (STR_SVT_MIMETYPE_START+75)
-#define STR_SVT_MIMETYPE_APP_SDM            (STR_SVT_MIMETYPE_START+76)
-#define STR_SVT_MIMETYPE_APP_SMD            (STR_SVT_MIMETYPE_START+77)
-#define STR_SVT_MIMETYPE_APP_STARW_WEB      (STR_SVT_MIMETYPE_START+78)
-#define STR_SVT_MIMETYPE_SCHEDULE           (STR_SVT_MIMETYPE_START+79)
-#define STR_SVT_MIMETYPE_SCHEDULE_EVT       (STR_SVT_MIMETYPE_START+80)
-#define STR_SVT_MIMETYPE_SCHEDULE_TASK      (STR_SVT_MIMETYPE_START+81)
-#define STR_SVT_MIMETYPE_SCHEDULE_FEVT      (STR_SVT_MIMETYPE_START+82)
-#define STR_SVT_MIMETYPE_SCHEDULE_FTASK     (STR_SVT_MIMETYPE_START+83)
-#define STR_SVT_MIMETYPE_FRAMESET           (STR_SVT_MIMETYPE_START+84)
-#define STR_SVT_MIMETYPE_MACRO              (STR_SVT_MIMETYPE_START+85)
-#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER    (STR_SVT_MIMETYPE_START+86)
-#define STR_SVT_MIMETYPE_CNT_SFSYSFILE      (STR_SVT_MIMETYPE_START+87)
-#define STR_SVT_MIMETYPE_APP_TEMPLATE       (STR_SVT_MIMETYPE_START+88)
-#define STR_SVT_MIMETYPE_IMAGE_GENERIC      (STR_SVT_MIMETYPE_START+89)
-#define STR_SVT_MIMETYPE_APP_MSEXCEL        (STR_SVT_MIMETYPE_START+90)
-#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL  (STR_SVT_MIMETYPE_START+91)
-#define STR_SVT_MIMETYPE_APP_MSPPOINT       (STR_SVT_MIMETYPE_START+92)
-#define STR_SVT_MIMETYPE_TEXT_VCALENDAR     (STR_SVT_MIMETYPE_START+93)
-#define STR_SVT_MIMETYPE_TEXT_ICALENDAR     (STR_SVT_MIMETYPE_START+94)
-#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR  (STR_SVT_MIMETYPE_START+95)
-#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP  (STR_SVT_MIMETYPE_START+96)
-#define STR_SVT_MIMETYPE_INET_MSG_RFC822        (STR_SVT_MIMETYPE_START+97)
-#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+98)
-#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST      (STR_SVT_MIMETYPE_START+99)
-#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL    (STR_SVT_MIMETYPE_START+100)
-#define STR_SVT_MIMETYPE_INET_MULTI_RELATED     (STR_SVT_MIMETYPE_START+101)
-#define STR_SVT_MIMETYPE_INET_MULTI_MIXED       (STR_SVT_MIMETYPE_START+102)
-#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED      (STR_SVT_MIMETYPE_START+103)
-#define STR_SVT_MIMETYPE_APP_JAR                (STR_SVT_MIMETYPE_START+104)
-#define STR_SVT_MIMETYPE_IMAGE_PNG              (STR_SVT_MIMETYPE_START+105)
-#define STR_SVT_MIMETYPE_IMAGE_TIFF             (STR_SVT_MIMETYPE_START+106)
-
-#define STR_SVT_MIMETYPE_APP_SXCALC         (STR_SVT_MIMETYPE_START+107)
-#define STR_SVT_MIMETYPE_APP_SXCHART        (STR_SVT_MIMETYPE_START+108)
-#define STR_SVT_MIMETYPE_APP_SXDRAW         (STR_SVT_MIMETYPE_START+109)
-#define STR_SVT_MIMETYPE_APP_SXMATH         (STR_SVT_MIMETYPE_START+110)
-#define STR_SVT_MIMETYPE_APP_SXWRITER       (STR_SVT_MIMETYPE_START+111)
-#define STR_SVT_MIMETYPE_APP_SXIMPRESS      (STR_SVT_MIMETYPE_START+112)
-#define STR_SVT_MIMETYPE_APP_SXGLOBAL       (STR_SVT_MIMETYPE_START+113)
-#define STR_SVT_MIMETYPE_APP_SXIPACKED      (STR_SVT_MIMETYPE_START+114)
-#define STR_SVT_MIMETYPE_END                (STR_SVT_MIMETYPE_APP_SXIPACKED)
-
-#define STR_SVT_PRNDLG_START                (STR_SVT_MIMETYPE_END+1)
-#define DLG_SVT_PRNDLG_PRNSETUPDLG          (STR_SVT_PRNDLG_START+0)
-#define DLG_SVT_PRNDLG_PRINTDLG             (STR_SVT_PRNDLG_START+1)
-#define STR_SVT_PRNDLG_READY                (STR_SVT_PRNDLG_START+2)
-#define STR_SVT_PRNDLG_PAUSED               (STR_SVT_PRNDLG_START+3)
-#define STR_SVT_PRNDLG_PENDING              (STR_SVT_PRNDLG_START+4)
-#define STR_SVT_PRNDLG_BUSY                 (STR_SVT_PRNDLG_START+5)
-#define STR_SVT_PRNDLG_INITIALIZING         (STR_SVT_PRNDLG_START+6)
-#define STR_SVT_PRNDLG_WAITING              (STR_SVT_PRNDLG_START+7)
-#define STR_SVT_PRNDLG_WARMING_UP           (STR_SVT_PRNDLG_START+8)
-#define STR_SVT_PRNDLG_PROCESSING           (STR_SVT_PRNDLG_START+9)
-#define STR_SVT_PRNDLG_PRINTING             (STR_SVT_PRNDLG_START+10)
-#define STR_SVT_PRNDLG_OFFLINE              (STR_SVT_PRNDLG_START+11)
-#define STR_SVT_PRNDLG_ERROR                (STR_SVT_PRNDLG_START+12)
-#define STR_SVT_PRNDLG_SERVER_UNKNOWN       (STR_SVT_PRNDLG_START+13)
-#define STR_SVT_PRNDLG_PAPER_JAM            (STR_SVT_PRNDLG_START+14)
-#define STR_SVT_PRNDLG_PAPER_OUT            (STR_SVT_PRNDLG_START+15)
-#define STR_SVT_PRNDLG_MANUAL_FEED          (STR_SVT_PRNDLG_START+16)
-#define STR_SVT_PRNDLG_PAPER_PROBLEM        (STR_SVT_PRNDLG_START+17)
-#define STR_SVT_PRNDLG_IO_ACTIVE            (STR_SVT_PRNDLG_START+18)
-#define STR_SVT_PRNDLG_OUTPUT_BIN_FULL      (STR_SVT_PRNDLG_START+19)
-#define STR_SVT_PRNDLG_TONER_LOW            (STR_SVT_PRNDLG_START+20)
-#define STR_SVT_PRNDLG_NO_TONER             (STR_SVT_PRNDLG_START+21)
-#define STR_SVT_PRNDLG_PAGE_PUNT            (STR_SVT_PRNDLG_START+22)
-#define STR_SVT_PRNDLG_USER_INTERVENTION    (STR_SVT_PRNDLG_START+23)
-#define STR_SVT_PRNDLG_OUT_OF_MEMORY        (STR_SVT_PRNDLG_START+24)
-#define STR_SVT_PRNDLG_DOOR_OPEN            (STR_SVT_PRNDLG_START+25)
-#define STR_SVT_PRNDLG_POWER_SAVE           (STR_SVT_PRNDLG_START+26)
-#define STR_SVT_PRNDLG_DEFPRINTER           (STR_SVT_PRNDLG_START+27)
-#define STR_SVT_PRNDLG_JOBCOUNT             (STR_SVT_PRNDLG_START+28)
-#define STR_SVT_PRNDLG_END                  (RID_IMG_PRNDLG_NOCOLLATE_HC)
-
-#define STR_SVT_CALENDAR_START              (STR_SVT_PRNDLG_END+1)
-#define STR_SVT_CALENDAR_DAY                (STR_SVT_CALENDAR_START+0)
-#define STR_SVT_CALENDAR_WEEK               (STR_SVT_CALENDAR_START+1)
-#define STR_SVT_CALENDAR_TODAY              (STR_SVT_CALENDAR_START+2)
-#define STR_SVT_CALENDAR_NONE               (STR_SVT_CALENDAR_START+3)
-#define STR_SVT_CALENDAR_END                (STR_SVT_CALENDAR_NONE)
-
-#define STR_SVT_PVER_START                  (STR_SVT_CALENDAR_END+1)
-#define STR_SVT_PVER_INTERNAL               (STR_SVT_PVER_START+0)
-#define STR_SVT_PVER_PERSONAL_DELUXE        (STR_SVT_PVER_START+1)
-#define STR_SVT_PVER_PERSONAL               (STR_SVT_PVER_START+2)
-#define STR_SVT_PVER_PROFESSIONAL           (STR_SVT_PVER_START+3)
-#define STR_SVT_PVER_BUSINESS               (STR_SVT_PVER_START+4)
-#define STR_SVT_PVER_ENTERPRICE             (STR_SVT_PVER_START+5)
-#define STR_SVT_PVER_EDUCATION              (STR_SVT_PVER_START+6)
-#define STR_SVT_PVER_DEMO                   (STR_SVT_PVER_START+7)
-#define STR_SVT_PVER_BETA                   (STR_SVT_PVER_START+8)
-#define STR_SVT_PVER_OEM                    (STR_SVT_PVER_START+9)
-#define STR_SVT_PVER_NOT_REGISTERED         (STR_SVT_PVER_START+10)
-#define STR_SVT_PVER_PILOT                  (STR_SVT_PVER_START+11)
-#define STR_SVT_PVER_CAMPUS                 (STR_SVT_PVER_START+12)
-#define STR_SVT_PVER_EVALUATION             (STR_SVT_PVER_START+13)
-#define STR_SVT_PVER_PARTNER                (STR_SVT_PVER_START+14)
-#define STR_SVT_PVER_SMALLBUSINESS          (STR_SVT_PVER_START+15)
-#define STR_SVT_PVER_OEM_PROFESSIONAL       (STR_SVT_PVER_START+16)
-#define STR_SVT_PVER_END                    (STR_SVT_PVER_OEM_PROFESSIONAL)
-
-#define STR_SVT_STYLE_START                 (STR_SVT_PVER_END+1)
-#define STR_SVT_STYLE_LIGHT                 (STR_SVT_STYLE_START+0)
-#define STR_SVT_STYLE_LIGHT_ITALIC          (STR_SVT_STYLE_START+1)
-#define STR_SVT_STYLE_NORMAL                (STR_SVT_STYLE_START+2)
-#define STR_SVT_STYLE_NORMAL_ITALIC         (STR_SVT_STYLE_START+3)
-#define STR_SVT_STYLE_BOLD                  (STR_SVT_STYLE_START+4)
-#define STR_SVT_STYLE_BOLD_ITALIC           (STR_SVT_STYLE_START+5)
-#define STR_SVT_STYLE_BLACK                 (STR_SVT_STYLE_START+6)
-#define STR_SVT_STYLE_BLACK_ITALIC          (STR_SVT_STYLE_START+7)
-#define STR_SVT_STYLE_END                   (STR_SVT_STYLE_BLACK_ITALIC)
-
-#define STR_SVT_FONTMAP_START               (STR_SVT_STYLE_END+1)
-#define STR_SVT_FONTMAP_BOTH                (STR_SVT_FONTMAP_START+0)
-#define STR_SVT_FONTMAP_PRINTERONLY         (STR_SVT_FONTMAP_START+1)
-#define STR_SVT_FONTMAP_SCREENONLY          (STR_SVT_FONTMAP_START+2)
-#define STR_SVT_FONTMAP_SIZENOTAVAILABLE    (STR_SVT_FONTMAP_START+3)
-#define STR_SVT_FONTMAP_STYLENOTAVAILABLE   (STR_SVT_FONTMAP_START+4)
-#define STR_SVT_FONTMAP_NOTAVAILABLE        (STR_SVT_FONTMAP_START+5)
-#define STR_SVT_FONTMAP_END                 (STR_SVT_FONTMAP_NOTAVAILABLE)
-
-#define STR_SVT_ERRORCONTEXT_START          (STR_SVT_FONTMAP_END+1)
-#define STR_ERR_HDLMESS                     (STR_SVT_ERRORCONTEXT_START+0)
-#define RID_ERRHDL_CLASS                    (STR_SVT_ERRORCONTEXT_START+1)
-#define RID_ERRCTX                          (STR_SVT_ERRORCONTEXT_START+2)
-#define RID_ERRHDL                          (STR_SVT_ERRORCONTEXT_START+3)
-#define STR_SVT_ERRORCONTEXT_END            (RID_ERRHDL)
-
-#define STR_WIZARDDIALOG_START              (STR_SVT_ERRORCONTEXT_END + 1)
-#define STR_WIZDLG_FINISH                   (STR_WIZARDDIALOG_START + 0)
-#define STR_WIZDLG_NEXT                     (STR_WIZARDDIALOG_START + 1)
-#define STR_WIZDLG_PREVIOUS                 (STR_WIZARDDIALOG_START + 2)
-#define STR_WIZDLG_ROADMAP_TITLE            (STR_WIZARDDIALOG_START + 3)
-#define STR_WIZARDDIALOG_END                (STR_WIZDLG_ROADMAP_TITLE)
-
-#define STR_SVT_COLLATE_START               (STR_WIZARDDIALOG_END+1)
-#define STR_SVT_COLLATE_NORMAL              (STR_SVT_COLLATE_START+0)
-#define STR_SVT_COLLATE_DICTIONARY          (STR_SVT_COLLATE_START+1)
-#define STR_SVT_COLLATE_PINYIN              (STR_SVT_COLLATE_START+2)
-#define STR_SVT_COLLATE_STROKE              (STR_SVT_COLLATE_START+3)
-#define STR_SVT_COLLATE_RADICAL             (STR_SVT_COLLATE_START+4)
-#define STR_SVT_COLLATE_CHARSET             (STR_SVT_COLLATE_START+5)
-#define STR_SVT_COLLATE_ZHUYIN              (STR_SVT_COLLATE_START+6)
-#define STR_SVT_COLLATE_ALPHANUMERIC        (STR_SVT_COLLATE_START+7)
-#define STR_SVT_COLLATE_UNICODE             (STR_SVT_COLLATE_START+8)
-#define STR_SVT_COLLATE_PHONEBOOK           (STR_SVT_COLLATE_START+9)
-#define STR_SVT_COLLATE_PHONETIC_F          (STR_SVT_COLLATE_START+10)
-#define STR_SVT_COLLATE_PHONETIC_L          (STR_SVT_COLLATE_START+11)
-#define STR_SVT_COLLATE_END                 (STR_SVT_COLLATE_PHONETIC_L)
-
-#define STR_SVT_FILEPICKER_START                    (STR_SVT_COLLATE_END+1)
-#define STR_SVT_FILEPICKER_AUTO_EXTENSION           (STR_SVT_FILEPICKER_START+ 0)
-#define STR_SVT_FILEPICKER_PASSWORD                 (STR_SVT_FILEPICKER_START+ 1)
-#define STR_SVT_FILEPICKER_FILTER_OPTIONS           (STR_SVT_FILEPICKER_START+ 2)
-#define STR_SVT_FILEPICKER_READONLY                 (STR_SVT_FILEPICKER_START+ 3)
-#define STR_SVT_FILEPICKER_INSERT_AS_LINK           (STR_SVT_FILEPICKER_START+ 4)
-#define STR_SVT_FILEPICKER_SHOW_PREVIEW             (STR_SVT_FILEPICKER_START+ 5)
-#define STR_SVT_FILEPICKER_PLAY                     (STR_SVT_FILEPICKER_START+ 6)
-#define STR_SVT_FILEPICKER_VERSION                  (STR_SVT_FILEPICKER_START+ 7)
-#define STR_SVT_FILEPICKER_TEMPLATES                (STR_SVT_FILEPICKER_START+ 8)
-#define STR_SVT_FILEPICKER_IMAGE_TEMPLATE           (STR_SVT_FILEPICKER_START+ 9)
-#define STR_SVT_FILEPICKER_SELECTION                (STR_SVT_FILEPICKER_START+10)
-#define STR_SVT_FILEPICKER_FILTER_TITLE             (STR_SVT_FILEPICKER_START+11)
-#define STR_SVT_FOLDERPICKER_DEFAULT_TITLE          (STR_SVT_FILEPICKER_START+12)
-#define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION    (STR_SVT_FILEPICKER_START+13)
-#define STR_SVT_FILEPICKER_END                      (STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION)
-
-// String-Ids for accessibility
-#define STR_SVT_ACC_BEGIN                   (STR_SVT_FILEPICKER_END+1)
-    // FREE
-    // FREE
-#define STR_SVT_ACC_DESC_TABLISTBOX         (STR_SVT_ACC_BEGIN+2)
-#define STR_SVT_ACC_DESC_FILEVIEW           (STR_SVT_ACC_BEGIN+3)
-#define STR_SVT_ACC_DESC_FOLDER             (STR_SVT_ACC_BEGIN+4)
-#define STR_SVT_ACC_DESC_FILE               (STR_SVT_ACC_BEGIN+5)
-#define STR_SVT_ACC_EMPTY_FIELD             (STR_SVT_ACC_BEGIN+6)
-#define STR_SVT_ACC_END                     (STR_SVT_ACC_EMPTY_FIELD)
-
-#define STR_SVT_INDEXENTRY_START            (STR_SVT_ACC_END + 1)
-#define STR_SVT_INDEXENTRY_ALPHANUMERIC     (STR_SVT_INDEXENTRY_START+0)
-#define STR_SVT_INDEXENTRY_DICTIONARY       (STR_SVT_INDEXENTRY_START+1)
-#define STR_SVT_INDEXENTRY_PINYIN           (STR_SVT_INDEXENTRY_START+2)
-#define STR_SVT_INDEXENTRY_RADICAL          (STR_SVT_INDEXENTRY_START+3)
-#define STR_SVT_INDEXENTRY_STROKE           (STR_SVT_INDEXENTRY_START+4)
-#define STR_SVT_INDEXENTRY_ZHUYIN           (STR_SVT_INDEXENTRY_START+5)
-#define STR_SVT_INDEXENTRY_PHONETIC_FS      (STR_SVT_INDEXENTRY_START+6)
-#define STR_SVT_INDEXENTRY_PHONETIC_FC      (STR_SVT_INDEXENTRY_START+7)
-#define STR_SVT_INDEXENTRY_PHONETIC_LS      (STR_SVT_INDEXENTRY_START+8)
-#define STR_SVT_INDEXENTRY_PHONETIC_LC      (STR_SVT_INDEXENTRY_START+9)
-#define STR_SVT_INDEXENTRY_END              (STR_SVT_INDEXENTRY_PHONETIC_LC)
-
-//String - Ids for Java errors, messages
-//These strings come from project desktop
-//There was no time for translation, therefore the defines needed to
-//remain the same.
-#define STR_SVT_JAVAERROR_START             (STR_SVT_INDEXENTRY_END + 1)
-#define STR_QUESTION_JAVADISABLED           (STR_SVT_JAVAERROR_START+0)
-#define STR_ERROR_JVMCREATIONFAILED         (STR_SVT_JAVAERROR_START+1)
-#define STR_WARNING_JAVANOTFOUND            (STR_SVT_JAVAERROR_START+2)
-#define STR_WARNING_INVALIDJAVASETTINGS     (STR_SVT_JAVAERROR_START+3)
-#define STR_ERROR_RESTARTREQUIRED           (STR_SVT_JAVAERROR_START+4)
-#define STR_SVT_JAVAERROR_END               (STR_ERROR_RESTARTREQUIRED)
-
-// String array to match UI language names to LanguageType values and vice versa
-#define STR_ARR_SVT_LANGUAGE_TABLE_START    (STR_SVT_JAVAERROR_END + 1)
-#define STR_ARR_SVT_LANGUAGE_TABLE          (STR_ARR_SVT_LANGUAGE_TABLE_START + 0)
-#define STR_ARR_SVT_LANGUAGE_TABLE_END      (STR_ARR_SVT_LANGUAGE_TABLE)
-
-//.............................................................................
-// dialogs
-
-#define DLG_EXPORT_JPG_START            (RID_SVTOOLS_START+110)
-#define DLG_EXPORT_JPG                  (RID_SVTOOLS_START+111)
-#define DLG_EXPORT_JPG_END              (RID_SVTOOLS_START+112)
-
-#define DLG_LOGIN                       (RID_SVTOOLS_START+113)
-#define DLG_ADDRESSBOOKSOURCE           (RID_SVTOOLS_START+114)
-
-#define DLG_REGISTRATION_REQUEST        (RID_SVTOOLS_START+115)
-
-#define DLG_EXPORT_EPNG                 (RID_SVTOOLS_START+116)
-//.............................................................................
-// bitmaps
-
-#define BMP_DEMO_FINGER                 (RID_SVTOOLS_BITMAP_START +   0)
-#define BMP_HELP_AGENT_IMAGE            (RID_SVTOOLS_BITMAP_START +   1)
-#define BMP_HELP_AGENT_CLOSER           (RID_SVTOOLS_BITMAP_START +   2)
-#define BMP_PLUGIN                      (RID_SVTOOLS_BITMAP_START +   3)
-
-//.............................................................................
-// image lists
-
-#define RID_IMG_EXPANDER                            (RID_SVTOOLS_IMAGELIST_START +  0)
-#define RID_SVTOOLS_IMAGELIST_BIG                   (RID_SVTOOLS_IMAGELIST_START +  1)
-#define RID_SVTOOLS_IMAGELIST_SMALL                 (RID_SVTOOLS_IMAGELIST_START +  2)
-#define RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX         (RID_SVTOOLS_IMAGELIST_START +  3)
-#define RID_SVTOOLS_IMAGELIST_BIG_HIGHCONTRAST      (RID_SVTOOLS_IMAGELIST_START +  4)
-#define RID_SVTOOLS_IMAGELIST_SMALL_HIGHCONTRAST    (RID_SVTOOLS_IMAGELIST_START +  5)
-#define RID_SVTOOLS_IMAGELIST_EDITBWSEBOX_H         (RID_SVTOOLS_IMAGELIST_START +  6)
-#define RID_FILEPICKER_IMAGES                       (RID_SVTOOLS_IMAGELIST_START +  7)
-#define RID_FILEPICKER_IMAGES_HC                    (RID_SVTOOLS_IMAGELIST_START +  8)
-
-//.............................................................................
-// error boxes
-#define ERRBOX_REG_NOSYSBROWSER             ( RID_SVTOOLS_START +  0 )
-#define ERRBOX_CHECK_PLZ                    ( RID_SVTOOLS_START + 11 )
-
-// Java message boxes
-//These strings come from project desktop
-//There was no time for translation, therefore the defines needed to
-//remain the same.
-#define QBX_JAVADISABLED                    (RID_SVTOOLS_START+20)
-#define ERRORBOX_JVMCREATIONFAILED          (RID_SVTOOLS_START+21)
-#define WARNINGBOX_JAVANOTFOUND             (RID_SVTOOLS_START+22)
-#define WARNINGBOX_INVALIDJAVASETTINGS      (RID_SVTOOLS_START+23)
-#define ERRORBOX_RESTARTREQUIRED            (RID_SVTOOLS_START+24)
-
-//.............................................................................
-// images
-#define RID_IMG_TREENODE_COLLAPSED      (RID_SVTOOLS_START +  0)
-#define RID_IMG_TREENODE_EXPANDED       (RID_SVTOOLS_START +  1)
-#define RID_IMG_TREENODE_COLLAPSED_HC   (RID_SVTOOLS_START +  2)
-#define RID_IMG_TREENODE_EXPANDED_HC    (RID_SVTOOLS_START +  3)
-
-#define RID_IMG_PRINTERFONT             (RID_SVTOOLS_START + 12)
-#define RID_IMG_BITMAPFONT              (RID_SVTOOLS_START + 13)
-#define RID_IMG_SCALABLEFONT            (RID_SVTOOLS_START + 14)
-#define RID_IMG_PRINTERFONT_HC          (RID_SVTOOLS_START + 15)
-#define RID_IMG_BITMAPFONT_HC           (RID_SVTOOLS_START + 16)
-#define RID_IMG_SCALABLEFONT_HC         (RID_SVTOOLS_START + 17)
-
-#define IMG_SVT_FOLDER                  (RID_SVTOOLS_START + 40)
-
-#define IMG_SVT_NEWDOC                  (RID_SVTOOLS_START + 52)
-#define IMG_SVT_MYDOCS                  (RID_SVTOOLS_START + 53)
-#define IMG_SVT_TEMPLATES               (RID_SVTOOLS_START + 54)
-#define IMG_SVT_SAMPLES                 (RID_SVTOOLS_START + 55)
-
-#define IMG_SVT_NEWDOC_HC               (RID_SVTOOLS_START + 59)
-#define IMG_SVT_MYDOCS_HC               (RID_SVTOOLS_START + 60)
-#define IMG_SVT_TEMPLATES_HC            (RID_SVTOOLS_START + 61)
-#define IMG_SVT_SAMPLES_HC              (RID_SVTOOLS_START + 62)
-
-#define IMG_SVT_DOCTEMPLATE_BACK_SMALL      (RID_SVTOOLS_START + 70)
-#define IMG_SVT_DOCTEMPLATE_BACK_LARGE      (RID_SVTOOLS_START + 71)
-#define IMG_SVT_DOCTEMPLATE_PREV_SMALL      (RID_SVTOOLS_START + 72)
-#define IMG_SVT_DOCTEMPLATE_PREV_LARGE      (RID_SVTOOLS_START + 73)
-#define IMG_SVT_DOCTEMPLATE_PRINT_SMALL     (RID_SVTOOLS_START + 74)
-#define IMG_SVT_DOCTEMPLATE_PRINT_LARGE     (RID_SVTOOLS_START + 75)
-#define IMG_SVT_DOCTEMPLATE_DOCINFO_SMALL   (RID_SVTOOLS_START + 76)
-#define IMG_SVT_DOCTEMPLATE_DOCINFO_LARGE   (RID_SVTOOLS_START + 77)
-#define IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL   (RID_SVTOOLS_START + 78)
-#define IMG_SVT_DOCTEMPLATE_PREVIEW_LARGE   (RID_SVTOOLS_START + 79)
-
-#define IMG_SVT_DOCTEMPL_HC_BACK_SMALL      (RID_SVTOOLS_START + 80)
-#define IMG_SVT_DOCTEMPL_HC_BACK_LARGE      (RID_SVTOOLS_START + 81)
-#define IMG_SVT_DOCTEMPL_HC_PREV_SMALL      (RID_SVTOOLS_START + 82)
-#define IMG_SVT_DOCTEMPL_HC_PREV_LARGE      (RID_SVTOOLS_START + 83)
-#define IMG_SVT_DOCTEMPL_HC_PRINT_SMALL     (RID_SVTOOLS_START + 84)
-#define IMG_SVT_DOCTEMPL_HC_PRINT_LARGE     (RID_SVTOOLS_START + 85)
-#define IMG_SVT_DOCTEMPL_HC_DOCINFO_SMALL   (RID_SVTOOLS_START + 86)
-#define IMG_SVT_DOCTEMPL_HC_DOCINFO_LARGE   (RID_SVTOOLS_START + 87)
-#define IMG_SVT_DOCTEMPL_HC_PREVIEW_SMALL   (RID_SVTOOLS_START + 88)
-#define IMG_SVT_DOCTEMPL_HC_PREVIEW_LARGE   (RID_SVTOOLS_START + 89)
-
-#define RID_IMG_PRNDLG_COLLATE              (STR_SVT_PRNDLG_START + 29)
-#define RID_IMG_PRNDLG_NOCOLLATE            (STR_SVT_PRNDLG_START + 30)
-#define RID_IMG_PRNDLG_COLLATE_HC           (STR_SVT_PRNDLG_START + 31)
-#define RID_IMG_PRNDLG_NOCOLLATE_HC         (STR_SVT_PRNDLG_START + 32)
-
-#endif  // #ifndef _SVTOOLS_HRC
-
-// ******************************************************************* EOF
-
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 00f2dbe92b4c..598295797ea6 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -333,6 +333,17 @@ class SvNumberFormatterRegistry_Impl;
 class SVL_DLLPUBLIC SvNumberFormatter
 {
 public:
+    /**
+     * We can't technically have an "infinite" value, so we use an arbitrary
+     * upper precision threshold to represent the "unlimited" precision.
+     */
+    static const sal_uInt16 UNLIMITED_PRECISION;
+
+    /**
+     * Precision suitable for numbers displayed in input bar, for instance
+     * Calc's formula input bar.
+     */
+    static const sal_uInt16 INPUTSTRING_PRECISION;
 
     /// Preferred ctor with service manager and language/country enum
     SvNumberFormatter(
@@ -583,7 +594,7 @@ public:
     /// Return the reference date
     Date* GetNullDate();
     /// Return the standard decimal precision
-    short GetStandardPrec();
+    sal_uInt16 GetStandardPrec();
     /// Return whether zero suppression is switched on
     BOOL GetNoZero() { return bNoZero; }
     /** Get the type of a format (or NUMBERFORMAT_UNDEFINED if no entry),
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 7cdcf4db518d..7c361382796a 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -236,6 +236,12 @@ public:
     // in fact that could be any string used in number formats.
     static void LoadString( SvStream& rStream, String& rStr );
 
+    /**
+     * Get output string from a numeric value that fits the number of
+     * characters specified.
+     */
+    bool GetOutputString( double fNumber, sal_uInt16 nCharCount, String& rOutString ) const;
+
     BOOL GetOutputString( double fNumber, String& OutString, Color** ppColor );
     BOOL GetOutputString( String& sString, String& OutString, Color** ppColor );
 
@@ -487,6 +493,7 @@ private:
 
     // standard number output
     SVL_DLLPRIVATE void ImpGetOutputStandard( double& fNumber, String& OutString );
+    SVL_DLLPRIVATE void ImpGetOutputStdToPrecision( double& rNumber, String& rOutString, sal_uInt16 nPrecision ) const;
     // numbers in input line
     SVL_DLLPRIVATE void ImpGetOutputInputLine( double fNumber, String& OutString );
 
diff --git a/svl/qa/complex/ConfigItems/helper/exports.map b/svl/qa/complex/ConfigItems/helper/exports.map
deleted file mode 100644
index 85610ad80888..000000000000
--- a/svl/qa/complex/ConfigItems/helper/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-            GetVersionInfo;
-            component_getImplementationEnvironment;
-            component_getFactory;
-            component_writeInfo;
-
-    local:
-            *;
-};
diff --git a/svl/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk
index 2c949da7b168..13ea12106792 100644
--- a/svl/qa/complex/ConfigItems/helper/makefile.mk
+++ b/svl/qa/complex/ConfigItems/helper/makefile.mk
@@ -65,7 +65,7 @@ SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=       $(SHL1TARGET)
 
-SHL1VERSIONMAP= exports.map
+SHL1VERSIONMAP= $(SOLARENV)/src/component.map
 
 # --- Targets ------------------------------------------------------
 
diff --git a/svl/qa/makefile.mk b/svl/qa/makefile.mk
index 4e107e31f924..7e8c7ee795cc 100644
--- a/svl/qa/makefile.mk
+++ b/svl/qa/makefile.mk
@@ -35,6 +35,8 @@ ENABLE_EXCEPTIONS = true
 
 .INCLUDE :  settings.mk
 
+CFLAGSCXX += $(CPPUNIT_CFLAGS)
+
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:job by codegen.pl
 SHL1OBJS=  \
diff --git a/svl/source/fsstor/exports.map b/svl/source/fsstor/exports.map
deleted file mode 100644
index f4ed78b9e970..000000000000
--- a/svl/source/fsstor/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/svl/source/fsstor/makefile.mk b/svl/source/fsstor/makefile.mk
index 43515155d63d..dc91814772f9 100644
--- a/svl/source/fsstor/makefile.mk
+++ b/svl/source/fsstor/makefile.mk
@@ -56,7 +56,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
diff --git a/svl/source/items/cstitem.src b/svl/source/items/cstitem.src
index b3511ffb302b..009fcb19e3c6 100644
--- a/svl/source/items/cstitem.src
+++ b/svl/source/items/cstitem.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include <svl/svtools.hrc>
+#include <svl/svl.hrc>
 String STR_COLUM_DT_AUTO
 {
     Text [ en-US ] = "automatic" ;
diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
index 3c8e85c461f2..27170c1d4f6e 100644
--- a/svl/source/items/dateitem.cxx
+++ b/svl/source/items/dateitem.cxx
@@ -33,7 +33,7 @@
 #define _DATETIMEITEM_CXX
 #include <svl/dateitem.hxx>
 #include <svl/svldata.hxx>
-#include <svl/svtools.hrc>
+#include <svl/svl.hrc>
 
 #include <unotools/intlwrapper.hxx>
 #include <comphelper/processfactory.hxx>
@@ -45,7 +45,6 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
-
 // STATIC DATA -----------------------------------------------------------
 
 DBG_NAME(SfxDateTimeItem)
diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index 284bc251a3a4..813c1fec8ebd 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.cxx
@@ -480,7 +480,7 @@ SfxNumRanges& SfxNumRanges::operator -=
     NUMTYPE nThisSize = Count_Impl(_pRanges);
     NUMTYPE nTargetSize = 1 + (  nThisSize + Count_Impl(rRanges._pRanges) );
     NUMTYPE *pTarget = new NUMTYPE[ nTargetSize ];
-    memset( pTarget, sizeof(NUMTYPE)*nTargetSize, 0 );
+    memset( pTarget, 0, sizeof(NUMTYPE)*nTargetSize );
     memcpy( pTarget, _pRanges, sizeof(NUMTYPE)*nThisSize );
 
     NUMTYPE nPos1 = 0, nPos2 = 0, nTargetPos = 0;
@@ -690,7 +690,7 @@ SfxNumRanges& SfxNumRanges::operator /=
     NUMTYPE nThisSize = Count_Impl(_pRanges);
     NUMTYPE nTargetSize = 1 + (  nThisSize + Count_Impl(rRanges._pRanges) );
     NUMTYPE *pTarget = new NUMTYPE[ nTargetSize ];
-    memset( pTarget, sizeof(NUMTYPE)*nTargetSize, 0 );
+    memset( pTarget, 0, sizeof(NUMTYPE)*nTargetSize );
     memcpy( pTarget, _pRanges, sizeof(NUMTYPE)*nThisSize );
 
     NUMTYPE nPos1 = 0, nPos2 = 0, nTargetPos = 0;
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index b7422c56224b..cc033bc6905e 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -151,40 +151,44 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
         rFlags |= TransliterationModules_IGNORE_CASE;
     if ( aOpt.IsMatchFullHalfWidthForms())
         rFlags |= TransliterationModules_IGNORE_WIDTH;
-    if ( aOpt.IsMatchHiraganaKatakana())
-        rFlags |= TransliterationModules_IGNORE_KANA;
-    if ( aOpt.IsMatchContractions())
-        rFlags |= TransliterationModules_ignoreSize_ja_JP;
-    if ( aOpt.IsMatchMinusDashChoon())
-        rFlags |= TransliterationModules_ignoreMinusSign_ja_JP;
-    if ( aOpt.IsMatchRepeatCharMarks())
-        rFlags |= TransliterationModules_ignoreIterationMark_ja_JP;
-    if ( aOpt.IsMatchVariantFormKanji())
-        rFlags |= TransliterationModules_ignoreTraditionalKanji_ja_JP;
-    if ( aOpt.IsMatchOldKanaForms())
-        rFlags |= TransliterationModules_ignoreTraditionalKana_ja_JP;
-    if ( aOpt.IsMatchDiziDuzu())
-        rFlags |= TransliterationModules_ignoreZiZu_ja_JP;
-    if ( aOpt.IsMatchBavaHafa())
-        rFlags |= TransliterationModules_ignoreBaFa_ja_JP;
-    if ( aOpt.IsMatchTsithichiDhizi())
-        rFlags |= TransliterationModules_ignoreTiJi_ja_JP;
-    if ( aOpt.IsMatchHyuiyuByuvyu())
-        rFlags |= TransliterationModules_ignoreHyuByu_ja_JP;
-    if ( aOpt.IsMatchSesheZeje())
-        rFlags |= TransliterationModules_ignoreSeZe_ja_JP;
-    if ( aOpt.IsMatchIaiya())
-        rFlags |= TransliterationModules_ignoreIandEfollowedByYa_ja_JP;
-    if ( aOpt.IsMatchKiku())
-        rFlags |= TransliterationModules_ignoreKiKuFollowedBySa_ja_JP;
-    if ( aOpt.IsIgnorePunctuation())
-        rFlags |= TransliterationModules_ignoreSeparator_ja_JP;
-    if ( aOpt.IsIgnoreWhitespace())
-        rFlags |= TransliterationModules_ignoreSpace_ja_JP;
-    if ( aOpt.IsIgnoreProlongedSoundMark())
-        rFlags |= TransliterationModules_ignoreProlongedSoundMark_ja_JP;
-    if ( aOpt.IsIgnoreMiddleDot())
-        rFlags |= TransliterationModules_ignoreMiddleDot_ja_JP;
+    if ( bAsianOptions )
+    {
+        if ( aOpt.IsMatchHiraganaKatakana())
+            rFlags |= TransliterationModules_IGNORE_KANA;
+        if ( aOpt.IsMatchContractions())
+            rFlags |= TransliterationModules_ignoreSize_ja_JP;
+        if ( aOpt.IsMatchMinusDashChoon())
+            rFlags |= TransliterationModules_ignoreMinusSign_ja_JP;
+        if ( aOpt.IsMatchRepeatCharMarks())
+            rFlags |= TransliterationModules_ignoreIterationMark_ja_JP;
+        if ( aOpt.IsMatchVariantFormKanji())
+            rFlags |= TransliterationModules_ignoreTraditionalKanji_ja_JP;
+        if ( aOpt.IsMatchOldKanaForms())
+            rFlags |= TransliterationModules_ignoreTraditionalKana_ja_JP;
+        if ( aOpt.IsMatchDiziDuzu())
+            rFlags |= TransliterationModules_ignoreZiZu_ja_JP;
+        if ( aOpt.IsMatchBavaHafa())
+            rFlags |= TransliterationModules_ignoreBaFa_ja_JP;
+        if ( aOpt.IsMatchTsithichiDhizi())
+            rFlags |= TransliterationModules_ignoreTiJi_ja_JP;
+        if ( aOpt.IsMatchHyuiyuByuvyu())
+            rFlags |= TransliterationModules_ignoreHyuByu_ja_JP;
+        if ( aOpt.IsMatchSesheZeje())
+            rFlags |= TransliterationModules_ignoreSeZe_ja_JP;
+        if ( aOpt.IsMatchIaiya())
+            rFlags |= TransliterationModules_ignoreIandEfollowedByYa_ja_JP;
+        if ( aOpt.IsMatchKiku())
+            rFlags |= TransliterationModules_ignoreKiKuFollowedBySa_ja_JP;
+        if ( aOpt.IsIgnorePunctuation())
+            rFlags |= TransliterationModules_ignoreSeparator_ja_JP;
+        if ( aOpt.IsIgnoreWhitespace())
+            rFlags |= TransliterationModules_ignoreSpace_ja_JP;
+        if ( aOpt.IsIgnoreProlongedSoundMark())
+            rFlags |= TransliterationModules_ignoreProlongedSoundMark_ja_JP;
+        if ( aOpt.IsIgnoreMiddleDot())
+            rFlags |= TransliterationModules_ignoreMiddleDot_ja_JP;
+    }
+
 }
 
 // -----------------------------------------------------------------------
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index b8bed49b603b..60c622208d53 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -28,7 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svl.hxx"
 
-#ifndef GCC
+#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_
+#include <com/sun/star/lang/XComponent.hpp>
 #endif
 
 #define _SVSTDARR_STRINGS
@@ -808,6 +809,16 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
         {
             // Alle Styles umsetzen, deren Parent dieser hier ist
             ChangeParent( p->GetName(), p->GetParent() );
+
+            com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp( static_cast< ::cppu::OWeakObject* >((*aIter).get()), com::sun::star::uno::UNO_QUERY );
+            if( xComp.is() ) try
+            {
+                xComp->dispose();
+            }
+            catch( com::sun::star::uno::Exception& )
+            {
+            }
+
             aStyles.erase(aIter);
             Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) );
         }
@@ -838,6 +849,15 @@ void SfxStyleSheetBasePool::Clear()
     SfxStyles::iterator aIter( aClearStyles.begin() );
     while( aIter != aClearStyles.end() )
     {
+        com::sun::star::uno::Reference< com::sun::star::lang::XComponent > xComp( static_cast< ::cppu::OWeakObject* >((*aIter).get()), com::sun::star::uno::UNO_QUERY );
+        if( xComp.is() ) try
+        {
+            xComp->dispose();
+        }
+        catch( com::sun::star::uno::Exception& )
+        {
+        }
+
         Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *(*aIter++).get() ) );
     }
 }
diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index bec8b91e7c22..0b9efdf22afd 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.cxx
@@ -31,9 +31,7 @@
 #include <tools/wldcrd.hxx>
 #include <svl/inettype.hxx>
 #include <svl/svldata.hxx>
-#ifndef _SVTOOLS_HRC
-#include <svl/svtools.hrc>
-#endif
+#include <svl/svl.hrc>
 
 #ifndef _SVSTDARR_STRINGSSORT_DECL
 #define _SVSTDARR_STRINGSSORT
@@ -806,16 +804,13 @@ namespace unnamed_svl_inettype {
 MediaTypeEntry const * seekEntry(UniString const & rTypeName,
                                  MediaTypeEntry const * pMap, sal_Size nSize)
 {
-#if defined DBG_UTIL || defined INETTYPE_DEBUG
-    static bool bChecked = false;
-    if (!bChecked)
-    {
-        for (sal_Size i = 0; i < nSize - 1; ++i)
-            DBG_ASSERT(pMap[i].m_pTypeName < pMap[i + 1].m_pTypeName,
-                       "seekEntry(): Bad map");
-        bChecked = true;
-    }
-#endif // DBG_UTIL, INETTYPE_DEBUG
+#if defined DBG_UTIL
+    for (sal_Size i = 0; i < nSize - 1; ++i)
+        DBG_ASSERT(
+            rtl_str_compare(
+                pMap[i].m_pTypeName, pMap[i + 1].m_pTypeName) < 0,
+            "seekEntry(): Bad map");
+#endif
 
     sal_Size nLow = 0;
     sal_Size nHigh = nSize;
diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src
index 195b2c640d67..333963c1d2d9 100644
--- a/svl/source/misc/mediatyp.src
+++ b/svl/source/misc/mediatyp.src
@@ -32,7 +32,7 @@
 //============================================================================
 
 #ifndef _SVTOOLS_HRC
-#include <svl/svtools.hrc>
+#include <svl/svl.hrc>
 #endif
 
 String STR_SVT_MIMETYPE_APP_OCTSTREAM
diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 95d957655d5e..656000fceae3 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.cxx
@@ -123,8 +123,7 @@ inline UniString SmartRel2Abs_Impl(INetURLObject const & rTheBaseURIRef,
                                                  eStyle);
         if (bCheckFileExists
             && !bWasAbsolute
-            && (aAbsURIRef.GetProtocol() == INET_PROT_FILE
-                || aAbsURIRef.GetProtocol() == INET_PROT_VND_SUN_STAR_WFS))
+            && (aAbsURIRef.GetProtocol() == INET_PROT_FILE))
         {
             INetURLObject aNonFileURIRef;
             aNonFileURIRef.SetSmartURL(rTheRelURIRef,
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 05dab66754e1..cb66a75558c2 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -61,6 +61,7 @@
 #include <rtl/instance.hxx>
 
 #include <math.h>
+#include <limits>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -178,6 +179,9 @@ SV_IMPL_PTRARR( NfWSStringsDtor, String* );
 
 /***********************Funktionen SvNumberFormatter**************************/
 
+const sal_uInt16 SvNumberFormatter::UNLIMITED_PRECISION   = ::std::numeric_limits<sal_uInt16>::max();
+const sal_uInt16 SvNumberFormatter::INPUTSTRING_PRECISION = ::std::numeric_limits<sal_uInt16>::max()-1;
+
 SvNumberFormatter::SvNumberFormatter(
             const Reference< XMultiServiceFactory >& xSMgr,
             LanguageType eLang )
@@ -338,7 +342,7 @@ void SvNumberFormatter::ChangeStandardPrec(short nPrec)
     pFormatScanner->ChangeStandardPrec(nPrec);
 }
 
-short SvNumberFormatter::GetStandardPrec()
+sal_uInt16 SvNumberFormatter::GetStandardPrec()
 {
     return pFormatScanner->GetStandardPrec();
 }
@@ -1473,7 +1477,6 @@ void SvNumberFormatter::GetInputLineString(const double& fOutNumber,
                                            String& sOutString)
 {
     SvNumberformat* pFormat;
-    short nOldPrec;
     Color* pColor;
     pFormat = (SvNumberformat*) aFTable.Get(nFIndex);
     if (!pFormat)
@@ -1483,7 +1486,8 @@ void SvNumberFormatter::GetInputLineString(const double& fOutNumber,
     short eType = pFormat->GetType() & ~NUMBERFORMAT_DEFINED;
     if (eType == 0)
         eType = NUMBERFORMAT_DEFINED;
-    nOldPrec = -1;
+    sal_uInt16 nOldPrec = pFormatScanner->GetStandardPrec();
+    bool bPrecChanged = false;
     if (eType == NUMBERFORMAT_NUMBER || eType == NUMBERFORMAT_PERCENT
                                      || eType == NUMBERFORMAT_CURRENCY
                                      || eType == NUMBERFORMAT_SCIENTIFIC
@@ -1491,8 +1495,8 @@ void SvNumberFormatter::GetInputLineString(const double& fOutNumber,
     {
         if (eType != NUMBERFORMAT_PERCENT)  // spaeter Sonderbehandlung %
             eType = NUMBERFORMAT_NUMBER;
-        nOldPrec = pFormatScanner->GetStandardPrec();
-        ChangeStandardPrec(300);                        // Merkwert
+        ChangeStandardPrec(INPUTSTRING_PRECISION);
+        bPrecChanged = true;
     }
     sal_uInt32 nKey = nFIndex;
     switch ( eType )
@@ -1512,12 +1516,12 @@ void SvNumberFormatter::GetInputLineString(const double& fOutNumber,
     {
         if ( eType == NUMBERFORMAT_TIME && pFormat->GetFormatPrecision() )
         {
-            nOldPrec = pFormatScanner->GetStandardPrec();
-            ChangeStandardPrec(300);                        // Merkwert
+            ChangeStandardPrec(INPUTSTRING_PRECISION);
+            bPrecChanged = true;
         }
         pFormat->GetOutputString(fOutNumber, sOutString, &pColor);
     }
-    if (nOldPrec != -1)
+    if (bPrecChanged)
         ChangeStandardPrec(nOldPrec);
 }
 
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 0e63b91e15d0..dbcad199f367 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -54,6 +54,9 @@
 #include "numhead.hxx"
 #include <unotools/digitgroupingiterator.hxx>
 #include <svl/nfsymbol.hxx>
+
+#include <cmath>
+
 using namespace svt;
 
 namespace {
@@ -63,6 +66,10 @@ struct Gregorian
         return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gregorian"));
     }
 };
+
+const sal_uInt16 UPPER_PRECISION = 300; // entirely arbitrary...
+const double EXP_LOWER_BOUND = 1.0E-4; // prefer scientific notation below this value.
+
 }
 
 const double _D_MAX_U_LONG_ = (double) 0xffffffff;      // 4294967295.0
@@ -675,7 +682,7 @@ SvNumberformat::SvNumberformat(String& rString,
                     xub_StrLen nAnzChars = ImpGetNumber(rString, nPos, sStr);
                     if (nAnzChars > 0)
                     {
-                        short F_Type;
+                        short F_Type = NUMBERFORMAT_UNDEFINED;
                         if (!pISc->IsNumberFormat(sStr,F_Type,fNumber) ||
                             ( F_Type != NUMBERFORMAT_NUMBER &&
                             F_Type != NUMBERFORMAT_SCIENTIFIC) )
@@ -1774,47 +1781,62 @@ void SvNumberformat::Build50Formatstring( String& rStr ) const
 
 void SvNumberformat::ImpGetOutputStandard(double& fNumber, String& OutString)
 {
-    USHORT nStandardPrec = rScan.GetStandardPrec();
+    sal_uInt16 nStandardPrec = rScan.GetStandardPrec();
+
     if ( fabs(fNumber) > 1.0E15 )       // #58531# war E16
+    {
+        nStandardPrec = ::std::min(nStandardPrec, static_cast<sal_uInt16>(14)); // limits to 14 decimals
         OutString = ::rtl::math::doubleToUString( fNumber,
                 rtl_math_StringFormat_E, nStandardPrec /*2*/,
                 GetFormatter().GetNumDecimalSep().GetChar(0));
+    }
     else
-    {
+        ImpGetOutputStdToPrecision(fNumber, OutString, nStandardPrec);
+}
+
+void SvNumberformat::ImpGetOutputStdToPrecision(double& rNumber, String& rOutString, sal_uInt16 nPrecision) const
+{
+    // Make sure the precision doesn't go over the maximum allowable precision.
+    nPrecision = ::std::min(UPPER_PRECISION, nPrecision);
+
 #if 0
 {
-        // debugger test case for ANSI standard correctness
-        ::rtl::OUString aTest;
-        // expect 0.00123   OK
-        aTest = ::rtl::math::doubleToUString( 0.001234567,
-                rtl_math_StringFormat_G, 3, '.', sal_True );
-        // expect 123       OK
-        aTest = ::rtl::math::doubleToUString( 123.4567,
-                rtl_math_StringFormat_G, 3, '.', sal_True );
-        // expect 123.5     OK
-        aTest = ::rtl::math::doubleToUString( 123.4567,
-                rtl_math_StringFormat_G, 4, '.', sal_True );
-        // expect 1e+03 (as 999.6 rounded to 3 significant digits results in
-        // 1000 with an exponent equal to significant digits)
-        // Currently (24-Jan-2003) we do fail in this case and output 1000
-        // instead, negligible.
-        aTest = ::rtl::math::doubleToUString( 999.6,
-                rtl_math_StringFormat_G, 3, '.', sal_True );
-        // expect what? result is 1.2e+004
-        aTest = ::rtl::math::doubleToUString( 12345.6789,
-                rtl_math_StringFormat_G, -3, '.', sal_True );
+    // debugger test case for ANSI standard correctness
+    ::rtl::OUString aTest;
+    // expect 0.00123   OK
+    aTest = ::rtl::math::doubleToUString( 0.001234567,
+            rtl_math_StringFormat_G, 3, '.', sal_True );
+    // expect 123       OK
+    aTest = ::rtl::math::doubleToUString( 123.4567,
+            rtl_math_StringFormat_G, 3, '.', sal_True );
+    // expect 123.5     OK
+    aTest = ::rtl::math::doubleToUString( 123.4567,
+            rtl_math_StringFormat_G, 4, '.', sal_True );
+    // expect 1e+03 (as 999.6 rounded to 3 significant digits results in
+    // 1000 with an exponent equal to significant digits)
+    // Currently (24-Jan-2003) we do fail in this case and output 1000
+    // instead, negligible.
+    aTest = ::rtl::math::doubleToUString( 999.6,
+            rtl_math_StringFormat_G, 3, '.', sal_True );
+    // expect what? result is 1.2e+004
+    aTest = ::rtl::math::doubleToUString( 12345.6789,
+            rtl_math_StringFormat_G, -3, '.', sal_True );
 }
 #endif
 
-        OutString = ::rtl::math::doubleToUString( fNumber,
-                rtl_math_StringFormat_F, nStandardPrec /*2*/,
-                GetFormatter().GetNumDecimalSep().GetChar(0), sal_True );
-        if (OutString.GetChar(0) == '-' &&
-            OutString.GetTokenCount('0') == OutString.Len())
-            OutString.EraseLeadingChars('-');            // nicht -0
-    }
-    ImpTransliterate( OutString, NumFor[0].GetNatNum() );
-    return;
+    // We decided to strip trailing zeros unconditionally, since binary
+    // double-precision rounding error makes it impossible to determine e.g.
+    // whether 844.10000000000002273737 is what the user has typed, or the
+    // user has typed 844.1 but IEEE 754 represents it that way internally.
+
+    rOutString = ::rtl::math::doubleToUString( rNumber,
+            rtl_math_StringFormat_F, nPrecision /*2*/,
+            GetFormatter().GetNumDecimalSep().GetChar(0), true );
+    if (rOutString.GetChar(0) == '-' &&
+        rOutString.GetTokenCount('0') == rOutString.Len())
+        rOutString.EraseLeadingChars('-');            // nicht -0
+
+    ImpTransliterate( rOutString, NumFor[0].GetNatNum() );
 }
 
 void SvNumberformat::ImpGetOutputInputLine(double fNumber, String& OutString)
@@ -1955,6 +1977,71 @@ ULONG SvNumberformat::ImpGGTRound(ULONG x, ULONG y)
     }
 }
 
+namespace {
+
+void lcl_GetOutputStringScientific(
+    double fNumber, sal_uInt16 nCharCount, const SvNumberFormatter& rFormatter, String& rOutString)
+{
+    bool bSign = ::rtl::math::isSignBitSet(fNumber);
+
+    // 1.000E+015 (one digit and the decimal point, and the five chars for the exponential part, totalling 7).
+    sal_uInt16 nPrec = nCharCount > 7 ? nCharCount - 7 : 0;
+    if (nPrec && bSign)
+        // Make room for the negative sign.
+        --nPrec;
+
+    nPrec = ::std::min(nPrec, static_cast<sal_uInt16>(14)); // limit to 14 decimals.
+
+    rOutString = ::rtl::math::doubleToUString(
+        fNumber, rtl_math_StringFormat_E, nPrec, rFormatter.GetNumDecimalSep().GetChar(0));
+}
+
+}
+
+bool SvNumberformat::GetOutputString(double fNumber, sal_uInt16 nCharCount, String& rOutString) const
+{
+    using namespace std;
+
+    if (eType != NUMBERFORMAT_NUMBER)
+        return false;
+
+    double fTestNum = fNumber;
+    bool bSign = ::rtl::math::isSignBitSet(fTestNum);
+    if (bSign)
+        fTestNum = -fTestNum;
+
+    if (fTestNum < EXP_LOWER_BOUND)
+    {
+        lcl_GetOutputStringScientific(fNumber, nCharCount, GetFormatter(), rOutString);
+        return true;
+    }
+
+    double fExp = log10(fTestNum);
+    // Values < 1.0 always have one digit before the decimal point.
+    sal_uInt16 nDigitPre = fExp >= 0.0 ? static_cast<sal_uInt16>(ceil(fExp)) : 1;
+
+    if (nDigitPre > 15)
+    {
+        lcl_GetOutputStringScientific(fNumber, nCharCount, GetFormatter(), rOutString);
+        return true;
+    }
+
+    sal_uInt16 nPrec = nCharCount >= nDigitPre ? nCharCount - nDigitPre : 0;
+    if (nPrec && bSign)
+        // Subtract the negative sign.
+        --nPrec;
+    if (nPrec)
+        // Subtract the decimal point.
+        --nPrec;
+
+    ImpGetOutputStdToPrecision(fNumber, rOutString, nPrec);
+    if (rOutString.Len() > nCharCount)
+        // String still wider than desired.  Switch to scientific notation.
+        lcl_GetOutputStringScientific(fNumber, nCharCount, GetFormatter(), rOutString);
+
+    return true;
+}
+
 BOOL SvNumberformat::GetOutputString(double fNumber,
                                      String& OutString,
                                      Color** ppColor)
@@ -1978,16 +2065,43 @@ BOOL SvNumberformat::GetOutputString(double fNumber,
     BOOL bHadStandard = FALSE;
     if (bStandard)                              // einzelne Standardformate
     {
-        if (rScan.GetStandardPrec() == 300)     // alle Zahlformate InputLine
+        if (rScan.GetStandardPrec() == SvNumberFormatter::INPUTSTRING_PRECISION)     // alle Zahlformate InputLine
         {
             ImpGetOutputInputLine(fNumber, OutString);
-            return FALSE;
+            return false;
         }
         switch (eType)
         {
             case NUMBERFORMAT_NUMBER:                   // Standardzahlformat
+            {
+                if (rScan.GetStandardPrec() == SvNumberFormatter::UNLIMITED_PRECISION)
+                {
+                    bool bSign = ::rtl::math::isSignBitSet(fNumber);
+                    if (bSign)
+                        fNumber = -fNumber;
+                    ImpGetOutputStdToPrecision(fNumber, OutString, 10); // Use 10 decimals for general 'unlimited' format.
+                    if (fNumber < EXP_LOWER_BOUND)
+                    {
+                        xub_StrLen nLen = OutString.Len();
+                        if (!nLen)
+                            return false;
+
+                        if (nLen > 11)
+                        {
+                            sal_uInt16 nStandardPrec = rScan.GetStandardPrec();
+                            nStandardPrec = ::std::min(nStandardPrec, static_cast<sal_uInt16>(14)); // limits to 14 decimals
+                            OutString = ::rtl::math::doubleToUString( fNumber,
+                                    rtl_math_StringFormat_E, nStandardPrec /*2*/,
+                                    GetFormatter().GetNumDecimalSep().GetChar(0), true);
+                        }
+                    }
+                    if (bSign)
+                        OutString.Insert('-', 0);
+                    return false;
+                }
                 ImpGetOutputStandard(fNumber, OutString);
                 bHadStandard = TRUE;
+            }
             break;
             case NUMBERFORMAT_DATE:
                 bRes |= ImpGetDateOutput(fNumber, 0, OutString);
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 11a51a662aee..ab68d8309159 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -465,7 +465,7 @@ void ImpSvNumberformatScan::ChangeNullDate(USHORT nDay, USHORT nMonth, USHORT nY
         pNullDate = new Date(nDay, nMonth, nYear);
 }
 
-void ImpSvNumberformatScan::ChangeStandardPrec(short nPrec)
+void ImpSvNumberformatScan::ChangeStandardPrec(sal_uInt16 nPrec)
 {
     nStandardPrec = nPrec;
 }
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 1ca6271443ae..176da84b652e 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -54,7 +54,7 @@ public:
 
     void ChangeNullDate(USHORT nDay, USHORT nMonth, USHORT nYear);
                                                 // tauscht Referenzdatum aus
-    void ChangeStandardPrec(short nPrec);       // tauscht Standardprecision aus
+    void ChangeStandardPrec(sal_uInt16 nPrec);  // tauscht Standardprecision aus
 
     xub_StrLen ScanFormat( String& rString, String& rComment ); // Aufruf der Scan-Analyse
 
@@ -93,7 +93,7 @@ public:
                 InitKeywords();
             return sNameStandardFormat;
         }
-    short GetStandardPrec() const               { return nStandardPrec; }
+    sal_uInt16 GetStandardPrec() const          { return nStandardPrec; }
     const Color& GetRedColor() const            { return StandardColor[4]; }
     Color* GetColor(String& sStr);          // Setzt Hauptfarben oder
                                                 // definierte Farben
@@ -158,7 +158,7 @@ private:                            // ---- privater Teil
                                                 // Array der Standardfarben
     Date* pNullDate;                            // 30Dec1899
     String sNameStandardFormat;             // "Standard"
-    short nStandardPrec;                        // default Precision fuer Standardformat (2)
+    sal_uInt16 nStandardPrec;                   // default Precision for Standardformat
     SvNumberFormatter* pFormatter;              // Pointer auf die Formatliste
 
     String sStrArray[NF_MAX_FORMAT_SYMBOLS];    // Array der Symbole
diff --git a/svl/source/passwordcontainer/exports.map b/svl/source/passwordcontainer/exports.map
deleted file mode 100644
index f4ed78b9e970..000000000000
--- a/svl/source/passwordcontainer/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/svl/source/passwordcontainer/makefile.mk b/svl/source/passwordcontainer/makefile.mk
index 92a9993fd251..d9eb9615cf80 100644
--- a/svl/source/passwordcontainer/makefile.mk
+++ b/svl/source/passwordcontainer/makefile.mk
@@ -52,7 +52,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)