[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - fpicker/source

Szymon Kłos eszkadev at gmail.com
Tue Jul 14 11:57:31 PDT 2015


 fpicker/source/office/RemoteFilesDialog.cxx |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 6bf4d86116181b1806f84bc8cb025a3337678e02
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Tue Jul 14 20:55:52 2015 +0200

    question about overwriting the file only in the save mode
    
    Change-Id: Iabb3bc12a8efae65a1c3d221a31c2214de8f6c90

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 6c200ae..ec34e96 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -777,11 +777,14 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl )
 
     if ( bExists )
     {
-        OUString sMsg = ResId( STR_SVT_ALREADYEXISTOVERWRITE, *ResMgrHolder::getOrCreate() );
-        sMsg = sMsg.replaceFirst( "$filename$", sName );
-        ScopedVclPtrInstance< MessageDialog > aBox( this, sMsg, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO );
-        if( aBox->Execute() != RET_YES )
-            return 0;
+        if( m_eMode == REMOTEDLG_MODE_SAVE )
+        {
+            OUString sMsg = ResId( STR_SVT_ALREADYEXISTOVERWRITE, *ResMgrHolder::getOrCreate() );
+            sMsg = sMsg.replaceFirst( "$filename$", sName );
+            ScopedVclPtrInstance< MessageDialog > aBox( this, sMsg, VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO );
+            if( aBox->Execute() != RET_YES )
+                return 0;
+        }
     }
     else
     {


More information about the Libreoffice-commits mailing list