[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-1' - sd/source

Zolnai Tamás tamas.zolnai at collabora.com
Fri Aug 22 08:59:08 PDT 2014


 sd/source/ui/func/fuinsert.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fed76fcf73fc06f8bc547ee5511768e3ddfa8356
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Tue Aug 19 10:09:02 2014 +0200

    Fix Insert 3D Model file dialog's "All supported formats" filter
    
    It seems on some system the file dialog does not like spaces
    between the formats.
    
    (cherry picked from commit fd63ba45742e0886f15f907c03025b9dcc84d8ab)
    
    Conflicts:
    	sd/source/ui/func/fuinsert.cxx
    
    Change-Id: Ifa69f4f210061209f7f0aa9223417d06b06b577a
    Reviewed-on: https://gerrit.libreoffice.org/11015
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index e3fbd43..cd03700 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -789,7 +789,7 @@ void FuInsert3DModel::DoExecute( SfxRequest& )
     sfx2::FileDialogHelper aDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
 
     aDlg.SetTitle( "Insert 3D Model" );
-    aDlg.AddFilter( "All supported formats", "*.json; *.dae; *.kmz"  );
+    aDlg.AddFilter( "All supported formats", "*.json;*.dae;*.kmz"  );
     aDlg.AddFilter( "JSON - GL Transmission Format", "*.json" );
     aDlg.AddFilter( "DAE - COLLADA", "*.dae" );
     aDlg.AddFilter( "KMZ - Keyhole Markup language Zipped", "*.kmz"  );


More information about the Libreoffice-commits mailing list