Committing fixed patch for autosave. Fixes bug #171092.

[inkscape.git] / src / ui / dialog / filedialogimpl-win32.cpp

diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp
index 9f7958cafb754489f6ad466d5f4eef465ee8a97f..ed257a49a68f23ee7143ee23d4712afcbc5376a4 100644 (file)
--- a/src/ui/dialog/filedialogimpl-win32.cpp
+++ b/src/ui/dialog/filedialogimpl-win32.cpp
@@ -40,7 +40,7 @@
 #include <display/nr-arena-item.h>
 #include <display/nr-arena.h>
 #include "sp-item.h"
-#include "canvas-arena.h"
+#include "display/canvas-arena.h"
 
 #include "filedialog.h"
 #include "filedialogimpl-win32.h"
@@ -119,8 +119,7 @@ FileDialogBaseWin32::FileDialogBaseWin32(Gtk::Window &parent,
 
 FileDialogBaseWin32::~FileDialogBaseWin32()
 {
-       if(_title != NULL)
-               g_free(_title);
+    g_free(_title);
 }
 
 Inkscape::Extension::Extension *FileDialogBaseWin32::getSelectionType()
@@ -242,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 +
@@ -874,7 +873,7 @@ bool FileOpenDialogImplWin32::set_svg_preview()
         arena, key, SP_ITEM_SHOW_DISPLAY);
 
     NRGC gc(NULL);
-    nr_matrix_set_scale(&gc.transform, scaleFactor, scaleFactor);
+    gc.transform = NR::Matrix(NR::scale(scaleFactor, scaleFactor));
 
     nr_arena_item_invoke_update (root, NULL, &gc,
         NR_ARENA_ITEM_STATE_ALL, NR_ARENA_ITEM_STATE_NONE);
@@ -1276,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++)