diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-07 16:31:04 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-07 16:31:04 +0000 |
| commit | 983830727db80ba8e6b1eb6c5663b1f9ab9c866d (patch) | |
| tree | f2a928d394d51e659e977ebbe9e81ccaba75dd2d /src/file-update.cpp | |
| parent | Fix a bug on tapper stroke detected with Ede_123 on IRC (diff) | |
| download | inkscape-983830727db80ba8e6b1eb6c5663b1f9ab9c866d.tar.gz inkscape-983830727db80ba8e6b1eb6c5663b1f9ab9c866d.zip | |
Minor refactor: check setlocale() occurences and make sure we do not setlocale() without resetting it to the initial default)
- inkview.cpp : This occurence in fact does *not* seem to be needed anymore (despite what the comment says)
- main.cpp : The (commented out) occurence is unnecessary as it is called as part of gtk_init_check()
(bzr r15674)
Diffstat (limited to 'src/file-update.cpp')
| -rw-r--r-- | src/file-update.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/file-update.cpp b/src/file-update.cpp index 2275ab1c3..8fb3b3111 100644 --- a/src/file-update.cpp +++ b/src/file-update.cpp @@ -150,12 +150,15 @@ void fix_update(SPObject *o) { void sp_file_convert_text_baseline_spacing(SPDocument *doc) { + char *oldlocale = g_strdup(setlocale(LC_NUMERIC, NULL)); setlocale(LC_NUMERIC,"C"); sp_file_text_run_recursive(fix_blank_line, doc->getRoot()); sp_file_text_run_recursive(fix_line_spacing, doc->getRoot()); sp_file_text_run_recursive(fix_font_size, doc->getRoot()); + setlocale(LC_NUMERIC, oldlocale); + g_free(oldlocale); + sp_file_text_run_recursive(fix_update, doc->getRoot()); - setlocale(LC_NUMERIC,""); } void sp_file_convert_font_name(SPDocument *doc) |