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

[Szymon Kłos]

 svtools/source/dialogs/PlaceEditDialog.cxx       |    3 +++
 svtools/source/dialogs/ServerDetailsControls.cxx |    4 ----
 ucb/source/ucp/cmis/cmis_content.cxx             |    5 +++++
 ucb/source/ucp/cmis/cmis_repo_content.cxx        |    6 +++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 5d54755b4fb9b710daa95457e4e98ca4be0a0db5
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Fri Jul 10 16:21:41 2015 +0200

    If user cancels authorization, don't show login dialog again
    
    Change-Id: I4b110c041f1b8908fdfeeec3b4544f8607f23ddb

diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 34f5b9f..ab61c24 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -377,6 +377,11 @@ namespace cmis
             else
             {
                 // Silently fail as the user cancelled the authentication
+                ucbhelper::cancelCommandExecution(
+                                    ucb::IOErrorCode_ABORT,
+                                    uno::Sequence< uno::Any >( 0 ),
+                                    xEnv,
+                                    OUString( ) );
                 throw uno::RuntimeException( );
             }
         }
commit 68f24bbe8350705f997fb50d1394c82ef2088b90
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Fri Jul 10 15:31:48 2015 +0200

    PlaceEditDialog: only one error after failed auth
    
    Change-Id: I215de03282b3692ebfdc6a7a0e9fd02ecc04f722

diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 46b5b05..e2f3ddc 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -411,10 +411,6 @@ IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl  )
     }
     catch ( const Exception& )
     {
-        ScopedVclPtrInstance< ErrorBox > pErrorBox( static_cast< vcl::Window* >( NULL ),
-                                                   WB_OK,
-                                                   "Auth failed!" );
-        pErrorBox->Execute( );
     }
 
     // Auto-select the first one
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 5128b70..82ca6b3 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -202,7 +202,11 @@ namespace cmis
                 catch (const libcmis::Exception& e)
                 {
                     SAL_INFO( "ucb.ucp.cmis", "Error getting repositories: " << e.what() );
-                    throw uno::Exception( );
+                    ucbhelper::cancelCommandExecution(
+                                        ucb::IOErrorCode_INVALID_DEVICE,
+                                        uno::Sequence< uno::Any >( 0 ),
+                                        xEnv,
+                                        OUString( ) );
                 }
             }
             else
commit 1198ac7e50cf4a243aa773d26423eaa614bb82b3
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Fri Jul 10 13:20:06 2015 +0200

    Check if OK button should be enabled after changing service type
    
    Change-Id: I64ce981846f4107c8f38e413f1e6eb9e5616ef87

diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index bbc1f43..0d1dced 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -258,6 +258,9 @@ IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl )
     m_xCurrentDetails->show(true);
 
     SetSizePixel(GetOptimalSize());
+
+    EditHdl(NULL);
+
     return 0;
 }