← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily-proposed

« back to all changes in this revision

Viewing changes to scribus/scclocale.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/scclocale.cpp
11
11
//
12
12
 
13
13
#include "scclocale.h"
 
14
 
 
15
#include <cstdlib>
14
16
#include <QDebug>
15
17
 
16
18
ScCLocale * ScCLocale::m_instance = 0;
99
101
                // a sade workaround
100
102
                double result(0.0);
101
103
                setlocale(LC_NUMERIC, "C");
102
 
                result = strtod(str, endptr);
 
104
                result = std::strtod(str, endptr);
103
105
                setlocale(LC_NUMERIC, "");
104
106
                return result;
105
107
        }
112
114
                char *oldlocale=setlocale(LC_NUMERIC, NULL);
113
115
                double result(0.0);
114
116
                setlocale(LC_NUMERIC, "C");
115
 
                result = strtod(str, endptr);
 
117
                result = std::strtod(str, endptr);
116
118
                setlocale(LC_NUMERIC, oldlocale);
117
119
                return result;
118
120
  #else