X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fgettext.C;h=e65081c71cd10a286db1ce4881e7e0006d27825f;hb=98c966c64594611e469313314abd1e59524adb4a;hp=b80792ac22e2936744bc5a99bf3f0d485a9c91d4;hpb=6a10fbcc39c528b32e816033fcb78d27787c37be;p=lyx.git

diff --git a/src/gettext.C b/src/gettext.C
index b80792ac22..e65081c71c 100644
--- a/src/gettext.C
+++ b/src/gettext.C
@@ -1,8 +1,8 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *        
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -16,6 +16,8 @@
 
 #include "LString.h"
 
+#include <boost/smart_ptr.hpp>
+
 #ifdef ENABLE_NLS
 
 #  if HAVE_GETTEXT
@@ -36,21 +38,21 @@ char const * _(char const * str)
 }
 
 
-string const _(string const & str) 
+string const _(string const & str)
 {
 	if (!str.empty()) {
 		int const s = str.length();
-		char * tmp = new char[s + 1];
-		str.copy(tmp, s);
+		boost::scoped_array<char> tmp(new char[s + 1]);
+		str.copy(tmp.get(), s);
 		tmp[s] = '\0';
-		string const ret(gettext(tmp));
-		delete [] tmp;
+		string const ret(gettext(tmp.get()));
 		return ret;
 	} else {
 		return string();
 	}
 }
 
+
 void locale_init()
 {
 #  ifdef HAVE_LC_MESSAGES
@@ -60,9 +62,10 @@ void locale_init()
 	setlocale(LC_NUMERIC, "C");
 }
 
+
 void gettext_init(string const & localedir)
 {
-	bindtextdomain(PACKAGE, localedir.c_str()); 
+	bindtextdomain(PACKAGE, localedir.c_str());
 	textdomain(PACKAGE);
 }
 
@@ -71,10 +74,11 @@ void gettext_init(string const & localedir)
 
 void locale_init()
 {
+	setlocale(LC_NUMERIC, "C");
 }
 
+
 void gettext_init(string const &)
 {
-	setlocale(LC_NUMERIC, "C");
 }
 #endif