Commits

Anonymous committed 269980c

dv19#i29340# Implmented handler for NameClashResolveRequests

Comments (0)

Files changed (1)

uui/source/nameclashdlg.cxx

  ************************************************************************/
 
 #include "vcl/msgbox.hxx"
+#include "osl/file.hxx"
 
 #include "ids.hrc"
 #include "nameclashdlg.hrc"
 	    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 );