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

[Szymon Kłos]

 include/svtools/RemoteFilesDialog.hxx            |    1 +
 svtools/source/dialogs/RemoteFilesDialog.cxx     |    5 ++---
 svtools/source/dialogs/ServerDetailsControls.cxx |    8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit adcd28baca0532c0b25d4ae338559657546fe85c
Author: Szymon Kłos <eszka...@gmail.com>
Date:   Wed Jul 1 15:46:31 2015 +0200

    PlaceEditDialog: resolved a crash
    
    Change-Id: Id20ca57819fd3af80b407678f6d176a804399ce5

diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx 
b/svtools/source/dialogs/ServerDetailsControls.cxx
index 08460cb..3fc26c4 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -351,9 +351,11 @@ void CmisDetailsContainer::selectRepository( )
 {
     // Get the repo ID and call the Change listener
     sal_uInt16 nPos = m_pLBRepository->GetSelectEntryPos( );
-    m_sRepoId = m_aRepoIds[nPos];
-
-    notifyChange( );
+    if( nPos < m_aRepoIds.size() )
+    {
+        m_sRepoId = m_aRepoIds[nPos];
+        notifyChange( );
+    }
 }
 
 IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl  )
commit b6613739b61b7910be8c5628920b111033d8c203
Author: Szymon Kłos <eszka...@gmail.com>
Date:   Wed Jul 1 15:36:37 2015 +0200

    RemoteFilesDialog: StandardDir getter and setter
    
    Change-Id: Idf6cfc274c827064eacbda072e618562ecdd11c8

diff --git a/include/svtools/RemoteFilesDialog.hxx 
b/include/svtools/RemoteFilesDialog.hxx
index 20f8bde..c5f876a 100644
--- a/include/svtools/RemoteFilesDialog.hxx
+++ b/include/svtools/RemoteFilesDialog.hxx
@@ -127,6 +127,7 @@ private:
     Image m_aFolderImage;
 
     OUString m_sPath;
+    OUString m_sStdDir;
     unsigned int m_nCurrentFilter;
 
     ::com::sun::star::uno::Sequence< OUString > m_aBlackList;
diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx 
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index 821b99c..28c34dd 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -766,13 +766,12 @@ const ::com::sun::star::uno::Sequence< OUString >& 
RemoteFilesDialog::GetBlackLi
 
 void RemoteFilesDialog::SetStandardDir( const OUString& rStdDir )
 {
-    // TODO
+    m_sStdDir = rStdDir;
 }
 
 const OUString& RemoteFilesDialog::GetStandardDir() const
 {
-    // TODO
-    return OUString( "" );
+    return m_sStdDir;
 }
 
 void RemoteFilesDialog::SetPath( const OUString& rNewURL )

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits