CWS changehid: resync to m84

11 files changed, 119 insertions, 620 deletions

diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 2849ddb71d10..9a66230f012c 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -36,7 +36,7 @@
 #include "addresstemplate.hrc"
 #endif
 #ifndef _SVTOOLS_HRC
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #endif
 #ifndef _SVT_HELPID_HRC
 #include <svtools/helpid.hrc>
diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
index f4812f8b7566..0652dfb9d0f5 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #ifndef _SVTOOLS_HRC
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #endif
 #ifndef _SVT_ADDRESSTEMPLATE_HRC_
 #include "addresstemplate.hrc"
diff --git a/svtools/source/dialogs/logindlg.cxx b/svtools/source/dialogs/logindlg.cxx
deleted file mode 100644
index c9edf632d2ec..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 <svl/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( USHORT nFlags )
-{
-    FASTBOOL bPathHide = FALSE;
-    FASTBOOL bErrorHide = FALSE;
-    FASTBOOL bAccountHide = FALSE;
-
-    if ( ( nFlags & LF_NO_PATH ) == LF_NO_PATH )
-    {
-        aPathFT.Hide();
-        aPathED.Hide();
-        aPathBtn.Hide();
-        bPathHide = 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 = TRUE;
-    }
-
-    if ( ( nFlags & LF_NO_ACCOUNT ) == LF_NO_ACCOUNT )
-    {
-        aAccountFT.Hide();
-        aAccountED.Hide();
-        bAccountHide = 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,
-    USHORT 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 338b608ab0e4..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 <svl/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..100755
--- 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.hrc b/svtools/source/dialogs/printdlg.hrc
index ef780acbb47c..83b7b0b28c82 100644
--- a/svtools/source/dialogs/printdlg.hrc
+++ b/svtools/source/dialogs/printdlg.hrc
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 
 #define FL_PRINTER              1
 #define LB_NAMES                2
diff --git a/svtools/source/dialogs/prnsetup.hrc b/svtools/source/dialogs/prnsetup.hrc
index 7d10c4652d45..4a06c3cf0e63 100644
--- a/svtools/source/dialogs/prnsetup.hrc
+++ b/svtools/source/dialogs/prnsetup.hrc
@@ -24,7 +24,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 
 #define FL_PRINTER          1
 #define LB_NAMES                2
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index 4898ed5d5f86..43b9fcddf91d 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svtools.hxx"
 
 #include <svtools/roadmapwizard.hxx>
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #include <svtools/svtdata.hxx>
 #include "roadmap.hxx"
 #include <tools/debug.hxx>
@@ -182,7 +182,21 @@ namespace svt
         ,m_pImpl( new RoadmapWizardImpl )
     {
         DBG_CTOR( RoadmapWizard, CheckInvariants );
+        impl_construct();
+    }
+
+    //--------------------------------------------------------------------
+    RoadmapWizard::RoadmapWizard( Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags )
+        :OWizardMachine( _pParent, i_nStyle, _nButtonFlags )
+        ,m_pImpl( new RoadmapWizardImpl )
+    {
+        DBG_CTOR( RoadmapWizard, CheckInvariants );
+        impl_construct();
+    }
 
+    //--------------------------------------------------------------------
+    void RoadmapWizard::impl_construct()
+    {
         SetLeftAlignedButtonCount( 1 );
         SetEmptyViewMargin();
 
@@ -328,15 +342,16 @@ namespace svt
         if ( (sal_Int32)aNewPathPos->second.size() <= nCurrentStatePathIndex )
             return;
 
-#if OSL_DEBUG_LEVEL > 0
         // assert that the current and the new path are equal, up to nCurrentStatePathIndex
         Paths::const_iterator aActivePathPos = m_pImpl->aPaths.find( m_pImpl->nActivePath );
         if ( aActivePathPos != m_pImpl->aPaths.end() )
         {
-            DBG_ASSERT( m_pImpl->getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) > nCurrentStatePathIndex,
-                "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" );
+            if ( m_pImpl->getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) <= nCurrentStatePathIndex )
+            {
+                OSL_ENSURE( false, "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" );
+                return;
+            }
         }
-#endif
 
         m_pImpl->nActivePath = _nPathId;
         m_pImpl->bActivePathIsDefinite = _bDecideForIt;
@@ -383,8 +398,14 @@ namespace svt
         }
 
         // can we advance from the current page?
-        const OWizardPage* pCurrentPage = dynamic_cast< const OWizardPage* >( GetPage( getCurrentState() ) );
-        const bool bCurrentPageCanAdvance = !pCurrentPage || pCurrentPage->canAdvance();
+        bool bCurrentPageCanAdvance = true;
+        TabPage* pCurrentPage = GetPage( getCurrentState() );
+        if ( pCurrentPage )
+        {
+            const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
+            OSL_ENSURE( pController != NULL, "RoadmapWizard::implUpdateRoadmap: no controller for the current page!" );
+            bCurrentPageCanAdvance = !pController || pController->canAdvance();
+        }
 
         // now, we have to remove all items after nCurrentStatePathIndex, and insert the items from the active
         // path, up to (excluding) nUpperStepBoundary
@@ -641,11 +662,33 @@ namespace svt
         // if the state is currently in the roadmap, reflect it's new status
         m_pImpl->pRoadmap->EnableRoadmapItem( (RoadmapTypes::ItemId)_nState, _bEnable );
     }
+
+    //--------------------------------------------------------------------
+    bool RoadmapWizard::knowsState( WizardState i_nState ) const
+    {
+        for (   Paths::const_iterator path = m_pImpl->aPaths.begin();
+                path != m_pImpl->aPaths.end();
+                ++path
+            )
+        {
+            for (   WizardPath::const_iterator state = path->second.begin();
+                    state != path->second.end();
+                    ++state
+                )
+            {
+                if ( *state == i_nState )
+                    return true;
+            }
+        }
+        return false;
+    }
+
     //--------------------------------------------------------------------
     bool RoadmapWizard::isStateEnabled( WizardState _nState ) const
     {
         return m_pImpl->aDisabledStates.find( _nState ) == m_pImpl->aDisabledStates.end();
     }
+
     //--------------------------------------------------------------------
     void RoadmapWizard::Resize()
     {
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 393509734a62..41e759eda43b 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -30,10 +30,11 @@
 #include <svtools/wizardmachine.hxx>
 #include <svtools/helpid.hrc>
 #include <tools/debug.hxx>
+#include <tools/diagnose_ex.h>
 #include <vcl/msgbox.hxx>
 #include <svtools/svtdata.hxx>
 #ifndef _SVTOOLS_HRC
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #endif
 
 //.........................................................................
@@ -101,7 +102,7 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    sal_Bool OWizardPage::commitPage( CommitPageReason )
+    sal_Bool OWizardPage::commitPage( WizardTypes::CommitPageReason )
     {
         return sal_True;
     }
@@ -161,6 +162,25 @@ namespace svt
         ,m_pHelp(NULL)
         ,m_pImpl( new WizardMachineImplData )
     {
+        implConstruct( _nButtonFlags );
+    }
+
+    //---------------------------------------------------------------------
+    OWizardMachine::OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags )
+        :WizardDialog( _pParent, i_nStyle )
+        ,m_pFinish(NULL)
+        ,m_pCancel(NULL)
+        ,m_pNextPage(NULL)
+        ,m_pPrevPage(NULL)
+        ,m_pHelp(NULL)
+        ,m_pImpl( new WizardMachineImplData )
+    {
+        implConstruct( _nButtonFlags );
+    }
+
+    //---------------------------------------------------------------------
+    void OWizardMachine::implConstruct( const sal_uInt32 _nButtonFlags )
+    {
         m_pImpl->sTitleBase = GetText();
 
         // create the buttons according to the wizard button flags
@@ -225,8 +245,6 @@ namespace svt
 
             AddButton( m_pCancel, WIZARDDIALOG_BUTTON_STDOFFSET_X );
         }
-
-
     }
 
     //---------------------------------------------------------------------
@@ -274,35 +292,42 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    void OWizardMachine::ActivatePage()
+    TabPage* OWizardMachine::GetOrCreatePage( const WizardState i_nState )
     {
-        WizardDialog::ActivatePage();
-
-        WizardState nCurrentLevel = GetCurLevel();
-        if (NULL == GetPage(nCurrentLevel))
+        if ( NULL == GetPage( i_nState ) )
         {
-            TabPage* pNewPage = createPage(nCurrentLevel);
-            DBG_ASSERT(pNewPage, "OWizardMachine::ActivatePage: invalid new page (NULL)!");
+            TabPage* pNewPage = createPage( i_nState );
+            DBG_ASSERT( pNewPage, "OWizardMachine::GetOrCreatePage: invalid new page (NULL)!" );
 
             // fill up the page sequence of our base class (with dummies)
-            while (m_pImpl->nFirstUnknownPage < nCurrentLevel)
+            while ( m_pImpl->nFirstUnknownPage < i_nState )
             {
-                AddPage(NULL);
+                AddPage( NULL );
                 ++m_pImpl->nFirstUnknownPage;
             }
 
-            if (m_pImpl->nFirstUnknownPage == nCurrentLevel)
+            if ( m_pImpl->nFirstUnknownPage == i_nState )
             {
                 // encountered this page number the first time
-                AddPage(pNewPage);
+                AddPage( pNewPage );
                 ++m_pImpl->nFirstUnknownPage;
             }
             else
                 // already had this page - just change it
-                SetPage(nCurrentLevel, pNewPage);
+                SetPage( i_nState, pNewPage );
         }
+        return GetPage( i_nState );
+    }
 
-        enterState(nCurrentLevel);
+    //---------------------------------------------------------------------
+    void OWizardMachine::ActivatePage()
+    {
+        WizardDialog::ActivatePage();
+
+        WizardState nCurrentLevel = GetCurLevel();
+        GetOrCreatePage( nCurrentLevel );
+
+        enterState( nCurrentLevel );
     }
 
     //---------------------------------------------------------------------
@@ -330,8 +355,10 @@ namespace svt
         if (m_pCancel && (_nWizardButtonFlags & WZB_CANCEL))
             pNewDefButton = m_pCancel;
 
-        if (pNewDefButton)
-            defaultButton(pNewDefButton);
+        if ( pNewDefButton )
+            defaultButton( pNewDefButton );
+        else
+            implResetDefault( this );
     }
 
     //---------------------------------------------------------------------
@@ -395,9 +422,10 @@ namespace svt
     void OWizardMachine::enterState(WizardState _nState)
     {
         // tell the page
-        IWizardPage* pCurrentPage = getWizardPage(GetPage(_nState));
-        if ( pCurrentPage )
-            pCurrentPage->initializePage();
+        IWizardPageController* pController = getPageController( GetPage( _nState ) );
+        OSL_ENSURE( pController, "OWizardMachine::enterState: no controller for the given page!" );
+        if ( pController )
+            pController->initializePage();
 
         if ( isAutomaticNextButtonStateEnabled() )
             enableButtons( WZB_NEXT, canAdvance() );
@@ -419,9 +447,9 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    sal_Bool OWizardMachine::onFinish(sal_Int32 _nResult)
+    sal_Bool OWizardMachine::onFinish()
     {
-        return Finnish(_nResult);
+        return Finnish( RET_OK );
     }
 
     //---------------------------------------------------------------------
@@ -434,8 +462,7 @@ namespace svt
         {
             return 0L;
         }
-        long nRet = onFinish( RET_OK );
-        return nRet;
+        return onFinish() ? 1L : 0L;
     }
 
     //---------------------------------------------------------------------
@@ -447,10 +474,9 @@ namespace svt
     //---------------------------------------------------------------------
     sal_Bool OWizardMachine::prepareLeaveCurrentState( CommitPageReason _eReason )
     {
-        IWizardPage* pCurrentPage = getWizardPage(GetPage(getCurrentState()));
-        if ( pCurrentPage )
-            return pCurrentPage->commitPage( _eReason );
-        return sal_True;
+        IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
+        ENSURE_OR_RETURN( pController != NULL, "OWizardMachine::prepareLeaveCurrentState: no controller for the current page!", sal_True );
+        return pController->commitPage( _eReason );
     }
 
     //---------------------------------------------------------------------
@@ -664,10 +690,10 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    IWizardPage* OWizardMachine::getWizardPage(TabPage* _pCurrentPage) const
+    IWizardPageController* OWizardMachine::getPageController( TabPage* _pCurrentPage ) const
     {
-        OWizardPage* pPage = dynamic_cast< OWizardPage* >( _pCurrentPage );
-        return pPage;
+        IWizardPageController* pController = dynamic_cast< IWizardPageController* >( _pCurrentPage );
+        return pController;
     }
 
     //---------------------------------------------------------------------
@@ -690,11 +716,12 @@ namespace svt
     //---------------------------------------------------------------------
     void OWizardMachine::updateTravelUI()
     {
-        OWizardPage* pPage = dynamic_cast< OWizardPage* >( GetPage( getCurrentState() ) );
+        const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
+        OSL_ENSURE( pController != NULL, "RoadmapWizard::updateTravelUI: no controller for the current page!" );
 
         bool bCanAdvance =
-                ( !pPage || pPage->canAdvance() )   // the current page allows to advance
-            &&  canAdvance();                       // the dialog as a whole allows to advance
+                ( !pController || pController->canAdvance() )   // the current page allows to advance
+            &&  canAdvance();                                   // the dialog as a whole allows to advance
         enableButtons( WZB_NEXT, bCanAdvance );
     }
 
diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src
index c3570335773f..9c82ea30071f 100644
--- a/svtools/source/dialogs/wizardmachine.src
+++ b/svtools/source/dialogs/wizardmachine.src
@@ -26,7 +26,7 @@
  ************************************************************************/
 
 #ifndef _SVTOOLS_HRC
-#include <svl/svtools.hrc>
+#include <svtools/svtools.hrc>
 #endif
 
 String STR_WIZDLG_FINISH