removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xmloff, linguistic, vcl, svtools, accessibility, fpicker, uui and framework

12 files changed, 51 insertions, 593 deletions

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 7f9896446e3b..73ad8e93e78e 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 );
@@ -347,7 +347,7 @@ IMPL_LINK( ImpPathDialog, ClickHdl, Button*, pBtn )
     if ( pBtn == pHomeBtn )
     {
         ::rtl::OUString aHomeDir;
-        NAMESPACE_VOS( OSecurity ) aSecurity;
+        vos:: OSecurity  aSecurity;
         if ( aSecurity.getHomeDir( aHomeDir ) )
         {
             DirEntry aFile ( aHomeDir );
@@ -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/logindlg.cxx b/svtools/source/dialogs/logindlg.cxx
deleted file mode 100644
index c51f7cc1bca0..000000000000
--- a/svtools/source/dialogs/logindlg.cxx
+++ /dev/null
@@ -1,312 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svtools.hxx"
-#include <filedlg.hxx>
-#include <vcl/msgbox.hxx>
-#include <svtools/logindlg.hxx>
-
-#ifndef _SVTOOLS_LOGINDLG_HRC_
-#include "logindlg.hrc"
-#endif
-#ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
-#endif
-#include <svtools/svtdata.hxx>
-
-#ifdef UNX
-#include <limits.h>
-#define _MAX_PATH PATH_MAX
-#endif
-
-// LoginDialog -------------------------------------------------------
-
-//............................................................................
-namespace svt
-{
-//............................................................................
-
-void LoginDialog::HideControls_Impl( sal_uInt16 nFlags )
-{
-    int bPathHide = sal_False;
-    int bErrorHide = sal_False;
-    int bAccountHide = sal_False;
-
-    if ( ( nFlags & LF_NO_PATH ) == LF_NO_PATH )
-    {
-        aPathFT.Hide();
-        aPathED.Hide();
-        aPathBtn.Hide();
-        bPathHide = sal_True;
-    }
-    else if ( ( nFlags & LF_PATH_READONLY ) == LF_PATH_READONLY )
-    {
-        aPathED.Hide();
-        aPathInfo.Show();
-        aPathBtn.Hide();
-    }
-
-    if ( ( nFlags & LF_NO_USERNAME ) == LF_NO_USERNAME )
-    {
-        aNameFT.Hide();
-        aNameED.Hide();
-    }
-    else if ( ( nFlags & LF_USERNAME_READONLY ) == LF_USERNAME_READONLY )
-    {
-        aNameED.Hide();
-        aNameInfo.Show();
-    }
-
-    if ( ( nFlags & LF_NO_PASSWORD ) == LF_NO_PASSWORD )
-    {
-        aPasswordFT.Hide();
-        aPasswordED.Hide();
-    }
-
-    if ( ( nFlags & LF_NO_SAVEPASSWORD ) == LF_NO_SAVEPASSWORD )
-        aSavePasswdBtn.Hide();
-
-    if ( ( nFlags & LF_NO_ERRORTEXT ) == LF_NO_ERRORTEXT )
-    {
-        aErrorInfo.Hide();
-        aErrorGB.Hide();
-        bErrorHide = sal_True;
-    }
-
-    if ( ( nFlags & LF_NO_ACCOUNT ) == LF_NO_ACCOUNT )
-    {
-        aAccountFT.Hide();
-        aAccountED.Hide();
-        bAccountHide = sal_True;
-    }
-
-    if ( bErrorHide )
-    {
-        long nOffset = aLoginGB.GetPosPixel().Y() -
-                       aErrorGB.GetPosPixel().Y();
-        Point aNewPnt = aRequestInfo.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aRequestInfo.SetPosPixel( aNewPnt );
-        aNewPnt = aPathFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathFT.SetPosPixel( aNewPnt );
-        aNewPnt = aPathED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathED.SetPosPixel( aNewPnt );
-        aNewPnt = aPathInfo.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathInfo.SetPosPixel( aNewPnt );
-        aNewPnt = aPathBtn.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPathBtn.SetPosPixel( aNewPnt );
-        aNewPnt = aNameFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aNameFT.SetPosPixel( aNewPnt );
-        aNewPnt = aNameED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aNameED.SetPosPixel( aNewPnt );
-        aNewPnt = aNameInfo.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aNameInfo.SetPosPixel( aNewPnt );
-        aNewPnt = aPasswordFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPasswordFT.SetPosPixel( aNewPnt );
-        aNewPnt = aPasswordED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aPasswordED.SetPosPixel( aNewPnt );
-        aNewPnt = aAccountFT.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aAccountFT.SetPosPixel( aNewPnt );
-        aNewPnt = aAccountED.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aAccountED.SetPosPixel( aNewPnt );
-        aNewPnt = aSavePasswdBtn.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aSavePasswdBtn.SetPosPixel( aNewPnt );
-        aNewPnt = aLoginGB.GetPosPixel();
-        aNewPnt.Y() -= nOffset;
-        aLoginGB.SetPosPixel( aNewPnt );
-        Size aNewSiz = GetSizePixel();
-        aNewSiz.Height() -= nOffset;
-        SetSizePixel( aNewSiz );
-    }
-
-    if ( bPathHide )
-    {
-        long nOffset = aNameED.GetPosPixel().Y() -
-                       aPathED.GetPosPixel().Y();
-
-        Point aTmpPnt1 = aNameFT.GetPosPixel();
-        Point aTmpPnt2 = aPasswordFT.GetPosPixel();
-        aNameFT.SetPosPixel( aPathFT.GetPosPixel() );
-        aPasswordFT.SetPosPixel( aTmpPnt1 );
-        aAccountFT.SetPosPixel( aTmpPnt2 );
-        aTmpPnt1 = aNameED.GetPosPixel();
-        aTmpPnt2 = aPasswordED.GetPosPixel();
-        aNameED.SetPosPixel( aPathED.GetPosPixel() );
-        aPasswordED.SetPosPixel( aTmpPnt1 );
-        aAccountED.SetPosPixel( aTmpPnt2 );
-        aNameInfo.SetPosPixel( aPathInfo.GetPosPixel() );
-        aTmpPnt1 = aSavePasswdBtn.GetPosPixel();
-        aTmpPnt1.Y() -= nOffset;
-        aSavePasswdBtn.SetPosPixel( aTmpPnt1 );
-        Size aNewSz = GetSizePixel();
-        aNewSz.Height() -= nOffset;
-        SetSizePixel( aNewSz );
-    }
-
-    if ( bAccountHide )
-    {
-        long nOffset = aAccountED.GetPosPixel().Y() - aPasswordED.GetPosPixel().Y();
-
-        Point aTmpPnt = aSavePasswdBtn.GetPosPixel();
-        aTmpPnt.Y() -= nOffset;
-        aSavePasswdBtn.SetPosPixel( aTmpPnt );
-        Size aNewSz = GetSizePixel();
-        aNewSz.Height() -= nOffset;
-        SetSizePixel( aNewSz );
-    }
-};
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( LoginDialog, OKHdl_Impl, OKButton *, EMPTYARG )
-{
-    // trim the strings
-    aNameED.SetText( aNameED.GetText().EraseLeadingChars().
-        EraseTrailingChars() );
-    aPasswordED.SetText( aPasswordED.GetText().EraseLeadingChars().
-        EraseTrailingChars() );
-    EndDialog( RET_OK );
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( LoginDialog, PathHdl_Impl, PushButton *, EMPTYARG )
-{
-    PathDialog* pDlg = new PathDialog( this, WB_3DLOOK );
-//  DirEntry aEntry;
-//  aEntry.ToAbs();
-//  pDlg->SetPath( aEntry.GetFull() );
-
-    if ( pDlg->Execute() == RET_OK )
-        aPathED.SetText( pDlg->GetPath() );
-
-    delete pDlg;
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
-LoginDialog::LoginDialog
-(
-    Window* pParent,
-    sal_uInt16 nFlags,
-    const String& rServer,
-    const String* pRealm
-) :
-
-    ModalDialog( pParent, SvtResId( DLG_LOGIN ) ),
-
-    aErrorInfo      ( this, SvtResId( INFO_LOGIN_ERROR ) ),
-    aErrorGB        ( this, SvtResId( GB_LOGIN_ERROR ) ),
-    aRequestInfo    ( this, SvtResId( INFO_LOGIN_REQUEST ) ),
-    aPathFT         ( this, SvtResId( FT_LOGIN_PATH ) ),
-    aPathED         ( this, SvtResId( ED_LOGIN_PATH ) ),
-    aPathInfo       ( this, SvtResId( INFO_LOGIN_PATH ) ),
-    aPathBtn        ( this, SvtResId( BTN_LOGIN_PATH ) ),
-    aNameFT         ( this, SvtResId( FT_LOGIN_USERNAME ) ),
-    aNameED         ( this, SvtResId( ED_LOGIN_USERNAME ) ),
-    aNameInfo       ( this, SvtResId( INFO_LOGIN_USERNAME ) ),
-    aPasswordFT     ( this, SvtResId( FT_LOGIN_PASSWORD ) ),
-    aPasswordED     ( this, SvtResId( ED_LOGIN_PASSWORD ) ),
-    aAccountFT      ( this, SvtResId( FT_LOGIN_ACCOUNT ) ),
-    aAccountED      ( this, SvtResId( ED_LOGIN_ACCOUNT ) ),
-    aSavePasswdBtn  ( this, SvtResId( CB_LOGIN_SAVEPASSWORD ) ),
-    aLoginGB        ( this, SvtResId( GB_LOGIN_LOGIN ) ),
-    aOKBtn          ( this, SvtResId( BTN_LOGIN_OK ) ),
-    aCancelBtn      ( this, SvtResId( BTN_LOGIN_CANCEL ) ),
-    aHelpBtn        ( this, SvtResId( BTN_LOGIN_HELP ) )
-
-{
-    // Einlog-Ort eintragen
-    String aServer;
-
-    if ( ( ( nFlags & LF_NO_ACCOUNT ) == LF_NO_ACCOUNT ) && pRealm && pRealm->Len() )
-    {
-        aServer = *pRealm;
-        ( ( aServer += ' ' ) += String( SvtResId( STR_LOGIN_AT ) ) ) += ' ';
-    }
-    aServer += rServer;
-    String aTxt = aRequestInfo.GetText();
-    aTxt.SearchAndReplaceAscii( "%1", aServer );
-    aRequestInfo.SetText( aTxt );
-
-    FreeResource();
-
-    aPathED.SetMaxTextLen( _MAX_PATH );
-    aNameED.SetMaxTextLen( _MAX_PATH );
-
-    aOKBtn.SetClickHdl( LINK( this, LoginDialog, OKHdl_Impl ) );
-    aPathBtn.SetClickHdl( LINK( this, LoginDialog, PathHdl_Impl ) );
-
-    HideControls_Impl( nFlags );
-};
-
-// -----------------------------------------------------------------------
-
-void LoginDialog::SetName( const String& rNewName )
-{
-    aNameED.SetText( rNewName );
-    aNameInfo.SetText( rNewName );
-}
-
-// -----------------------------------------------------------------------
-
-void LoginDialog::ClearPassword()
-{
-    aPasswordED.SetText( String() );
-
-    if ( 0 == aNameED.GetText().Len() )
-        aNameED.GrabFocus();
-    else
-        aPasswordED.GrabFocus();
-};
-
-// -----------------------------------------------------------------------
-
-void LoginDialog::ClearAccount()
-{
-    aAccountED.SetText( String() );
-    aAccountED.GrabFocus();
-};
-
-//............................................................................
-}   // namespace svt
-//............................................................................
diff --git a/svtools/source/dialogs/logindlg.hrc b/svtools/source/dialogs/logindlg.hrc
deleted file mode 100644
index 7baf6010f531..000000000000
--- a/svtools/source/dialogs/logindlg.hrc
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifndef _SVTOOLS_LOGINDLG_HRC_
-#define _SVTOOLS_LOGINDLG_HRC_
-
-//============================================================================
-#define INFO_LOGIN_ERROR        10
-#define GB_LOGIN_ERROR          11
-
-#define INFO_LOGIN_REQUEST      20
-#define FT_LOGIN_PATH           21
-#define ED_LOGIN_PATH           22
-#define INFO_LOGIN_PATH         23
-#define BTN_LOGIN_PATH          24
-#define FT_LOGIN_USERNAME       25
-#define ED_LOGIN_USERNAME       26
-#define INFO_LOGIN_USERNAME     27
-#define FT_LOGIN_PASSWORD       28
-#define ED_LOGIN_PASSWORD       29
-#define FT_LOGIN_ACCOUNT        30
-#define ED_LOGIN_ACCOUNT        31
-#define CB_LOGIN_SAVEPASSWORD   32
-#define GB_LOGIN_LOGIN          33
-
-#define BTN_LOGIN_OK            50
-#define BTN_LOGIN_CANCEL        51
-#define BTN_LOGIN_HELP          52
-
-#define STR_LOGIN_AT            60
-
-#endif // _SVTOOLS_LOGINDLG_HRC_
diff --git a/svtools/source/dialogs/logindlg.src b/svtools/source/dialogs/logindlg.src
deleted file mode 100644
index f6e3565d8cd9..000000000000
--- a/svtools/source/dialogs/logindlg.src
+++ /dev/null
@@ -1,200 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SVTOOLS_HRC
-#include <svtools/svtools.hrc>
-#endif
-
-#ifndef _SVTOOLS_LOGINDLG_HRC_
-#include "logindlg.hrc"
-#endif
-
-ModalDialog DLG_LOGIN
-{
-//  HelpId = HID_DLG_LOGIN ;
-    Border = TRUE ;
-    Moveable = TRUE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 265 , 158 ) ;
-    FixedText INFO_LOGIN_ERROR
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 185 , 18 ) ;
-        WordBreak = TRUE ;
-    };
-    FixedLine GB_LOGIN_ERROR
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 197 , 8 ) ;
-        Text [ en-US ] = "Message from server" ;
-    };
-    FixedText INFO_LOGIN_REQUEST
-    {
-        Pos = MAP_APPFONT ( 12 , 55 ) ;
-        Size = MAP_APPFONT ( 185 , 18 ) ;
-        WordBreak = TRUE ;
-        Text [ en-US ] = "Please enter user name and password for %1." ;
-    };
-    FixedText FT_LOGIN_PATH
-    {
-        Pos = MAP_APPFONT ( 12 , 77 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text [ en-US ] = "~Path" ;
-    };
-    Edit ED_LOGIN_PATH
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 76 ) ;
-        Size = MAP_APPFONT ( 108 , 12 ) ;
-    };
-    FixedText INFO_LOGIN_PATH
-    {
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 77 ) ;
-        Size = MAP_APPFONT ( 125 , 10 ) ;
-    };
-    PushButton BTN_LOGIN_PATH
-    {
-        Pos = MAP_APPFONT ( 183 , 75 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
-        Text = "~..." ;
-    };
-    FixedText FT_LOGIN_USERNAME
-    {
-        Pos = MAP_APPFONT ( 12 , 92 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text [ en-US ] = "~User name" ;
-    };
-    Edit ED_LOGIN_USERNAME
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 91 ) ;
-        Size = MAP_APPFONT ( 125 , 12 ) ;
-    };
-    FixedText INFO_LOGIN_USERNAME
-    {
-        Hide = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 92 ) ;
-        Size = MAP_APPFONT ( 125 , 10 ) ;
-    };
-    FixedText FT_LOGIN_PASSWORD
-    {
-        Pos = MAP_APPFONT ( 12 , 107 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text [ en-US ] = "Pass~word" ;
-    };
-    Edit ED_LOGIN_PASSWORD
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 106 ) ;
-        Size = MAP_APPFONT ( 125 , 12 ) ;
-        PassWord = TRUE ;
-    };
-    FixedText FT_LOGIN_ACCOUNT
-    {
-        Pos = MAP_APPFONT ( 12 , 122 ) ;
-        Size = MAP_APPFONT ( 57 , 10 ) ;
-        Text [ en-US ] = "A~ccount";
-    };
-    Edit ED_LOGIN_ACCOUNT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 72 , 121 ) ;
-        Size = MAP_APPFONT ( 125 , 12 ) ;
-        PassWord = TRUE ;
-    };
-    CheckBox CB_LOGIN_SAVEPASSWORD
-    {
-        Pos = MAP_APPFONT ( 12 , 136 ) ;
-        Size = MAP_APPFONT ( 185 , 10 ) ;
-        Text [ en-US ] = "~Save password" ;
-    };
-    FixedLine GB_LOGIN_LOGIN
-    {
-        Pos = MAP_APPFONT ( 7 , 44 ) ;
-        Size = MAP_APPFONT ( 197 , 8 ) ;
-        Text [ en-US ] = "Log in" ;
-    };
-    OKButton BTN_LOGIN_OK
-    {
-        Pos = MAP_APPFONT ( 209 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_LOGIN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 209 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    HelpButton BTN_LOGIN_HELP
-    {
-        Pos = MAP_APPFONT ( 209 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    String STR_LOGIN_AT
-    {
-        Text [ en-US ] = "to " ;
-    };
-    Text [ en-US ] = "User Name and Password Required" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/svtools/source/dialogs/makefile.mk b/svtools/source/dialogs/makefile.mk
index 16528ee7d4cd..99c4b59b76ae 100644
--- a/svtools/source/dialogs/makefile.mk
+++ b/svtools/source/dialogs/makefile.mk
@@ -44,7 +44,6 @@ SRC1FILES=		filedlg2.src	\
                 prnsetup.src	\
                 printdlg.src	\
                 colrdlg.src		\
-                logindlg.src	\
                 addresstemplate.src	\
                 wizardmachine.src
 
@@ -69,8 +68,7 @@ SLOFILES=	\
                     $(SLO)$/colrdlg.obj 	\
                     $(SLO)$/property.obj	\
                     $(SLO)$/wizdlg.obj		\
-                    $(SLO)$/mcvmath.obj		\
-                    $(SLO)$/logindlg.obj
+                    $(SLO)$/mcvmath.obj
 
 # --- Targets ------------------------------------------------------
 
diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index 8ac47db14cdd..dc726683a355 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();