dv19#i29340# Implmented handler for NameClashResolveRequests

1 files changed, 6 insertions, 1 deletions

diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index dd4566e45b30..593398d53640 100755
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -26,6 +26,7 @@
  ************************************************************************/
 
 #include "vcl/msgbox.hxx"
+#include "osl/file.hxx"
 
 #include "ids.hrc"
 #include "nameclashdlg.hrc"
@@ -89,10 +90,14 @@ NameClashDialog::NameClashDialog( Window* pParent, ResMgr* 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", rTargetFolderURL );
+    aInfo.SearchAndReplaceAscii( "%FOLDER", aPath );
     maFTMessage.SetText( aInfo );
     if ( rProposedNewName.getLength() )
         maEDNewName.SetText( rProposedNewName );