Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts: avmedia/source/framework/mediacontrol.cxx connectivity/source/commontools/DateConversion.cxx desktop/source/deployment/registry/component/dp_component.cxx editeng/inc/editeng/numitem.hxx editeng/inc/editeng/txtrange.hxx editeng/source/editeng/editobj.cxx editeng/source/editeng/editview.cxx editeng/source/editeng/eehtml.cxx editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit4.cxx editeng/source/misc/txtrange.cxx editeng/source/outliner/outlin2.cxx editeng/source/outliner/outlvw.cxx framework/source/layoutmanager/layoutmanager.cxx linguistic/source/lngsvcmgr.hxx sfx2/source/appl/app.cxx sfx2/source/appl/app.src sfx2/source/appl/appbas.cxx sfx2/source/appl/appcfg.cxx sfx2/source/appl/appdde.cxx sfx2/source/appl/appmain.cxx sfx2/source/appl/appopen.cxx sfx2/source/appl/appquit.cxx sfx2/source/appl/appserv.cxx sfx2/source/appl/childwin.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/fileobj.hxx sfx2/source/appl/workwin.cxx sfx2/source/control/dispatch.cxx sfx2/source/control/macro.cxx sfx2/source/control/objface.cxx sfx2/source/control/request.cxx sfx2/source/control/shell.cxx sfx2/source/control/statcach.cxx sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dockwin.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodelapi.cxx sfx2/source/dialog/mgetempl.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/styledlg.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/dialog/tplcitem.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/doc/doctempl.cxx sfx2/source/doc/docvor.cxx sfx2/source/doc/new.cxx sfx2/source/doc/objcont.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/objxtor.cxx sfx2/source/inc/appdata.hxx sfx2/source/inc/helpid.hrc sfx2/source/inc/sfxlocal.hrc sfx2/source/inc/statcach.hxx sfx2/source/inc/templdgi.hxx sfx2/source/inc/virtmenu.hxx sfx2/source/inc/workwin.hxx sfx2/source/menu/mnumgr.cxx sfx2/source/menu/virtmenu.cxx sfx2/source/statbar/stbitem.cxx sfx2/source/view/frame.cxx sfx2/source/view/frame2.cxx sfx2/source/view/orgmgr.cxx sfx2/source/view/printer.cxx sfx2/source/view/prnmon.cxx sfx2/source/view/sfxbasecontroller.cxx sfx2/source/view/viewfrm.cxx sfx2/source/view/viewfrm2.cxx sfx2/source/view/viewprn.cxx sfx2/source/view/viewsh.cxx svx/inc/svx/svditer.hxx svx/source/dialog/sdstring.src svx/source/form/fmpage.cxx svx/source/form/formcontroller.cxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svditer.cxx svx/source/svdraw/svdview.cxx xmloff/source/forms/elementimport.cxx
author: Jan Holesovsky <kendy@suse.cz> 2011-03-18 15:49:47 +0100
committer: Jan Holesovsky <kendy@suse.cz> 2011-03-18 15:49:47 +0100
commit: 091e4aee3386f3bfee081dc8646494e0eb97f88a (patch)
tree: dd79298b4e8729ca7dc874274d4a33ea88fe107d /uui
parent: f0681adbf092e2b455db52535f2df882bc87343a (diff)
parent: 224bd63b3fa459baa0a6bb5cd03f5dc2ca475d82 (diff)
88 files changed, 745 insertions, 522 deletions
diff --git a/uui/prj/build.lst b/uui/prj/build.lst
index dbe31cb1b57e..b4a009cd0b9e 100644..100755
--- a/uui/prj/build.lst
+++ b/uui/prj/build.lst
@@ -1,4 +1,4 @@
-uu	uui :    l10n vcl svtools NULL
+uu	uui :    L10N:l10n vcl svtools LIBXSLT:libxslt NULL
 uu	uui				usr1	-	all	uu_mkout NULL
 uu	uui\source	    nmake	-	all	uu_source NULL
 uu	uui\util	    nmake	-	all	uu_util uu_source NULL
diff --git a/uui/prj/d.lst b/uui/prj/d.lst
index 30c6f812fd5b..46b0118319fb 100644..100755
--- a/uui/prj/d.lst
+++ b/uui/prj/d.lst
@@ -7,3 +7,4 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
 ..\%__SRC%\lib\iuui.lib %_DEST%\lib%_EXT%\iuui.lib
 
 ..\util\uui.xml %_DEST%\xml%_EXT%\uui.xml
+..\%__SRC%\misc\uui.component %_DEST%\xml%_EXT%\uui.component
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index fbe6a7f3793f..fbe6a7f3793f 100644..100755
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx
index cfab1e0b94de..cfab1e0b94de 100644..100755
--- a/uui/source/alreadyopen.hxx
+++ b/uui/source/alreadyopen.hxx
diff --git a/uui/source/alreadyopen.src b/uui/source/alreadyopen.src
index 928973947e38..928973947e38 100644..100755
--- a/uui/source/alreadyopen.src
+++ b/uui/source/alreadyopen.src
diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx
index 3608d41e6168..5c1652814aa3 100644..100755
--- a/uui/source/cookiedg.cxx
+++ b/uui/source/cookiedg.cxx
@@ -77,7 +77,7 @@ CookiesDialog::CookiesDialog( Window* pParent,
     maCookieFB.SetPosSizePixel( LogicToPixel( aPoint ), aSize );
     maCookieFB.Show();
 
-    USHORT nOffset = CNTHTTP_COOKIE_REQUEST_RECV == mpCookieRequest->m_eType
+    sal_uInt16 nOffset = CNTHTTP_COOKIE_REQUEST_RECV == mpCookieRequest->m_eType
         ? 0 : STR_COOKIES_SEND_START - STR_COOKIES_RECV_START;
     INetURLObject aObj( mpCookieRequest->m_rURL );
     SetText( String( ResId( STR_COOKIES_RECV_TITLE + nOffset, *pResMgr ) ) );
@@ -88,7 +88,7 @@ CookiesDialog::CookiesDialog( Window* pParent,
     List& rList =mpCookieRequest->m_rCookieList;
     String aPair, aCookie;
 
-    for ( USHORT i = (USHORT)rList.Count(); i--; )
+    for ( sal_uInt16 i = (sal_uInt16)rList.Count(); i--; )
     {
         CntHTTPCookie* pCookie = (CntHTTPCookie*)rList.GetObject(i);
 
@@ -104,7 +104,7 @@ CookiesDialog::CookiesDialog( Window* pParent,
             aMsg += aCookie;
         }
     }
-    maInFutureInteractiveBtn.Check( TRUE );
+    maInFutureInteractiveBtn.Check( sal_True );
     maCookieFT.SetText( aMsg );
 }
 
@@ -114,7 +114,7 @@ short CookiesDialog::Execute()
 {
     maSendBtn.GrabFocus();
     short nRet = ModalDialog::Execute();
-    USHORT nStatus = CNTHTTP_COOKIE_POLICY_INTERACTIVE;
+    sal_uInt16 nStatus = CNTHTTP_COOKIE_POLICY_INTERACTIVE;
 
     if ( maInFutureSendBtn.IsChecked() )
         nStatus = CNTHTTP_COOKIE_POLICY_ACCEPTED;
@@ -123,9 +123,9 @@ short CookiesDialog::Execute()
         nStatus = CNTHTTP_COOKIE_POLICY_BANNED;
     List& rList = mpCookieRequest->m_rCookieList;
 
-    for ( USHORT i = (USHORT)rList.Count(); i--; )
+    for ( sal_uInt16 i = (sal_uInt16)rList.Count(); i--; )
     {
-        USHORT& rStatus = ( (CntHTTPCookie*)rList.GetObject(i) )->m_nPolicy;
+        sal_uInt16& rStatus = ( (CntHTTPCookie*)rList.GetObject(i) )->m_nPolicy;
 
         if ( rStatus == CNTHTTP_COOKIE_POLICY_INTERACTIVE )
             rStatus = nStatus;
diff --git a/uui/source/cookiedg.hrc b/uui/source/cookiedg.hrc
index 01d93e17de7f..01d93e17de7f 100644..100755
--- a/uui/source/cookiedg.hrc
+++ b/uui/source/cookiedg.hrc
diff --git a/uui/source/cookiedg.hxx b/uui/source/cookiedg.hxx
index 746f56bf333c..746f56bf333c 100644..100755
--- a/uui/source/cookiedg.hxx
+++ b/uui/source/cookiedg.hxx
diff --git a/uui/source/cookiedg.src b/uui/source/cookiedg.src
index 9df0d481d6ae..156da50c160c 100644..100755
--- a/uui/source/cookiedg.src
+++ b/uui/source/cookiedg.src
@@ -64,18 +64,21 @@ ModalDialog DLG_COOKIES
     };
     RadioButton RB_INFUTURE_SEND
     {
+        HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_SEND";
         Pos = MAP_APPFONT ( 12 , 171 ) ;
         Size = MAP_APPFONT ( 52 , 10 ) ;
         Text [ en-US ] = "~Send" ;
     };
     RadioButton RB_INFUTURE_IGNORE
     {
+        HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_IGNORE";
         Pos = MAP_APPFONT ( 67 , 171 ) ;
         Size = MAP_APPFONT ( 52 , 10 ) ;
         Text [ en-US ] = "I~gnore" ;
     };
     RadioButton RB_INFUTURE_INTERACTIVE
     {
+        HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_INTERACTIVE";
         Pos = MAP_APPFONT ( 122 , 171 ) ;
         Size = MAP_APPFONT ( 52 , 10 ) ;
         Text [ en-US ] = "I~nteractive" ;
@@ -90,12 +93,14 @@ ModalDialog DLG_COOKIES
     };
     PushButton BTN_COOKIES_CANCEL
     {
+        HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_CANCEL";
         Pos = MAP_APPFONT ( 186 , 173 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         Text [ en-US ] = "~Ignore" ;
     };
     PushButton BTN_COOKIES_OK
     {
+        HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_OK";
         Pos = MAP_APPFONT ( 239 , 173 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         DefButton = TRUE ;
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 0a41fa8d7dbc..0a41fa8d7dbc 100644..100755
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
diff --git a/uui/source/filechanged.hxx b/uui/source/filechanged.hxx
index d2205d02a243..d2205d02a243 100644..100755
--- a/uui/source/filechanged.hxx
+++ b/uui/source/filechanged.hxx
diff --git a/uui/source/filechanged.src b/uui/source/filechanged.src
index fa07c40c0853..74435516a497 100644..100755
--- a/uui/source/filechanged.src
+++ b/uui/source/filechanged.src
@@ -33,7 +33,7 @@
 
 String STR_FILECHANGED_TITLE
 {
-    Text = "Document Has Been Changed by Others";
+    Text [ en-US ] = "Document Has Been Changed by Others";
 };
 String STR_FILECHANGED_MSG
 {
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index 1e551dbe0833..2d32630d687c 100644..100755
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -134,15 +134,15 @@ void FilterDialog::ChangeFilters( const FilterNameList* pFilterNames )
 /*-************************************************************************************************************//**
     @short      ask user for his decision
     @descr      We show the dialog and if user finish it with "OK" - we try to find selected item in internal saved
-                name list (which you must set in "ChangeFilters()"!). If we return TRUE as result, you can use out
+                name list (which you must set in "ChangeFilters()"!). If we return sal_True as result, you can use out
                 parameter "pSelectedItem" as pointer into your FilterNameList to get selected item realy ...
-                but if we return FALSE ... user hsa cancel the dialog ... you shouldnt do that. pSelectedItem isnt
+                but if we return sal_False ... user hsa cancel the dialog ... you shouldnt do that. pSelectedItem isnt
                 set to any valid value then. We don't change them ...
 
     @seealso    method ChangeFilters()
 
     @param      "pSelectedItem", returns result of selection as pointer into set list of filter names
-                                 (valid for function return TRUE only!)
+                                 (valid for function return sal_True only!)
     @return     true  => pSelectedItem parameter points into name list and represent use decision
                 false => use has cancelled dialog (pSelectedItem isnt valid then!)
 
diff --git a/uui/source/fltdlg.hrc b/uui/source/fltdlg.hrc
index 8a6b2fddcd16..8a6b2fddcd16 100644..100755
--- a/uui/source/fltdlg.hrc
+++ b/uui/source/fltdlg.hrc
diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx
index 95d541a0af7e..95d541a0af7e 100644..100755
--- a/uui/source/fltdlg.hxx
+++ b/uui/source/fltdlg.hxx
diff --git a/uui/source/fltdlg.src b/uui/source/fltdlg.src
index 84e27cd1be1f..6e25266e95ed 100644..100755
--- a/uui/source/fltdlg.src
+++ b/uui/source/fltdlg.src
@@ -53,6 +53,7 @@ ModalDialog DLG_FILTER_SELECT
 
     ListBox LB_FILTERS
     {
+        HelpID = "uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS";
         Border      = TRUE ;
         Pos         = MAP_APPFONT (   6 ,  19 ) ;
         Size        = MAP_APPFONT ( 182 , 175 ) ;
diff --git a/uui/source/getcontinuations.hxx b/uui/source/getcontinuations.hxx
index 2b0df1a39582..2b0df1a39582 100644..100755
--- a/uui/source/getcontinuations.hxx
+++ b/uui/source/getcontinuations.hxx
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index a310e1489d99..8ee1e12a7569 100644..100755
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -53,7 +53,6 @@
 #include "logindlg.hxx"
 #include "masterpasscrtdlg.hxx"
 #include "masterpassworddlg.hxx"
-#include "passcrtdlg.hxx"
 #include "passworddlg.hxx"
 
 #include "iahndl.hxx"
@@ -519,7 +518,8 @@ executePasswordDialog(
     task::PasswordRequestMode nMode,
     ::rtl::OUString aDocName,
     bool bMSCryptoMode,
-    bool bIsPasswordToModify )
+    bool bIsPasswordToModify,
+    bool bIsSimplePasswordRequest )
        SAL_THROW((uno::RuntimeException))
 {
     try
@@ -530,21 +530,36 @@ executePasswordDialog(
             ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(uui)));
         if( nMode == task::PasswordRequestMode_PASSWORD_CREATE )
         {
-            const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0;   // 0 -> allow any length
+            if (bIsSimplePasswordRequest)
+            {
+                std::auto_ptr< PasswordDialog > pDialog(
+                    new PasswordDialog( pParent, nMode, xManager.get(), aDocName,
+                    bIsPasswordToModify, bIsSimplePasswordRequest ) );
+                pDialog->SetMinLen(0);
+
+                rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL );
+                rInfo.SetPassword( pDialog->GetPassword() );
+            }
+            else
+            {
+                const sal_uInt16 nMaxPasswdLen = bMSCryptoMode ? 15 : 0;   // 0 -> allow any length
 
-            VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create();
-            AbstractPasswordToOpenModifyDialog *pTmp = pFact->CreatePasswordToOpenModifyDialog( pParent, 0, nMaxPasswdLen, bIsPasswordToModify );
-            std::auto_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp );
+                VclAbstractDialogFactory * pFact = VclAbstractDialogFactory::Create();
+                AbstractPasswordToOpenModifyDialog *pTmp = pFact->CreatePasswordToOpenModifyDialog( pParent, 0, nMaxPasswdLen, bIsPasswordToModify );
+                std::auto_ptr< AbstractPasswordToOpenModifyDialog > pDialog( pTmp );
 
-            rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL );
-            rInfo.SetPassword( pDialog->GetPasswordToOpen() );
-            rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() );
-            rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() );
+                rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL );
+                rInfo.SetPassword( pDialog->GetPasswordToOpen() );
+                rInfo.SetPasswordToModify( pDialog->GetPasswordToModify() );
+                rInfo.SetRecommendToOpenReadonly( pDialog->IsRecommendToOpenReadonly() );
+            }
         }
-        else
+        else // enter password or reenter password
         {
             std::auto_ptr< PasswordDialog > pDialog(
-                new PasswordDialog( pParent, nMode, xManager.get(), aDocName, bIsPasswordToModify ) );
+                new PasswordDialog( pParent, nMode, xManager.get(), aDocName,
+                bIsPasswordToModify, bIsSimplePasswordRequest ) );
+            pDialog->SetMinLen(0);
 
             rInfo.SetResult( pDialog->Execute() == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL );
             rInfo.SetPassword( bIsPasswordToModify ? String() : pDialog->GetPassword() );
@@ -567,7 +582,8 @@ handlePasswordRequest_(
         rContinuations,
     ::rtl::OUString aDocumentName,
     bool bMSCryptoMode,
-    bool bIsPasswordToModify )
+    bool bIsPasswordToModify,
+    bool bIsSimplePasswordRequest = false )
     SAL_THROW((uno::RuntimeException))
 {
     uno::Reference< task::XInteractionRetry > xRetry;
@@ -582,7 +598,7 @@ handlePasswordRequest_(
     LoginErrorInfo aInfo;
 
     executePasswordDialog( pParent, aInfo, nMode,
-            aDocumentName, bMSCryptoMode, bIsPasswordToModify );
+            aDocumentName, bMSCryptoMode, bIsPasswordToModify, bIsSimplePasswordRequest );
 
     switch (aInfo.GetResult())
     {
@@ -742,7 +758,8 @@ UUIInteractionHelper::handlePasswordRequest(
                                rRequest->getContinuations(),
                                rtl::OUString(),
                                false /* bool bMSCryptoMode */,
-                               false /* bool bIsPasswordToModify */);
+                               false /* bool bIsPasswordToModify */,
+                               true  /* bool bIsSimplePasswordRequest */ );
         return true;
     }
 
diff --git a/uui/source/iahndl-cookies.cxx b/uui/source/iahndl-cookies.cxx
index bb2a4a50566c..bb2a4a50566c 100644..100755
--- a/uui/source/iahndl-cookies.cxx
+++ b/uui/source/iahndl-cookies.cxx
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index e2e3dae684d8..05530fcb7d1f 100644..100755
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star;
 
 namespace {
 
-USHORT
+sal_uInt16
 executeErrorDialog(
     Window * pParent,
     task::InteractionClassification eClassification,
@@ -113,7 +113,7 @@ executeErrorDialog(
             uno::Reference< uno::XInterface >());
     }
 
-    USHORT aResult = xBox->Execute();
+    sal_uInt16 aResult = xBox->Execute();
     switch( aResult )
     {
     case BUTTONID_OK:
@@ -165,7 +165,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
                 CREATEVERSIONRESMGR_NAME(cnt),
                 CREATEVERSIONRESMGR_NAME(svx),
                 CREATEVERSIONRESMGR_NAME(uui) };
-        static USHORT const aId[4]
+        static sal_uInt16 const aId[4]
             = { RID_ERRHDL,
                 RID_CHAOS_START + 12,
                 // cf. chaos/source/inc/cntrids.hrc, where
@@ -277,7 +277,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
             }
         }
 
-        USHORT nResult = executeErrorDialog(
+        sal_uInt16 nResult = executeErrorDialog(
             getParentProperty(), eClassification, aContext, aMessage, nButtonMask );
 
         switch (nResult)
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index 149a60f287af..149a60f287af 100644..100755
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx
index 8d21c8f99948..8d21c8f99948 100644..100755
--- a/uui/source/iahndl-ioexceptions.cxx
+++ b/uui/source/iahndl-ioexceptions.cxx
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index 90c9188792fb..90c9188792fb 100644..100755
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index ecc0ea46536d..ecc0ea46536d 100644..100755
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index de5ac9102b20..79362cc8cf10 100644..100755
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -90,6 +90,7 @@
 #include "newerverwarn.hxx"
 
 #include "iahndl.hxx"
+#include "nameclashdlg.hxx"
 
 /** === begin UNO using === **/
 using ::com::sun::star::uno::Sequence;
@@ -186,7 +187,7 @@ UUIInteractionHelper::handleRequest(
         HandleData aHD(rRequest);
         Link aLink(&aHD,handlerequest);
         pApp->PostUserEvent(aLink,this);
-        ULONG locks = Application::ReleaseSolarMutex();
+        sal_uLong locks = Application::ReleaseSolarMutex();
         aHD.wait();
         Application::AcquireSolarMutex(locks);
         return aHD.bHandled;
@@ -247,7 +248,7 @@ UUIInteractionHelper::getStringFromRequest(
         HandleData aHD(rRequest);
         Link aLink(&aHD,getstringfromrequest);
         pApp->PostUserEvent(aLink,this);
-        ULONG locks = Application::ReleaseSolarMutex();
+        sal_uLong locks = Application::ReleaseSolarMutex();
         aHD.wait();
         Application::AcquireSolarMutex(locks);
         return aHD.m_aResult;
@@ -868,6 +869,14 @@ UUIInteractionHelper::handleRequest_impl(
             if ( handleCertificateValidationRequest( rRequest ) )
                 return true;
 
+            ucb::NameClashResolveRequest aNameClashResolveRequest;
+            if (aAnyRequest >>= aNameClashResolveRequest)
+            {
+                handleNameClashResolveRequest(aNameClashResolveRequest,
+                                              rRequest->getContinuations());
+                return true;
+            }
+
             if ( handleMasterPasswordRequest( rRequest ) )
                 return true;
 
@@ -1142,7 +1151,7 @@ UUIInteractionHelper::getInteractionHandler()
 
 namespace {
 
-USHORT
+sal_uInt16
 executeMessageBox(
     Window * pParent,
     rtl::OUString const & rTitle,
@@ -1154,7 +1163,7 @@ executeMessageBox(
 
     MessBox xBox( pParent, nButtonMask, rTitle, rMessage );
 
-    USHORT aResult = xBox.Execute();
+    sal_uInt16 aResult = xBox.Execute();
     switch( aResult )
     {
     case BUTTONID_OK:
@@ -1177,9 +1186,84 @@ executeMessageBox(
     return aResult;
 }
 
+NameClashResolveDialogResult executeSimpleNameClashResolveDialog( Window *pParent,
+                                                                  rtl::OUString const & rTargetFolderURL,
+                                                                  rtl::OUString const & rClashingName,
+                                                                  rtl::OUString & rProposedNewName,
+                                                                  bool bAllowOverwrite )
+{
+    std::auto_ptr< ResMgr > xManager( ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( uui ) ) );
+    if ( !xManager.get() )
+        return ABORT;
+
+    NameClashDialog aDialog( pParent, xManager.get(), rTargetFolderURL,
+                             rClashingName, rProposedNewName, bAllowOverwrite );
+
+    NameClashResolveDialogResult eResult = (NameClashResolveDialogResult) aDialog.Execute();
+    rProposedNewName = aDialog.getNewName();
+    return eResult;
+}
+
 } // namespace
 
 void
+UUIInteractionHelper::handleNameClashResolveRequest(
+    ucb::NameClashResolveRequest const & rRequest,
+    uno::Sequence< uno::Reference<
+        task::XInteractionContinuation > > const & rContinuations)
+  SAL_THROW((uno::RuntimeException))
+{
+    OSL_ENSURE(
+        rRequest.TargetFolderURL.getLength() > 0,
+        "NameClashResolveRequest must not contain empty TargetFolderURL" );
+
+    OSL_ENSURE(
+        rRequest.ClashingName.getLength() > 0,
+        "NameClashResolveRequest must not contain empty ClashingName" );
+
+    uno::Reference< task::XInteractionAbort > xAbort;
+    uno::Reference< ucb::XInteractionSupplyName > xSupplyName;
+    uno::Reference< ucb::XInteractionReplaceExistingData > xReplaceExistingData;
+    getContinuations(
+        rContinuations, &xAbort, &xSupplyName, &xReplaceExistingData);
+
+    OSL_ENSURE( xAbort.is(),
+        "NameClashResolveRequest must contain Abort continuation" );
+
+    OSL_ENSURE( xSupplyName.is(),
+        "NameClashResolveRequest must contain SupplyName continuation" );
+
+    NameClashResolveDialogResult eResult = ABORT;
+    rtl::OUString aProposedNewName( rRequest.ProposedNewName );
+
+    eResult = executeSimpleNameClashResolveDialog( getParentProperty(),
+                    rRequest.TargetFolderURL,
+                    rRequest.ClashingName,
+                    aProposedNewName,
+                    xReplaceExistingData.is() );
+
+    switch ( eResult )
+    {
+    case ABORT:
+        xAbort->select();
+        break;
+
+    case RENAME:
+        xSupplyName->setName( aProposedNewName );
+        xSupplyName->select();
+        break;
+
+    case OVERWRITE:
+        OSL_ENSURE(
+            xReplaceExistingData.is(),
+            "Invalid NameClashResolveDialogResult: OVERWRITE - "
+            "No ReplaceExistingData continuation available!" );
+        xReplaceExistingData->select();
+        break;
+    }
+}
+
+void
 UUIInteractionHelper::handleGenericErrorRequest(
     sal_Int32 nErrorCode,
     uno::Sequence< uno::Reference<
@@ -1490,7 +1574,7 @@ ErrorResource::getString(ErrCode nErrorCode, rtl::OUString * pString)
     const SAL_THROW(())
 {
     OSL_ENSURE(pString, "specification violation");
-    ResId aResId(static_cast< USHORT >(nErrorCode & ERRCODE_RES_MASK),
+    ResId aResId(static_cast< sal_uInt16 >(nErrorCode & ERRCODE_RES_MASK),
                  *m_pResMgr);
     aResId.SetRT(RSC_STRING);
     if (!IsAvailableRes(aResId))
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 044080750b4d..f02a6a07fb12 100644..100755
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -40,10 +40,10 @@
 #include "com/sun/star/beans/Optional.hpp"
 #include "com/sun/star/task/InteractionClassification.hpp"
 
-#include "tools/solar.h" // USHORT
+#include "tools/solar.h" // sal_uInt16
 #include "tools/errcode.hxx" // ErrCode
 #include "tools/rc.hxx" // Resource
-#include "vcl/wintypes.hxx" // WinBits
+#include "tools/wintypes.hxx" // WinBits
 
 namespace com { namespace sun { namespace star {
     namespace awt {
@@ -216,6 +216,15 @@ private:
             com::sun::star::task::XInteractionRequest > const & rRequest)
         SAL_THROW((com::sun::star::uno::RuntimeException));
 
+    void
+    handleNameClashResolveRequest(
+        com::sun::star::ucb::NameClashResolveRequest const & rRequest,
+        com::sun::star::uno::Sequence<
+            com::sun::star::uno::Reference<
+                com::sun::star::task::XInteractionContinuation > > const &
+                    rContinuations)
+        SAL_THROW((com::sun::star::uno::RuntimeException));
+
     bool
     handleMasterPasswordRequest(
         com::sun::star::uno::Reference<
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index 796186fd5140..c292befb1663 100755
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -48,13 +48,15 @@
 #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_SIMPLE_PASSWORD_WRONG                 (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 +91,11 @@
 #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 STR_ENTER_SIMPLE_PASSWORD                       (RID_UUI_START + 61)
+#define STR_CONFIRM_SIMPLE_PASSWORD                     (RID_UUI_START + 62)
 
 #define ERRCODE_UUI_IO_ABORT                                    (ERRCODE_AREA_UUI + 0)
 #define ERRCODE_UUI_IO_ACCESSDENIED                             (ERRCODE_AREA_UUI + 1)
@@ -170,25 +177,26 @@
 #define ERRCODE_UUI_SSLWARN_INVALID_1 (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 1)
 #define TITLE_UUI_SSLWARN_INVALID (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 3)
 
-#define HID_DLG_LOGIN                           (HID_UUI_START + 0)
-#define HID_DLG_COOKIES                         (HID_UUI_START + 1)
-#define HID_DLG_MASTERPASSWORD_UUI              (HID_UUI_START + 2)
-#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)
-#define HID_DLG_NEWERVERSIONWARNING             (HID_UUI_START +10)
+#define HID_DLG_LOGIN                                          "UUI_HID_DLG_LOGIN"
+#define HID_DLG_COOKIES                                        "UUI_HID_DLG_COOKIES"
+#define HID_DLG_MASTERPASSWORD_UUI                             "UUI_HID_DLG_MASTERPASSWORD_UUI"
+#define HID_DLG_MASTERPASSWORD_CRT                             "UUI_HID_DLG_MASTERPASSWORD_CRT"
+#define HID_DLG_FILTER_SELECT                                  "UUI_HID_DLG_FILTER_SELECT"
+#define HID_DLG_PASSWORD_UUI                                   "UUI_HID_DLG_PASSWORD_UUI"
+#define HID_DLG_PASSWORD_CRT                                   "UUI_HID_DLG_PASSWORD_CRT"
+#define HID_DLG_UNKNOWNAUTH_UUI                                "UUI_HID_DLG_UNKNOWNAUTH_UUI"
+#define HID_DLG_SSLWARN_UUI                                    "UUI_HID_DLG_SSLWARN_UUI"
+#define HID_XMLSECDLG_MACROWARN                                "UUI_HID_XMLSECDLG_MACROWARN"
+#define HID_DLG_NEWERVERSIONWARNING                            "UUI_HID_DLG_NEWERVERSIONWARNING"
 
-#define HID_LOGIN_DLG_PATH                      (HID_UUI_START +11)
-#define HID_LOGIN_DLG_BROWSE                    (HID_UUI_START +12)
-#define HID_LOGIN_DLG_USER_NAME                 (HID_UUI_START +13)
-#define HID_LOGIN_DLG_PASSWORD                  (HID_UUI_START +14)
-#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_LOGIN_DLG_PATH                      "UUI_HID_LOGIN_DLG_PATH"
+#define HID_LOGIN_DLG_BROWSE                    "UUI_HID_LOGIN_DLG_BROWSE"
+#define HID_LOGIN_DLG_USER_NAME                 "UUI_HID_LOGIN_DLG_USER_NAME"
+#define HID_LOGIN_DLG_PASSWORD                  "UUI_HID_LOGIN_DLG_PASSWORD"
+#define HID_LOGIN_DLG_ACCOUNT                   "UUI_HID_LOGIN_DLG_ACCOUNT"
+#define HID_LOGIN_DLG_REMEMBER_PASSWORD         "UUI_HID_LOGIN_DLG_REMEMBER_PASSWORD"
+#define HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS    "UUI_HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS"
+#define HID_DLG_SIMPLE_NAME_CLASH               "UUI_HID_DLG_SIMPLE_NAME_CLASH"
 
 // HID_UUI_END (aka HID_CHAOS_NEW_DATABASE) is reserved in
 // sfx2/util/hidother.src
diff --git a/uui/source/ids.src b/uui/source/ids.src
index 378b513b2e42..378b513b2e42 100644..100755
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index c790d86c4948..c790d86c4948 100644..100755
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx
index 7398f3439199..7398f3439199 100644..100755
--- a/uui/source/interactionhandler.hxx
+++ b/uui/source/interactionhandler.hxx
diff --git a/uui/source/lockfailed.cxx b/uui/source/lockfailed.cxx
index bc2e7c383c5d..bc2e7c383c5d 100644..100755
--- a/uui/source/lockfailed.cxx
+++ b/uui/source/lockfailed.cxx
diff --git a/uui/source/lockfailed.hxx b/uui/source/lockfailed.hxx
index b19dd84169c1..b19dd84169c1 100644..100755
--- a/uui/source/lockfailed.hxx
+++ b/uui/source/lockfailed.hxx
diff --git a/uui/source/lockfailed.src b/uui/source/lockfailed.src
index 1a3e1534d0ff..1a3e1534d0ff 100644..100755
--- a/uui/source/lockfailed.src
+++ b/uui/source/lockfailed.src
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index 8811f01313ec..a90cd35efa85 100644..100755
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -52,24 +52,24 @@ static void lcl_Move( Window &rWin, long nOffset )
 }
 
 
-void LoginDialog::HideControls_Impl( USHORT nFlags )
+void LoginDialog::HideControls_Impl( sal_uInt16 nFlags )
 {
-    bool bPathHide = FALSE;
-    bool bErrorHide = FALSE;
-    bool bAccountHide = FALSE;
-    bool bUseSysCredsHide = FALSE;
+    bool bPathHide = sal_False;
+    bool bErrorHide = sal_False;
+    bool bAccountHide = sal_False;
+    bool bUseSysCredsHide = sal_False;
 
     if ( ( nFlags & LF_NO_PATH ) == LF_NO_PATH )
     {
         aPathFT.Hide();
         aPathED.Hide();
         aPathBtn.Hide();
-        bPathHide = TRUE;
+        bPathHide = sal_True;
     }
     else if ( ( nFlags & LF_PATH_READONLY ) == LF_PATH_READONLY )
     {
-        aPathED.Enable( FALSE );
-        aPathBtn.Enable( FALSE );
+        aPathED.Enable( sal_False );
+        aPathBtn.Enable( sal_False );
     }
 
     if ( ( nFlags & LF_NO_USERNAME ) == LF_NO_USERNAME )
@@ -79,7 +79,7 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
     }
     else if ( ( nFlags & LF_USERNAME_READONLY ) == LF_USERNAME_READONLY )
     {
-        aNameED.Enable( FALSE );
+        aNameED.Enable( sal_False );
     }
 
     if ( ( nFlags & LF_NO_PASSWORD ) == LF_NO_PASSWORD )
@@ -96,20 +96,20 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
         aErrorInfo.Hide();
         aErrorFT.Hide();
         aLogin1FL.Hide();
-        bErrorHide = TRUE;
+        bErrorHide = sal_True;
     }
 
     if ( ( nFlags & LF_NO_ACCOUNT ) == LF_NO_ACCOUNT )
     {
         aAccountFT.Hide();
         aAccountED.Hide();
-        bAccountHide = TRUE;
+        bAccountHide = sal_True;
     }
 
     if ( ( nFlags & LF_NO_USESYSCREDS ) == LF_NO_USESYSCREDS )
     {
         aUseSysCredsCB.Hide();
-        bUseSysCredsHide = TRUE;
+        bUseSysCredsHide = sal_True;
     }
 
     if ( bErrorHide )
@@ -193,7 +193,7 @@ void LoginDialog::HideControls_Impl( USHORT nFlags )
 };
 
 // -----------------------------------------------------------------------
-void LoginDialog::EnableUseSysCredsControls_Impl( BOOL bUseSysCredsEnabled )
+void LoginDialog::EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled )
 {
     aErrorInfo.Enable( !bUseSysCredsEnabled );
     aErrorFT.Enable( !bUseSysCredsEnabled );
@@ -249,7 +249,7 @@ IMPL_LINK( LoginDialog, UseSysCredsHdl_Impl, CheckBox *, EMPTYARG )
 LoginDialog::LoginDialog
 (
     Window* pParent,
-    USHORT nFlags,
+    sal_uInt16 nFlags,
     const String& rServer,
     const String* pRealm,
     ResMgr* pResMgr
@@ -314,7 +314,7 @@ LoginDialog::~LoginDialog()
 
 // -----------------------------------------------------------------------
 
-void LoginDialog::SetUseSystemCredentials( BOOL bUse )
+void LoginDialog::SetUseSystemCredentials( sal_Bool bUse )
 {
     if ( aUseSysCredsCB.IsVisible() )
     {
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index 1ad6c59bbcfd..85f8b09e504d 100644..100755
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -73,15 +73,15 @@ class LoginDialog : public ModalDialog
     CancelButton    aCancelBtn;
     HelpButton      aHelpBtn;
 
-    void            HideControls_Impl( USHORT nFlags );
-    void            EnableUseSysCredsControls_Impl( BOOL bUseSysCredsEnabled );
+    void            HideControls_Impl( sal_uInt16 nFlags );
+    void            EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled );
 
     DECL_LINK( OKHdl_Impl, OKButton * );
     DECL_LINK( PathHdl_Impl, PushButton * );
     DECL_LINK( UseSysCredsHdl_Impl, CheckBox * );
 
 public:
-    LoginDialog( Window* pParent, USHORT nFlags,
+    LoginDialog( Window* pParent, sal_uInt16 nFlags,
                  const String& rServer, const String* pRealm,
                  ResMgr * pResMgr );
     virtual ~LoginDialog();
@@ -94,11 +94,11 @@ public:
     void            SetPassword( const String& rNew )           { aPasswordED.SetText( rNew ); }
     String          GetAccount() const                          { return aAccountED.GetText(); }
     void            SetAccount( const String& rNew )            { aAccountED.SetText( rNew ); }
-    BOOL            IsSavePassword() const                      { return aSavePasswdBtn.IsChecked(); }
-    void            SetSavePassword( BOOL bSave )               { aSavePasswdBtn.Check( bSave ); }
+    sal_Bool            IsSavePassword() const                      { return aSavePasswdBtn.IsChecked(); }
+    void            SetSavePassword( sal_Bool bSave )               { aSavePasswdBtn.Check( bSave ); }
     void            SetSavePasswordText( const String& rTxt )   { aSavePasswdBtn.SetText( rTxt ); }
-    BOOL            IsUseSystemCredentials() const              { return aUseSysCredsCB.IsChecked(); }
-    void            SetUseSystemCredentials( BOOL bUse );
+    sal_Bool            IsUseSystemCredentials() const              { return aUseSysCredsCB.IsChecked(); }
+    void            SetUseSystemCredentials( sal_Bool bUse );
     void            SetErrorText( const String& rTxt )          { aErrorInfo.SetText( rTxt ); }
     void            SetLoginRequestText( const String& rTxt )   { aRequestInfo.SetText( rTxt ); }
     void            ClearPassword();
diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src
index bf6a97c3b0ff..736e0f9ae1df 100755
--- a/uui/source/logindlg.src
+++ b/uui/source/logindlg.src
@@ -175,20 +175,20 @@ ModalDialog DLG_UUI_LOGIN
         Size = MAP_APPFONT( 177 , 8 ) ;
     };
 
-    OKButton BTN_LOGIN_OK
+    HelpButton BTN_LOGIN_HELP
     {
         Pos = MAP_APPFONT( 6 , 227 ) ;
         Size = MAP_APPFONT( 50 , 14 ) ;
-        DefButton = TRUE ;
     };
 
-    CancelButton BTN_LOGIN_CANCEL
+    OKButton BTN_LOGIN_OK
     {
         Pos = MAP_APPFONT( 66 , 227 ) ;
         Size = MAP_APPFONT( 50 , 14 ) ;
+        DefButton = TRUE ;
     };
 
-    HelpButton BTN_LOGIN_HELP
+    CancelButton BTN_LOGIN_CANCEL
     {
         Pos = MAP_APPFONT( 121 , 227 ) ;
         Size = MAP_APPFONT( 50 , 14 ) ;
diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx
index d8cc696ad87b..bdab13f97a3a 100644..100755
--- a/uui/source/loginerr.hxx
+++ b/uui/source/loginerr.hxx
@@ -52,8 +52,8 @@ private:
     String m_aPasswordToModify;
     String m_aPath;
     String m_aErrorText;
-    BYTE   m_nFlags;
-    USHORT m_nRet;
+    sal_uInt8   m_nFlags;
+    sal_uInt16 m_nRet;
     bool   m_bRecommendToOpenReadonly;
 
 public:
@@ -72,17 +72,17 @@ public:
     bool            IsRecommendToOpenReadonly() const   { return m_bRecommendToOpenReadonly; }
     const String&   GetPath() const                     { return m_aPath; }
     const String&   GetErrorText() const                { return m_aErrorText; }
-    BOOL            GetCanRememberPassword() const      { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); }
-    BOOL            GetIsRememberPersistent() const     { return ( m_nFlags & LOGINERROR_FLAG_REMEMBER_PERSISTENT ); }
-    BOOL            GetIsRememberPassword() const       { return ( m_nFlags & LOGINERROR_FLAG_IS_REMEMBER_PASSWORD ); }
+    sal_Bool            GetCanRememberPassword() const      { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); }
+    sal_Bool            GetIsRememberPersistent() const     { return ( m_nFlags & LOGINERROR_FLAG_REMEMBER_PERSISTENT ); }
+    sal_Bool            GetIsRememberPassword() const       { return ( m_nFlags & LOGINERROR_FLAG_IS_REMEMBER_PASSWORD ); }
 
-    BOOL            GetCanUseSystemCredentials() const
+    sal_Bool            GetCanUseSystemCredentials() const
                     { return ( m_nFlags & LOGINERROR_FLAG_CAN_USE_SYSCREDS ); }
-    BOOL            GetIsUseSystemCredentials() const
+    sal_Bool            GetIsUseSystemCredentials() const
                     { return ( m_nFlags & LOGINERROR_FLAG_IS_USE_SYSCREDS ) ==
                              LOGINERROR_FLAG_IS_USE_SYSCREDS; }
-    BYTE            GetFlags() const        { return m_nFlags; }
-    USHORT          GetResult() const       { return m_nRet; }
+    sal_uInt8            GetFlags() const        { return m_nFlags; }
+    sal_uInt16          GetResult() const       { return m_nRet; }
 
     void            SetTitle( const String& aTitle )
                     { m_aTitle = aTitle; }
@@ -102,23 +102,23 @@ public:
                     { m_aPath = aPath; }
     void            SetErrorText( const String& aErrorText )
                     { m_aErrorText = aErrorText; }
-    void            SetFlags( BYTE nFlags )
+    void            SetFlags( sal_uInt8 nFlags )
                     { m_nFlags = nFlags; }
 
-    inline void     SetCanRememberPassword( BOOL bSet );
-    inline void     SetIsRememberPassword( BOOL bSet );
-    inline void     SetIsRememberPersistent( BOOL bSet );
+    inline void     SetCanRememberPassword( sal_Bool bSet );
+    inline void     SetIsRememberPassword( sal_Bool bSet );
+    inline void     SetIsRememberPersistent( sal_Bool bSet );
 
-    inline void     SetCanUseSystemCredentials( BOOL bSet );
-    inline void     SetIsUseSystemCredentials( BOOL bSet );
-    inline void     SetModifyAccount( BOOL bSet );
-    inline void     SetModifyUserName( BOOL bSet );
+    inline void     SetCanUseSystemCredentials( sal_Bool bSet );
+    inline void     SetIsUseSystemCredentials( sal_Bool bSet );
+    inline void     SetModifyAccount( sal_Bool bSet );
+    inline void     SetModifyUserName( sal_Bool bSet );
 
-    void            SetResult( USHORT nRet )
+    void            SetResult( sal_uInt16 nRet )
                     { m_nRet = nRet; }
 };
 
-inline void LoginErrorInfo::SetCanRememberPassword( BOOL bSet )
+inline void LoginErrorInfo::SetCanRememberPassword( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD;
@@ -126,7 +126,7 @@ inline void LoginErrorInfo::SetCanRememberPassword( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD;
 }
 
-inline void LoginErrorInfo::SetIsRememberPassword( BOOL bSet )
+inline void LoginErrorInfo::SetIsRememberPassword( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_IS_REMEMBER_PASSWORD;
@@ -134,7 +134,7 @@ inline void LoginErrorInfo::SetIsRememberPassword( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_IS_REMEMBER_PASSWORD;
 }
 
-inline void LoginErrorInfo::SetIsRememberPersistent( BOOL bSet )
+inline void LoginErrorInfo::SetIsRememberPersistent( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_REMEMBER_PERSISTENT;
@@ -142,7 +142,7 @@ inline void LoginErrorInfo::SetIsRememberPersistent( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_REMEMBER_PERSISTENT;
 }
 
-inline void LoginErrorInfo::SetCanUseSystemCredentials( BOOL bSet )
+inline void LoginErrorInfo::SetCanUseSystemCredentials( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_CAN_USE_SYSCREDS;
@@ -150,7 +150,7 @@ inline void LoginErrorInfo::SetCanUseSystemCredentials( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_CAN_USE_SYSCREDS;
 }
 
-inline void LoginErrorInfo::SetIsUseSystemCredentials( BOOL bSet )
+inline void LoginErrorInfo::SetIsUseSystemCredentials( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_IS_USE_SYSCREDS;
@@ -158,7 +158,7 @@ inline void LoginErrorInfo::SetIsUseSystemCredentials( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_IS_USE_SYSCREDS;
 }
 
-inline void LoginErrorInfo::SetModifyAccount( BOOL bSet )
+inline void LoginErrorInfo::SetModifyAccount( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_MODIFY_ACCOUNT;
@@ -166,7 +166,7 @@ inline void LoginErrorInfo::SetModifyAccount( BOOL bSet )
         m_nFlags &= ~LOGINERROR_FLAG_MODIFY_ACCOUNT;
 }
 
-inline void LoginErrorInfo::SetModifyUserName( BOOL bSet )
+inline void LoginErrorInfo::SetModifyUserName( sal_Bool bSet )
 {
     if ( bSet )
         m_nFlags |= LOGINERROR_FLAG_MODIFY_USER_NAME;
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/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 61ea4d5548d3..82557cb5c7f8 100644..100755
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -91,7 +91,7 @@ MasterPasswordCreateDialog::MasterPasswordCreateDialog
     aHelpBtn                ( this, ResId( BTN_MASTERPASSCRT_HELP, *pResMgr ) ),
 
     pResourceMgr            ( pResMgr ),
-    nMinLen                 ( 5 )
+    nMinLen                 ( 1 )
 {
     FreeResource();
 
diff --git a/uui/source/masterpasscrtdlg.hrc b/uui/source/masterpasscrtdlg.hrc
index ff84830b5842..ff84830b5842 100644..100755
--- a/uui/source/masterpasscrtdlg.hrc
+++ b/uui/source/masterpasscrtdlg.hrc
diff --git a/uui/source/masterpasscrtdlg.hxx b/uui/source/masterpasscrtdlg.hxx
index d612ffe55e03..d612ffe55e03 100644..100755
--- a/uui/source/masterpasscrtdlg.hxx
+++ b/uui/source/masterpasscrtdlg.hxx
diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src
index 870cc8a2456f..1ed1e9507b96 100644..100755
--- a/uui/source/masterpasscrtdlg.src
+++ b/uui/source/masterpasscrtdlg.src
@@ -63,6 +63,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT
     };
     Edit ED_MASTERPASSWORD_CRT
     {
+        HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT";
         Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ;
         Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
         Border = TRUE ;
@@ -76,6 +77,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT
     };
     Edit ED_MASTERPASSWORD_REPEAT
     {
+        HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT";
         Pos = MAP_APPFONT ( COL_0 , ROW_5 ) ;
         Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ;
         Border = TRUE ;
@@ -86,7 +88,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT
         Pos = MAP_APPFONT ( COL_0 , ROW_6 ) ;
         Size = MAP_APPFONT ( CTRL_WIDTH , 8*RSC_CD_FIXEDTEXT_HEIGHT ) ;
         WordBreak = TRUE ;
-        Text [ en-US ] = "Caution: Make sure you remember the Master Password you have set. If you forget your Master Password, you will be unable to access any of the information protected by it. Passwords are case-sensitive and at least five characters long.";
+        Text [ en-US ] = "Caution: If you forget the master password, you will be unable to access any of the information protected by it. Passwords are case-sensitive.";
     };
     FixedLine FL_CAUTIONTEXT
     {
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index dda109993cc4..dda109993cc4 100644..100755
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
diff --git a/uui/source/masterpassworddlg.hrc b/uui/source/masterpassworddlg.hrc
index 7263b577a8cf..7263b577a8cf 100644..100755
--- a/uui/source/masterpassworddlg.hrc
+++ b/uui/source/masterpassworddlg.hrc
diff --git a/uui/source/masterpassworddlg.hxx b/uui/source/masterpassworddlg.hxx
index b0f988d348fa..b0f988d348fa 100644..100755
--- a/uui/source/masterpassworddlg.hxx
+++ b/uui/source/masterpassworddlg.hxx
diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src
index c7bc835d92ee..2919a85ab488 100644..100755
--- a/uui/source/masterpassworddlg.src
+++ b/uui/source/masterpassworddlg.src
@@ -50,6 +50,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD
     };
     Edit ED_MASTERPASSWORD
     {
+        HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD:ED_MASTERPASSWORD";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 3 , 17 ) ;
         Size = MAP_APPFONT ( 169 , 13 ) ;
diff --git a/uui/source/mphndl.hxx b/uui/source/mphndl.hxx
index 78aa1665379b..78aa1665379b 100644..100755
--- a/uui/source/mphndl.hxx
+++ b/uui/source/mphndl.hxx
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 74bdfb216a03..8c813ffaae0b 100644..100755
--- a/uui/source/passcrtdlg.hxx
+++ b/uui/source/nameclashdlg.hxx
@@ -26,41 +26,40 @@
  *
  ************************************************************************/
 
-#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
-{
-    FixedText       aFTPasswordCrt;
-    Edit            aEDPasswordCrt;
-    FixedText       aFTPasswordRepeat;
-    Edit            aEDPasswordRepeat;
-    FixedText       aFTWarning;
-    FixedLine       aFixedLine1;
-    OKButton        aOKBtn;
-    CancelButton    aCancelBtn;
-    HelpButton      aHelpBtn;
 
-    ResMgr*                                         pResourceMgr;
-    sal_uInt16                                      nMinLen;
+enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE };
+
+class NameClashDialog : public ModalDialog
+{
+    FixedText     maFTMessage;
+    Edit          maEDNewName;
+    PushButton    maBtnOverwrite;
+    PushButton    maBtnRename;
+    CancelButton  maBtnCancel;
+    HelpButton    maBtnHelp;
+    rtl::OUString maSameName;
+    rtl::OUString maNewName;
 
-    DECL_LINK( OKHdl_Impl, OKButton * );
-    DECL_LINK( EditHdl_Impl, Edit * );
+    DECL_LINK( ButtonHdl_Impl, PushButton * );
 
 public:
-    PasswordCreateDialog( Window* pParent, ResMgr * pResMgr, bool bMSCryptoMode = false );
-
-    String          GetPassword() const { return aEDPasswordCrt.GetText(); }
+    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
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src
new file mode 100755
index 000000000000..b0e5ab5d15bf
--- /dev/null
+++ b/uui/source/nameclashdlg.src
@@ -0,0 +1,116 @@
+/*************************************************************************
+ *
+ * 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
+    {
+        HelpID = "uui:Edit:DLG_SIMPLE_NAME_CLASH: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
+    {
+        HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH: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
+    {
+        HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH: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/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index 2fd8be760818..2fd8be760818 100644..100755
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
diff --git a/uui/source/newerverwarn.hrc b/uui/source/newerverwarn.hrc
index 9097cf026b08..9097cf026b08 100644..100755
--- a/uui/source/newerverwarn.hrc
+++ b/uui/source/newerverwarn.hrc
diff --git a/uui/source/newerverwarn.hxx b/uui/source/newerverwarn.hxx
index 0caac8e88951..0caac8e88951 100644..100755
--- a/uui/source/newerverwarn.hxx
+++ b/uui/source/newerverwarn.hxx
diff --git a/uui/source/newerverwarn.src b/uui/source/newerverwarn.src
index 3de289d69baa..94ee6be7db12 100644..100755
--- a/uui/source/newerverwarn.src
+++ b/uui/source/newerverwarn.src
@@ -66,6 +66,7 @@ ModalDialog RID_DLG_NEWER_VERSION_WARNING
     };
     PushButton PB_UPDATE
     {
+        HelpID = "uui:PushButton:RID_DLG_NEWER_VERSION_WARNING:PB_UPDATE";
         Pos = MAP_APPFONT ( COL_3 , ROW_3 ) ;
         Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
         TabStop = TRUE ;
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index 84ea5f5b85f8..84ea5f5b85f8 100644..100755
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
diff --git a/uui/source/openlocked.hxx b/uui/source/openlocked.hxx
index 43429b6b00cc..43429b6b00cc 100644..100755
--- a/uui/source/openlocked.hxx
+++ b/uui/source/openlocked.hxx
diff --git a/uui/source/openlocked.src b/uui/source/openlocked.src
index 9ec075774352..9ec075774352 100644..100755
--- a/uui/source/openlocked.src
+++ b/uui/source/openlocked.src
diff --git a/uui/source/passcrtdlg.cxx b/uui/source/passcrtdlg.cxx
deleted file mode 100644
index 1f024bc1b198..000000000000
--- a/uui/source/passcrtdlg.cxx
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * 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 <sal/macros.h>
-#include <svtools/filedlg.hxx>
-#include <vcl/msgbox.hxx>
-
-#include <ids.hrc>
-#include <passcrtdlg.hrc>
-#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 = SAL_N_ELEMENTS( pControls );
-    for ( int i = 0; i < nCCount; ++i )
-    {
-        Point aNewPos =(*pControls[i]).GetPosPixel();
-        aNewPos.Y() += nDelta;
-        pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() );
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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";
-};
-
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index 359aa977d1f8..359aa977d1f8 100644..100755
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index cd29fb308ac6..cd29fb308ac6 100644..100755
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 4e18e3a2f292..43202c47e65f 100644..100755
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -26,64 +26,119 @@
  *
  ************************************************************************/
 
-#include <sal/macros.h>
+#include "passworddlg.hxx"
+#include "passworddlg.hrc"
+#include "ids.hrc"
+
 #include <svtools/filedlg.hxx>
 #include <vcl/msgbox.hxx>
 
-#include <ids.hrc>
-#include <passworddlg.hrc>
-#include <passworddlg.hxx>
 
-// PasswordDialog---------------------------------------------------------
+using namespace ::com::sun::star;
+
 
 // -----------------------------------------------------------------------
 
-IMPL_LINK( PasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG )
+static void lcl_Move( Window &rWin, long nOffset )
 {
-    EndDialog( RET_OK );
-    return 1;
+    Point aTmp( rWin.GetPosPixel() );
+    aTmp.Y() += nOffset;
+    rWin.SetPosPixel( aTmp );
 }
 
 // -----------------------------------------------------------------------
 
 PasswordDialog::PasswordDialog(
     Window* _pParent,
-    ::com::sun::star::task::PasswordRequestMode nDlgMode,
+    task::PasswordRequestMode nDlgMode,
     ResMgr * pResMgr,
     rtl::OUString& aDocURL,
-    bool bOpenToModify )
+    bool bOpenToModify,
+    bool bIsSimplePasswordRequest )
 
     :ModalDialog( _pParent, ResId( DLG_UUI_PASSWORD, *pResMgr ) )
     ,aFTPassword( this, ResId( FT_PASSWORD, *pResMgr ))
     ,aEDPassword( this, ResId( ED_PASSWORD, *pResMgr ))
+    ,aFTConfirmPassword( this, ResId( FT_CONFIRM_PASSWORD, *pResMgr ))
+    ,aEDConfirmPassword( this, ResId( ED_CONFIRM_PASSWORD, *pResMgr ))
     ,aOKBtn ( this, ResId( BTN_PASSWORD_OK, *pResMgr ))
     ,aCancelBtn ( this, ResId( BTN_PASSWORD_CANCEL, *pResMgr ))
     ,aHelpBtn ( this, ResId( BTN_PASSWORD_HELP, *pResMgr ))
     ,aFixedLine1( this, ResId( FL_FIXED_LINE_1, *pResMgr ))
+    ,nMinLen(1)
+    ,aPasswdMismatch( ResId( STR_PASSWORD_MISMATCH, *pResMgr ))
     ,nDialogMode( nDlgMode )
     ,pResourceMgr ( pResMgr )
 {
-    if( nDialogMode == ::com::sun::star::task::PasswordRequestMode_PASSWORD_REENTER )
+    if( nDialogMode == task::PasswordRequestMode_PASSWORD_REENTER )
     {
-        USHORT nErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
+        const sal_uInt16 nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
+        const sal_uInt16 nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId;
         String aErrorMsg( ResId( nErrStrId, *pResourceMgr ));
-        ErrorBox aErrorBox( _pParent, WB_OK, aErrorMsg );
+        ErrorBox aErrorBox( this, WB_OK, aErrorMsg );
         aErrorBox.Execute();
     }
 
-    USHORT nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN;
-    aFTPassword.SetText( String( ResId( nStrId, *pResourceMgr ) ) );
+    // default settings for enter password or reenter passwd...
+    String aTitle( ResId( STR_TITLE_ENTER_PASSWORD, *pResourceMgr ) );
+    aFTConfirmPassword.Hide();
+    aEDConfirmPassword.Hide();
+    aFTConfirmPassword.Enable( sal_False );
+    aEDConfirmPassword.Enable( sal_False );
 
-    FreeResource();
+    // settings for create password
+    if (nDialogMode == task::PasswordRequestMode_PASSWORD_CREATE)
+    {
+        aTitle = String( ResId( STR_TITLE_CREATE_PASSWORD, *pResourceMgr ) );
+
+        aFTConfirmPassword.SetText( String( ResId( STR_CONFIRM_SIMPLE_PASSWORD, *pResourceMgr ) ) );
+
+        aFTConfirmPassword.Show();
+        aEDConfirmPassword.Show();
+        aFTConfirmPassword.Enable( sal_True );
+        aEDConfirmPassword.Enable( sal_True );
+    }
+    else
+    {
+        // shrink dialog by size of hidden controls and move rest up accordingly
+
+        long nDelta = aFixedLine1.GetPosPixel().Y() - aFTConfirmPassword.GetPosPixel().Y();
+
+        lcl_Move( aFixedLine1, -nDelta );
+        lcl_Move( aOKBtn, -nDelta );
+        lcl_Move( aCancelBtn, -nDelta );
+        lcl_Move( aHelpBtn, -nDelta );
+
+        Size aNewDlgSize = GetSizePixel();
+        aNewDlgSize.Height() -= nDelta;
+        SetSizePixel( aNewDlgSize );
+    }
+
+    SetText( aTitle );
 
+    sal_uInt16 nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN;
+    aFTPassword.SetText( String( ResId( nStrId, *pResourceMgr ) ) );
     aFTPassword.SetText( aFTPassword.GetText() + aDocURL );
+    if (bIsSimplePasswordRequest)
+    {
+        DBG_ASSERT( aDocURL.getLength() == 0, "A simple password request should not have a document URL! Use document password request instead." );
+        aFTPassword.SetText( String( ResId( STR_ENTER_SIMPLE_PASSWORD, *pResourceMgr ) ) );
+    }
+
+    FreeResource();
 
     aOKBtn.SetClickHdl( LINK( this, PasswordDialog, OKHdl_Impl ) );
 
-    long nLabelWidth = aFTPassword.GetSizePixel().Width();
-    long nLabelHeight = aFTPassword.GetSizePixel().Height();
-    long nTextWidth = aFTPassword.GetCtrlTextWidth( aFTPassword.GetText() );
-    long nTextHeight = aFTPassword.GetTextHeight();
+
+    //
+    // move controls down by extra height needed for aFTPassword
+    // (usually only needed if a URL was provided)
+    //
+
+    long nLabelWidth    = aFTPassword.GetSizePixel().Width();
+    long nLabelHeight   = aFTPassword.GetSizePixel().Height();
+    long nTextWidth     = aFTPassword.GetCtrlTextWidth( aFTPassword.GetText() );
+    long nTextHeight    = aFTPassword.GetTextHeight();
 
     Rectangle aLabelRect( aFTPassword.GetPosPixel(), aFTPassword.GetSizePixel() );
     Rectangle aRect = aFTPassword.GetTextRect( aLabelRect, aFTPassword.GetText() );
@@ -103,15 +158,33 @@ PasswordDialog::PasswordDialog(
     aNewLabelSize.Height() = nNewLabelHeight;
     aFTPassword.SetPosSizePixel( aFTPassword.GetPosPixel(), aNewLabelSize );
 
-    Window* pControls[] = { &aEDPassword, &aFixedLine1, &aOKBtn, &aCancelBtn, &aHelpBtn };
-    const sal_Int32 nCCount = SAL_N_ELEMENTS( pControls );
-    for ( int i = 0; i < nCCount; ++i )
+    lcl_Move( aEDPassword, nDelta );
+    lcl_Move( aFTConfirmPassword, nDelta );
+    lcl_Move( aEDConfirmPassword, nDelta );
+    lcl_Move( aFixedLine1, nDelta );
+    lcl_Move( aOKBtn, nDelta );
+    lcl_Move( aCancelBtn, nDelta );
+    lcl_Move( aHelpBtn, nDelta );
+}
+
+
+IMPL_LINK( PasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG )
+{
+    bool bEDPasswdValid = aEDPassword.GetText().Len() >= nMinLen;
+    bool bPasswdMismatch = aEDConfirmPassword.GetText() != aEDPassword.GetText();
+    bool bValid = (!aEDConfirmPassword.IsVisible() && bEDPasswdValid) ||
+            (aEDConfirmPassword.IsVisible() && bEDPasswdValid && !bPasswdMismatch);
+
+    if (aEDConfirmPassword.IsVisible() && bPasswdMismatch)
     {
-        Point aNewPos =(*pControls[i]).GetPosPixel();
-        aNewPos.Y() += nDelta;
-        pControls[i]->SetPosSizePixel( aNewPos, pControls[i]->GetSizePixel() );
+        ErrorBox aErrorBox( this, WB_OK, aPasswdMismatch );
+        aErrorBox.Execute();
     }
+    else if (bValid)
+        EndDialog( RET_OK );
 
+    return 1;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --git a/uui/source/passworddlg.hrc b/uui/source/passworddlg.hrc
index ad7517b7a62b..e9a8bb5b5b04 100644..100755
--- a/uui/source/passworddlg.hrc
+++ b/uui/source/passworddlg.hrc
@@ -29,12 +29,18 @@
 #define PASSWORDDLG_HRC
 
 // local identifiers
-#define BTN_PASSWORD_OK     1
-#define ED_PASSWORD         2
-#define FT_PASSWORD 3
-#define FL_FIXED_LINE_1         4
-#define BTN_PASSWORD_HELP     5
-#define BTN_PASSWORD_CANCEL     6
+#define BTN_PASSWORD_OK         1
+#define ED_PASSWORD             2
+#define FT_PASSWORD             3
+#define FT_CONFIRM_PASSWORD     4
+#define ED_CONFIRM_PASSWORD     5
+#define FL_FIXED_LINE_1         6
+#define BTN_PASSWORD_HELP       7
+#define BTN_PASSWORD_CANCEL     8
+
+#define STR_TITLE_CREATE_PASSWORD   9
+#define STR_TITLE_ENTER_PASSWORD   10
+#define STR_PASSWORD_MISMATCH      11
 
 
 #endif // PASSWORDDLG_HRC
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index f69d08c210d4..0195ee5e7f5d 100644..100755
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -38,21 +38,28 @@
 #include <vcl/fixed.hxx>
 
 //============================================================================
+
 class PasswordDialog : public ModalDialog
 {
     FixedText       aFTPassword;
     Edit            aEDPassword;
+    FixedText       aFTConfirmPassword;
+    Edit            aEDConfirmPassword;
     OKButton        aOKBtn;
     CancelButton    aCancelBtn;
     HelpButton      aHelpBtn;
     FixedLine       aFixedLine1;
+    sal_uInt16          nMinLen;
+    String          aPasswdMismatch;
 
 
     DECL_LINK( OKHdl_Impl, OKButton * );
 
 public:
-    PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL, bool bOpenToModify = false );
+    PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL,
+            bool bOpenToModify = false, bool bIsSimplePasswordRequest = false );
 
+    void            SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; }
     String          GetPassword() const { return aEDPassword.GetText(); }
 
 private:
diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src
index 33767057e1bd..41c90dfabcab 100755
--- a/uui/source/passworddlg.src
+++ b/uui/source/passworddlg.src
@@ -41,48 +41,63 @@ ModalDialog DLG_UUI_PASSWORD
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Size = MAP_APPFONT( 145, 91 );
-    Text [ en-US ] = "Enter password";
+    Size = MAP_APPFONT( 165, 95 );
 
     FixedText FT_PASSWORD
     {
-        Pos = MAP_APPFONT( 3, 4 );
-        Size = MAP_APPFONT( 139, 28 );
+        Pos = MAP_APPFONT( 3, 6 );
+        Size = MAP_APPFONT( 159, 8 );
         WordBreak = TRUE;
     };
 
     Edit ED_PASSWORD
     {
-        Pos = MAP_APPFONT( 3, 51 );
-        Size = MAP_APPFONT( 139, 13 );
+        HelpID = "uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD";
+        Pos = MAP_APPFONT( 3, 17 );
+        Size = MAP_APPFONT( 159, 12 );
         Border = TRUE ;
         PassWord = TRUE ;
     };
 
-    FixedLine FL_FIXED_LINE_1
+    FixedText FT_CONFIRM_PASSWORD
     {
-        Pos = MAP_APPFONT( 0, 66 );
-        Size = MAP_APPFONT( 145, 6 );
+        Pos = MAP_APPFONT( 3, 34 );
+        Size = MAP_APPFONT( 159, 8 );
+        WordBreak = TRUE;
     };
 
-    OKButton BTN_PASSWORD_OK
+    Edit ED_CONFIRM_PASSWORD
     {
-        Pos = MAP_APPFONT( 27, 72 );
-        Size = MAP_APPFONT( 37, 15 );
-        DefButton = TRUE ;
-        DefButton = TRUE;
+        HelpID = "uui:Edit:DLG_UUI_PASSWORD:ED_CONFIRM_PASSWORD";
+        Pos = MAP_APPFONT( 3, 45 );
+        Size = MAP_APPFONT( 159, 12 );
+        Border = TRUE ;
+        PassWord = TRUE ;
     };
 
-    CancelButton BTN_PASSWORD_CANCEL
+    FixedLine FL_FIXED_LINE_1
     {
-        Pos = MAP_APPFONT( 66, 72 );
-        Size = MAP_APPFONT( 37, 15 );
+        Pos = MAP_APPFONT( 0, 63 );
+        Size = MAP_APPFONT( 165, 8 );
     };
 
     HelpButton BTN_PASSWORD_HELP
     {
-        Pos = MAP_APPFONT( 105, 72 );
-        Size = MAP_APPFONT( 37, 15 );
+        Pos = MAP_APPFONT( 3, 76 );
+        Size = MAP_APPFONT( 50, 14 );
+    };
+
+    OKButton BTN_PASSWORD_OK
+    {
+        Pos = MAP_APPFONT( 59, 76 );
+        Size = MAP_APPFONT( 50, 14 );
+        DefButton = TRUE ;
+    };
+
+    CancelButton BTN_PASSWORD_CANCEL
+    {
+        Pos = MAP_APPFONT( 112, 76 );
+        Size = MAP_APPFONT( 50, 14 );
     };
 
     String STR_ENTER_PASSWORD_TO_OPEN
@@ -94,5 +109,30 @@ ModalDialog DLG_UUI_PASSWORD
     {
         Text [ en-US ] = "Enter password to modify file: \n";
     };
+
+    String STR_ENTER_SIMPLE_PASSWORD
+    {
+        Text [ en-US ] = "Enter password: ";
+    };
+
+    String STR_CONFIRM_SIMPLE_PASSWORD
+    {
+        Text [ en-US ] = "Confirm password: ";
+    };
+
+    String STR_TITLE_CREATE_PASSWORD
+    {
+        Text [ en-US ] = "Set Password";
+    };
+
+    String STR_TITLE_ENTER_PASSWORD
+    {
+        Text [ en-US ] = "Enter Password";
+    };
+
+    String STR_PASSWORD_MISMATCH
+    {
+        Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ;
+    };
 };
 
diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src
index 91b244ae543e..3d4307ad4f80 100755
--- a/uui/source/passworderrs.src
+++ b/uui/source/passworderrs.src
@@ -43,7 +43,12 @@ String STR_ERROR_PASSWORD_TO_MODIFY_WRONG
 
 String STR_ERROR_MASTERPASSWORD_WRONG
 {
-    Text [ en-US ] = "The wrong Master Password has been entered. %PRODUCTNAME could not access web login information protected by Master Password.\n\nNote: Passwords are case-sensitive and at least five characters long.";
+    Text [ en-US ] = "The master password is incorrect.";
+};
+
+String STR_ERROR_SIMPLE_PASSWORD_WRONG
+{
+    Text [ en-US ] = "The password is incorrect.";
 };
 
 String STR_ERROR_PASSWORDS_NOT_IDENTICAL
diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx
index 77df688dbb2c..77df688dbb2c 100644..100755
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index 5492cc4cac66..5492cc4cac66 100644..100755
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 1d3cc72648ef..1d3cc72648ef 100644..100755
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
diff --git a/uui/source/secmacrowarnings.hrc b/uui/source/secmacrowarnings.hrc
index 38e8974a3d2c..38e8974a3d2c 100644..100755
--- a/uui/source/secmacrowarnings.hrc
+++ b/uui/source/secmacrowarnings.hrc
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index 65d3f0d23c48..65d3f0d23c48 100644..100755
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
diff --git a/uui/source/secmacrowarnings.src b/uui/source/secmacrowarnings.src
index 6d0039da7746..f19694054281 100644..100755
--- a/uui/source/secmacrowarnings.src
+++ b/uui/source/secmacrowarnings.src
@@ -74,6 +74,7 @@ ModalDialog RID_XMLSECDLG_MACROWARN
     };
     PushButton PB_VIEWSIGNS
     {
+        HelpID = "uui:PushButton:RID_XMLSECDLG_MACROWARN:PB_VIEWSIGNS";
         Pos = MAP_APPFONT( MW_COL_3, MW_ROW_2 );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
         Text [ en-US ] = "View Signatures...";
@@ -87,6 +88,7 @@ ModalDialog RID_XMLSECDLG_MACROWARN
     };
     CheckBox CB_ALWAYSTRUST
     {
+        HelpID = "uui:CheckBox:RID_XMLSECDLG_MACROWARN:CB_ALWAYSTRUST";
         Pos = MAP_APPFONT( MW_COL_1, MW_ROW_4 );
         Size = MAP_APPFONT( MW_COL_4-MW_COL_1, RSC_CD_CHECKBOX_HEIGHT );
         Text [ en-US ] = "Always trust macros from this source";
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index 8063d83585f9..125a1d86cd5d 100644..100755
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -43,49 +43,6 @@ using namespace com::sun::star::registry;
 
 using ::rtl::OUString;
 
-namespace {
-
-sal_Bool writeInfo( void * pRegistryKey,
-                    const OUString & rImplementationName,
-                    Sequence< OUString > const & rServiceNames )
-{
-    OUString aKeyName( OUString(RTL_CONSTASCII_USTRINGPARAM( "/" )) );
-    aKeyName += rImplementationName;
-    aKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
-
-    Reference< XRegistryKey > xKey;
-    try
-    {
-        xKey = static_cast< XRegistryKey * >(
-            pRegistryKey )->createKey( aKeyName );
-    }
-    catch ( InvalidRegistryException const & )
-    {
-    }
-
-    if ( !xKey.is() )
-    {
-        return sal_False;
-    }
-    sal_Bool bSuccess = sal_True;
-
-    for ( sal_Int32 n = 0; n < rServiceNames.getLength(); ++n )
-    {
-        try
-        {
-            xKey->createKey( rServiceNames[ n ] );
-        }
-        catch ( InvalidRegistryException const & )
-        {
-            bSuccess = sal_False;
-            break;
-        }
-    }
-    return bSuccess;
-}
-
-} // namespace
-
 //============================================================================
 //
 //  component_getImplementationEnvironment
@@ -101,43 +58,6 @@ component_getImplementationEnvironment(sal_Char const ** pEnvTypeName,
 
 //============================================================================
 //
-//  component_writeInfo
-//
-//============================================================================
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(void *, void * pRegistryKey)
-{
-    return pRegistryKey &&
-
-    //////////////////////////////////////////////////////////////////////
-    // UUI Interaction Handler.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-            OUString::createFromAscii(
-                UUIInteractionHandler::m_aImplementationName ),
-            UUIInteractionHandler::getSupportedServiceNames_static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // UUI Interaction Request String Resolver.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-            OUString::createFromAscii(
-                UUIInteractionRequestStringResolver::m_aImplementationName ),
-            UUIInteractionRequestStringResolver::getSupportedServiceNames_static() ) &&
-
-    //////////////////////////////////////////////////////////////////////
-    // UUI Password Container Interaction Handler.
-    //////////////////////////////////////////////////////////////////////
-
-    writeInfo( pRegistryKey,
-            uui::PasswordContainerInteractionHandler::getImplementationName_Static(),
-            uui::PasswordContainerInteractionHandler::getSupportedServiceNames_Static() );
-}
-
-//============================================================================
-//
 //  component_getFactory
 //
 //============================================================================
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 3ef1b4283e19..3ef1b4283e19 100644..100755
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
diff --git a/uui/source/sslwarndlg.hrc b/uui/source/sslwarndlg.hrc
index f5bbf00c6f37..f5bbf00c6f37 100644..100755
--- a/uui/source/sslwarndlg.hrc
+++ b/uui/source/sslwarndlg.hrc
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index a2be27e34233..a2be27e34233 100644..100755
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
diff --git a/uui/source/sslwarndlg.src b/uui/source/sslwarndlg.src
index acae9453a971..cbcdeef3a8b1 100644..100755
--- a/uui/source/sslwarndlg.src
+++ b/uui/source/sslwarndlg.src
@@ -41,7 +41,6 @@ ModalDialog DLG_UUI_SSLWARN
     Moveable = TRUE ;
     OutputSize = TRUE ;
     SVLook = TRUE ;
-    Pos = MAP_APPFONT( 221, 158 );
     Size = MAP_APPFONT( DLG_WIDTH, DLG_HEIGHT );
 
     Text [ en-US ] = "Security Warning: ";
@@ -59,6 +58,7 @@ ModalDialog DLG_UUI_SSLWARN
 
     PushButton PB_VIEW__CERTIFICATE
     {
+        HelpID = "uui:PushButton:DLG_UUI_SSLWARN:PB_VIEW__CERTIFICATE";
         Pos = MAP_APPFONT( DLG_CTLBTN_CERT_START_X, DLG_CTLBTN_START_Y );
         Size = MAP_APPFONT( DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
 
@@ -77,6 +77,7 @@ ModalDialog DLG_UUI_SSLWARN
 
     PushButton PB_OK
     {
+        HelpID = "uui:PushButton:DLG_UUI_SSLWARN:PB_OK";
         Pos = MAP_APPFONT( DLG_CTLBTN_OK_START_X, DLG_CTLBTN_START_Y );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
 
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index d8aaad203270..d8aaad203270 100644..100755
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.cxx
diff --git a/uui/source/trylater.hxx b/uui/source/trylater.hxx
index da8206be6496..da8206be6496 100644..100755
--- a/uui/source/trylater.hxx
+++ b/uui/source/trylater.hxx
diff --git a/uui/source/trylater.src b/uui/source/trylater.src
index 4f328fed7c02..4f328fed7c02 100644..100755
--- a/uui/source/trylater.src
+++ b/uui/source/trylater.src
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index 0aebd177b6c5..0aebd177b6c5 100644..100755
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
diff --git a/uui/source/unknownauthdlg.hrc b/uui/source/unknownauthdlg.hrc
index e9cc84fc1896..e9cc84fc1896 100644..100755
--- a/uui/source/unknownauthdlg.hrc
+++ b/uui/source/unknownauthdlg.hrc
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 1f183c0fe407..1f183c0fe407 100644..100755
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
diff --git a/uui/source/unknownauthdlg.src b/uui/source/unknownauthdlg.src
index d20a28a00704..37613939565e 100644..100755
--- a/uui/source/unknownauthdlg.src
+++ b/uui/source/unknownauthdlg.src
@@ -62,6 +62,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH
 
     PushButton PB_VIEW__CERTIFICATE
     {
+        HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_VIEW__CERTIFICATE";
         Pos = MAP_APPFONT( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP + DLG_TEXT_1_HEIGHT + RSC_SP_CTRL_GROUP_Y );
         Size = MAP_APPFONT( 70, RSC_CD_PUSHBUTTON_HEIGHT );
 
@@ -80,6 +81,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH
 
     PushButton PB_OK
     {
+        HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_OK";
         Pos = MAP_APPFONT( DLG_CTLBTN_OK_START_X, DLG_CTLBTN_START_Y );
         Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
 
@@ -96,6 +98,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH
 
     RadioButton RB_ACCEPT_1
     {
+        HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_ACCEPT_1";
         Pos = MAP_APPFONT( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y );
         Size = MAP_APPFONT( 182, RSC_CD_RADIOBUTTON_HEIGHT );
 
@@ -106,6 +109,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH
 
     RadioButton RB_DONTACCEPT_2
     {
+        HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_DONTACCEPT_2";
         Pos = MAP_APPFONT( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y + RSC_CD_RADIOBUTTON_HEIGHT  );
         Size = MAP_APPFONT( 182, RSC_CD_RADIOBUTTON_HEIGHT );
 
diff --git a/uui/util/makefile.mk b/uui/util/makefile.mk
index 163a7bb5502e..8a77e71b5e8d 100644..100755
--- a/uui/util/makefile.mk
+++ b/uui/util/makefile.mk
@@ -62,3 +62,11 @@ RESLIB1SRSFILES = \
     $(SRS)$/source.srs
 
 .INCLUDE: target.mk
+
+ALLTAR : $(MISC)/uui.component
+
+$(MISC)/uui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        uui.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt uui.component
diff --git a/uui/util/uui.component b/uui/util/uui.component
new file mode 100755
index 000000000000..0a15ad6eb8e5
--- /dev/null
+++ b/uui/util/uui.component
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation
+      name="com.sun.star.comp.uui.PasswordContainerInteractionHandler">
+    <service name="com.sun.star.task.PasswordContainerInteractionHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.uui.UUIInteractionHandler">
+    <service name="com.sun.star.configuration.backend.InteractionHandler"/>
+    <service name="com.sun.star.task.InteractionHandler"/>
+    <service name="com.sun.star.uui.InteractionHandler"/>
+  </implementation>
+  <implementation
+      name="com.sun.star.comp.uui.UUIInteractionRequestStringResolver">
+    <service name="com.sun.star.task.InteractionRequestStringResolver"/>
+  </implementation>
+</component>
diff --git a/uui/util/uui.xml b/uui/util/uui.xml
index d5a2537a5379..d5a2537a5379 100644..100755
--- a/uui/util/uui.xml
+++ b/uui/util/uui.xml
author	Jan Holesovsky <kendy@suse.cz>	2011-03-18 15:49:47 +0100
committer	Jan Holesovsky <kendy@suse.cz>	2011-03-18 15:49:47 +0100
commit	091e4aee3386f3bfee081dc8646494e0eb97f88a (patch)
tree	dd79298b4e8729ca7dc874274d4a33ea88fe107d /uui
parent	f0681adbf092e2b455db52535f2df882bc87343a (diff)
parent	224bd63b3fa459baa0a6bb5cd03f5dc2ca475d82 (diff)