diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-25 09:20:04 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-25 09:56:38 +0000 |
| commit | 6312367fb80f0cce15c576981b342ed57baf2b95 (patch) | |
| tree | eaf20acadf05a2de055d0e933cb21d33c0687772 /tools/bootstrp | |
| parent | 360043b30ebe21a6a02b5eeeecdfe0b4bd12ab22 (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'tools/bootstrp')
| -rw-r--r-- | tools/bootstrp/prj.cxx | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx index a3caf2328080..ef362a0af8b3 100644 --- a/tools/bootstrp/prj.cxx +++ b/tools/bootstrp/prj.cxx @@ -28,21 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_tools.hxx" -#include <stdlib.h> -#include <stdio.h> -#include <osl/mutex.hxx> - -#include <tools/stream.hxx> -#include <comphelper/string.hxx> #include "bootstrp/prj.hxx" - -#if defined(WNT) -#define LIST_DELIMETER ';' -#define PATH_DELIMETER '\\' -#elif defined UNX -#define LIST_DELIMETER ':' -#define PATH_DELIMETER '/' -#endif +#include <comphelper/string.hxx> SimpleConfig::SimpleConfig(const String &rSimpleConfigFileName) { @@ -56,21 +43,14 @@ SimpleConfig::~SimpleConfig() rtl::OString SimpleConfig::getNext() { - if (aStringBuffer == "") + if (aStringBuffer.isEmpty()) while ((aStringBuffer = GetNextLine()) == "\t") ; //solange bis != "\t" - if ( aStringBuffer == "" ) + if (aStringBuffer.isEmpty()) return rtl::OString(); rtl::OString aString = comphelper::string::getToken(aStringBuffer, 0, '\t'); -#ifdef _MSC_VER -#pragma warning (push) -#pragma warning (disable:4244) -#endif - aStringBuffer.Erase(0, aString.getLength()+1); -#ifdef _MSC_VER -#pragma warning (pop) -#endif + aStringBuffer = aStringBuffer.copy(aString.getLength()+1); aStringBuffer = comphelper::string::stripStart(aStringBuffer, '\t'); |