diff options
author | Szymon Kłos <eszkadev@gmail.com> | 2015-07-22 15:19:37 +0200 |
---|---|---|
committer | Szymon Kłos <eszkadev@gmail.com> | 2015-07-24 12:29:03 +0200 |
commit | 62f77f52e9cb5e4825a269fa377af696235d0d17 (patch) | |
tree | 7fe6dd56be19002e4e3079f942c1843cb3fe8154 /fpicker | |
parent | Breadcrumb: clear all fields after changing root (diff) | |
download | core-62f77f52e9cb5e4825a269fa377af696235d0d17.tar.gz core-62f77f52e9cb5e4825a269fa377af696235d0d17.zip |
check if path exist before init of the fileview
Change-Id: I0c9384644cf5aabf83512c341d3ffff5d4847f36
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/office/RemoteFilesDialog.cxx | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 75615d16c49e..bd35802ec34d 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -462,34 +462,41 @@ FileViewResult RemoteFilesDialog::OpenURL( OUString const & sURL ) if( m_pFileView ) { - OUString sFilter = FILEDIALOG_FILTER_ALL; - - if( m_nCurrentFilter != LISTBOX_ENTRY_NOTFOUND ) + if( ContentIsFolder( sURL ) ) { - sFilter = m_aFilters[m_nCurrentFilter].second; - } + OUString sFilter = FILEDIALOG_FILTER_ALL; - m_pFileView->EndInplaceEditing( false ); + if( m_nCurrentFilter != LISTBOX_ENTRY_NOTFOUND ) + { + sFilter = m_aFilters[m_nCurrentFilter].second; + } - EnableChildPointerOverwrite( true ); - SetPointer( PointerStyle::Wait ); + m_pFileView->EndInplaceEditing( false ); - eResult = m_pFileView->Initialize( sURL, sFilter, NULL, GetBlackList() ); + EnableChildPointerOverwrite( true ); + SetPointer( PointerStyle::Wait ); - if( eResult == eSuccess ) - { - m_pPath->SetURL( sURL ); + eResult = m_pFileView->Initialize( sURL, sFilter, NULL, GetBlackList() ); - m_pTreeView->SetSelectHdl( Link<>() ); - m_pTreeView->SetTreePath( sURL ); - m_pTreeView->SetSelectHdl( LINK( this, RemoteFilesDialog, TreeSelectHdl ) ); + if( eResult == eSuccess ) + { + m_pPath->SetURL( sURL ); - m_bIsConnected = true; - EnableControls(); - } + m_pTreeView->SetSelectHdl( Link<>() ); + m_pTreeView->SetTreePath( sURL ); + m_pTreeView->SetSelectHdl( LINK( this, RemoteFilesDialog, TreeSelectHdl ) ); + + m_bIsConnected = true; + EnableControls(); + } - SetPointer( PointerStyle::Arrow ); - EnableChildPointerOverwrite( false ); + SetPointer( PointerStyle::Arrow ); + EnableChildPointerOverwrite( false ); + } + else + { + // content doesn't exist + } } return eResult; |