summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/filedialogimpl-win32.cpp
diff options
context:
space:
mode:
authorJoel Holdsworth <joel@airwebreathe.org.uk>2008-03-17 22:58:43 +0000
committerjoelholdsworth <joelholdsworth@users.sourceforge.net>2008-03-17 22:58:43 +0000
commit9216034749fae332de72059929abb5876dbe1684 (patch)
tree4e180612eed6d0fcecf95426681ddd7a64397d0c /src/ui/dialog/filedialogimpl-win32.cpp
parent* src/bind/Makefile_insert: Fix a build problem when srcdir != builddir. (diff)
downloadinkscape-9216034749fae332de72059929abb5876dbe1684.tar.gz
inkscape-9216034749fae332de72059929abb5876dbe1684.zip
A fix for bug #199357 "cannot load emf file" based on the patch submitted by Ulferikson
(bzr r5109)
Diffstat (limited to 'src/ui/dialog/filedialogimpl-win32.cpp')
-rw-r--r--src/ui/dialog/filedialogimpl-win32.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp
index ed1ba50b4..280fc52a6 100644
--- a/src/ui/dialog/filedialogimpl-win32.cpp
+++ b/src/ui/dialog/filedialogimpl-win32.cpp
@@ -241,31 +241,31 @@ void FileOpenDialogImplWin32::createFilterMenu()
}
int extension_index = 0;
- _extension_map = new Inkscape::Extension::Extension*[filter_count + 3];
+ _extension_map = new Inkscape::Extension::Extension*[filter_count];
// Filter Image Files
all_image_files.name = g_utf8_to_utf16(all_image_files_filter_name,
-1, NULL, &all_image_files.name_length, NULL);
all_image_files.filter = g_utf8_to_utf16(all_image_files_filter.data(),
-1, NULL, &all_image_files.filter_length, NULL);
+ all_image_files.mod = NULL;
filter_list.push_front(all_image_files);
- _extension_map[extension_index++] = NULL;
// Filter Inkscape Files
all_inkscape_files.name = g_utf8_to_utf16(all_inkscape_files_filter_name,
-1, NULL, &all_inkscape_files.name_length, NULL);
all_inkscape_files.filter = g_utf8_to_utf16(all_inkscape_files_filter.data(),
-1, NULL, &all_inkscape_files.filter_length, NULL);
+ all_inkscape_files.mod = NULL;
filter_list.push_front(all_inkscape_files);
- _extension_map[extension_index++] = NULL;
// Filter All Files
all_files.name = g_utf8_to_utf16(all_files_filter_name,
-1, NULL, &all_files.name_length, NULL);
all_files.filter = NULL;
all_files.filter_length = 0;
+ all_files.mod = NULL;
filter_list.push_front(all_files);
- _extension_map[extension_index++] = NULL;
filter_length += all_files.name_length + 3 +
all_inkscape_files.filter_length +
@@ -1275,7 +1275,7 @@ void FileSaveDialogImplWin32::createFilterMenu()
Inkscape::Extension::db.get_output_list(extension_list);
int filter_count = 0;
- int filter_length = 0;
+ int filter_length = 1;
for (Inkscape::Extension::DB::OutputList::iterator current_item = extension_list.begin();
current_item != extension_list.end(); current_item++)