diff options
| author | brainbreaker <gautamprajapati06@gmail.com> | 2017-07-13 09:43:23 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-07-18 10:14:39 +0200 |
| commit | e530689ef6ba79a26162670580ba28f9b09eb689 (patch) | |
| tree | 86d136f135951d709f2c95fd80c4e0fd2171740c /desktop/source | |
| parent | Updated core (diff) | |
| download | core-e530689ef6ba79a26162670580ba28f9b09eb689.tar.gz core-e530689ef6ba79a26162670580ba28f9b09eb689.zip | |
Clean up android specific template functions defined in std namespace
Change-Id: I2094ee8eec00587f166d96723a02eb5957dbf79b
Reviewed-on: https://gerrit.libreoffice.org/39890
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/lib/init.cxx | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index c57c4e4d6760..fd62da29d704 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -85,6 +85,7 @@ #include <sfx2/sfxbasemodel.hxx> #include <svl/undo.hxx> #include <unotools/datetime.hxx> +#include <android/compatibility.hxx> #include <app.hxx> @@ -102,25 +103,6 @@ using namespace vcl; using namespace desktop; using namespace utl; -#if defined(ANDROID) -namespace std -{ -template<typename T> -std::string to_string(T x) -{ - std::ostringstream stream; - stream << x; - return stream.str(); -} - -long stol( const std::string& str, std::size_t* /*pos*/ = 0, int base = 10 ) -{ - char* end; - return strtol(str.c_str(), &end, base); -} -} -#endif - static LibLibreOffice_Impl *gImpl = nullptr; static std::weak_ptr< LibreOfficeKitClass > gOfficeClass; static std::weak_ptr< LibreOfficeKitDocumentClass > gDocumentClass; |