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

[Szymon Kłos]

 fpicker/source/office/RemoteFilesDialog.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit bb228d829eec6d8f4ad8d6d7797cb6c905283aa5
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Mon Aug 3 16:47:29 2015 +0200

    delete entry in the context menu
    
    Change-Id: Ib315dbc27b8b278ffce4bb24f4c4b60e5cb4d709

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 8e816e0..48b0ab6 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -226,6 +226,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, WinBits nBits )
     m_pFileView->EnableAutoResize();
     m_pFileView->SetDoubleClickHdl( LINK( this, RemoteFilesDialog, DoubleClickHdl ) );
     m_pFileView->SetSelectHdl( LINK( this, RemoteFilesDialog, SelectHdl ) );
+    m_pFileView->EnableDelete( true );
 
     m_pSplitter = VclPtr< Splitter >::Create( m_pContainer, WB_HSCROLL );
     m_pSplitter->SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() ) );
commit 8b1800aef297c90f5d9d47274585b910eb19d4e9
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Mon Aug 3 16:33:25 2015 +0200

    don't show edit menu when there is no selected service
    
    Change-Id: I6b5f713926383d776aa687801f6bef239c9675cb

diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 12b8a3b..8e816e0 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -354,6 +354,7 @@ short RemoteFilesDialog::Execute()
     if( !m_bIsConnected )
     {
         m_pServices_lb->SetNoSelection();
+        m_pAddService_btn->SetPopupMenu( NULL );
     }
 
     short nRet = SvtFileDialog_Base::Execute();
@@ -658,6 +659,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, SelectServiceHdl )
     if( nPos >= 0 )
     {
         OUString sURL = m_aServices[nPos]->GetUrl();
+        m_pAddService_btn->SetPopupMenu( m_pAddMenu );
 
         m_bServiceChanged = true;
         OpenURL( sURL );