[Libreoffice-commits] .: fpicker/source

[Jan Holesovsky]

 fpicker/source/office/iodlg.cxx |    7 ++++++-
 fpicker/source/office/iodlg.src |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 5d2036dcf1fbfa0e897f45ec91cc7088e6e2793b
Author: Sébastien Le Ray <sebastien-libreoffice at orniz.org>
Date:   Thu Feb 10 18:54:59 2011 +0100

    Fixes bug fdo#31252 - Overwrite dialog improvment.

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 7db9889..699081a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -1247,7 +1247,12 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
         {
             if ( ::utl::UCBContentHelper::Exists( aFileObj.GetMainURL( INetURLObject::NO_DECODE ) ) )
             {
-                QueryBox aBox( pThis, WB_YES_NO, SvtResId( STR_SVT_ALREADYEXISTOVERWRITE ) );
+                String aMsg = SvtResId( STR_SVT_ALREADYEXISTOVERWRITE );
+                aMsg.SearchAndReplace(
+                    String( RTL_CONSTASCII_USTRINGPARAM( "$filename$" ) ),
+                    aFileObj.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET)
+                );
+                QueryBox aBox( pThis, WB_YES_NO, aMsg );
                 if ( aBox.Execute() != RET_YES )
                     return 0;
             }
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index af24bd0..08ad36f 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -280,7 +280,7 @@ String STR_FILTERNAME_ALL
 
 String STR_SVT_ALREADYEXISTOVERWRITE
 {
-    Text [ en-US ] = "The file already exists. Overwrite?" ;
+    Text [ en-US ] = "A file named \"$filename$\" already exists.\n\nDo you want to replace it?" ;
 };
 
 String STR_SVT_NEW_FOLDER