From 709c1f365b3bdd0d46ec4f1ddc244580a0dfa637 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Wed, 23 Nov 2011 22:17:24 +0000
Subject: remove various EraseLeadingAndTrailingChars

---
 shell/source/tools/lngconvex/lngconvex.cxx | 3 ++-
 shell/source/tools/lngconvex/makefile.mk   | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'shell/source')

diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index 8ba8653ea749..005c8c742578 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -57,6 +57,7 @@ typedef unsigned short WORD;
 
 #include "cmdline.hxx"
 
+#include <comphelper/string.hxx>
 #include "osl/thread.h"
 #include "osl/process.h"
 #include "osl/file.hxx"
@@ -347,7 +348,7 @@ void add_group_entries(
         {
             Substitutor.set_language(iso_lang_identifier(iso_lang));
 
-            key_value_utf8.EraseLeadingAndTrailingChars('\"');
+            key_value_utf8 = comphelper::string::strip(key_value_utf8, '\"');
 
             OUString key_value_utf16 =
                 rtl::OStringToOUString(key_value_utf8, RTL_TEXTENCODING_UTF8);
diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk
index bf711520209f..4d3971b81490 100644
--- a/shell/source/tools/lngconvex/makefile.mk
+++ b/shell/source/tools/lngconvex/makefile.mk
@@ -54,9 +54,11 @@ APP1TARGET=$(TARGET)
 APP1OBJS=$(OBJ)$/$(TARGET).obj\
         $(OBJ)$/cmdline.obj
 APP1RPATH = NONE
-APP1STDLIBS= $(SALLIB)\
-            $(TOOLSLIB)\
-            $(I18NISOLANGLIB)
+APP1STDLIBS= \
+	$(COMPHELPERLIB)\
+	$(SALLIB)\
+        $(TOOLSLIB)\
+        $(I18NISOLANGLIB)
 
 # --- Targets ------------------------------------------------------
 
-- 
cgit