diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-29 14:14:31 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2014-08-29 12:43:47 -0500 |
| commit | 6d239ee19a4b1d9068fbd04b5a692c859142f613 (patch) | |
| tree | 186bb849ebb5affe5c3e205c0af470327971aa00 /sd | |
| parent | 2378f45d70c9ce4a093fd6b09216c1cd4563ebe2 (diff) | |
Handle collada libraries seperately: --disable-collada
Depends on gltf support.
(cherry picked from commit 191f0944fd8fc30493eda58c7adfdfa0b538f507)
Conflicts:
config_host.mk.in
sd/source/ui/func/fuinsert.cxx
Change-Id: Ief0452da3d03b0ddbca45272e5f5cd268691aeca
Reviewed-on: https://gerrit.libreoffice.org/11193
Tested-by: Rene Engelhard <rene@debian.org>
Reviewed-by: Rene Engelhard <rene@debian.org>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/func/fuinsert.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index cd0370011819..9c1c4ad5dcac 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -789,10 +789,19 @@ void FuInsert3DModel::DoExecute( SfxRequest& ) sfx2::FileDialogHelper aDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); aDlg.SetTitle( "Insert 3D Model" ); + +#if HAVE_FEATURE_COLLADA aDlg.AddFilter( "All supported formats", "*.json;*.dae;*.kmz" ); +#else + aDlg.AddFilter( "All supported formats", "*.json" ); +#endif + aDlg.AddFilter( "JSON - GL Transmission Format", "*.json" ); + +#if HAVE_FEATURE_COLLADA aDlg.AddFilter( "DAE - COLLADA", "*.dae" ); aDlg.AddFilter( "KMZ - Keyhole Markup language Zipped", "*.kmz" ); +#endif OUString sURL; if( aDlg.Execute() == ERRCODE_NONE ) |