[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source

[Luboš Luňák]

 sfx2/source/doc/guisaveas.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 0e689d0d31c93012a375fa86f1ce9e91128db8e5
Author: Luboš Luňák <l.lunak at collabora.com>
Date:   Sun Apr 20 14:29:27 2014 +0200

    adjust output file extension when exporting (bnc#870581)
    
    If foo.odt is open, 'foo.odt' is the file name passed to the file dialog
    for File->Export to PDF (simply because it's the document name).  If automatic
    file extension is enabled, the file dialog will fix this to the PDF file type,
    but if disabled, the default filename will remain foo.odt, possibly overwriting
    the source file if the user confirms without checking.
    
    (cherry picked from commit cadf6cc31ffa000d1fe8e42cc3e6cd427e0104bd)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>
    
    Change-Id: I46504630b5f4e489d5a0cedf0b2b358305763722

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 9a8d84b..446d9d5 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -991,6 +991,9 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
                                         OUString("UIName"),
                                         OUString() );
         pFileDlg->SetCurrentFilter( aFilterUIName );
+        aAdjustToType = aPreselectedFilterPropsHM.getUnpackedValueOrDefault(
+                                        OUString("Type"),
+                                        OUString() );
     }
     // it is no export, bSetStandardName == true means that user agreed to store document in the default (default default ;-)) format
     else if ( bSetStandardName || GetStorable()->hasLocation() )