dr77: rebase to DEV300m92

author: Daniel Rentz [dr] <daniel.rentz@oracle.com> 2010-11-09 15:15:30 +0100
committer: Daniel Rentz [dr] <daniel.rentz@oracle.com> 2010-11-09 15:15:30 +0100
commit: 376a1fd0f4f538f3fa3591b66201b59834d9f278 (patch)
tree: 665653b2ab47ab118a631b3e93c2658ca76b9cc8 /svtools
parent: 45a0ee3dc399b280e117fa61bdce0a4c56eba2fa (diff)
parent: 95f71183414a50d12cd4bbacf47d711672e63268 (diff)
58 files changed, 764 insertions, 713 deletions
diff --git a/svtools/bmpmaker/bmp.src b/svtools/bmpmaker/bmp.src
index 7431d2e335a4..30ff9488a805 100644
--- a/svtools/bmpmaker/bmp.src
+++ b/svtools/bmpmaker/bmp.src
@@ -27,6 +27,7 @@
 
 #include "bmp.hrc"
 ModalDialog DLG_PATH {
+    HelpID = "svtools:ModalDialog:DLG_PATH";
     OutputSize = TRUE;
     SVLook = TRUE;
     Size = MAP_APPFONT( 301, 104 );
@@ -54,36 +55,42 @@ ModalDialog DLG_PATH {
             Text = "Bitmap-Pfad:";
         };
     Edit EDT_SRS {
+        HelpID = "svtools:Edit:DLG_PATH:EDT_SRS";
             Border = TRUE;
             Pos = MAP_APPFONT( 65, 14 );
             Size = MAP_APPFONT( 160, 12 );
             TabStop = TRUE;
         };
     Edit EDT_RES {
+        HelpID = "svtools:Edit:DLG_PATH:EDT_RES";
             Border = TRUE;
             Pos = MAP_APPFONT( 65, 29 );
             Size = MAP_APPFONT( 160, 12 );
             TabStop = TRUE;
         };
     Edit EDT_OUT {
+        HelpID = "svtools:Edit:DLG_PATH:EDT_OUT";
             Border = TRUE;
             Pos = MAP_APPFONT( 65, 44 );
             Size = MAP_APPFONT( 160, 12 );
             TabStop = TRUE;
         };
     PushButton BTN_SRS {
+        HelpID = "svtools:PushButton:DLG_PATH:BTN_SRS";
             Pos = MAP_APPFONT( 228, 14 );
             Size = MAP_APPFONT( 15, 12 );
             Text = "...";
             TabStop = TRUE;
         };
     PushButton BTN_RES {
+        HelpID = "svtools:PushButton:DLG_PATH:BTN_RES";
             Pos = MAP_APPFONT( 228, 29 );
             Size = MAP_APPFONT( 15, 12 );
             Text = "...";
             TabStop = TRUE;
         };
     PushButton BTN_OUT {
+        HelpID = "svtools:PushButton:DLG_PATH:BTN_OUT";
             Pos = MAP_APPFONT( 228, 44 );
             Size = MAP_APPFONT( 15, 12 );
             Text = "...";
@@ -106,6 +113,7 @@ ModalDialog DLG_PATH {
             Text = "Sprache";
         };
     ListBox LB_LANG {
+        HelpID = "svtools:ListBox:DLG_PATH:LB_LANG";
             Border = TRUE;
             Pos = MAP_APPFONT( 12, 76 );
             Size = MAP_APPFONT( 231, 70 );
diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx
index 74476541dcd8..db704a0e6784 100644
--- a/svtools/inc/fileview.hxx
+++ b/svtools/inc/fileview.hxx
@@ -104,8 +104,8 @@ public:
     sal_Bool                GetParentURL( String& _rParentURL ) const;
     sal_Bool                CreateNewFolder( const String& rNewFolder );
 
-    void                    SetHelpId( sal_uInt32 nHelpId );
-    sal_uInt32              GetHelpId( ) const;
+    void                    SetHelpId( const rtl::OString& rHelpId );
+    const rtl::OString&     GetHelpId( ) const;
     void                    SetSizePixel( const Size& rNewSize );
     using Window::SetPosSizePixel;
     virtual void            SetPosSizePixel( const Point& rNewPos, const Size& rNewSize );
diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx
index 49ec77adfea5..8c6f014d4219 100644
--- a/svtools/inc/svtools/filter.hxx
+++ b/svtools/inc/svtools/filter.hxx
@@ -134,16 +134,6 @@ class Graphic;
 #define GFF_EMF ( (USHORT)0x00f8 )
 #define GFF_XXX ( (USHORT)0xffff )
 
-// ---------------
-// - RequestInfo -
-// ---------------
-
-struct RequestInfo
-{
-    BYTE*   pBuffer;
-    ULONG   nRealBufferSize;
-};
-
 // ---------------------
 // - GraphicDescriptor -
 // ---------------------
@@ -151,29 +141,18 @@ struct RequestInfo
 class SVT_DLLPUBLIC GraphicDescriptor
 {
     SvStream*           pFileStm;
-    Link                aReqLink;
+
     String              aPathExt;
     Size                aPixSize;
     Size                aLogSize;
-    SvStream*           pMemStm;
-    SvStream*           pBaseStm;
-    ULONG               nStmPos;
     USHORT              nBitsPerPixel;
     USHORT              nPlanes;
     USHORT              nFormat;
     BOOL                bCompressed;
-    BOOL                bDataReady;
-    BOOL                bLinked;
-    BOOL                bLinkChanged;
-    BOOL                bWideSearch;
-    BOOL                bBaseStm;
-    long                nExtra1;
-    long                nExtra2;
+    BOOL                bOwnStream;
 
     void                ImpConstruct();
 
-//#if 0 // _SOLAR__PRIVATE
-
     BOOL                ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo );
     BOOL                ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo );
     BOOL                ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo );
@@ -199,27 +178,11 @@ class SVT_DLLPUBLIC GraphicDescriptor
     BOOL                ImpDetectSGV( SvStream& rStm, BOOL bExtendedInfo );
     BOOL                ImpDetectEMF( SvStream& rStm, BOOL bExtendedInfo );
 
-//#endif
-
     GraphicDescriptor( const GraphicDescriptor& );
     GraphicDescriptor& operator=( const GraphicDescriptor& );
 
-protected:
-
-    BOOL                IsDataReady() const;
-    BOOL                IsWideSearch() const;
-    SvStream&           GetSearchStream() const;
-    const String&       GetPathExtension() const;
-
 public:
 
-    // Default-Ctor, um anschliessend einen Link zu setzen, mit dem
-    // die Daten vom Aufrufer im ::Detect() angefordert werden.
-    // da einige Formate ( Mtf's ) keinen eindeutigen Header besitzen,
-    // ist es sinnvoll den vollen Filenamen (inkl. Ext. ) mitanzugeben,
-    // da so das Format ueber die Extension ermittelt werden kann
-    GraphicDescriptor( const String* pPath = NULL );
-
     // Ctor, um einen Filenamen zu setzen. Es muss ::Detect() gerufen werden,
     // um das File zu identifizieren;
     // wenn das File keinen eindeutigen Header besitzt ( Mtf's ) wird das
@@ -261,21 +224,6 @@ public:
     // zeigt an, ob das Bild evtl. komprimiert (wie auch immer) ist
     BOOL            IsCompressed() const { return bCompressed; }
 
-    // setzt den LinkHdl zum Setzen der Bytes;
-    // der Handler muss einen Pointer auf die RequestInfo-Struktur
-    // zurueckgeben; die Anzahl der minimal zur Verfuegung zu stellenden
-    // Daten muss im Handler ueber ::GetRequestedByteCount() erfragt werden;
-    // die tatsaechlich zur Verfuegung gestellte BYTE-Anzahl
-    // wird in der RequestInfo-Struktur gesetzt
-    void            SetRequestHdl( const Link& rRequestHdl );
-
-    // gibt den LinkHdl zum Setzen der Bytes zurueck
-    const Link&     GetRequestHdl() const { return aReqLink; }
-
-    // muss im ReqHdl gerufen werden, um zu erfahren, wieviele
-    // Bytes _mindestens_ bereitgestellt werden muessen
-    ULONG           GetRequestedByteCount() const;
-
     // gibt die Filternummer des Filters zurueck,
     // der im GraphicFilter zum Lesen dieses Formats
     // benoetigt wird
diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx
index 1ef7687cfb1d..c225a95d1f55 100644
--- a/svtools/inc/svtools/headbar.hxx
+++ b/svtools/inc/svtools/headbar.hxx
@@ -360,15 +360,15 @@ public:
 
     void                SetHelpText( USHORT nItemId, const XubString& rText );
     XubString           GetHelpText( USHORT nItemId ) const;
-    void                SetHelpId( USHORT nItemId, ULONG nHelpId );
-    ULONG               GetHelpId( USHORT nItemId ) const;
+    void                SetHelpId( USHORT nItemId, const rtl::OString& nHelpId );
+    rtl::OString        GetHelpId( USHORT nItemId ) const;
 
     Size                CalcWindowSizePixel() const;
 
     inline void             SetHelpText( const String& rText )      { Window::SetHelpText( rText ); }
     inline const String&    GetHelpText() const                     { return Window::GetHelpText(); }
-    inline void             SetHelpId( ULONG nId )                  { Window::SetHelpId( nId ); }
-    inline ULONG            GetHelpId() const                       { return Window::GetHelpId(); }
+    inline void             SetHelpId( const rtl::OString& rId )    { Window::SetHelpId( rId ); }
+    inline const rtl::OString& GetHelpId() const                    { return Window::GetHelpId(); }
 
     inline void         SetStartDragHdl( const Link& rLink )        { maStartDragHdl = rLink; }
     inline const Link&  GetStartDragHdl() const                     { return maStartDragHdl; }
diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc
index 1ffb7a99fb32..ecf8ba4b1bf7 100644
--- a/svtools/inc/svtools/helpid.hrc
+++ b/svtools/inc/svtools/helpid.hrc
@@ -28,90 +28,103 @@
 #ifndef _SVT_HELPID_HRC
 #define _SVT_HELPID_HRC
 
-// include ---------------------------------------------------------------
-
-#include <svl/solar.hrc>
-
-// Help-Ids --------------------------------------------------------------
-
-#define HID_FILEDLG_OPENDLG         (HID_SVTOOLS_START +   0)
-#define HID_FILEDLG_PATHDLG         (HID_SVTOOLS_START +   1)
-#define HID_FILEDLG_DIR             (HID_SVTOOLS_START +   2)
-#define HID_FILEDLG_EDIT            (HID_SVTOOLS_START +   3)
-#define HID_FILEDLG_DIRS            (HID_SVTOOLS_START +   4)
-#define HID_FILEDLG_DRIVE           (HID_SVTOOLS_START +   5)
-#define HID_FILEDLG_DRIVES          (HID_SVTOOLS_START +   6)
-#define HID_FILEDLG_NEWDIR          (HID_SVTOOLS_START +   7)
-#define HID_FILEDLG_HOME            (HID_SVTOOLS_START +   8)
-#define HID_FILEDLG_FILE            (HID_SVTOOLS_START +   9)
-#define HID_FILEDLG_FILES           (HID_SVTOOLS_START +  10)
-#define HID_FILEDLG_PATH            (HID_SVTOOLS_START +  11)
-#define HID_FILEDLG_TYPE            (HID_SVTOOLS_START +  12)
-#define HID_FILEDLG_TYPES           (HID_SVTOOLS_START +  13)
+#define HID_FILEDLG_OPENDLG                                    "SVT_HID_FILEDLG_OPENDLG"
+#define HID_FILEDLG_PATHDLG                                    "SVT_HID_FILEDLG_PATHDLG"
+#define HID_FILEDLG_DIR                                        "SVT_HID_FILEDLG_DIR"
+#define HID_FILEDLG_EDIT                                       "SVT_HID_FILEDLG_EDIT"
+#define HID_FILEDLG_DIRS                                       "SVT_HID_FILEDLG_DIRS"
+#define HID_FILEDLG_DRIVE                                      "SVT_HID_FILEDLG_DRIVE"
+#define HID_FILEDLG_DRIVES                                     "SVT_HID_FILEDLG_DRIVES"
+#define HID_FILEDLG_NEWDIR                                     "SVT_HID_FILEDLG_NEWDIR"
+#define HID_FILEDLG_HOME                                       "SVT_HID_FILEDLG_HOME"
+#define HID_FILEDLG_FILE                                       "SVT_HID_FILEDLG_FILE"
+#define HID_FILEDLG_FILES                                      "SVT_HID_FILEDLG_FILES"
+#define HID_FILEDLG_PATH                                       "SVT_HID_FILEDLG_PATH"
+#define HID_FILEDLG_TYPE                                       "SVT_HID_FILEDLG_TYPE"
+#define HID_FILEDLG_TYPES                                      "SVT_HID_FILEDLG_TYPES"
+#define HID_FILEDLG_LINK_CB                                    "SVT_HID_FILEDLG_LINK_CB"
+#define HID_FILEDLG_PREVIEW_CB                                 "SVT_HID_FILEDLG_PREVIEW_CB"
+#define HID_FILEDLG_STANDARD                                  "SVT_HID_FILEDLG_STANDARD"
+#define HID_FILEDLG_MANAGER                                   "SVT_HID_FILEDLG_MANAGER"
+#define HID_FILEDLG_URL                                       "SVT_HID_FILEDLG_URL"
+#define HID_FILEDLG_USE_PASSWD                                "SVT_HID_FILEDLG_USE_PASSWD"
+#define HID_FILEDLG_READ_ONLY                                 "SVT_HID_FILEDLG_READ_ONLY"
+#define HID_FILEDLG_AUTOCOMPLETEBOX                           "SVT_HID_FILEDLG_AUTOCOMPLETEBOX"
+#define HID_FILEDLG_SAVE_BTN                                  "SVT_HID_FILEDLG_SAVE_BTN"
+#define HID_FILEDLG_SAVE_FILENAME                             "SVT_HID_FILEDLG_SAVE_FILENAME"
+#define HID_FILEDLG_SAVE_FILETYPE                             "SVT_HID_FILEDLG_SAVE_FILETYPE"
+#define HID_FILEDLG_INSERT_BTN                                "SVT_HID_FILEDLG_INSERT_BTN"
+#define HID_FILEDLG_PATH_BTN                                  "SVT_HID_FILEDLG_PATH_BTN"
+#define HID_FILEDLG_PATH_FILENAME                             "SVT_HID_FILEDLG_PATH_FILENAME"
+#define HID_FILEDLG_FOLDER_BTN                                "SVT_HID_FILEDLG_FOLDER_BTN"
+#define HID_FILEDLG_FOLDER_FILENAME                           "SVT_HID_FILEDLG_FOLDER_FILENAME"
+#define HID_FILEDLG_SRCHFOLDER_BTN                            "SVT_HID_FILEDLG_SRCHFOLDER_BTN"
+#define HID_FILEDLG_EDIT_FAVORITES                            "SVT_HID_FILEDLG_EDIT_FAVORITES"
+#define HID_FILEDLG_NEW_FAVORITE                              "SVT_HID_FILEDLG_NEW_FAVORITE"
+#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX                    "SVT_HID_FILEDLG_EDIT_FAVORITES_LISTBOX"
+#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR                  "SVT_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR"
+#define HID_FILEDLG_EXPORTASPDF                               "SVT_HID_FILEDLG_EXPORTASPDF"
 
 // HelpID's fuer die Textkomponente
-#define HID_TEXTCPNT_OPEN_LINK          (HID_SVTOOLS_START +  14)
-#define HID_TEXTCPNT_OPEN_LINK_NEW      (HID_SVTOOLS_START +  15)
-#define HID_TEXTCPNT_DOWNLOAD           (HID_SVTOOLS_START +  16)
-#define HID_TEXTCPNT_ADD_BOOKMARK       (HID_SVTOOLS_START +  17)
-#define HID_TEXTCPNT_COPY_LINK          (HID_SVTOOLS_START +  18)
+#define HID_TEXTCPNT_OPEN_LINK                                 "SVT_HID_TEXTCPNT_OPEN_LINK"
+#define HID_TEXTCPNT_OPEN_LINK_NEW                             "SVT_HID_TEXTCPNT_OPEN_LINK_NEW"
+#define HID_TEXTCPNT_DOWNLOAD                                  "SVT_HID_TEXTCPNT_DOWNLOAD"
+#define HID_TEXTCPNT_ADD_BOOKMARK                              "SVT_HID_TEXTCPNT_ADD_BOOKMARK"
+#define HID_TEXTCPNT_COPY_LINK                                 "SVT_HID_TEXTCPNT_COPY_LINK"
 
 // HelpID's fuer RegisterDialog
-#define HID_LIMITED_DIALOG              (HID_SVTOOLS_START +  20)
+#define HID_LIMITED_DIALOG                                     "SVT_HID_LIMITED_DIALOG"
 
 // Help ids of template dialog
-#define HID_TEMPLATEDLG_DIALOG          (HID_SVTOOLS_START +  21)
-#define HID_TEMPLATEDLG_ICONCTRL        (HID_SVTOOLS_START +  22)
-#define HID_TEMPLATEDLG_FILEVIEW        (HID_SVTOOLS_START +  23)
-#define HID_TEMPLATEDLG_TB_BACK         (HID_SVTOOLS_START +  24)
-#define HID_TEMPLATEDLG_TB_PREV         (HID_SVTOOLS_START +  25)
-#define HID_TEMPLATEDLG_TB_PRINT        (HID_SVTOOLS_START +  26)
-#define HID_TEMPLATEDLG_TB_DOCINFO      (HID_SVTOOLS_START +  27)
-#define HID_TEMPLATEDLG_TB_PREVIEW      (HID_SVTOOLS_START +  28)
+#define HID_TEMPLATEDLG_DIALOG                                 "SVT_HID_TEMPLATEDLG_DIALOG"
+#define HID_TEMPLATEDLG_ICONCTRL                               "SVT_HID_TEMPLATEDLG_ICONCTRL"
+#define HID_TEMPLATEDLG_FILEVIEW                               "SVT_HID_TEMPLATEDLG_FILEVIEW"
+#define HID_TEMPLATEDLG_TB_BACK                                "SVT_HID_TEMPLATEDLG_TB_BACK"
+#define HID_TEMPLATEDLG_TB_PREV                                "SVT_HID_TEMPLATEDLG_TB_PREV"
+#define HID_TEMPLATEDLG_TB_PRINT                               "SVT_HID_TEMPLATEDLG_TB_PRINT"
+#define HID_TEMPLATEDLG_TB_DOCINFO                             "SVT_HID_TEMPLATEDLG_TB_DOCINFO"
+#define HID_TEMPLATEDLG_TB_PREVIEW                             "SVT_HID_TEMPLATEDLG_TB_PREVIEW"
 
-#define HID_ADDRTEMPL_FIELD_ASSIGNMENT  (HID_SVTOOLS_START +  29)
+#define HID_ADDRTEMPL_FIELD_ASSIGNMENT                         "SVT_HID_ADDRTEMPL_FIELD_ASSIGNMENT"
 
 // Help ids for the filepicker dialogs
-#define HID_EXPLORERDLG_FILE            (HID_SVTOOLS_START +  30)
+#define HID_EXPLORERDLG_FILE                                   "SVT_HID_EXPLORERDLG_FILE"
 
 // help ids for fileview contextmenu
-#define HID_FILEVIEW_MENU_DELETE        (HID_SVTOOLS_START +  31)
-#define HID_FILEVIEW_MENU_RENAME        (HID_SVTOOLS_START +  32)
+#define HID_FILEVIEW_MENU_DELETE                               "SVT_HID_FILEVIEW_MENU_DELETE"
+#define HID_FILEVIEW_MENU_RENAME                               "SVT_HID_FILEVIEW_MENU_RENAME"
 
 // help ids for the different modi of the file picker dialog
     // FREE
-#define HID_FILESAVE_LEVELUP            (HID_SVTOOLS_START +  34)
-#define HID_FILESAVE_CREATEDIRECTORY    (HID_SVTOOLS_START +  35)
-#define HID_FILESAVE_DEFAULTDIRECTORY   (HID_SVTOOLS_START +  36)
-#define HID_FILESAVE_FILEVIEW           (HID_SVTOOLS_START +  37)
-#define HID_FILESAVE_TEMPLATE           (HID_SVTOOLS_START +  38)
-#define HID_FILESAVE_FILEURL            (HID_SVTOOLS_START +  39)
-#define HID_FILESAVE_FILETYPE           (HID_SVTOOLS_START +  40)
-#define HID_FILESAVE_DOSAVE             (HID_SVTOOLS_START +  41)
-#define HID_FILESAVE_AUTOEXTENSION      (HID_SVTOOLS_START +  42)
-#define HID_FILESAVE_SAVEWITHPASSWORD   (HID_SVTOOLS_START +  43)
-#define HID_FILESAVE_CUSTOMIZEFILTER    (HID_SVTOOLS_START +  44)
-#define HID_FILESAVE_SELECTION          (HID_SVTOOLS_START +  45)
-#define HID_FILESAVE_DIALOG             (HID_SVTOOLS_START +  46)
-#define HID_FILESAVE_DOPLAY             (HID_SVTOOLS_START +  47)
-
-#define HID_FILEOPEN_READONLY           (HID_SVTOOLS_START +  48)
-#define HID_FILEOPEN_VERSION            (HID_SVTOOLS_START +  49)
-#define HID_FILEOPEN_IMAGE_TEMPLATE     (HID_SVTOOLS_START +  50)
-
-#define HID_FILEDLG_LINK_CB             (HID_SFX_START     + 276)
-#define HID_FILEDLG_PREVIEW_CB          (HID_SFX_START     + 277)
+#define HID_FILESAVE_LEVELUP                                   "SVT_HID_FILESAVE_LEVELUP"
+#define HID_FILESAVE_CREATEDIRECTORY                           "SVT_HID_FILESAVE_CREATEDIRECTORY"
+#define HID_FILESAVE_DEFAULTDIRECTORY                          "SVT_HID_FILESAVE_DEFAULTDIRECTORY"
+#define HID_FILESAVE_FILEVIEW                                  "SVT_HID_FILESAVE_FILEVIEW"
+#define HID_FILESAVE_TEMPLATE                                  "SVT_HID_FILESAVE_TEMPLATE"
+#define HID_FILESAVE_FILEURL                                   "SVT_HID_FILESAVE_FILEURL"
+#define HID_FILESAVE_FILETYPE                                  "SVT_HID_FILESAVE_FILETYPE"
+#define HID_FILESAVE_DOSAVE                                    "SVT_HID_FILESAVE_DOSAVE"
+#define HID_FILESAVE_AUTOEXTENSION                             "SVT_HID_FILESAVE_AUTOEXTENSION"
+#define HID_FILESAVE_SAVEWITHPASSWORD                          "SVT_HID_FILESAVE_SAVEWITHPASSWORD"
+#define HID_FILESAVE_CUSTOMIZEFILTER                           "SVT_HID_FILESAVE_CUSTOMIZEFILTER"
+#define HID_FILESAVE_SELECTION                                 "SVT_HID_FILESAVE_SELECTION"
+#define HID_FILESAVE_DIALOG                                    "SVT_HID_FILESAVE_DIALOG"
+#define HID_FILESAVE_DOPLAY                                    "SVT_HID_FILESAVE_DOPLAY"
+
+#define HID_FILEOPEN_READONLY                                  "SVT_HID_FILEOPEN_READONLY"
+#define HID_FILEOPEN_VERSION                                   "SVT_HID_FILEOPEN_VERSION"
+#define HID_FILEOPEN_IMAGE_TEMPLATE                            "SVT_HID_FILEOPEN_IMAGE_TEMPLATE"
 
 // uniqueid for the helpagent window (testtool)
-#define HID_HELPAGENT_WINDOW            (HID_SVTOOLS_START +  51)
+#define HID_HELPAGENT_WINDOW                                   "SVT_HID_HELPAGENT_WINDOW"
 
 // registration dialog
-#define HID_REGISTRATION_DIALOG         (HID_SVTOOLS_START +  52)
+#define HID_REGISTRATION_DIALOG                                "SVT_HID_REGISTRATION_DIALOG"
 
-#define HID_PRINTDIALOG_TOFILE          (HID_SVTOOLS_START +  53)
+#define HID_PRINTDIALOG_TOFILE                                 "SVT_HID_PRINTDIALOG_TOFILE"
 
-#define HID_WIZARD_NEXT                 (HID_SVTOOLS_START +  54)
-#define HID_WIZARD_PREVIOUS             (HID_SVTOOLS_START +  55)
+#define HID_WIZARD_NEXT                                        "SVT_HID_WIZARD_NEXT"
+#define HID_WIZARD_PREVIOUS                                    "SVT_HID_WIZARD_PREVIOUS"
 
 #endif
 
diff --git a/svtools/inc/svtools/parrtf.hxx b/svtools/inc/svtools/parrtf.hxx
index 179f5a28259a..b96e3937231d 100644
--- a/svtools/inc/svtools/parrtf.hxx
+++ b/svtools/inc/svtools/parrtf.hxx
@@ -30,7 +30,7 @@
 
 #include "svtools/svtdllapi.h"
 #include <svtools/svparser.hxx>
-#include <svl/svarray.hxx>
+#include <stack>
 
 struct RtfParserState_Impl
 {
@@ -42,7 +42,7 @@ struct RtfParserState_Impl
     {}
 };
 
-SV_DECL_VARARR( RtfParserStates_Impl, RtfParserState_Impl, 16, 16 )
+typedef std::stack< RtfParserState_Impl > RtfParserStates_Impl;
 
 class SVT_DLLPUBLIC SvRTFParser : public SvParser
 {
diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/svtools/inc/svtools/roadmapwizard.hxx
index 5d8e0d9b01bb..25d983c85a90 100644
--- a/svtools/inc/svtools/roadmapwizard.hxx
+++ b/svtools/inc/svtools/roadmapwizard.hxx
@@ -90,8 +90,8 @@ namespace svt
         void            SetRoadmapBitmap( const BitmapEx& _rBitmap );
         const BitmapEx& GetRoadmapBitmap( ) const;
 
-        void            SetRoadmapSmartHelpId( const SmartId& _rId, SmartIdUpdateMode _aMode = SMART_SET_SMART );
-        SmartId         GetRoadmapSmartHelpId() const;
+        void            SetRoadmapHelpId( const rtl::OString& _rId );
+        const rtl::OString& GetRoadmapHelpId() const;
 
         void            SetRoadmapInteractive( sal_Bool _bInteractive );
         sal_Bool        IsRoadmapInteractive();
diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index 1501afbb6157..eb5c5dad1b75 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -56,7 +56,6 @@ public:
 };
 
 //============================================================================
-
 class SvtResId: public ResId
 {
 public:
diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx
index 8cf7126fa24c..e406c33fc54f 100644
--- a/svtools/inc/svtools/syntaxhighlight.hxx
+++ b/svtools/inc/svtools/syntaxhighlight.hxx
@@ -57,8 +57,6 @@
 #include <tools/string.hxx>
 #include <tools/gen.hxx>
 
-#include <svl/svarray.hxx>
-
 
 // Token-Typen TT_...
 enum TokenTypes
@@ -79,8 +77,7 @@ enum TokenTypes
 struct HighlightPortion { UINT16 nBegin; UINT16 nEnd; TokenTypes tokenType; };
 
 
-
-SV_DECL_VARARR(HighlightPortions, HighlightPortion, 0, 16)
+typedef std::vector<HighlightPortion> HighlightPortions;
 
 /////////////////////////////////////////////////////////////////////////
 // Hilfsklasse zur Untersuchung von JavaScript-Modulen, zunaechst zum
diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx
index 432dea64e8b5..d38d8e7d257d 100644
--- a/svtools/inc/svtools/toolpanel/toolpanel.hxx
+++ b/svtools/inc/svtools/toolpanel/toolpanel.hxx
@@ -32,7 +32,6 @@
 
 #include <rtl/ustring.hxx>
 #include <vcl/image.hxx>
-#include <vcl/smartid.hxx>
 
 #include <boost/noncopyable.hpp>
 
@@ -62,7 +61,7 @@ namespace svt
         virtual Image GetImage() const = 0;
 
         /// retrieves the help ID associated with the panel, if any.
-        virtual SmartId GetHelpID() const = 0;
+        virtual rtl::OString GetHelpID() const = 0;
 
         /** activates the panel
 
diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/tabbar.hxx
index e036f4c2f045..2757811ba34e 100644
--- a/svtools/inc/tabbar.hxx
+++ b/svtools/inc/tabbar.hxx
@@ -516,8 +516,8 @@ public:
     XubString       GetPageText( USHORT nPageId ) const;
     void            SetHelpText( USHORT nPageId, const XubString& rText );
     XubString       GetHelpText( USHORT nPageId ) const;
-    void            SetHelpId( USHORT nPageId, ULONG nHelpId );
-    ULONG           GetHelpId( USHORT nPageId ) const;
+    void            SetHelpId( USHORT nPageId, const rtl::OString& nHelpId );
+    rtl::OString    GetHelpId( USHORT nPageId ) const;
 
     long            GetSplitSize() const { return mnSplitSize; }
     long            GetMinSize() const;
@@ -526,9 +526,9 @@ public:
                         { Window::SetHelpText( rText ); }
     XubString       GetHelpText() const
                         { return Window::GetHelpText(); };
-    void            SetHelpId( ULONG nId )
-                        { Window::SetHelpId( nId ); }
-    ULONG           GetHelpId() const
+    void            SetHelpId( const rtl::OString& rId )
+                        { Window::SetHelpId( rId ); }
+    const rtl::OString& GetHelpId() const
                         { return Window::GetHelpId(); }
 
     void            SetStyle( WinBits nStyle );
diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx
index 46853fa07c03..d4a6699e2d5e 100644
--- a/svtools/inc/taskbar.hxx
+++ b/svtools/inc/taskbar.hxx
@@ -268,7 +268,7 @@ private:
     Image               maImage;
     XubString           maQuickHelpText;
     XubString           maHelpText;
-    ULONG               mnHelpId;
+    rtl::OString        maHelpId;
     USHORT              mnFlags;
 
 public:
@@ -289,8 +289,8 @@ public:
     const XubString&    GetQuickHelpText() const { return maQuickHelpText; }
     void                SetHelpText( const XubString& rStr ) { maHelpText = rStr; }
     const XubString&    GetHelpText() const { return maHelpText; }
-    void                SetHelpId( ULONG nHelpId ) { mnHelpId = nHelpId; }
-    ULONG               GetHelpId() const { return mnHelpId; }
+    void                SetHelpId( const rtl::OString& rHelpId ) { maHelpId = rHelpId; }
+    const rtl::OString& GetHelpId() const { return maHelpId; }
     void                SetFlags( USHORT nFlags ) { mnFlags = nFlags; }
     USHORT              GetFlags() const { return mnFlags; }
 
diff --git a/svtools/prj/d.lst b/svtools/prj/d.lst
index b46ddef72311..7b9c6a1957e3 100644
--- a/svtools/prj/d.lst
+++ b/svtools/prj/d.lst
@@ -38,3 +38,6 @@ dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\b
 
 *.xml %_DEST%\xml%_EXT%\*.xml
 
+..\%__SRC%\misc\hatchwindowfactory.component %_DEST%\xml%_EXT%\hatchwindowfactory.component
+..\%__SRC%\misc\productregistration.uno.component %_DEST%\xml%_EXT%\productregistration.uno.component
+..\%__SRC%\misc\svt.component %_DEST%\xml%_EXT%\svt.component
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 68cf316e813b..53c2a5ac86f6 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -613,13 +613,6 @@ void BrowseBox::Resize()
     if (IsZoom())
         nSBSize = (ULONG)(nSBSize * (double)GetZoom());
 
-    long nSize = pDataWin->GetPosPixel().Y();
-    if( !getDataWindow()->bNoHScroll )
-        nSize += aHScroll.GetSizePixel().Height();
-
-    if ( GetOutputSizePixel().Height() < nSize )
-        return;
-
     DoHideCursor( "Resize" );
     USHORT nOldVisibleRows =
         (USHORT)(pDataWin->GetOutputSizePixel().Height() / GetDataRowHeight() + 1);
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index af19379d8b8f..7c1dd8362e86 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -1443,16 +1443,16 @@ sal_Bool SvtFileView::GetParentURL( String& rParentURL ) const
 
 // -----------------------------------------------------------------------
 
-sal_uInt32 SvtFileView::GetHelpId( ) const
+const rtl::OString& SvtFileView::GetHelpId( ) const
 {
     return mpImp->mpView->GetHelpId( );
 }
 
 // -----------------------------------------------------------------------
 
-void SvtFileView::SetHelpId( sal_uInt32 nHelpId )
+void SvtFileView::SetHelpId( const rtl::OString& rHelpId )
 {
-    mpImp->mpView->SetHelpId( nHelpId );
+    mpImp->mpView->SetHelpId( rHelpId );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src
index f40530c10347..bcb282f44615 100644
--- a/svtools/source/contnr/fileview.src
+++ b/svtools/source/contnr/fileview.src
@@ -110,6 +110,7 @@ Menu RID_FILEVIEW_CONTEXTMENU
 
 ModalDialog DLG_SVT_QUERYDELETE
 {
+    HelpID = "svtools:ModalDialog:DLG_SVT_QUERYDELETE";
     SVLook = TRUE ;
     OutputSize = TRUE ;
     Moveable = TRUE ;
@@ -142,6 +143,7 @@ ModalDialog DLG_SVT_QUERYDELETE
 
     PushButton BTN_YES
     {
+        HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES";
         Pos = MAP_APPFONT ( 6 , 47 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -151,6 +153,7 @@ ModalDialog DLG_SVT_QUERYDELETE
 
     PushButton BTN_ALL
     {
+        HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL";
         Pos = MAP_APPFONT ( 59 , 47 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
@@ -160,6 +163,7 @@ ModalDialog DLG_SVT_QUERYDELETE
 
     PushButton BTN_NO
     {
+        HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO";
         Pos = MAP_APPFONT ( 112 , 47 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src
index 048d052c18d8..45f9803539a1 100644
--- a/svtools/source/contnr/templwin.src
+++ b/svtools/source/contnr/templwin.src
@@ -289,12 +289,14 @@ ModalDialog DLG_DOCTEMPLATE
     };
     PushButton BTN_DOCTEMPLATE_MANAGE
     {
+        HelpID = "svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_MANAGE";
         Pos = MAP_APPFONT( 6, 230 );
         Size = MAP_APPFONT( 50, 14 );
         Text [ en-US ] = "Organi~ze...";
     };
     PushButton BTN_DOCTEMPLATE_EDIT
     {
+        HelpID = "svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_EDIT";
         Pos = MAP_APPFONT( 59, 230 );
         Size = MAP_APPFONT( 50, 14 );
         Text [ en-US ] = "~Edit";
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 1ae223bebf06..7b1f2ad87108 100644..100755
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -53,7 +53,7 @@ struct ImplHeadItem
     USHORT              mnId;
     HeaderBarItemBits   mnBits;
     long                mnSize;
-    ULONG               mnHelpId;
+    rtl::OString        maHelpId;
     Image               maImage;
     XubString           maOutText;
     XubString           maText;
@@ -1132,13 +1132,13 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt )
         }
         else if ( rHEvt.GetMode() & HELPMODE_EXTENDED )
         {
-            ULONG nHelpId = GetHelpId( nItemId );
-            if ( nHelpId )
+            rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) );
+            if ( aHelpId.getLength() )
             {
                 // Wenn eine Hilfe existiert, dann ausloesen
                 Help* pHelp = Application::GetHelp();
                 if ( pHelp )
-                    pHelp->Start( nHelpId, this );
+                    pHelp->Start( aHelpId, this );
                 return;
             }
         }
@@ -1266,7 +1266,6 @@ void HeaderBar::InsertItem( USHORT nItemId, const XubString& rText,
     pItem->mnId         = nItemId;
     pItem->mnBits       = nBits;
     pItem->mnSize       = nSize;
-    pItem->mnHelpId     = 0;
     pItem->maText       = rText;
     pItem->mpUserData   = 0;
     mpItemList->Insert( pItem, nPos );
@@ -1291,7 +1290,6 @@ void HeaderBar::InsertItem( USHORT nItemId,
     pItem->mnId         = nItemId;
     pItem->mnBits       = nBits;
     pItem->mnSize       = nSize;
-    pItem->mnHelpId     = 0;
     pItem->maImage      = rImage;
     pItem->maText       = rText;
     pItem->mpUserData   = 0;
@@ -1563,11 +1561,11 @@ XubString HeaderBar::GetHelpText( USHORT nItemId ) const
     if ( nPos != HEADERBAR_ITEM_NOTFOUND )
     {
         ImplHeadItem* pItem = mpItemList->GetObject( nPos );
-        if ( !pItem->maHelpText.Len() && pItem->mnHelpId )
+        if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() )
         {
             Help* pHelp = Application::GetHelp();
             if ( pHelp )
-                pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this );
+                pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this );
         }
 
         return pItem->maHelpText;
@@ -1578,22 +1576,22 @@ XubString HeaderBar::GetHelpText( USHORT nItemId ) const
 
 // -----------------------------------------------------------------------
 
-void HeaderBar::SetHelpId( USHORT nItemId, ULONG nHelpId )
+void HeaderBar::SetHelpId( USHORT nItemId, const rtl::OString& rHelpId )
 {
     USHORT nPos = GetItemPos( nItemId );
     if ( nPos != HEADERBAR_ITEM_NOTFOUND )
-        mpItemList->GetObject( nPos )->mnHelpId = nHelpId;
+        mpItemList->GetObject( nPos )->maHelpId = rHelpId;
 }
 
 // -----------------------------------------------------------------------
 
-ULONG HeaderBar::GetHelpId( USHORT nItemId ) const
+rtl::OString HeaderBar::GetHelpId( USHORT nItemId ) const
 {
     USHORT nPos = GetItemPos( nItemId );
+    rtl::OString aRet;
     if ( nPos != HEADERBAR_ITEM_NOTFOUND )
-        return mpItemList->GetObject( nPos )->mnHelpId;
-    else
-        return 0;
+        aRet = mpItemList->GetObject( nPos )->maHelpId;
+    return aRet;
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 02a578629039..6781efc070fe 100644..100755
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -858,7 +858,7 @@ SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart
 void SvtURLBox::ImplInit()
 {
     pImp = new SvtURLBox_Impl();
-    SetHelpId( SID_OPENURL );
+    SetHelpId( ".uno:OpenURL" );
     EnableAutocomplete( FALSE );
 
     SetText( String() );
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 2ad81da40716..315e432edd60 100755
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -60,7 +60,7 @@ struct ImplTabBarItem
     XubString       maHelpText;
     Rectangle       maRect;
     long            mnWidth;
-    ULONG           mnHelpId;
+    rtl::OString    maHelpId;
     BOOL            mbShort;
     BOOL            mbSelect;
     BOOL            mbEnable;
@@ -76,7 +76,6 @@ struct ImplTabBarItem
                         mnId     = nItemId;
                         mnBits   = nPageBits;
                         mnWidth  = 0;
-                        mnHelpId = 0;
                         mbShort  = FALSE;
                         mbSelect = FALSE;
                         mbEnable = TRUE;
@@ -1394,13 +1393,13 @@ void TabBar::RequestHelp( const HelpEvent& rHEvt )
         }
         else if ( rHEvt.GetMode() & HELPMODE_EXTENDED )
         {
-            ULONG nHelpId = GetHelpId( nItemId );
-            if ( nHelpId )
+            rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) );
+            if ( aHelpId.getLength() )
             {
                 // Wenn eine Hilfe existiert, dann ausloesen
                 Help* pHelp = Application::GetHelp();
                 if ( pHelp )
-                    pHelp->Start( nHelpId, this );
+                    pHelp->Start( aHelpId, this );
                 return;
             }
         }
@@ -2400,11 +2399,11 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const
     if ( nPos != PAGE_NOT_FOUND )
     {
         ImplTabBarItem* pItem = mpItemList->GetObject( nPos );
-        if ( !pItem->maHelpText.Len() && pItem->mnHelpId )
+        if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() )
         {
             Help* pHelp = Application::GetHelp();
             if ( pHelp )
-                pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this );
+                pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this );
         }
 
         return pItem->maHelpText;
@@ -2415,22 +2414,22 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const
 
 // -----------------------------------------------------------------------
 
-void TabBar::SetHelpId( USHORT nPageId, ULONG nHelpId )
+void TabBar::SetHelpId( USHORT nPageId, const rtl::OString& rHelpId )
 {
     USHORT nPos = GetPagePos( nPageId );
     if ( nPos != PAGE_NOT_FOUND )
-        mpItemList->GetObject( nPos )->mnHelpId = nHelpId;
+        mpItemList->GetObject( nPos )->maHelpId = rHelpId;
 }
 
 // -----------------------------------------------------------------------
 
-ULONG TabBar::GetHelpId( USHORT nPageId ) const
+rtl::OString TabBar::GetHelpId( USHORT nPageId ) const
 {
     USHORT nPos = GetPagePos( nPageId );
+    rtl::OString aRet;
     if ( nPos != PAGE_NOT_FOUND )
-        return mpItemList->GetObject( nPos )->mnHelpId;
-    else
-        return 0;
+        aRet = mpItemList->GetObject( nPos )->maHelpId;
+    return aRet;
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index 2fdab63be37f..ba5e8d53b8b2 100644..100755
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.cxx
@@ -517,13 +517,13 @@ void TaskStatusBar::RequestHelp( const HelpEvent& rHEvt )
         {
             if ( pItem )
             {
-                ULONG nHelpId = pItem->maItem.GetHelpId();
-                if ( nHelpId )
+                rtl::OUString aHelpId( rtl::OStringToOUString( pItem->maItem.GetHelpId(), RTL_TEXTENCODING_UTF8 ) );
+                if ( aHelpId.getLength() )
                 {
                     // Wenn eine Hilfe existiert, dann ausloesen
                     Help* pHelp = Application::GetHelp();
                     if ( pHelp )
-                        pHelp->Start( nHelpId, this );
+                        pHelp->Start( aHelpId, this );
                     return;
                 }
             }
diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
index 0652dfb9d0f5..990dfc98f89b 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.src
@@ -39,6 +39,7 @@
 
 ModalDialog DLG_ADDRESSBOOKSOURCE
 {
+    HelpID = "svtools:ModalDialog:DLG_ADDRESSBOOKSOURCE";
     SVLook = TRUE ;
     OutputSize = TRUE ;
     Size = MAP_APPFONT ( 300 , 88 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ;
@@ -64,6 +65,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     };
     ComboBox CB_DATASOURCE
     {
+        HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_DATASOURCE";
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 105, 13 ) ;
         Size = MAP_APPFONT ( 96, 55 ) ;
@@ -73,6 +75,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     };
     PushButton PB_ADMINISTATE_DATASOURCES
     {
+        HelpID = "svtools:PushButton:DLG_ADDRESSBOOKSOURCE:PB_ADMINISTATE_DATASOURCES";
         Text [ en-US ] = "~Address Data Source...";
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 204, 13 ) ;
@@ -90,6 +93,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE
     };
     ComboBox CB_TABLE
     {
+        HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_TABLE";
         SVLook = TRUE ;
         Pos = MAP_APPFONT ( 105, 30 ) ;
         Size = MAP_APPFONT ( 96, 55 ) ;
diff --git a/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src
index ad9a5c1aa015..a93642b0bd05 100644
--- a/svtools/source/dialogs/colrdlg.src
+++ b/svtools/source/dialogs/colrdlg.src
@@ -29,6 +29,7 @@
 #define DIFF 3
 ModalDialog DLG_COLOR
 {
+    HelpID = "svtools:ModalDialog:DLG_COLOR";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 260 , 165 + DIFF ) ;
@@ -93,6 +94,7 @@ ModalDialog DLG_COLOR
     };
     MetricField NUM_CYAN
     {
+        HelpID = "svtools:MetricField:DLG_COLOR:NUM_CYAN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 109 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -106,6 +108,7 @@ ModalDialog DLG_COLOR
     };
     MetricField NUM_MAGENTA
     {
+        HelpID = "svtools:MetricField:DLG_COLOR:NUM_MAGENTA";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 122 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -119,6 +122,7 @@ ModalDialog DLG_COLOR
     };
     MetricField NUM_YELLOW
     {
+        HelpID = "svtools:MetricField:DLG_COLOR:NUM_YELLOW";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 135 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -132,6 +136,7 @@ ModalDialog DLG_COLOR
     };
     MetricField NUM_KEY
     {
+        HelpID = "svtools:MetricField:DLG_COLOR:NUM_KEY";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 42 , 148 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -163,6 +168,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_RED
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_RED";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 106 , 122 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -174,6 +180,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_GREEN
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_GREEN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 106 , 135 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -185,6 +192,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_BLUE
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_BLUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 106 , 148 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -202,6 +210,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_HUE
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_HUE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 171 , 122 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -219,6 +228,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_SATURATION
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_SATURATION";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 171 , 135 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -236,6 +246,7 @@ ModalDialog DLG_COLOR
     };
     NumericField NUM_LUMINANCE
     {
+        HelpID = "svtools:NumericField:DLG_COLOR:NUM_LUMINANCE";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 171 , 148 + DIFF ) ;
         Size = MAP_APPFONT ( 26 , 12 ) ;
@@ -247,6 +258,7 @@ ModalDialog DLG_COLOR
     };
     PushButton BTN_1
     {
+        HelpID = "svtools:PushButton:DLG_COLOR:BTN_1";
         Pos = MAP_APPFONT ( 80 , 109 ) ;
         Size = MAP_APPFONT ( 17 , 12 ) ;
         Text = "~<--" ;
@@ -254,6 +266,7 @@ ModalDialog DLG_COLOR
     };
     PushButton BTN_2
     {
+        HelpID = "svtools:PushButton:DLG_COLOR:BTN_2";
         Pos = MAP_APPFONT ( 100 , 109 ) ;
         Size = MAP_APPFONT ( 17 , 12 ) ;
         Text = "--~>" ;
diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index 798ff87e02ac..67262ba72c1a 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.cxx
@@ -68,9 +68,9 @@ DECLARE_LIST( UniStringList, UniString* )
 //      #define STD_BTN_WIDTH   90
 //      #define STD_BTN_HEIGHT  35
 
-#define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, nHelpId ) \
+#define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, rHelpId ) \
     p = new ControlClass( GetPathDialog(), WinBits( nBits ) ); \
-    p->SetHelpId( nHelpId ); \
+    p->SetHelpId( rHelpId ); \
     p->SetPosSizePixel( aPos, aSize ); \
     p->SetText( aTitel ); \
     p->Show();
@@ -226,10 +226,10 @@ void ImpPathDialog::InitControls()
     aPnt.X() = 2 * a6Siz.Width() + aEDSiz.Width();
     aPnt.Y() = a6Siz.Height();
     INITCONTROL( pOkBtn, PushButton, WB_DEFBUTTON,
-                 aPnt, aBtnSiz, aOkStr, 0 );
+                 aPnt, aBtnSiz, aOkStr, "" );
     aPnt.Y() += aBtnSiz.Height() + a3Siz.Height();
     INITCONTROL( pCancelBtn, CancelButton, 0,
-                 aPnt, aBtnSiz, aCancelStr, 0 );
+                 aPnt, aBtnSiz, aCancelStr, "" );
     aPnt.Y() += aBtnSiz.Height() + a3Siz.Height();
     INITCONTROL( pNewDirBtn, PushButton, WB_DEFBUTTON,
                  aPnt, aBtnSiz, aNewDirStr, HID_FILEDLG_NEWDIR );
@@ -782,10 +782,10 @@ void ImpFileDialog::InitControls()
     const long nButtonStartX = 2*nW+20+15;
     INITCONTROL( pOkBtn, PushButton, WB_DEFBUTTON,
         Point(nButtonStartX, 10), Size(STD_BTN_WIDTH, STD_BTN_HEIGHT),
-        Button::GetStandardText( BUTTON_OK ), 0 );
+        Button::GetStandardText( BUTTON_OK ), "" );
     INITCONTROL( pCancelBtn, CancelButton, 0,
         Point(nButtonStartX, 45 ), Size(STD_BTN_WIDTH, STD_BTN_HEIGHT),
-        Button::GetStandardText( BUTTON_CANCEL ), 0 );
+        Button::GetStandardText( BUTTON_CANCEL ), "" );
 
     pLoadBtn = 0;
 
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index 532fd3f61bb2..dba5ed627952 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.cxx
@@ -28,26 +28,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include <tools/debug.hxx>
-#ifndef _SV_APP_HXX
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _VCL_PRINT_HXX
 #include <vcl/print.hxx>
-#endif
 #include <vcl/msgbox.hxx>
 #include <vcl/jobset.hxx>
 #include <tools/urlobj.hxx>
-
 #include "printdlg.hrc"
 #include "controldims.hrc"
 #include <svtools/prnsetup.hxx>
 #include <svtools/printdlg.hxx>
 #include <svtools/svtdata.hxx>
 #include <filedlg.hxx>
-#include "svl/pickerhelper.hxx"
-#ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
-#endif
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src
index 405accc63344..80c6e465d49a 100644
--- a/svtools/source/dialogs/printdlg.src
+++ b/svtools/source/dialogs/printdlg.src
@@ -31,6 +31,7 @@
 
 ModalDialog DLG_SVT_PRNDLG_PRINTDLG
 {
+    HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRINTDLG";
     SVLook = TRUE ;
     OutputSize = TRUE ;
     Moveable = TRUE ;
@@ -50,6 +51,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     ListBox LB_NAMES
     {
+        HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRINTDLG:LB_NAMES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 13 ) ;
         Size = MAP_APPFONT ( 130 , 80 ) ;
@@ -58,6 +60,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     PushButton BTN_PROPERTIES
     {
+        HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_PROPERTIES";
         Pos = MAP_APPFONT ( 193 , 12 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Propert~ies..." ;
@@ -114,12 +117,14 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     Edit EDT_FAXNO
     {
+        HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_FAXNO";
         Border = TRUE;
         Pos = MAP_APPFONT ( 60 , 73 );
         Size = MAP_APPFONT ( 188 , 12 );
     };
     CheckBox CBX_FILEPRINT
     {
+        HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_FILEPRINT";
         Pos = MAP_APPFONT ( 12 , 73 ) ;
         Size = MAP_APPFONT ( 75 , 10 ) ;
         Text [ en-US ] = "Print to file" ;
@@ -132,6 +137,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     /*!!!
     PushButton BTN_BROWSE
     {
+        HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_BROWSE";
         Pos = MAP_APPFONT ( 234 , 75 ) ;
         Size = MAP_APPFONT ( 14 , 14 ) ;
         Text = "~..." ;
@@ -146,18 +152,21 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     RadioButton RBT_ALL_SHEETS
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL_SHEETS";
         Pos = MAP_APPFONT ( 12 , 102 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "All sheets" ;
     };
     RadioButton RBT_SELECTED_SHEETS
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_SHEETS";
         Pos = MAP_APPFONT ( 12 , 115 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "Selected sheets" ;
     };
     RadioButton RBT_SELECTED_CELLS
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_CELLS";
         Pos = MAP_APPFONT ( 12 , 128 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "Selected cells" ;
@@ -170,24 +179,28 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     RadioButton RBT_ALL
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL";
         Pos = MAP_APPFONT ( 12 , 152 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "All pages" ;
     };
     RadioButton RBT_PAGES
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_PAGES";
         Pos = MAP_APPFONT ( 12 , 165 ) ;
         Size = MAP_APPFONT ( 50 , 10 ) ;
         Text [ en-US ] = "Pages" ;
     };
     Edit EDT_PAGES
     {
+        HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_PAGES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 65 , 164 ) ;
         Size = MAP_APPFONT ( 52 , 12 ) ;
     };
     RadioButton RBT_SELECTION
     {
+        HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTION";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 12 , 179 ) ;
         Size = MAP_APPFONT ( 105 , 10 ) ;
@@ -213,6 +226,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     NumericField NUM_COPIES
     {
+        HelpID = "svtools:NumericField:DLG_SVT_PRNDLG_PRINTDLG:NUM_COPIES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 201 , 102 ) ;
         Size = MAP_APPFONT ( 33 , 12 ) ;
@@ -226,6 +240,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     CheckBox CBX_COLLATE
     {
+        HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_COLLATE";
         Pos = MAP_APPFONT ( 201 , 123 ) ;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "Co~llate" ;
@@ -249,6 +264,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG
     };
     PushButton BTN_OPTIONS
     {
+        HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_OPTIONS";
         Hide = TRUE ;
         Pos = MAP_APPFONT ( 6 , 190 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
diff --git a/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src
index 1443a35e0f39..afdf7d56864e 100644
--- a/svtools/source/dialogs/prnsetup.src
+++ b/svtools/source/dialogs/prnsetup.src
@@ -138,6 +138,7 @@ String STR_SVT_PRNDLG_JOBCOUNT
 
 ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
 {
+    HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Moveable = TRUE ;
@@ -157,6 +158,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
     };
     ListBox LB_NAMES
     {
+        HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 60 , 12 ) ;
         Size = MAP_APPFONT ( 125 , 80 ) ;
@@ -165,6 +167,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
     };
     PushButton BTN_PROPERTIES
     {
+        HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES";
         Pos = MAP_APPFONT ( 188 , 12 ) ;
         Size = MAP_APPFONT ( 60 , 14 ) ;
         Text [ en-US ] = "Propert~ies..." ;
@@ -220,6 +223,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG
     };
     PushButton BTN_OPTIONS
     {
+        HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_OPTIONS";
         Pos = MAP_APPFONT ( 5 , 84 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Options..." ;
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index c28cfe1d4b18..43b9fcddf91d 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -239,15 +239,15 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    void RoadmapWizard::SetRoadmapSmartHelpId( const SmartId& _rId, SmartIdUpdateMode _aMode )
+    void RoadmapWizard::SetRoadmapHelpId( const rtl::OString& _rId )
     {
-        m_pImpl->pRoadmap->SetSmartHelpId( _rId, _aMode );
+        m_pImpl->pRoadmap->SetHelpId( _rId );
     }
 
     //--------------------------------------------------------------------
-    SmartId RoadmapWizard::GetRoadmapSmartHelpId() const
+    const rtl::OString& RoadmapWizard::GetRoadmapHelpId() const
     {
-        return m_pImpl->pRoadmap->GetSmartHelpId();
+        return m_pImpl->pRoadmap->GetHelpId();
     }
 
     //--------------------------------------------------------------------
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 2053da80019d..41e759eda43b 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -197,7 +197,7 @@ namespace svt
         if (_nButtonFlags & WZB_PREVIOUS)
         {
             m_pPrevPage = new PushButton(this, WB_TABSTOP);
-            m_pPrevPage->SetSmartHelpId( SmartId(HID_WIZARD_PREVIOUS) );
+            m_pPrevPage->SetHelpId( HID_WIZARD_PREVIOUS );
             m_pPrevPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
             m_pPrevPage->SetText(String(SvtResId(STR_WIZDLG_PREVIOUS)));
             m_pPrevPage->Show();
@@ -214,7 +214,7 @@ namespace svt
         if (_nButtonFlags & WZB_NEXT)
         {
             m_pNextPage = new PushButton(this, WB_TABSTOP);
-            m_pNextPage->SetSmartHelpId( SmartId(HID_WIZARD_NEXT) );
+            m_pNextPage->SetHelpId( HID_WIZARD_NEXT );
             m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) );
             m_pNextPage->SetText(String(SvtResId(STR_WIZDLG_NEXT)));
             m_pNextPage->Show();
diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index 01bb7ad41682..af38c444c0f2 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -193,7 +193,7 @@ void MultiLineEditSyntaxHighlight::UpdateData()
         GetTextEngine()->RemoveAttribs( nLine, TRUE );
         HighlightPortions aPortions;
         aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
-        for ( USHORT i = 0; i < aPortions.Count(); i++ )
+        for ( size_t i = 0; i < aPortions.size(); i++ )
         {
             HighlightPortion& r = aPortions[i];
             GetTextEngine()->SetAttrib( TextAttribFontColor( GetColorValue(r.tokenType) ), nLine, r.nBegin, r.nEnd, TRUE );
diff --git a/svtools/source/edit/makefile.mk b/svtools/source/edit/makefile.mk
index 58a63be58f78..8d4da553cb0d 100644
--- a/svtools/source/edit/makefile.mk
+++ b/svtools/source/edit/makefile.mk
@@ -38,25 +38,23 @@ TARGET=edit
 # --- Files --------------------------------------------------------
 
 SLOFILES=   \
+            $(EXCEPTIONSFILES) \
             $(SLO)$/textdata.obj	\
-            $(SLO)$/textdoc.obj		\
-            $(SLO)$/texteng.obj		\
             $(SLO)$/textundo.obj	\
-            $(SLO)$/textview.obj	\
             $(SLO)$/txtattr.obj		\
             $(SLO)$/xtextedt.obj	\
             $(SLO)$/sychconv.obj	\
             $(SLO)$/svmedit.obj		\
             $(SLO)$/svmedit2.obj    \
-            $(SLO)$/textwindowpeer.obj	\
-            $(SLO)$/syntaxhighlight.obj \
         $(SLO)$/editsyntaxhighlighter.obj
 
 EXCEPTIONSFILES=	\
             $(SLO)$/textview.obj	\
             $(SLO)$/textdoc.obj     \
             $(SLO)$/texteng.obj     \
-            $(SLO)$/textwindowpeer.obj
+            $(SLO)$/textwindowpeer.obj \
+            $(SLO)$/syntaxhighlight.obj \
+
 
 # --- Targets ------------------------------------------------------
 
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index 5729eb712bfe..87585f5b2587 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.cxx
@@ -34,9 +34,6 @@
 #include <tools/debug.hxx>
 
 
-SV_IMPL_VARARR(HighlightPortions, HighlightPortion)
-
-
 // ##########################################################################
 // ATTENTION: all these words needs to be in small caps
 // ##########################################################################
@@ -849,7 +846,7 @@ void SimpleTokenizer_Impl::getHighlightPortions( UINT32 nParseLine, const String
         portion.nEnd = (UINT16)(pEndPos - mpStringBegin);
         portion.tokenType = eType;
 
-        portions.Insert(portion, portions.Count());
+        portions.push_back(portion);
     }
 }
 
diff --git a/svtools/source/edit/textdata.cxx b/svtools/source/edit/textdata.cxx
index 32bdfe40a3fb..cb33ea7d50e6 100644
--- a/svtools/source/edit/textdata.cxx
+++ b/svtools/source/edit/textdata.cxx
@@ -37,7 +37,7 @@ SV_IMPL_PTRARR( TextLines, TextLinePtr );
 SV_IMPL_VARARR( TEWritingDirectionInfos, TEWritingDirectionInfo );
 
 
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
 // (+) class TextSelection
 // -------------------------------------------------------------------------
 
@@ -66,7 +66,7 @@ void TextSelection::Justify()
 }
 
 
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
 // (+) class TETextPortionList
 // -------------------------------------------------------------------------
 TETextPortionList::TETextPortionList()
@@ -129,7 +129,7 @@ USHORT TETextPortionList::GetPortionStartIndex( USHORT nPortion )
 */
 
 
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
 // (+) class TEParaPortion
 // -------------------------------------------------------------------------
 TEParaPortion::TEParaPortion( TextNode* pN )
@@ -254,7 +254,7 @@ void TEParaPortion::CorrectValuesBehindLastFormattedLine( USHORT nLastFormattedL
     }
 }
 
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
 // (+) class TEParaPortions
 // -------------------------------------------------------------------------
 TEParaPortions::TEParaPortions()
@@ -274,7 +274,7 @@ void TEParaPortions::Reset()
     clear();
 }
 
-// -------------------------------------------------------------------------
+// -------------------------------------------------------------------------
 // (+) class IdleFormatter
 // -------------------------------------------------------------------------
 IdleFormatter::IdleFormatter()
diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx
index c04b587b6278..20cc46a30ab5 100755..100644
--- a/svtools/source/filter.vcl/filter/exportdialog.cxx
+++ b/svtools/source/filter.vcl/filter/exportdialog.cxx
@@ -396,7 +396,7 @@ awt::Size ExportDialog::GetOriginalSize()
             }
         }
     }
-    return awt::Size( aShapesRange.getWidth(), aShapesRange.getHeight() );
+    return awt::Size( static_cast<sal_Int32>(aShapesRange.getWidth()), static_cast<sal_Int32>(aShapesRange.getHeight()) );
 }
 
 void ExportDialog::GetGraphicSource()
@@ -1227,23 +1227,23 @@ void ExportDialog::updatePreview()
         if ( fXRatio > 1.0 )
         {
             aSize.Width() =  maSize.Width > aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width();
-            aSize.Width() /= fXRatio;
+            aSize.Width() /= static_cast<long int>(fXRatio);
         }
         else
         {
             aSize.Width() =  maSize.Width < aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width();
-            aSize.Width() /= fXRatio;
+            aSize.Width() /= static_cast<long int>(fXRatio);
         }
 
         if ( fYRatio > 1.0 )
         {
             aSize.Height() =  maSize.Height > aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height();
-            aSize.Height() /= fYRatio;
+            aSize.Height() /= static_cast<long int>(fYRatio);
         }
         else
         {
             aSize.Height() =  maSize.Height < aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height();
-            aSize.Height() /= fYRatio;
+            aSize.Height() /= static_cast<long int>(fYRatio);
         }
 
         if ( aSize.Width() < maSize.Width )
@@ -1260,7 +1260,7 @@ void ExportDialog::updatePreview()
         Bitmap aCroppedBitmap( maBitmap );
         aCroppedBitmap.Crop( Rectangle( aPos, aSize ) );
         aSize = aCroppedBitmap.GetSizePixel();
-        aSize = Size( aSize.Width() * fXRatio, aSize.Height() * fYRatio );
+        aSize = Size( static_cast<long int>(aSize.Width() * fXRatio), static_cast<long int>(aSize.Height() * fYRatio) );
         aCroppedBitmap.Scale( aSize );
 
         if ( aSize.Width() > aFixedBitmapSize.Width() )
@@ -1347,7 +1347,7 @@ void ExportDialog::updateControls()
         case 0 : nResolution = maResolution.Width / 100; break;     // pixels / cm
         case 2 : nResolution = maResolution.Width; break;           // pixels / meter
         default:
-        case 1 : nResolution = maResolution.Width * 0.0254; break;  // pixels / inch
+        case 1 : nResolution = static_cast< sal_Int32 >(maResolution.Width * 0.0254); break;    // pixels / inch
     }
     maNfResolution.SetValue( nResolution );
 
diff --git a/svtools/source/filter.vcl/filter/exportdialog.src b/svtools/source/filter.vcl/filter/exportdialog.src
index 065fcee6ba18..c9e87989a314 100755..100644
--- a/svtools/source/filter.vcl/filter/exportdialog.src
+++ b/svtools/source/filter.vcl/filter/exportdialog.src
@@ -34,6 +34,7 @@ String DLG_EXPORT_TITLE
 
 ModalDialog DLG_EXPORT
 {
+    HelpID = "svtools:ModalDialog:DLG_EXPORT";
     OutputSize = TRUE ;
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 178 , 135 ) ;
@@ -54,6 +55,7 @@ ModalDialog DLG_EXPORT
     };
     MetricField MF_SIZEX
     {
+        HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEX";
         Hide = TRUE;
         Border = TRUE;
         Size = MAP_APPFONT ( 30, 12 ) ;
@@ -68,6 +70,7 @@ ModalDialog DLG_EXPORT
     };
     ListBox LB_SIZEX
     {
+        HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEX";
         Hide = TRUE;
         Border = TRUE ;
         Size = MAP_APPFONT ( 60, 80 ) ;
@@ -90,6 +93,7 @@ ModalDialog DLG_EXPORT
     };
     MetricField MF_SIZEY
     {
+        HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEY";
         Hide = TRUE;
         Border = TRUE;
         Size = MAP_APPFONT ( 30, 12 );
@@ -104,6 +108,7 @@ ModalDialog DLG_EXPORT
     };
     ListBox LB_SIZEY
     {
+        HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEY";
         Hide = TRUE;
         Border = TRUE ;
         Size = MAP_APPFONT ( 60, 80 ) ;
@@ -126,6 +131,7 @@ ModalDialog DLG_EXPORT
     };
     NumericField NF_RESOLUTION
     {
+        HelpID = "svtools:NumericField:DLG_EXPORT:NF_RESOLUTION";
         Hide = TRUE;
         Border = TRUE ;
         Size = MAP_APPFONT ( 30, 12 ) ;
@@ -137,6 +143,7 @@ ModalDialog DLG_EXPORT
     };
     ListBox LB_RESOLUTION
     {
+        HelpID = "svtools:ListBox:DLG_EXPORT:LB_RESOLUTION";
         Hide = TRUE;
         Border = TRUE ;
         Size = MAP_APPFONT ( 60, 80 ) ;
@@ -157,6 +164,7 @@ ModalDialog DLG_EXPORT
     };
     ListBox LB_COLOR_DEPTH
     {
+        HelpID = "svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH";
         Hide = TRUE;
         Border = TRUE ;
         Size = MAP_APPFONT ( 60, 80 ) ;
@@ -225,6 +233,7 @@ ModalDialog DLG_EXPORT
     };
     NumericField NF_COMPRESSION
     {
+        HelpID = "svtools:NumericField:DLG_EXPORT:NF_COMPRESSION";
         Hide = TRUE;
         Border = TRUE ;
         Size = MAP_APPFONT ( 30, 12 ) ;
@@ -260,18 +269,21 @@ ModalDialog DLG_EXPORT
     };
     CheckBox CB_JPG_PREVIEW
     {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_JPG_PREVIEW";
         Hide = TRUE;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "Preview" ;
     };
     CheckBox CB_INTERLACED
     {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_INTERLACED";
         Hide = TRUE;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "Interlaced" ;
     };
     CheckBox CB_RLE_ENCODING
     {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_RLE_ENCODING";
         Hide = TRUE;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "RLE encoding" ;
@@ -284,18 +296,21 @@ ModalDialog DLG_EXPORT
     };
     CheckBox CB_SAVE_TRANSPARENCY
     {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_SAVE_TRANSPARENCY";
         Hide = TRUE;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "Save transparency" ;
     };
     RadioButton RB_BINARY
     {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_BINARY";
         Hide = TRUE;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "Binary" ;
     };
     RadioButton RB_TEXT
     {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_TEXT";
         Hide = TRUE;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "Text" ;
@@ -308,12 +323,14 @@ ModalDialog DLG_EXPORT
     };
     CheckBox CB_EPS_PREVIEW_TIFF
     {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_TIFF";
         Hide = TRUE;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "Image Preview (TIFF)" ;
     };
     CheckBox CB_EPS_PREVIEW_EPSI
     {
+        HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_EPSI";
         Hide = TRUE;
         Size = MAP_APPFONT ( 60 , 10 ) ;
         Text [ en-US ] = "Interchange (EPSI)" ;
@@ -326,12 +343,14 @@ ModalDialog DLG_EXPORT
     };
     RadioButton RB_EPS_LEVEL1
     {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL1";
         Hide = TRUE;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "Level 1" ;
     };
     RadioButton RB_EPS_LEVEL2
     {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL2";
         Hide = TRUE;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "Level 2" ;
@@ -344,24 +363,28 @@ ModalDialog DLG_EXPORT
     };
     RadioButton RB_EPS_COLOR_FORMAT1
     {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT1";
         Hide = TRUE;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "Color" ;
     };
     RadioButton RB_EPS_COLOR_FORMAT2
     {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT2";
         Hide = TRUE;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "Grayscale" ;
     };
     RadioButton RB_EPS_COMPRESSION_LZW
     {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_LZW";
         Hide = TRUE;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "LZW encoding" ;
     };
     RadioButton RB_EPS_COMPRESSION_NONE
     {
+        HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_NONE";
         Hide = TRUE;
         Size = MAP_APPFONT ( 105 , 10 ) ;
         Text [ en-US ] = "None" ;
@@ -413,6 +436,7 @@ ModalDialog DLG_EXPORT
     };
     NumericField NF_ZOOM
     {
+        HelpID = "svtools:NumericField:DLG_EXPORT:NF_ZOOM";
         Hide = TRUE;
         Border = TRUE ;
         Size = MAP_APPFONT ( 30, 12 ) ;
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx
index 65f51ce212f4..9c754a947fcd 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter.vcl/filter/filter.cxx
@@ -552,16 +552,48 @@ static BOOL ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtension, B
     if( !bTest || ( rFormatExtension.CompareToAscii( "PCT", 3 ) == COMPARE_EQUAL ) )
     {
         bSomethingTested = TRUE;
-        BYTE sBuf[4];
+        BYTE sBuf[3];
+        // store number format
+        sal_uInt16 oldNumberFormat = rStream.GetNumberFormatInt();
         sal_uInt32 nOffset; // in ms documents the pict format is used without the first 512 bytes
-        for ( nOffset = 10; ( nOffset <= 522 ) && ( ( nStreamPos + nOffset + 3 ) <= nStreamLen ); nOffset += 512 )
+        for ( nOffset = 0; ( nOffset <= 512 ) && ( ( nStreamPos + nOffset + 14 ) <= nStreamLen ); nOffset += 512 )
         {
-            rStream.Seek( nStreamPos + nOffset );
+            short y1,x1,y2,x2;
+            bool bdBoxOk = true;
+
+            rStream.Seek( nStreamPos + nOffset);
+            // size of the pict in version 1 pict ( 2bytes) : ignored
+            rStream.SeekRel(2);
+            // bounding box (bytes 2 -> 9)
+            rStream.SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN);
+            rStream >> y1 >> x1 >> y2 >> x2;
+            rStream.SetNumberFormatInt(oldNumberFormat); // reset format
+
+            if (x1 > x2 || y1 > y2 || // bad bdbox
+                (x1 == x2 && y1 == y2) || // 1 pixel picture
+                x2-x1 > 2048 || y2-y1 > 2048 ) // picture anormaly big
+              bdBoxOk = false;
+
+            // read version op
             rStream.Read( sBuf,3 );
-            if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && ( sBuf[ 2 ] == 0x01 || sBuf[ 2 ] == 0x02 ) )
+            // see http://developer.apple.com/legacy/mac/library/documentation/mac/pdf/Imaging_With_QuickDraw/Appendix_A.pdf
+            // normal version 2 - page A23 and A24
+            if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && sBuf[ 2 ] == 0x02)
             {
-                rFormatExtension = UniString::CreateFromAscii( "PCT", 3 );
-                return TRUE;
+              rFormatExtension = UniString::CreateFromAscii( "PCT", 3 );
+              return TRUE;
+            }
+            // normal version 1 - page A25
+            else if (sBuf[ 0 ] == 0x11 && sBuf[ 1 ] == 0x01 && bdBoxOk) {
+              rFormatExtension = UniString::CreateFromAscii( "PCT", 3 );
+              return TRUE;
+            }
+            // previous code kept in order to do not break any compatibility
+            // probably eroneous
+            else if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && sBuf[ 2 ] == 0x01 && bdBoxOk)
+            {
+              rFormatExtension = UniString::CreateFromAscii( "PCT", 3 );
+              return TRUE;
             }
         }
     }
diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx
index 6abab2626516..d91ec1a19772 100644
--- a/svtools/source/filter.vcl/filter/filter2.cxx
+++ b/svtools/source/filter.vcl/filter/filter2.cxx
@@ -42,29 +42,6 @@
 
 BYTE* ImplSearchEntry( BYTE* , BYTE* , ULONG , ULONG  );
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-GraphicDescriptor::GraphicDescriptor( const String* pPath ) :
-    pFileStm        ( NULL )
-{
-    ImpConstruct();
-
-    if ( pPath )
-    {
-        INetURLObject aURL( *pPath, INET_PROT_FILE );
-        aPathExt = aURL.GetFileExtension().toAsciiLowerCase();
-    }
-    bLinked = TRUE;
-    bLinkChanged = FALSE;
-    bWideSearch = FALSE;
-}
-
-
 /*************************************************************************
 |*
 |*
@@ -73,19 +50,10 @@ GraphicDescriptor::GraphicDescriptor( const String* pPath ) :
 
 GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) :
     pFileStm( ::utl::UcbStreamHelper::CreateStream( rPath.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ) ),
-    aPathExt( rPath.GetFileExtension().toAsciiLowerCase() )
+    aPathExt( rPath.GetFileExtension().toAsciiLowerCase() ),
+    bOwnStream( TRUE )
 {
-    if ( pFileStm )
-    {
-        nStmPos = 0;
-        pFileStm->Seek( nStmPos );
-        bDataReady = TRUE;
-    }
-
     ImpConstruct();
-
-    if ( pFileStm && !pFileStm->GetError() )
-        bDataReady = TRUE;
 }
 
 /*************************************************************************
@@ -95,7 +63,8 @@ GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) :
 \************************************************************************/
 
 GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath) :
-    pFileStm    ( NULL )
+    pFileStm    ( &rInStream ),
+    bOwnStream  ( FALSE )
 {
     ImpConstruct();
 
@@ -104,15 +73,8 @@ GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath)
         INetURLObject aURL( *pPath );
         aPathExt = aURL.GetFileExtension().toAsciiLowerCase();
     }
-    nStmPos = rInStream.Tell();
-    pBaseStm = &rInStream;
-    bBaseStm = TRUE;
-
-    if ( !pBaseStm->GetError() )
-        bDataReady = TRUE;
 }
 
-
 /*************************************************************************
 |*
 |*
@@ -121,10 +83,10 @@ GraphicDescriptor::GraphicDescriptor( SvStream& rInStream, const String* pPath)
 
 GraphicDescriptor::~GraphicDescriptor()
 {
-    delete pFileStm;
+    if ( bOwnStream )
+        delete pFileStm;
 }
 
-
 /*************************************************************************
 |*
 |*
@@ -134,22 +96,9 @@ GraphicDescriptor::~GraphicDescriptor()
 BOOL GraphicDescriptor::Detect( BOOL bExtendedInfo )
 {
     BOOL bRet = FALSE;
-
-    // Link-Status ueberpruefen
-    if ( bLinked && bLinkChanged )
-    {
-        DBG_ASSERT( aReqLink.IsSet(), "Wo ist der RequestHandler???" );
-        pMemStm = (SvStream*) aReqLink.Call( this );
-        if ( pMemStm )
-        {
-            nStmPos = pMemStm->Tell();
-            bDataReady = TRUE;
-        }
-    }
-
-    if ( bDataReady )
+    if ( pFileStm && !pFileStm->GetError() )
     {
-        SvStream&   rStm = GetSearchStream();
+        SvStream&   rStm = *pFileStm;
         UINT16      nOldFormat = rStm.GetNumberFormatInt();
 
         if      ( ImpDetectGIF( rStm, bExtendedInfo ) ) bRet = TRUE;
@@ -175,96 +124,13 @@ BOOL GraphicDescriptor::Detect( BOOL bExtendedInfo )
         else if ( ImpDetectTGA( rStm, bExtendedInfo ) ) bRet = TRUE;
         else if ( ImpDetectPSD( rStm, bExtendedInfo ) ) bRet = TRUE;
         else if ( ImpDetectEPS( rStm, bExtendedInfo ) ) bRet = TRUE;
-
-        // diese Formate lassen sich nur bei WideSearch im gesamten
-        // Stream ermitteln
-        else if ( bWideSearch )
-        {
-            if ( ImpDetectPCD( rStm, bExtendedInfo ) )
-                bRet = TRUE;
-        }
+        else if ( ImpDetectPCD( rStm, bExtendedInfo ) ) bRet = TRUE;
 
         rStm.SetNumberFormatInt( nOldFormat );
-        rStm.Seek( nStmPos );
     }
-
     return bRet;
 }
 
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-BOOL GraphicDescriptor::IsDataReady() const
-{
-    return bDataReady;
-}
-
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-BOOL GraphicDescriptor::IsWideSearch() const
-{
-    return bWideSearch;
-}
-
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-SvStream& GraphicDescriptor::GetSearchStream() const
-{
-    DBG_ASSERT( bDataReady, "Was laeuft hier falsch???" );
-
-    if ( bLinked )
-        return *pMemStm;
-    else if ( bBaseStm )
-        return *pBaseStm;
-    else
-        return *pFileStm;
-}
-
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-void GraphicDescriptor::SetRequestHdl( const Link& rRequestLink )
-{
-    aReqLink = rRequestLink;
-    bLinkChanged = TRUE;
-}
-
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
-
-ULONG GraphicDescriptor::GetRequestedByteCount() const
-{
-    return DATA_SIZE;
-}
-
-
-/******************************************************************************/
-/*                               IMP-Methoden                                 */
-/*                                                                            */
-
-
 /*************************************************************************
 |*
 |*
@@ -273,17 +139,10 @@ ULONG GraphicDescriptor::GetRequestedByteCount() const
 
 void GraphicDescriptor::ImpConstruct()
 {
-    if ( !pFileStm )
-        pFileStm = new SvStream();
     nFormat = GFF_NOT;
     nBitsPerPixel = 0;
     nPlanes = 0;
     bCompressed = FALSE;
-    bDataReady = FALSE;
-    bLinked = FALSE;
-    bWideSearch = TRUE;
-    bBaseStm = FALSE;
-    pMemStm = NULL;
 }
 
 
@@ -297,10 +156,9 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo )
 {
     UINT16  nTemp16;
     BOOL    bRet = FALSE;
+    sal_Int32 nStmPos = rStm.Tell();
 
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    rStm.Seek( nStmPos );
-
     rStm >> nTemp16;
 
     // OS/2-BitmapArray
@@ -364,7 +222,7 @@ BOOL GraphicDescriptor::ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo )
             }
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -382,10 +240,10 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo )
     BOOL    bRet = FALSE;
     BYTE    cByte;
 
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    rStm.Seek( nStmPos );
-
     rStm >> n32;
+
     if ( n32 == 0x38464947 )
     {
         rStm >> n16;
@@ -412,7 +270,7 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo )
             }
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -423,125 +281,188 @@ BOOL GraphicDescriptor::ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo )
 |*
 \************************************************************************/
 
+// returns the next jpeg marker, a return value of 0 represents an error
+sal_uInt8 ImpDetectJPG_GetNextMarker( SvStream& rStm )
+{
+    sal_uInt8 nByte;
+    do
+    {
+        do
+        {
+            rStm >> nByte;
+            if ( rStm.IsEof() || rStm.GetError() )  // as 0 is not allowed as marker,
+                return 0;                           // we can use it as errorcode
+        }
+        while ( nByte != 0xff );
+        do
+        {
+            rStm >> nByte;
+            if ( rStm.IsEof() || rStm.GetError() )
+                return 0;
+        }
+        while( nByte == 0xff );
+    }
+    while( nByte == 0 );        // 0xff00 represents 0xff and not a marker,
+                                // the marker detection has to be restartet.
+    return nByte;
+}
+
 BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm,  BOOL bExtendedInfo )
 {
     UINT32  nTemp32;
     BOOL    bRet = FALSE;
-    BYTE    cByte = 0;
-    BOOL    bM_COM;
 
-    rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-    rStm.Seek( nStmPos );
+    sal_Int32 nStmPos = rStm.Tell();
 
+    rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     rStm >> nTemp32;
 
-    // compare upper 28 bits
+    // compare upper 24 bits
     if( 0xffd8ff00 == ( nTemp32 & 0xffffff00 ) )
     {
         nFormat = GFF_JPG;
-        return TRUE;
-    }
-
-    bM_COM = ( nTemp32 == 0xffd8fffe );
-    if ( ( nTemp32 == 0xffd8ffe0 ) || bM_COM )
-    {
-        if( !bM_COM )
-        {
-            rStm.SeekRel( 2 );
-            rStm >> nTemp32;
-        }
+        bRet = TRUE;
 
-        if( bM_COM || ( nTemp32 == 0x4a464946 ) )
+        if ( bExtendedInfo )
         {
-            nFormat = GFF_JPG;
-            bRet = TRUE;
+            rStm.SeekRel( -2 );
 
-            if( bExtendedInfo )
-            {
-                MapMode aMap;
-                UINT16  nTemp16;
-                ULONG   nCount = 9;
-                ULONG   nMax;
-                ULONG   nResX;
-                ULONG   nResY;
-                BYTE    cUnit;
-
-                // Groesse des verbleibenden Puffers ermitteln
-                if ( bLinked )
-                    nMax = static_cast< SvMemoryStream& >(rStm).GetEndOfData()
-                                - 16;
-                else
-                    nMax = DATA_SIZE - 16;
-
-                // max. 8K
-                nMax = Min( nMax, (ULONG) 8192 );
+            sal_uInt32 nError( rStm.GetError() );
 
-                // Res-Unit ermitteln
-                rStm.SeekRel( 3 );
-                rStm >> cUnit;
-
-                // ResX ermitteln
-                rStm >> nTemp16;
-                nResX = nTemp16;
+            sal_Bool bScanFailure = sal_False;
+            sal_Bool bScanFinished = sal_False;
 
-                // ResY ermitteln
-                rStm >> nTemp16;
-                nResY = nTemp16;
-
-                // SOF0/1-Marker finden, aber dabei
-                // nicht mehr als DATA_SIZE Pixel lesen, falls
-                // kein WideSearch
-                do
+            while( !bScanFailure && !bScanFinished && !rStm.IsEof() && !rStm.GetError() )
+            {
+                sal_uInt8 nMarker = ImpDetectJPG_GetNextMarker( rStm );
+                switch( nMarker )
                 {
-                    while ( ( cByte != 0xff ) &&
-                            ( bWideSearch || ( nCount++ < nMax ) ) )
+                    // fixed size marker, not having a two byte length parameter
+                    case 0xd0 :     // RST0
+                    case 0xd1 :
+                    case 0xd2 :
+                    case 0xd3 :
+                    case 0xd4 :
+                    case 0xd5 :
+                    case 0xd6 :
+                    case 0xd7 :     // RST7
+                    case 0x01 :     // TEM
+                    break;
+
+                    case 0xd8 :     // SOI (has already been checked, there should not be a second one)
+                    case 0x00 :     // marker is invalid, we should stop now
+                        bScanFailure = sal_True;
+                    break;
+
+                    case 0xd9 :     // EOI
+                        bScanFinished = sal_True;
+                    break;
+
+                    // per default we assume marker segments conaining a length parameter
+                    default :
                     {
-                        rStm >> cByte;
-                    }
-
-                    while ( ( cByte == 0xff ) &&
-                            ( bWideSearch || ( nCount++ < nMax ) ) )
-                    {
-                        rStm >> cByte;
-                    }
-                }
-                while ( ( cByte != 0xc0 ) &&
-                        ( cByte != 0xc1 ) &&
-                        ( bWideSearch || ( nCount < nMax ) ) );
-
-                // wir haben den SOF0/1-Marker
-                if ( ( cByte == 0xc0 ) || ( cByte == 0xc1 ) )
-                {
-                    // Hoehe einlesen
-                    rStm.SeekRel( 3 );
-                    rStm >> nTemp16;
-                    aPixSize.Height() = nTemp16;
+                        sal_uInt16 nLength;
+                        rStm >> nLength;
 
-                    // Breite einlesen
-                    rStm >> nTemp16;
-                    aPixSize.Width() = nTemp16;
-
-                    // Bit/Pixel einlesen
-                    rStm >> cByte;
-                    nBitsPerPixel = ( cByte == 3 ? 24 : cByte == 1 ? 8 : 0 );
+                        if ( nLength < 2 )
+                            bScanFailure = sal_True;
+                        else
+                        {
+                            sal_uInt32 nNextMarkerPos = rStm.Tell() + nLength - 2;
+                            switch( nMarker )
+                            {
+                                case 0xe0 : // APP0 Marker
+                                {
+                                    if ( nLength == 16 )
+                                    {
+                                        sal_Int32 nIdentifier;
+                                        rStm >> nIdentifier;
+                                        if ( nIdentifier == 0x4a464946 )    // JFIF Identifier
+                                        {
+                                            sal_uInt8   nStringTerminator;
+                                            sal_uInt8   nMajorRevision;
+                                            sal_uInt8   nMinorRevision;
+                                            sal_uInt8   nUnits;
+                                            sal_uInt16  nHorizontalResolution;
+                                            sal_uInt16  nVerticalResolution;
+                                            sal_uInt8   nHorzThumbnailPixelCount;
+                                            sal_uInt8   nVertThumbnailPixelCount;
+
+                                            rStm >> nStringTerminator
+                                                 >> nMajorRevision
+                                                 >> nMinorRevision
+                                                 >> nUnits
+                                                 >> nHorizontalResolution
+                                                 >> nVerticalResolution
+                                                 >> nHorzThumbnailPixelCount
+                                                 >> nVertThumbnailPixelCount;
+
+                                            // setting the logical size
+                                            if ( nUnits && nHorizontalResolution && nVerticalResolution )
+                                            {
+                                                MapMode aMap;
+                                                aMap.SetMapUnit( nUnits == 1 ? MAP_INCH : MAP_CM );
+                                                aMap.SetScaleX( Fraction( 1, nHorizontalResolution ) );
+                                                aMap.SetScaleY( Fraction( 1, nVerticalResolution ) );
+                                                aLogSize = OutputDevice::LogicToLogic( aPixSize, aMap, MapMode( MAP_100TH_MM ) );
+                                            }
+                                        }
+                                    }
+                                }
+                                break;
 
-                    // logische Groesse setzen
-                    if ( cUnit && nResX && nResY )
-                    {
-                        aMap.SetMapUnit( cUnit == 1 ? MAP_INCH : MAP_CM );
-                        aMap.SetScaleX( Fraction( 1, nResX ) );
-                        aMap.SetScaleY( Fraction( 1, nResY ) );
-                        aLogSize = OutputDevice::LogicToLogic( aPixSize, aMap,
-                                                               MapMode( MAP_100TH_MM ) );
+                                // Start of Frame Markers
+                                case 0xc0 : // SOF0
+                                case 0xc1 : // SOF1
+                                case 0xc2 : // SOF2
+                                case 0xc3 : // SOF3
+                                case 0xc5 : // SOF5
+                                case 0xc6 : // SOF6
+                                case 0xc7 : // SOF7
+                                case 0xc9 : // SOF9
+                                case 0xca : // SOF10
+                                case 0xcb : // SOF11
+                                case 0xcd : // SOF13
+                                case 0xce : // SOF14
+                                case 0xcf : // SOF15
+                                {
+                                    sal_uInt8   nSamplePrecision;
+                                    sal_uInt16  nNumberOfLines;
+                                    sal_uInt16  nSamplesPerLine;
+                                    sal_uInt8   nNumberOfImageComponents;
+                                    sal_uInt8   nComponentsIdentifier;
+                                    sal_uInt8   nHorizontalSamplingFactor;
+                                    sal_uInt8   nVerticalSamplingFactor;
+                                    sal_uInt8   nQuantizationTableDestinationSelector;
+                                    rStm >> nSamplePrecision
+                                         >> nNumberOfLines
+                                         >> nSamplesPerLine
+                                         >> nNumberOfImageComponents
+                                         >> nComponentsIdentifier
+                                         >> nHorizontalSamplingFactor
+                                         >> nQuantizationTableDestinationSelector;
+                                    nVerticalSamplingFactor = nHorizontalSamplingFactor & 0xf;
+                                    nHorizontalSamplingFactor >>= 4;
+
+                                    aPixSize.Height() = nNumberOfLines;
+                                    aPixSize.Width() = nSamplesPerLine;
+                                    nBitsPerPixel = ( nNumberOfImageComponents == 3 ? 24 : nNumberOfImageComponents == 1 ? 8 : 0 );
+                                    nPlanes = 1;
+
+                                    bScanFinished = sal_True;
+                                }
+                                break;
+                            }
+                            rStm.Seek( nNextMarkerPos );
+                        }
                     }
-
-                    // Planes immer 1
-                    nPlanes = 1;
+                    break;
                 }
             }
+            rStm.SetError( nError );
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -556,37 +477,26 @@ BOOL GraphicDescriptor::ImpDetectPCD( SvStream& rStm, BOOL )
 {
     BOOL    bRet = FALSE;
 
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    rStm.Seek( nStmPos );
 
-    if ( bWideSearch )
-    {
-        UINT32  nTemp32;
-        UINT16  nTemp16;
-        BYTE    cByte;
+    UINT32  nTemp32;
+    UINT16  nTemp16;
+    BYTE    cByte;
 
-        rStm.SeekRel( 2048 );
-        rStm >> nTemp32;
-        rStm >> nTemp16;
-        rStm >> cByte;
+    rStm.SeekRel( 2048 );
+    rStm >> nTemp32;
+    rStm >> nTemp16;
+    rStm >> cByte;
 
-        if ( ( nTemp32 == 0x5f444350 ) &&
-             ( nTemp16 == 0x5049 ) &&
-             ( cByte == 0x49 ) )
-        {
-            nFormat = GFF_PCD;
-            bRet = TRUE;
-        }
-    }
-    else
+    if ( ( nTemp32 == 0x5f444350 ) &&
+         ( nTemp16 == 0x5049 ) &&
+         ( cByte == 0x49 ) )
     {
-        bRet = aPathExt.CompareToAscii( "pcd", 3 ) == COMPARE_EQUAL;
-        if ( bRet )
-        {
-            nFormat = GFF_PCD;
-        }
+        nFormat = GFF_PCD;
+        bRet = TRUE;
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -608,10 +518,10 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo )
     BOOL    bRet = FALSE;
     BYTE    cByte;
 
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    rStm.Seek( nStmPos );
-
     rStm >> cByte;
+
     if ( cByte == 0x0a )
     {
         nFormat = GFF_PCX;
@@ -675,6 +585,7 @@ BOOL GraphicDescriptor::ImpDetectPCX( SvStream& rStm, BOOL bExtendedInfo )
         }
     }
 
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -690,10 +601,10 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo )
     UINT32  nTemp32;
     BOOL    bRet = FALSE;
 
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-    rStm.Seek( nStmPos );
-
     rStm >> nTemp32;
+
     if ( nTemp32 == 0x89504e47 )
     {
         rStm >> nTemp32;
@@ -726,55 +637,52 @@ BOOL GraphicDescriptor::ImpDetectPNG( SvStream& rStm, BOOL bExtendedInfo )
                 nPlanes = 1;
                 bCompressed = TRUE;
 
-                if ( bWideSearch )
-                {
-                    UINT32  nLen32;
+                UINT32  nLen32;
 
-                    rStm.SeekRel( 8 );
+                rStm.SeekRel( 8 );
 
-                    // so lange ueberlesen, bis wir den pHYs-Chunk haben oder
-                    // den Anfang der Bilddaten
+                // so lange ueberlesen, bis wir den pHYs-Chunk haben oder
+                // den Anfang der Bilddaten
+                rStm >> nLen32;
+                rStm >> nTemp32;
+                while( ( nTemp32 != 0x70485973 ) && ( nTemp32 != 0x49444154 ) )
+                {
+                    rStm.SeekRel( 4 + nLen32 );
                     rStm >> nLen32;
                     rStm >> nTemp32;
-                    while( ( nTemp32 != 0x70485973 ) && ( nTemp32 != 0x49444154 ) )
-                    {
-                        rStm.SeekRel( 4 + nLen32 );
-                        rStm >> nLen32;
-                        rStm >> nTemp32;
-                    }
+                }
 
-                    if ( nTemp32 == 0x70485973 )
-                    {
-                        ULONG   nXRes;
-                        ULONG   nYRes;
+                if ( nTemp32 == 0x70485973 )
+                {
+                    ULONG   nXRes;
+                    ULONG   nYRes;
 
-                        // horizontale Aufloesung
-                        rStm >> nTemp32;
-                        nXRes = nTemp32;
+                    // horizontale Aufloesung
+                    rStm >> nTemp32;
+                    nXRes = nTemp32;
 
-                        // vertikale Aufloesung
-                        rStm >> nTemp32;
-                        nYRes = nTemp32;
+                    // vertikale Aufloesung
+                    rStm >> nTemp32;
+                    nYRes = nTemp32;
 
-                        // Unit einlesen
-                        rStm >> cByte;
+                    // Unit einlesen
+                    rStm >> cByte;
 
-                        if ( cByte )
-                        {
-                            if ( nXRes )
-                                aLogSize.Width() = ( aPixSize.Width() * 100000 ) /
-                                                   nTemp32;
+                    if ( cByte )
+                    {
+                        if ( nXRes )
+                            aLogSize.Width() = ( aPixSize.Width() * 100000 ) /
+                                               nTemp32;
 
-                            if ( nYRes )
-                                aLogSize.Height() = ( aPixSize.Height() * 100000 ) /
-                                                    nTemp32;
-                        }
+                        if ( nYRes )
+                            aLogSize.Height() = ( aPixSize.Height() * 100000 ) /
+                                                nTemp32;
                     }
                 }
             }
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -792,7 +700,7 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo )
     BYTE    cByte1;
     BYTE    cByte2;
 
-    rStm.Seek( nStmPos );
+    sal_Int32 nStmPos = rStm.Tell();
     rStm >> cByte1;
     rStm >> cByte2;
     if ( cByte1 == cByte2 )
@@ -829,14 +737,14 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo )
                     rStm >> nTemp32;
                     rStm.SeekRel( ( nCount = ( nTemp32 + 2 ) ) - 0x08 );
 
-                    if ( bWideSearch || ( nCount < nMax ) )
+                    if ( nCount < nMax )
                     {
                         // Tag's lesen, bis wir auf Tag256 ( Width ) treffen
                         // nicht mehr Bytes als DATA_SIZE lesen
                         rStm >> nTemp16;
                         while ( nTemp16 != 256 )
                         {
-                            bOk = bWideSearch || ( nCount < nMax );
+                            bOk = nCount < nMax;
                             if ( !bOk )
                             {
                                 break;
@@ -912,7 +820,7 @@ BOOL GraphicDescriptor::ImpDetectTIF( SvStream& rStm, BOOL bExtendedInfo )
             }
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -965,11 +873,12 @@ BOOL GraphicDescriptor::ImpDetectPBM( SvStream& rStm, BOOL )
         bRet = TRUE;
     else
     {
+        sal_Int32 nStmPos = rStm.Tell();
         BYTE    nFirst, nSecond;
-        rStm.Seek( nStmPos );
         rStm >> nFirst >> nSecond;
         if ( nFirst == 'P' && ( ( nSecond == '1' ) || ( nSecond == '4' ) ) )
             bRet = TRUE;
+        rStm.Seek( nStmPos );
     }
 
     if ( bRet )
@@ -992,11 +901,12 @@ BOOL GraphicDescriptor::ImpDetectPGM( SvStream& rStm, BOOL )
         bRet = TRUE;
     else
     {
-        BYTE    nFirst, nSecond;
-        rStm.Seek( nStmPos );
+        BYTE nFirst, nSecond;
+        sal_Int32 nStmPos = rStm.Tell();
         rStm >> nFirst >> nSecond;
         if ( nFirst == 'P' && ( ( nSecond == '2' ) || ( nSecond == '5' ) ) )
             bRet = TRUE;
+        rStm.Seek( nStmPos );
     }
 
     if ( bRet )
@@ -1020,10 +930,11 @@ BOOL GraphicDescriptor::ImpDetectPPM( SvStream& rStm, BOOL )
     else
     {
         BYTE    nFirst, nSecond;
-        rStm.Seek( nStmPos );
+        sal_Int32 nStmPos = rStm.Tell();
         rStm >> nFirst >> nSecond;
         if ( nFirst == 'P' && ( ( nSecond == '3' ) || ( nSecond == '6' ) ) )
             bRet = TRUE;
+        rStm.Seek( nStmPos );
     }
 
     if ( bRet )
@@ -1041,16 +952,17 @@ BOOL GraphicDescriptor::ImpDetectPPM( SvStream& rStm, BOOL )
 BOOL GraphicDescriptor::ImpDetectRAS( SvStream& rStm, BOOL )
 {
     UINT32 nMagicNumber;
-    rStm.Seek( nStmPos );
+    BOOL bRet = FALSE;
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     rStm >> nMagicNumber;
     if ( nMagicNumber == 0x59a66a95 )
     {
         nFormat = GFF_RAS;
-        return TRUE;
+        bRet = TRUE;
     }
-    else
-        return FALSE;
+    rStm.Seek( nStmPos );
+    return bRet;
 }
 
 /*************************************************************************
@@ -1079,7 +991,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo )
     BOOL bRet = FALSE;
 
     UINT32  nMagicNumber;
-    rStm.Seek( nStmPos );
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     rStm >> nMagicNumber;
     if ( nMagicNumber == 0x38425053 )
@@ -1123,6 +1035,7 @@ BOOL GraphicDescriptor::ImpDetectPSD( SvStream& rStm, BOOL bExtendedInfo )
 
     if ( bRet )
         nFormat = GFF_PSD;
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -1139,8 +1052,9 @@ BOOL GraphicDescriptor::ImpDetectEPS( SvStream& rStm, BOOL )
 
     sal_uInt32  nFirstLong;
     sal_uInt8   nFirstBytes[20];
+    BOOL        bRet = FALSE;
 
-    rStm.Seek( nStmPos );
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
     rStm >> nFirstLong;
     rStm.SeekRel( -4 );
@@ -1151,10 +1065,10 @@ BOOL GraphicDescriptor::ImpDetectEPS( SvStream& rStm, BOOL )
             && ImplSearchEntry( &nFirstBytes[15], (sal_uInt8*)"EPS", 3, 3 ) ) )
     {
         nFormat = GFF_EPS;
-        return TRUE;
+        bRet = TRUE;
     }
-    else
-        return FALSE;
+    rStm.Seek( nStmPos );
+    return bRet;
 }
 
 /*************************************************************************
@@ -1201,9 +1115,11 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL )
         nFormat = GFF_PCT;
     else
     {
-        BYTE sBuf[3]={0};
+        sal_Int32 nStmPos = rStm.Tell();
+
+        BYTE sBuf[4];
 
-        rStm.Seek( nStmPos + 522 );
+        rStm.SeekRel( 522 );
         rStm.Read( sBuf, 3 );
 
         if( !rStm.GetError() )
@@ -1215,6 +1131,7 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL )
                 nFormat = GFF_PCT;
             }
         }
+        rStm.Seek( nStmPos );
     }
 
     return bRet;
@@ -1230,18 +1147,20 @@ BOOL GraphicDescriptor::ImpDetectPCT( SvStream& rStm, BOOL )
 BOOL GraphicDescriptor::ImpDetectSGF( SvStream& rStm, BOOL )
 {
     BOOL bRet = FALSE;
-
     if( aPathExt.CompareToAscii( "sgf", 3 ) == COMPARE_EQUAL )
         bRet = TRUE;
     else
     {
+        sal_Int32 nStmPos = rStm.Tell();
+
         BYTE nFirst, nSecond;
 
-        rStm.Seek( nStmPos );
         rStm >> nFirst >> nSecond;
 
         if( nFirst == 'J' && nSecond == 'J' )
             bRet = TRUE;
+
+        rStm.Seek( nStmPos );
     }
 
     if( bRet )
@@ -1279,9 +1198,8 @@ BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo )
     BOOL    bRet = FALSE;
     BYTE    cByte;
 
+    sal_Int32 nStmPos = rStm.Tell();
     rStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    rStm.Seek( nStmPos );
-
     rStm >> n32;
     if ( n32 == 0x44475653 )
     {
@@ -1342,7 +1260,7 @@ BOOL GraphicDescriptor::ImpDetectSVM( SvStream& rStm, BOOL bExtendedInfo )
             }
         }
     }
-
+    rStm.Seek( nStmPos );
     return bRet;
 }
 
@@ -1417,3 +1335,5 @@ String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat )
 
     return String( aKeyName, RTL_TEXTENCODING_ASCII_US );
 }
+
+
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.component b/svtools/source/hatchwindow/hatchwindowfactory.component
new file mode 100644
index 000000000000..153fc8796281
--- /dev/null
+++ b/svtools/source/hatchwindow/hatchwindowfactory.component
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.embed.DocumentCloser">
+    <service name="com.sun.star.embed.DocumentCloser"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.embed.HatchWindowFactory">
+    <service name="com.sun.star.comp.embed.HatchWindowFactory"/>
+    <service name="com.sun.star.embed.HatchWindowFactory"/>
+  </implementation>
+</component>
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index f8dbddff3761..0eec027167c2 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -112,45 +112,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
-    void * /* pServiceManager */, void * pRegistryKey)
-{
-    if (pRegistryKey)
-    {
-        uno::Reference< registry::XRegistryKey> xRegistryKey (
-            reinterpret_cast< registry::XRegistryKey* >(pRegistryKey));
-        uno::Reference< registry::XRegistryKey> xNewKey;
-
-        // OHatchWindowFactory registration
-
-        xNewKey = xRegistryKey->createKey (
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-            OHatchWindowFactory::impl_staticGetImplementationName() +
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-        uno::Sequence< ::rtl::OUString > aServices =
-            OHatchWindowFactory::impl_staticGetSupportedServiceNames();
-        for (sal_Int32 i = 0, n = aServices.getLength(); i < n; i++ )
-            xNewKey->createKey( aServices.getConstArray()[i] );
-
-
-        // ODocumentCloser registration
-
-        xNewKey = xRegistryKey->createKey (
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-            ODocumentCloser::impl_staticGetImplementationName() +
-            ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-        aServices = ODocumentCloser::impl_staticGetSupportedServiceNames();
-        for (sal_Int32 i = 0, n = aServices.getLength(); i < n; i++ )
-            xNewKey->createKey( aServices.getConstArray()[i] );
-
-
-        return sal_True;
-    }
-    return sal_False;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
     const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */)
 {
diff --git a/svtools/source/hatchwindow/makefile.mk b/svtools/source/hatchwindow/makefile.mk
index 316e4ab1bfe2..3c736bc4e66a 100644
--- a/svtools/source/hatchwindow/makefile.mk
+++ b/svtools/source/hatchwindow/makefile.mk
@@ -63,3 +63,11 @@ DEF1NAME=	$(SHL1TARGET)
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/hatchwindowfactory.component
+
+$(MISC)/hatchwindowfactory.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt hatchwindowfactory.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt hatchwindowfactory.component
diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index dc01de750b06..a7420dbc388f 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.cxx
@@ -149,10 +149,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bJavaNotFound_Handled = true;
             WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_JAVANOTFOUND ) );
             String aTitle( SvtResId( STR_WARNING_JAVANOTFOUND ) );
-
             aWarningBox.SetText( aTitle );
             nResult = aWarningBox.Execute();
-
         }
         else
         {
@@ -168,7 +166,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bInvalidSettings_Handled = true;
             WarningBox aWarningBox( NULL, SvtResId( WARNINGBOX_INVALIDJAVASETTINGS ) );
             String aTitle( SvtResId(STR_WARNING_INVALIDJAVASETTINGS));
-
             aWarningBox.SetText( aTitle );
             nResult = aWarningBox.Execute();
         }
@@ -186,7 +183,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             // Java disabled. Give user a chance to enable Java inside Office.
             QueryBox aQueryBox( NULL, SvtResId( QBX_JAVADISABLED ) );
             String aTitle( SvtResId( STR_QUESTION_JAVADISABLED ) );
-
             aQueryBox.SetText( aTitle );
             nResult = aQueryBox.Execute();
             if ( nResult == RET_YES )
@@ -211,7 +207,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bVMCreationFailure_Handled = true;
             ErrorBox aErrorBox( NULL, SvtResId( ERRORBOX_JVMCREATIONFAILED ) );
             String aTitle( SvtResId( STR_ERROR_JVMCREATIONFAILED ) );
-
             aErrorBox.SetText( aTitle );
             nResult = aErrorBox.Execute();
         }
@@ -230,7 +225,6 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque
             m_bRestartRequired_Handled = true;
             ErrorBox aErrorBox(NULL, SvtResId( ERRORBOX_RESTARTREQUIRED ) );
             String aTitle( SvtResId( STR_ERROR_RESTARTREQUIRED ) );
-
             aErrorBox.SetText( aTitle );
             nResult = aErrorBox.Execute();
         }
diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src
index 9cc52c58f013..e456200943f6 100644
--- a/svtools/source/plugapp/testtool.src
+++ b/svtools/source/plugapp/testtool.src
@@ -104,6 +104,7 @@ Bitmap TT_SHOW2 {
 };
 
 WorkWindow TT_INLINE_TRANSLATION {
+    HelpID = "svtools:WorkWindow:TT_INLINE_TRANSLATION";
     SVLook = TRUE;
     Size = MAP_APPFONT( 2*Control_Border + 4*ButtonWidth + 3*Button_Button, 120 );
     Moveable = TRUE;
@@ -116,6 +117,7 @@ WorkWindow TT_INLINE_TRANSLATION {
         Text[ en-US ] = "Translation";
     };
     Edit TT_E_NEW {
+        HelpID = "svtools:Edit:TT_INLINE_TRANSLATION:TT_E_NEW";
             Disable = TRUE;
             Border = TRUE;
             Pos = MAP_APPFONT( 7, 16 );
@@ -134,6 +136,7 @@ WorkWindow TT_INLINE_TRANSLATION {
         Text[ en-US ] = "Comment";
     };
     Edit TT_E_COMMENT {
+        HelpID = "svtools:Edit:TT_INLINE_TRANSLATION:TT_E_COMMENT";
             Disable = TRUE;
             Border = TRUE;
             Pos = MAP_APPFONT( 7, 64 );
@@ -142,12 +145,14 @@ WorkWindow TT_INLINE_TRANSLATION {
         Text[ en-US ] = "~Comment";
     };
     PushButton TT_PB_SELECT {
+        HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_SELECT";
             Pos = MAP_APPFONT( Control_Border, 89 );
             Size = MAP_APPFONT( ButtonWidth, 12 );
             TabStop = TRUE;
         Text[ en-US ] = "~Select";
     };
     PushButton TT_PB_RESTORE {
+        HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_RESTORE";
             Disable = TRUE;
             Pos = MAP_APPFONT( Control_Border + ButtonWidth + Button_Button, 89 );
             Size = MAP_APPFONT( ButtonWidth, 12 );
@@ -155,6 +160,7 @@ WorkWindow TT_INLINE_TRANSLATION {
         Text[ en-US ] = "~Restore";
     };
     PushButton TT_PB_ACCEPT {
+        HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_ACCEPT";
             Disable = TRUE;
             Pos = MAP_APPFONT( Control_Border + 2*(ButtonWidth + Button_Button), 89 );
             Size = MAP_APPFONT( ButtonWidth, 12 );
@@ -162,6 +168,7 @@ WorkWindow TT_INLINE_TRANSLATION {
         Text[ en-US ] = "~Accept";
     };
     PushButton TT_PB_NEXT {
+        HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_NEXT";
             Pos = MAP_APPFONT( Control_Border + 3*(ButtonWidth + Button_Button), 89 );
             Size = MAP_APPFONT( ButtonWidth, 12 );
             TabStop = TRUE;
diff --git a/svtools/source/productregistration/makefile.mk b/svtools/source/productregistration/makefile.mk
index a26e8feca753..b6e119601697 100644
--- a/svtools/source/productregistration/makefile.mk
+++ b/svtools/source/productregistration/makefile.mk
@@ -76,3 +76,11 @@ RESLIB1SRSFILES=\
 
 .INCLUDE : target.mk
 
+
+ALLTAR : $(MISC)/productregistration.uno.component
+
+$(MISC)/productregistration.uno.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt productregistration.uno.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt productregistration.uno.component
diff --git a/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx
index 39629f5c3f77..cb3a9b7a7702 100644
--- a/svtools/source/productregistration/productregistration.cxx
+++ b/svtools/source/productregistration/productregistration.cxx
@@ -461,25 +461,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
-    void * /* pServiceManager */, void * pRegistryKey)
-{
-    if (pRegistryKey)
-    {
-        Reference< XRegistryKey > xRegistryKey (
-            reinterpret_cast< XRegistryKey* >( pRegistryKey ));
-        Reference< XRegistryKey > xNewKey;
-
-        xNewKey = xRegistryKey->createKey(
-            OUString::createFromAscii( "/" PRODREG_IMPLNAME "/UNO/SERVICES" ));
-        xNewKey->createKey(
-            OUString::createFromAscii( PRODREG_SERVNAME ));
-
-        return sal_True;
-    }
-    return sal_False;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
     const sal_Char * pImplementationName, void * pServiceManager, void * /* pRegistryKey */)
 {
diff --git a/svtools/source/productregistration/productregistration.uno.component b/svtools/source/productregistration/productregistration.uno.component
new file mode 100644
index 000000000000..da2cfd37c483
--- /dev/null
+++ b/svtools/source/productregistration/productregistration.uno.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.setup.ProductRegistration">
+    <service name="com.sun.star.setup.ProductRegistration"/>
+  </implementation>
+</component>
diff --git a/svtools/source/productregistration/registrationdlg.src b/svtools/source/productregistration/registrationdlg.src
index c4cdcbcbe3ec..64f1063f1ba3 100644
--- a/svtools/source/productregistration/registrationdlg.src
+++ b/svtools/source/productregistration/registrationdlg.src
@@ -72,6 +72,7 @@ ModalDialog DLG_REGISTRATION_REQUEST
 
     RadioButton RB_NOW
     {
+        HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW";
         Pos = MAP_APPFONT ( 33 , 41 ) ;
         Size = MAP_APPFONT ( 153 , 10 ) ;
         Text [ en-US ] = "Register now" ;
@@ -79,18 +80,21 @@ ModalDialog DLG_REGISTRATION_REQUEST
 
     RadioButton RB_LATER
     {
+        HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_LATER";
         Pos = MAP_APPFONT ( 33 , 54 ) ;
         Size = MAP_APPFONT ( 153 , 10 ) ;
         Text [ en-US ] = "Remind me to register later" ;
     };
     RadioButton RB_NEVER
     {
+        HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NEVER";
         Pos = MAP_APPFONT ( 33 , 67 ) ;
         Size = MAP_APPFONT ( 153 , 10 ) ;
         Text [ en-US ] = "Never register" ;
     };
     RadioButton RB_DONE
     {
+        HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_DONE";
         Pos = MAP_APPFONT ( 33 , 80 ) ;
         Size = MAP_APPFONT ( 153 , 20 ) ;
         WordBreak = TRUE;
diff --git a/svtools/source/svrtf/makefile.mk b/svtools/source/svrtf/makefile.mk
index 5ebb0e28c69e..cb76882f5f94 100644
--- a/svtools/source/svrtf/makefile.mk
+++ b/svtools/source/svrtf/makefile.mk
@@ -30,6 +30,8 @@ PRJ=..$/..
 PRJNAME=svtools
 TARGET=svrtf
 
+ENABLE_EXCEPTIONS=TRUE
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index 1c578d160307..3a775a7fc345 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -44,8 +44,6 @@ const int MAX_TOKEN_LEN = 128;
 #define RTF_ISDIGIT( c ) (c >= '0' && c <= '9')
 #define RTF_ISALPHA( c ) ( (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') )
 
-SV_IMPL_VARARR( RtfParserStates_Impl, RtfParserState_Impl )
-
 SvRTFParser::SvRTFParser( SvStream& rIn, BYTE nStackSize )
     : SvParser( rIn, nStackSize ),
     eUNICodeSet( RTL_TEXTENCODING_MS_1252 ),    // default ist ANSI-CodeSet
@@ -175,14 +173,13 @@ int SvRTFParser::_GetNextToken()
                                 nUCharOverread = (BYTE)nTokenValue;
 #if 1
                                 //cmc: other ifdef breaks #i3584
-                                aParserStates[ aParserStates.Count()-1].
+                                aParserStates.top().
                                     nUCharOverread = nUCharOverread;
 #else
                                 if( !nUCharOverread )
-                                    nUCharOverread = aParserStates[
-                                        aParserStates.Count()-1].nUCharOverread;
+                                    nUCharOverread = aParserStates.top().nUCharOverread;
                                 else
-                                    aParserStates[ aParserStates.Count()-1].
+                                    aParserStates.top().
                                         nUCharOverread = nUCharOverread;
 #endif
                             }
@@ -252,12 +249,12 @@ int SvRTFParser::_GetNextToken()
                 if( 0 <= nOpenBrakets )
                 {
                     RtfParserState_Impl aState( nUCharOverread, GetSrcEncoding() );
-                    aParserStates.Insert(
-                        aState, sal::static_int_cast< USHORT >(nOpenBrakets) );
+                    aParserStates.push( aState );
                 }
                 ++nOpenBrakets;
-                DBG_ASSERT( nOpenBrakets == aParserStates.Count(),
-                            "ParserStateStack unequal to bracket count" );
+                DBG_ASSERT(
+                    static_cast<size_t>(nOpenBrakets) == aParserStates.size(),
+                    "ParserStateStack unequal to bracket count" );
                 nRet = nNextCh;
             }
             break;
@@ -266,12 +263,11 @@ int SvRTFParser::_GetNextToken()
             --nOpenBrakets;
             if( 0 <= nOpenBrakets )
             {
-                aParserStates.Remove(
-                    sal::static_int_cast< USHORT >(nOpenBrakets) );
-                if( aParserStates.Count() )
+                aParserStates.pop();
+                if( !aParserStates.empty() )
                 {
                     const RtfParserState_Impl& rRPS =
-                            aParserStates[ aParserStates.Count() - 1 ];
+                            aParserStates.top();
                     nUCharOverread = rRPS.nUCharOverread;
                     SetSrcEncoding( rRPS.eCodeSet );
                 }
@@ -281,8 +277,9 @@ int SvRTFParser::_GetNextToken()
                     SetSrcEncoding( GetCodeSet() );
                 }
             }
-            DBG_ASSERT( nOpenBrakets == aParserStates.Count(),
-                        "ParserStateStack unequal to bracket count" );
+            DBG_ASSERT(
+                static_cast<size_t>(nOpenBrakets) == aParserStates.size(),
+                "ParserStateStack unequal to bracket count" );
             nRet = nNextCh;
             break;
 
@@ -690,8 +687,8 @@ void SvRTFParser::SetEncoding( rtl_TextEncoding eEnc )
     if (eEnc == RTL_TEXTENCODING_DONTKNOW)
         eEnc = GetCodeSet();
 
-    if (aParserStates.Count())
-        aParserStates[aParserStates.Count() - 1].eCodeSet = eEnc;
+    if (!aParserStates.empty())
+        aParserStates.top().eCodeSet = eEnc;
     SetSrcEncoding(eEnc);
 }
 
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index 040f33045fff..7fc7d05ea0c9 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -165,7 +165,7 @@ namespace svt
         OSL_PRECOND( i_nPosition <= m_aDrawers.size(), "DrawerDeckLayouter::PanelInserted: inconsistency!" );
 
         PToolPanelDrawer pDrawer( new ToolPanelDrawer( m_rParentWindow, i_pPanel->GetDisplayName() ) );
-        pDrawer->SetSmartHelpId( i_pPanel->GetHelpID() );
+        pDrawer->SetHelpId( i_pPanel->GetHelpID() );
         // proper Z-Order
         if ( i_nPosition == 0 )
         {
diff --git a/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx
index 20f140a6e610..4de38b7f4bb3 100644
--- a/svtools/source/toolpanel/dummypanel.cxx
+++ b/svtools/source/toolpanel/dummypanel.cxx
@@ -80,9 +80,9 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    SmartId DummyPanel::GetHelpID() const
+    rtl::OString DummyPanel::GetHelpID() const
     {
-        return SmartId();
+        return rtl::OString();
     }
 
     //--------------------------------------------------------------------
diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx
index adb98e52077e..d2ca4480fce5 100644
--- a/svtools/source/toolpanel/dummypanel.hxx
+++ b/svtools/source/toolpanel/dummypanel.hxx
@@ -49,7 +49,7 @@ namespace svt
         // IToolPanel
         virtual ::rtl::OUString GetDisplayName() const;
         virtual Image GetImage() const;
-        virtual SmartId GetHelpID() const;
+        virtual rtl::OString GetHelpID() const;
         virtual void Activate( Window& i_rParentWindow );
         virtual void Deactivate();
         virtual void SetSizePixel( const Size& i_rPanelWindowSize );
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index e16a1ecb56dc..34984976bf07 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.cxx
@@ -101,55 +101,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
-    void * pServiceManager, void * _pRegistryKey )
-{
-    if (_pRegistryKey)
-    {
-        Reference< XRegistryKey > xRegistryKey (
-            reinterpret_cast< XRegistryKey* >( _pRegistryKey ));
-        Reference< XRegistryKey > xNewKey;
-        uno::Sequence< ::rtl::OUString >            aServices;
-
-        xNewKey = xRegistryKey->createKey (
-            OUString::createFromAscii( "/com.sun.star.comp.svtools.OAddressBookSourceDialogUno/UNO/SERVICES" ) );
-        xNewKey->createKey(
-            OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" ) );
-
-        xNewKey = xRegistryKey->createKey (
-            OUString::createFromAscii( "/com.sun.star.svtools.SvFilterOptionsDialog/UNO/SERVICES" ) );
-        xNewKey->createKey (
-            OUString::createFromAscii( "com.sun.star.ui.dialogs.FilterOptionsDialog" ) );
-
-        // GraphicProvider
-        xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                    GraphicProvider::getImplementationName_Static() +
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-        aServices = GraphicProvider::getSupportedServiceNames_Static();
-        int i;
-        for( i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[ i ] );
-
-        // GraphicRendererVCL
-        xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey(
-                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                    GraphicRendererVCL::getImplementationName_Static() +
-                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-        aServices = ( GraphicRendererVCL::getSupportedServiceNames_Static() );
-        for( i = 0; i < aServices.getLength(); i++ )
-            xNewKey->createKey( aServices.getConstArray()[ i ] );
-
-        if ( !component_writeInfoHelper( reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ), reinterpret_cast< registry::XRegistryKey* >( _pRegistryKey ), serviceDecl ) )
-            return false;
-
-        return ::cppu::component_writeInfoHelper( pServiceManager, _pRegistryKey, s_aServiceEntries );
-    }
-    return sal_False;
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
     const sal_Char * pImplementationName, void * _pServiceManager, void * pRegistryKey)
 {
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 147b11aceb11..ea147c5979d3 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -42,6 +42,7 @@
 #include <rtl/strbuf.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/urlobj.hxx>
 
 //......................................................................................................................
 namespace svt { namespace uno
@@ -206,11 +207,32 @@ namespace svt { namespace uno
         m_bInitialized = true;
     }
 
+    static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL )
+    {
+        INetURLObject aHID( _rHelpURL );
+        if ( aHID.GetProtocol() == INET_PROT_HID )
+            return rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 );
+        else
+            return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 );
+    }
+
+    //------------------------------------------------------------------------
+    static ::rtl::OUString lcl_getHelpURL( const rtl::OString& sHelpId )
+    {
+        ::rtl::OUStringBuffer aBuffer;
+        ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 );
+        INetURLObject aHID( aTmp );
+        if ( aHID.GetProtocol() == INET_PROT_NOT_VALID )
+            aBuffer.appendAscii( INET_HID_SCHEME );
+        aBuffer.append( aTmp.getStr() );
+        return aBuffer.makeStringAndClear();
+    }
+
     //--------------------------------------------------------------------
     Dialog* Wizard::createDialog( Window* i_pParent )
     {
         WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, m_aWizardSteps ) );
-        pDialog->SetSmartHelpId( SmartId( m_sHelpURL ) );
+        pDialog->SetHelpId(  lcl_getHelpId( m_sHelpURL ) );
         pDialog->setTitleBase( m_sTitle );
         return pDialog;
     }
@@ -219,7 +241,7 @@ namespace svt { namespace uno
     void Wizard::destroyDialog()
     {
         if ( m_pDialog )
-            m_sHelpURL = m_pDialog->GetSmartHelpId().GetStr();
+            m_sHelpURL = lcl_getHelpURL( m_pDialog->GetHelpId() );
 
         Wizard_Base::destroyDialog();
     }
@@ -279,8 +301,7 @@ namespace svt { namespace uno
         if ( !m_pDialog )
             return m_sHelpURL;
 
-        const SmartId aSmartId( m_pDialog->GetSmartHelpId() );
-        return aSmartId.GetStr();
+        return lcl_getHelpURL( m_pDialog->GetHelpId() );
     }
 
     //------------------------------------------------------------------------------------------------------------------
@@ -292,7 +313,7 @@ namespace svt { namespace uno
         if ( !m_pDialog )
             m_sHelpURL = i_HelpURL;
         else
-            m_pDialog->SetSmartHelpId( SmartId( i_HelpURL ) );
+            m_pDialog->SetHelpId( lcl_getHelpId( i_HelpURL ) );
     }
 
     //------------------------------------------------------------------------------------------------------------------
diff --git a/svtools/util/hidother.src b/svtools/util/hidother.src
index 77dd98115221..03aea7ebdf7e 100644
--- a/svtools/util/hidother.src
+++ b/svtools/util/hidother.src
@@ -57,3 +57,23 @@ hidspecial HID_PRINTDIALOG_TOFILE               { HelpID = HID_PRINTDIALOG_TOFIL
 
 hidspecial HID_WIZARD_NEXT                  { HelpID = HID_WIZARD_NEXT; };
 hidspecial HID_WIZARD_PREVIOUS              { HelpID = HID_WIZARD_PREVIOUS; };
+hidspecial HID_FILEDLG_LINK_CB                  { HelpID = HID_FILEDLG_LINK_CB; };
+hidspecial HID_FILEDLG_PREVIEW_CB               { HelpID = HID_FILEDLG_PREVIEW_CB; };
+hidspecial HID_FILEDLG_FILE                     { HelpID = HID_FILEDLG_FILE; };
+hidspecial HID_FILEDLG_MANAGER                  { HelpID = HID_FILEDLG_MANAGER; };
+hidspecial HID_FILEDLG_READ_ONLY                { HelpID = HID_FILEDLG_READ_ONLY; };
+hidspecial HID_FILEDLG_STANDARD                 { HelpID = HID_FILEDLG_STANDARD; };
+hidspecial HID_FILEDLG_URL                      { HelpID = HID_FILEDLG_URL; };
+hidspecial HID_FILEDLG_USE_PASSWD               { HelpID = HID_FILEDLG_USE_PASSWD; };
+hidspecial HID_FILEDLG_AUTOCOMPLETEBOX          { HelpID = HID_FILEDLG_AUTOCOMPLETEBOX; };
+hidspecial HID_FILEDLG_SAVE_BTN                 { HelpID = HID_FILEDLG_SAVE_BTN; };
+hidspecial HID_FILEDLG_SAVE_FILENAME            { HelpID = HID_FILEDLG_SAVE_FILENAME; };
+hidspecial HID_FILEDLG_SAVE_FILETYPE            { HelpID = HID_FILEDLG_SAVE_FILETYPE; };
+hidspecial HID_FILEDLG_INSERT_BTN               { HelpID = HID_FILEDLG_INSERT_BTN; };
+hidspecial HID_FILEDLG_PATH_BTN                 { HelpID = HID_FILEDLG_PATH_BTN; };
+hidspecial HID_FILEDLG_PATH_FILENAME            { HelpID = HID_FILEDLG_PATH_FILENAME; };
+hidspecial HID_FILEDLG_FOLDER_BTN               { HelpID = HID_FILEDLG_FOLDER_BTN; };
+hidspecial HID_FILEDLG_FOLDER_FILENAME          { HelpID = HID_FILEDLG_FOLDER_FILENAME; };
+hidspecial HID_FILEDLG_SRCHFOLDER_BTN           { HelpID = HID_FILEDLG_SRCHFOLDER_BTN; };
+hidspecial HID_FILEDLG_EDIT_FAVORITES_LISTBOX   { HelpID = HID_FILEDLG_EDIT_FAVORITES_LISTBOX; };
+hidspecial HID_FILEDLG_EDIT_FAVORITES_HEADERBAR { HelpID = HID_FILEDLG_EDIT_FAVORITES_HEADERBAR; };
diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk
index f9c14a540410..27b46488a16c 100644
--- a/svtools/util/makefile.mk
+++ b/svtools/util/makefile.mk
@@ -190,3 +190,11 @@ ALL: $(SLB)$/svt.lib \
 .INCLUDE :	target.mk
 
 
+
+ALLTAR : $(MISC)/svt.component
+
+$(MISC)/svt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        svt.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt svt.component
diff --git a/svtools/util/svt.component b/svtools/util/svt.component
new file mode 100644
index 000000000000..e15970547a38
--- /dev/null
+++ b/svtools/util/svt.component
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.graphic.GraphicProvider">
+    <service name="com.sun.star.graphic.GraphicProvider"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.graphic.GraphicRendererVCL">
+    <service name="com.sun.star.graphic.GraphicRendererVCL"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.svtools.OAddressBookSourceDialogUno">
+    <service name="com.sun.star.ui.AddressBookSourceDialog"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.svtools.uno.Wizard">
+    <service name="com.sun.star.ui.dialogs.Wizard"/>
+  </implementation>
+  <implementation name="com.sun.star.graphic.GraphicObject">
+    <service name="com.sun.star.graphic.GraphicObject"/>
+  </implementation>
+  <implementation name="com.sun.star.svtools.SvFilterOptionsDialog">
+    <service name="com.sun.star.ui.dialogs.FilterOptionsDialog"/>
+  </implementation>
+</component>
diff --git a/svtools/workben/toolpanel/toolpaneltest.cxx b/svtools/workben/toolpanel/toolpaneltest.cxx
index 6d044cee7c93..6542fe826587 100755
--- a/svtools/workben/toolpanel/toolpaneltest.cxx
+++ b/svtools/workben/toolpanel/toolpaneltest.cxx
@@ -145,7 +145,7 @@ public:
     // IToolPanel
     virtual ::rtl::OUString GetDisplayName() const;
     virtual Image GetImage() const;
-    virtual SmartId GetHelpID() const;
+    virtual rtl::OString GetHelpID() const;
     virtual void Activate( Window& i_rParentWindow );
     virtual void Deactivate();
     virtual void SetSizePixel( const Size& i_rPanelWindowSize );
@@ -272,9 +272,9 @@ Image ColoredPanel::GetImage() const
 }
 
 //-----------------------------------------------------------------------------
-SmartId ColoredPanel::GetHelpID() const
+rtl::OString ColoredPanel::GetHelpID() const
 {
-    return SmartId();
+    return rtl::OString();
 }
 
 //=============================================================================
diff --git a/svtools/workben/unodialog/roadmapskeleton.src b/svtools/workben/unodialog/roadmapskeleton.src
index 797490273b5f..33728c700df6 100644
--- a/svtools/workben/unodialog/roadmapskeleton.src
+++ b/svtools/workben/unodialog/roadmapskeleton.src
@@ -31,6 +31,7 @@
 // -----------------------------------------------------------------------------
 ModalDialog DLG_ROADMAP_SKELETON
 {
+    HelpID = "svtools:ModalDialog:DLG_ROADMAP_SKELETON";
     OutputSize = TRUE ;
     Moveable = TRUE;
     Closeable = TRUE ;
@@ -61,24 +62,28 @@ ModalDialog DLG_ROADMAP_SKELETON
 
 TabPage TP_WELCOME
 {
+    HelpID = "svtools:TabPage:TP_WELCOME";
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
     Hide = TRUE;
 };
 
 TabPage TP_PREPARE
 {
+    HelpID = "svtools:TabPage:TP_PREPARE";
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
     Hide = TRUE;
 };
 
 TabPage TP_SETUP
 {
+    HelpID = "svtools:TabPage:TP_SETUP";
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
     Hide = TRUE;
 };
 
 TabPage TP_FINISH
 {
+    HelpID = "svtools:TabPage:TP_FINISH";
     Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
     Hide = TRUE;
 };
author	Daniel Rentz [dr] <daniel.rentz@oracle.com>	2010-11-09 15:15:30 +0100
committer	Daniel Rentz [dr] <daniel.rentz@oracle.com>	2010-11-09 15:15:30 +0100
commit	376a1fd0f4f538f3fa3591b66201b59834d9f278 (patch)
tree	665653b2ab47ab118a631b3e93c2658ca76b9cc8 /svtools
parent	45a0ee3dc399b280e117fa61bdce0a4c56eba2fa (diff)
parent	95f71183414a50d12cd4bbacf47d711672e63268 (diff)