[Libreoffice-commits] .: 2 commits - fpicker/source sfx2/source

[Stephan Bergmann]

 fpicker/source/office/PlacesListBox.cxx |    2 +-
 sfx2/source/doc/guisaveas.cxx           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 449440706c6db8f10d37321ed1280d986d07b9f3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 27 14:38:50 2012 +0200

    NOINITIALSELECTION important for Save As
    
    ...as otherwise the initial selection would overwrite the passed-in
    directory where to save to.
    
    Change-Id: Iafb3aa8a120a777f9bf15c00ab3b9c0379bd3b2c

diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 5338cb7..708b500 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -40,7 +40,7 @@ namespace css = com::sun::star;
 using rtl::OUString;
 
 PlacesListBox_Impl::PlacesListBox_Impl( Window* pParent, const rtl::OUString& rTitle ) :
-    SvHeaderTabListBox( pParent, WB_TABSTOP ),
+    SvHeaderTabListBox( pParent, WB_TABSTOP | WB_NOINITIALSELECTION ),
     mpHeaderBar( NULL )
 {
     Size aBoxSize = pParent->GetSizePixel( );
commit 41b0d974e40ba777955dd22a09a0bfe44d17fdeb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 27 14:34:25 2012 +0200

    SetDisplayDirectory is deprecated
    
    ...and SetDisplayFolder seems correct here, anyway, given that aReccomendedDir (sic)
    denotes a directory, not a file.
    
    Change-Id: I2f77e8e9fe0948a028f344639d383726b4b8641d

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 4009639..3231bde 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -957,7 +957,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
 
     ::rtl::OUString aReccomendedDir = GetReccomendedDir( aSuggestedDir );
     if ( !aReccomendedDir.isEmpty() )
-        pFileDlg->SetDisplayDirectory( aReccomendedDir );
+        pFileDlg->SetDisplayFolder( aReccomendedDir );
     ::rtl::OUString aReccomendedName = GetReccomendedName( aSuggestedName, aAdjustToType );
     if ( !aReccomendedName.isEmpty() )
         pFileDlg->SetFileName( aReccomendedName );