CWS-TOOLING: integrate CWS dv19

11 files changed, 291 insertions, 336 deletions

diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 73fa61f31ff4..6d65eb67055e 100755..100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -52,7 +52,6 @@
 #include "logindlg.hxx"
 #include "masterpasscrtdlg.hxx"
 #include "masterpassworddlg.hxx"
-#include "passcrtdlg.hxx"
 #include "passworddlg.hxx"
 
 #include "iahndl.hxx"
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 0879e3574da3..ee233f5ac9de 100644..100755
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -89,6 +89,7 @@
 #include "newerverwarn.hxx"
 
 #include "iahndl.hxx"
+#include "nameclashdlg.hxx"
 
 /** === begin UNO using === **/
 using ::com::sun::star::uno::Sequence;
@@ -867,8 +868,6 @@ UUIInteractionHelper::handleRequest_impl(
             if ( handleCertificateValidationRequest( rRequest ) )
                 return true;
 
-// @@@ Todo #i29340#: activate!
-#if 0
             ucb::NameClashResolveRequest aNameClashResolveRequest;
             if (aAnyRequest >>= aNameClashResolveRequest)
             {
@@ -876,7 +875,7 @@ UUIInteractionHelper::handleRequest_impl(
                                               rRequest->getContinuations());
                 return true;
             }
-#endif
+
             if ( handleMasterPasswordRequest( rRequest ) )
                 return true;
 
@@ -1188,40 +1187,26 @@ executeMessageBox(
     return aResult;
 }
 
-// @@@ Todo #i29340#: activate!
-#if 0
-enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE };
-
-NameClashResolveDialogResult
-executeNameClashResolveDialog(
-    Window * /*pParent*/,
-    rtl::OUString const & /*rTargetFolderURL*/,
-    rtl::OUString const & /*rClashingName*/,
-    rtl::OUString & /*rProposedNewName*/)
+NameClashResolveDialogResult executeSimpleNameClashResolveDialog( Window *pParent,
+                                                                  rtl::OUString const & rTargetFolderURL,
+                                                                  rtl::OUString const & rClashingName,
+                                                                  rtl::OUString & rProposedNewName,
+                                                                  bool bAllowOverwrite )
 {
-    // @@@ Todo DV: execute overwrite-rename dialog, deliver result
-    OSL_ENSURE( false,
-                "executeNameClashResolveDialog not yet implemented!" );
-    return ABORT;
-}
+    std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
+    if ( !xManager.get() )
+        return ABORT;
 
-NameClashResolveDialogResult
-executeSimpleNameClashResolveDialog(
-    Window * /*pParent*/,
-    rtl::OUString const & /*rTargetFolderURL*/,
-    rtl::OUString const & /*rClashingName*/,
-    rtl::OUString & /*rProposedNewName*/)
-{
-    // @@@ Todo DV: execute rename-only dialog, deliver result
-    OSL_ENSURE( false,
-                "executeSimpleNameClashResolveDialog not yet implemented!" );
-    return ABORT;
+    NameClashDialog aDialog( pParent, xManager.get(), rTargetFolderURL,
+                             rClashingName, rProposedNewName, bAllowOverwrite );
+
+    NameClashResolveDialogResult eResult = (NameClashResolveDialogResult) aDialog.Execute();
+    rProposedNewName = aDialog.getNewName();
+    return eResult;
 }
-#endif
+
 } // namespace
 
-// @@@ Todo #i29340#: activate!
-#if 0
 void
 UUIInteractionHelper::handleNameClashResolveRequest(
     ucb::NameClashResolveRequest const & rRequest,
@@ -1251,18 +1236,12 @@ UUIInteractionHelper::handleNameClashResolveRequest(
 
     NameClashResolveDialogResult eResult = ABORT;
     rtl::OUString aProposedNewName( rRequest.ProposedNewName );
-    if ( xReplaceExistingData.is() )
-        eResult = executeNameClashResolveDialog(
-            getParentProperty(),
-            rRequest.TargetFolderURL,
-            rRequest.ClashingName,
-            aProposedNewName);
-    else
-        eResult = executeSimpleNameClashResolveDialog(
-            getParentProperty(),
-            rRequest.TargetFolderURL,
-            rRequest.ClashingName,
-            aProposedNewName);
+
+    eResult = executeSimpleNameClashResolveDialog( getParentProperty(),
+                    rRequest.TargetFolderURL,
+                    rRequest.ClashingName,
+                    aProposedNewName,
+                    xReplaceExistingData.is() );
 
     switch ( eResult )
     {
@@ -1282,14 +1261,8 @@ UUIInteractionHelper::handleNameClashResolveRequest(
             "No ReplaceExistingData continuation available!" );
         xReplaceExistingData->select();
         break;
-
-    default:
-        OSL_ENSURE( false, "Unknown NameClashResolveDialogResult value. "
-                           "Interaction Request not handled!" );
-        break;
     }
 }
-#endif
 
 void
 UUIInteractionHelper::handleGenericErrorRequest(
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 581099462845..6402653d3bda 100755
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -215,8 +215,6 @@ private:
             com::sun::star::task::XInteractionRequest > const & rRequest)
         SAL_THROW((com::sun::star::uno::RuntimeException));
 
-// @@@ Todo #i29340#: activate!
-#if 0
     void
     handleNameClashResolveRequest(
         com::sun::star::ucb::NameClashResolveRequest const & rRequest,
@@ -225,7 +223,6 @@ private:
                 com::sun::star::task::XInteractionContinuation > > const &
                     rContinuations)
         SAL_THROW((com::sun::star::uno::RuntimeException));
-#endif
 
     bool
     handleMasterPasswordRequest(
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index 796186fd5140..9be81479ef59 100755..100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -48,13 +48,14 @@
 #define DLG_FILTER_SELECT                               (RID_UUI_START + 10)
 // RID_UUI_START + 11 moved to ERRCODE_UUI_WRONGMEDIUM
 #define DLG_UUI_MASTERPASSWORD                          (RID_UUI_START + 12)
+#define DLG_SIMPLE_NAME_CLASH                           (RID_UUI_START + 13)
 #define STR_ERROR_PASSWORDS_NOT_IDENTICAL               (RID_UUI_START + 13)
 #define STR_ERROR_MASTERPASSWORD_WRONG                  (RID_UUI_START + 14)
 // RID_UUI_START + 15, 16, 17 are misused by syncaccess/source/ui/resids.hrc
+
 #define RID_UUI_ERRHDL                                  (RID_UUI_START + 20)
 #define DLG_UUI_MASTERPASSWORD_CRT                      (RID_UUI_START + 21)
 #define DLG_UUI_PASSWORD                                (RID_UUI_START + 22)
-#define DLG_UUI_PASSWORD_CRT                            (RID_UUI_START + 23)
 #define STR_ERROR_PASSWORD_TO_OPEN_WRONG                (RID_UUI_START + 24)
 #define STR_ERROR_PASSWORD_TO_MODIFY_WRONG              (RID_UUI_START + 25)
 #define DLG_UUI_UNKNOWNAUTH                             (RID_UUI_START + 26)
@@ -89,6 +90,9 @@
 #define STR_WARNING_BROKENSIGNATURE_TITLE               (RID_UUI_START + 55)
 #define STR_ENTER_PASSWORD_TO_OPEN                      (RID_UUI_START + 56)
 #define STR_ENTER_PASSWORD_TO_MODIFY                    (RID_UUI_START + 57)
+#define STR_RENAME_OR_REPLACE                           (RID_UUI_START + 58)
+#define STR_NAME_CLASH_RENAME_ONLY                      (RID_UUI_START + 59)
+#define STR_SAME_NAME_USED                              (RID_UUI_START + 60)
 
 #define ERRCODE_UUI_IO_ABORT                                    (ERRCODE_AREA_UUI + 0)
 #define ERRCODE_UUI_IO_ACCESSDENIED                             (ERRCODE_AREA_UUI + 1)
@@ -176,7 +180,6 @@
 #define HID_DLG_MASTERPASSWORD_CRT              (HID_UUI_START + 3)
 #define HID_DLG_FILTER_SELECT                   (HID_UUI_START + 4)
 #define HID_DLG_PASSWORD_UUI                    (HID_UUI_START + 5)
-#define HID_DLG_PASSWORD_CRT                    (HID_UUI_START + 6)
 #define HID_DLG_UNKNOWNAUTH_UUI                 (HID_UUI_START + 7)
 #define HID_DLG_SSLWARN_UUI                     (HID_UUI_START + 8)
 #define HID_XMLSECDLG_MACROWARN                 (HID_UUI_START + 9)
@@ -189,6 +192,7 @@
 #define HID_LOGIN_DLG_ACCOUNT                   (HID_UUI_START +15)
 #define HID_LOGIN_DLG_REMEMBER_PASSWORD         (HID_UUI_START +16)
 #define HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS    (HID_UUI_START +17)
+#define HID_DLG_SIMPLE_NAME_CLASH               (HID_UUI_START +18)
 
 // HID_UUI_END (aka HID_CHAOS_NEW_DATABASE) is reserved in
 // sfx2/util/hidother.src
diff --git a/uui/source/makefile.mk b/uui/source/makefile.mk
index 5c20e593046a..e09f5c01e967 100644..100755
--- a/uui/source/makefile.mk
+++ b/uui/source/makefile.mk
@@ -48,7 +48,6 @@ SLOFILES = \
     $(SLO)$/masterpasscrtdlg.obj \
     $(SLO)$/openlocked.obj \
     $(SLO)$/passworddlg.obj \
-    $(SLO)$/passcrtdlg.obj \
     $(SLO)$/fltdlg.obj \
     $(SLO)$/interactionhandler.obj \
     $(SLO)$/requeststringresolver.obj \
@@ -60,6 +59,7 @@ SLOFILES = \
     $(SLO)$/lockfailed.obj \
     $(SLO)$/trylater.obj \
     $(SLO)$/newerverwarn.obj \
+    $(SLO)$/nameclashdlg.obj \
     $(SLO)$/passwordcontainer.obj
 
 SRS1NAME=$(TARGET)
@@ -71,7 +71,6 @@ SRC1FILES = \
     masterpasscrtdlg.src \
     openlocked.src \
     passworddlg.src \
-    passcrtdlg.src \
     passworderrs.src \
     fltdlg.src \
     unknownauthdlg.src\
@@ -81,6 +80,7 @@ SRC1FILES = \
     alreadyopen.src\
     lockfailed.src\
     trylater.src\
+    nameclashdlg.src\
     newerverwarn.src
 
 .INCLUDE: target.mk
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
new file mode 100755
index 000000000000..593398d53640
--- /dev/null
+++ b/uui/source/nameclashdlg.cxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#include "vcl/msgbox.hxx"
+#include "osl/file.hxx"
+
+#include "ids.hrc"
+#include "nameclashdlg.hrc"
+#include "nameclashdlg.hxx"
+
+// NameClashDialog ---------------------------------------------------------
+
+IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn )
+{
+    long nRet = (long) ABORT;
+    if ( &maBtnRename == pBtn )
+    {
+        nRet = (long) RENAME;
+        rtl::OUString aNewName = maEDNewName.GetText();
+        if ( ( aNewName == maNewName ) || !aNewName.getLength() )
+        {
+            ErrorBox aError( NULL, WB_OK, maSameName );
+            aError.Execute();
+            return 1;
+        }
+        maNewName = aNewName;
+    }
+    else if ( &maBtnOverwrite == pBtn )
+        nRet = (long) OVERWRITE;
+
+    EndDialog( nRet );
+
+    return 1;
+}
+
+// -----------------------------------------------------------------------
+NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr,
+                                  rtl::OUString const & rTargetFolderURL,
+                                  rtl::OUString const & rClashingName,
+                                  rtl::OUString const & rProposedNewName,
+                                  bool bAllowOverwrite )
+    : ModalDialog( pParent, ResId( DLG_SIMPLE_NAME_CLASH, *pResMgr ) ),
+    maFTMessage            ( this, ResId( FT_FILE_EXISTS_WARNING, *pResMgr ) ),
+    maEDNewName            ( this, ResId( EDIT_NEW_NAME, *pResMgr ) ),
+    maBtnOverwrite         ( this, ResId( BTN_OVERWRITE, *pResMgr ) ),
+    maBtnRename            ( this, ResId( BTN_RENAME, *pResMgr ) ),
+    maBtnCancel            ( this, ResId( BTN_CANCEL, *pResMgr ) ),
+    maBtnHelp              ( this, ResId( BTN_HELP, *pResMgr ) ),
+    maNewName              ( rClashingName )
+{
+    FreeResource();
+
+    Link aLink( LINK( this, NameClashDialog, ButtonHdl_Impl ) );
+    maBtnOverwrite.SetClickHdl( aLink );
+    maBtnRename.SetClickHdl( aLink );
+    maBtnCancel.SetClickHdl( aLink );
+
+    String aInfo;
+    if ( bAllowOverwrite )
+    {
+        aInfo = String( ResId( STR_RENAME_OR_REPLACE, *pResMgr ) );
+    }
+    else
+    {
+        aInfo = String( ResId( STR_NAME_CLASH_RENAME_ONLY, *pResMgr ) );
+        maBtnOverwrite.Hide();
+    }
+
+    rtl::OUString aPath;
+    if ( osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( rTargetFolderURL, aPath ) )
+        aPath = rTargetFolderURL;
+
+    maSameName = String ( ResId( STR_SAME_NAME_USED, *pResMgr ) );
+
+    aInfo.SearchAndReplaceAscii( "%NAME", rClashingName );
+    aInfo.SearchAndReplaceAscii( "%FOLDER", aPath );
+    maFTMessage.SetText( aInfo );
+    if ( rProposedNewName.getLength() )
+        maEDNewName.SetText( rProposedNewName );
+    else
+        maEDNewName.SetText( rClashingName );
+}
+
diff --git a/uui/source/passcrtdlg.hrc b/uui/source/nameclashdlg.hrc
index 5a999aa99209..1bfdc01de5ab 100644..100755
--- a/uui/source/passcrtdlg.hrc
+++ b/uui/source/nameclashdlg.hrc
@@ -25,19 +25,17 @@
  *
  ************************************************************************/
 
-#ifndef UUI_PASSCRTDLG_HRC
-#define UUI_PASSCRTDLG_HRC
+#ifndef UUI_NAMECLASHDLG_HRC
+#define UUI_NAMECLASHDLG_HRC
 
-// local identifiers
-#define BTN_PASSCRT_CANCEL 1
-#define ED_PASSWORD_CRT     2
-#define FT_PASSWORD_REPEAT          3
-#define FT_PASSWORD_WARNING          4
-#define ED_PASSWORD_REPEAT     5
-#define FL_FIXED_LINE_1     6
-#define BTN_PASSCRT_OK 7
-#define BTN_PASSCRT_HELP 8
-#define FT_PASSWORD_CRT          9
-#define FT_MSPASSWORD_WARNING 10
+//============================================================================
+
+#define FT_FILE_EXISTS_WARNING  20
+#define EDIT_NEW_NAME           21
+#define BTN_OVERWRITE           22
+#define BTN_RENAME              23
+#define BTN_CANCEL              24
+#define BTN_HELP                25
+
+#endif // UUI_NAMECLASHDLG_HRC
 
-#endif // UUI_PASSCRTDLG_HRC
diff --git a/uui/source/passcrtdlg.hxx b/uui/source/nameclashdlg.hxx
index 8ad19c59924d..1e234008a229 100644..100755
--- a/uui/source/passcrtdlg.hxx
+++ b/uui/source/nameclashdlg.hxx
@@ -25,39 +25,39 @@
  *
  ************************************************************************/
 
-#ifndef UUI_PASSCRTDLG_HXX
-#define UUI_PASSCRTDLG_HXX
+#ifndef UUI_NAMECLASHDLG_HXX
+#define UUI_NAMECLASHDLG_HXX
 
-#include <com/sun/star/task/PasswordRequestMode.hpp>
-#include <svtools/stdctrl.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
+#include "vcl/button.hxx"
+#include "vcl/dialog.hxx"
+#include "vcl/fixed.hxx"
+#include "vcl/edit.hxx"
 
 //============================================================================
-class PasswordCreateDialog : public ModalDialog
+
+enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE };
+
+class NameClashDialog : public ModalDialog
 {
-    FixedText       aFTPasswordCrt;
-    Edit            aEDPasswordCrt;
-    FixedText       aFTPasswordRepeat;
-    Edit            aEDPasswordRepeat;
-    FixedText       aFTWarning;
-    FixedLine       aFixedLine1;
-    OKButton        aOKBtn;
-    CancelButton    aCancelBtn;
-    HelpButton      aHelpBtn;
-
-    ResMgr*                                         pResourceMgr;
-    sal_uInt16                                      nMinLen;
-
-    DECL_LINK( OKHdl_Impl, OKButton * );
-    DECL_LINK( EditHdl_Impl, Edit * );
+    FixedText     maFTMessage;
+    Edit          maEDNewName;
+    PushButton    maBtnOverwrite;
+    PushButton    maBtnRename;
+    CancelButton  maBtnCancel;
+    HelpButton    maBtnHelp;
+    rtl::OUString maSameName;
+    rtl::OUString maNewName;
 
-public:
-    PasswordCreateDialog( Window* pParent, ResMgr * pResMgr, bool bMSCryptoMode = false );
+    DECL_LINK( ButtonHdl_Impl, PushButton * );
 
-    String          GetPassword() const { return aEDPasswordCrt.GetText(); }
+public:
+    NameClashDialog( Window* pParent, ResMgr* pResMgr,
+                     rtl::OUString const & rTargetFolderURL,
+                     rtl::OUString const & rClashingName,
+                     rtl::OUString const & rProposedNewName,
+                     bool bAllowOverwrite );
+    rtl::OUString getNewName() const { return maNewName; }
 };
 
-#endif // UUI_PASSCRTDLG_HXX
+#endif // UUI_COOKIEDG_HXX
+
diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src
new file mode 100755
index 000000000000..de8cdb8e716d
--- /dev/null
+++ b/uui/source/nameclashdlg.src
@@ -0,0 +1,113 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#define __RSC
+
+#ifndef UUI_IDS_HRC
+#include "ids.hrc"
+#endif
+
+#ifndef UUI_NAMECLASHDLG_HRC
+#include "nameclashdlg.hrc"
+#endif
+
+#define DLG_WIDTH       250
+#define DLG_HEIGTH       75
+#define BORDER_OFFSET     6
+#define EDIT_HEIGTH      12
+#define BTN_WIDTH        50
+#define BTN_HEIGTH       14
+
+ModalDialog DLG_SIMPLE_NAME_CLASH
+{
+    HelpId      = HID_DLG_SIMPLE_NAME_CLASH ;
+    OutputSize  = TRUE ;
+    SVLook      = TRUE ;
+    Size        = MAP_APPFONT ( DLG_WIDTH , DLG_HEIGTH ) ;
+    Moveable    = TRUE ;
+    Text [ en-US ] = "File Exists" ;
+
+    FixedText FT_FILE_EXISTS_WARNING
+    {
+        Pos       = MAP_APPFONT ( BORDER_OFFSET, BORDER_OFFSET ) ;
+        Size      = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET, DLG_HEIGTH - EDIT_HEIGTH - BTN_HEIGTH - 4*BORDER_OFFSET ) ;
+        WordBreak = TRUE ;
+    };
+
+    Edit EDIT_NEW_NAME
+    {
+        Border      = TRUE ;
+        Pos         = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - EDIT_HEIGTH - BTN_HEIGTH - 2*BORDER_OFFSET ) ;
+        Size        = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET , EDIT_HEIGTH ) ;
+    };
+
+    PushButton BTN_OVERWRITE
+    {
+        Pos         = MAP_APPFONT (  DLG_WIDTH - 3*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
+        Size        = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+        TabStop     = TRUE ;
+        Text [ en-US ] = "Replace" ;
+    };
+
+    PushButton BTN_RENAME
+    {
+        Pos         = MAP_APPFONT ( DLG_WIDTH - 2*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
+        Size        = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+        TabStop     = TRUE ;
+        Text [ en-US ] = "Rename" ;
+        DefButton   = TRUE ;
+    };
+
+    CancelButton BTN_CANCEL
+    {
+        Pos     = MAP_APPFONT ( DLG_WIDTH - BTN_WIDTH - BORDER_OFFSET, DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
+        Size    = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+        TabStop = TRUE ;
+    };
+
+    HelpButton BTN_HELP
+    {
+        Pos     = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ;
+        Size    = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ;
+        TabStop = TRUE ;
+    };
+};
+
+String STR_RENAME_OR_REPLACE
+{
+    Text = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nChoose Replace to overwrite the existing file or provide a new name.";
+};
+
+String STR_NAME_CLASH_RENAME_ONLY
+{
+    Text = "A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\nPlease enter a new name.";
+};
+
+String STR_SAME_NAME_USED
+{
+    Text = "Please provide a different file name!";
+};
diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx
deleted file mode 100644
index 1fc6024bcd19..000000000000
--- a/uui/source/passcrtdlg.cxx
+++ /dev/null
@@ -1,128 +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.
- *
- ************************************************************************/
-
-#include <svtools/filedlg.hxx>
-#include <vcl/msgbox.hxx>
-
-#ifndef UUI_IDS_HRC
-#include <ids.hrc>
-#endif
-#ifndef UUI_PASSCRTDLG_HRC
-#include <passcrtdlg.hrc>
-#endif
-#include <passcrtdlg.hxx>
-
-// PasswordCreateDialog---------------------------------------------------
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( PasswordCreateDialog, EditHdl_Impl, Edit *, EMPTYARG )
-{
-    aOKBtn.Enable( aEDPasswordCrt.GetText().Len() >= nMinLen );
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
-IMPL_LINK( PasswordCreateDialog, OKHdl_Impl, OKButton *, EMPTYARG )
-{
-    // compare both passwords and show message box if there are not equal!!
-    if( aEDPasswordCrt.GetText() == aEDPasswordRepeat.GetText() )
-        EndDialog( RET_OK );
-    else
-    {
-        String aErrorMsg( ResId( STR_ERROR_PASSWORDS_NOT_IDENTICAL, *pResourceMgr ));
-        ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
-        aErrorBox.Execute();
-        aEDPasswordCrt.SetText( String() );
-        aEDPasswordRepeat.SetText( String() );
-        aEDPasswordCrt.GrabFocus();
-    }
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
-PasswordCreateDialog::PasswordCreateDialog( Window* _pParent, ResMgr * pResMgr, bool bMSCryptoMode)
-    :ModalDialog( _pParent, ResId( DLG_UUI_PASSWORD_CRT, *pResMgr ) )
-    ,aFTPasswordCrt           ( this, ResId( FT_PASSWORD_CRT, *pResMgr )             )
-    ,aEDPasswordCrt       ( this, ResId( ED_PASSWORD_CRT, *pResMgr )        )
-    ,aFTPasswordRepeat           ( this, ResId( FT_PASSWORD_REPEAT, *pResMgr )             )
-    ,aEDPasswordRepeat       ( this, ResId( ED_PASSWORD_REPEAT, *pResMgr )        )
-    ,aFTWarning           ( this, ResId( bMSCryptoMode ? FT_MSPASSWORD_WARNING : FT_PASSWORD_WARNING, *pResMgr )             )
-    ,aFixedLine1       ( this, ResId( FL_FIXED_LINE_1, *pResMgr )        )
-    ,aOKBtn   ( this, ResId( BTN_PASSCRT_OK, *pResMgr )    )
-    ,aCancelBtn   ( this, ResId( BTN_PASSCRT_CANCEL, *pResMgr )    )
-    ,aHelpBtn   ( this, ResId( BTN_PASSCRT_HELP, *pResMgr )    )
-    ,pResourceMgr           ( pResMgr )
-    ,nMinLen(1) // if it should be changed for ODF, it must stay 1 for bMSCryptoMode
-{
-    FreeResource();
-
-    aOKBtn.SetClickHdl( LINK( this, PasswordCreateDialog, OKHdl_Impl ) );
-    aEDPasswordCrt.SetModifyHdl( LINK( this, PasswordCreateDialog, EditHdl_Impl ) );
-
-    aOKBtn.Enable( sal_False );
-
-    if ( bMSCryptoMode )
-    {
-        aEDPasswordCrt.SetMaxTextLen( 15 );
-        aEDPasswordRepeat.SetMaxTextLen( 15 );
-    }
-
-    long nLabelWidth = aFTWarning.GetSizePixel().Width();
-    long nLabelHeight = aFTWarning.GetSizePixel().Height();
-    long nTextWidth = aFTWarning.GetCtrlTextWidth( aFTWarning.GetText() );
-    long nTextHeight = aFTWarning.GetTextHeight();
-
-    Rectangle aLabelRect( aFTWarning.GetPosPixel(), aFTWarning.GetSizePixel() );
-    Rectangle aRect = aFTWarning.GetTextRect( aLabelRect, aFTWarning.GetText() );
-
-    long nNewLabelHeight = 0;
-    for( nNewLabelHeight = ( nTextWidth / nLabelWidth + 1 ) * nTextHeight;
-        nNewLabelHeight < aRect.GetHeight();
-        nNewLabelHeight += nTextHeight ) {} ;
-
-    long nDelta = nNewLabelHeight - nLabelHeight;
-
-    Size aNewDlgSize = GetSizePixel();
-    aNewDlgSize.Height() += nDelta;
-    SetSizePixel( aNewDlgSize );
-
-    Size aNewWarningSize = aFTWarning.GetSizePixel();
-    aNewWarningSize.Height() = nNewLabelHeight;
-    aFTWarning.SetPosSizePixel( aFTWarning.GetPosPixel(), aNewWarningSize );
-
-    Window* pControls[] = { &aFixedLine1, &aOKBtn, &aCancelBtn, &aHelpBtn };
-    const sal_Int32 nCCount = sizeof( pControls ) / sizeof( pControls[0] );
-    for ( int i = 0; i < nCCount; ++i )
-    {
-        Point aNewPos =(*pControls[i]).GetPosPixel();
-        aNewPos.Y() += nDelta;
-        pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() );
-    }
-}
diff --git a/uui/source/passcrtdlg.src b/uui/source/passcrtdlg.src
deleted file mode 100644
index a74752ed589e..000000000000
--- a/uui/source/passcrtdlg.src
+++ /dev/null
@@ -1,108 +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.
- *
- ************************************************************************/
-
-#define __RSC
-
-#ifndef UUI_IDS_HRC
-#include <ids.hrc>
-#endif
-#ifndef UUI_PASSCRTDLG_HRC
-#include "passcrtdlg.hrc"
-#endif
-
-ModalDialog DLG_UUI_PASSWORD_CRT
-{
-    HelpId = HID_DLG_PASSWORD_CRT ;
-    Border = TRUE ;
-    Moveable = TRUE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT( 145, 129 );
-    FixedText FT_PASSWORD_CRT
-    {
-        Pos = MAP_APPFONT( 3, 4 );
-        Size = MAP_APPFONT( 139, 9 );
-        Text [ en-US ] = "Enter password";
-    };
-    Edit ED_PASSWORD_CRT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT( 3, 17 );
-        Size = MAP_APPFONT( 139, 13 );
-        PassWord = TRUE ;
-    };
-    Edit ED_PASSWORD_REPEAT
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT( 3, 47 );
-        Size = MAP_APPFONT( 139, 13 );
-        PassWord = TRUE ;
-    };
-    OKButton BTN_PASSCRT_OK
-    {
-        Pos = MAP_APPFONT( 27, 110 );
-        Size = MAP_APPFONT( 37, 15 );
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_PASSCRT_CANCEL
-    {
-        Pos = MAP_APPFONT( 66, 110 );
-        Size = MAP_APPFONT( 37, 15 );
-    };
-    HelpButton BTN_PASSCRT_HELP
-    {
-        Pos = MAP_APPFONT( 105, 110 );
-        Size = MAP_APPFONT( 37, 15 );
-    };
-    FixedText FT_PASSWORD_REPEAT
-    {
-        Pos = MAP_APPFONT( 3, 34 );
-        Size = MAP_APPFONT( 139, 9 );
-        Text [ en-US ] = "Reenter password";
-    };
-    FixedText FT_PASSWORD_WARNING
-    {
-        Pos = MAP_APPFONT( 4, 64 );
-        Size = MAP_APPFONT( 137, 40 );
-        Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive.";
-        WordBreak = TRUE;
-    };
-    FixedText FT_MSPASSWORD_WARNING
-    {
-        Pos = MAP_APPFONT( 4, 64 );
-        Size = MAP_APPFONT( 137, 40 );
-        Text [ en-US ] = "WARNING: If you lose or forget the password, it cannot be recovered. It is advisable to keep passwords in a safe place. Passwords are case-sensitive and at most fifteen characters long.";
-        WordBreak = TRUE;
-    };
-    FixedLine FL_FIXED_LINE_1
-    {
-        Pos = MAP_APPFONT( 0, 104 );
-        Size = MAP_APPFONT( 145, 6 );
-    };
-    Text [ en-US ] = "Enter Password";
-};
-