summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/export.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-03-19 09:38:56 +0000
committerJabiertxo Arraiza Zenotz <jtx@jtx.marker.es>2013-03-19 09:38:56 +0000
commit757f1b17bf5db6b7b5cc8725a0ee3c438c08cafc (patch)
treec62786af287828f0f70dba2e079be3cea604d8f4 /src/ui/dialog/export.cpp
parentWorking width widgets (diff)
parentDrop remaining unused functions (diff)
downloadinkscape-757f1b17bf5db6b7b5cc8725a0ee3c438c08cafc.tar.gz
inkscape-757f1b17bf5db6b7b5cc8725a0ee3c438c08cafc.zip
Widgets to effect added
(bzr r11950.1.59)
Diffstat (limited to 'src/ui/dialog/export.cpp')
-rw-r--r--src/ui/dialog/export.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 603786742..ac039bf77 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -412,7 +412,6 @@ void Export::set_default_filename () {
if ( SP_ACTIVE_DOCUMENT && SP_ACTIVE_DOCUMENT->getURI() )
{
- gchar *name;
SPDocument * doc = SP_ACTIVE_DOCUMENT;
const gchar *uri = doc->getURI();
const gchar *text_extension = get_file_save_extension (Inkscape::Extension::FILE_SAVE_METHOD_SAVE_AS).c_str();
@@ -441,7 +440,7 @@ void Export::set_default_filename () {
g_free(uri_copy);
}
} else {
- name = g_strconcat(uri, ".png", NULL);
+ gchar *name = g_strconcat(uri, ".png", NULL);
filename_entry.set_text(name);
filename_entry.set_position(strlen(name));
@@ -1310,7 +1309,7 @@ void Export::onBrowse ()
WCHAR _filename[_MAX_PATH + 1];
memset(_filename, 0, sizeof(_filename));
gunichar2* utf16_path_string = g_utf8_to_utf16(filename.c_str(), -1, NULL, NULL, NULL);
- wcsncpy(_filename, (wchar_t*)utf16_path_string, _MAX_PATH);
+ wcsncpy(_filename, reinterpret_cast<wchar_t*>(utf16_path_string), _MAX_PATH);
g_free(utf16_path_string);
opf.hwndOwner = (HWND)(GDK_WINDOW_HWND(gtk_widget_get_window(GTK_WIDGET(this))));