diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-04-24 12:29:42 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-04-24 12:38:05 +0200 |
commit | a6ab5fa0e6ae9c8694902977892d7b717766e8af (patch) | |
tree | 43cdaecf57c13d8c21acac4730119f90690796e4 /idl | |
parent | aee01f809e214090b320b31bdce98dff77208a3b (diff) |
Revert "svidl: write dependencies with cygwin paths"
This reverts commit a042c2a6ab29011800de55fa382740be56c2d928.
A GNU make that understands native Win32 paths is required now anyway,
so revert this.
Conflicts:
idl/source/prj/database.cxx
Change-Id: I6eb77d4b02728269f8dc484444df0cabc8c29b3e
Diffstat (limited to 'idl')
-rw-r--r-- | idl/source/prj/database.cxx | 47 |
1 files changed, 2 insertions, 45 deletions
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx index e0c6fe62acc3..c79318bc0e6e 100644 --- a/idl/source/prj/database.cxx +++ b/idl/source/prj/database.cxx @@ -833,49 +833,6 @@ void SvIdlDataBase::AddDepFile(String const& rFileName) m_DepFiles.insert(rFileName); } -#ifdef WNT -static OString -lcl_ConvertToCygwin(OString const& rString) -{ - sal_Int32 i = 0; - sal_Int32 const len = rString.getLength(); - OStringBuffer buf(len + 16); - if ((2 <= len) && (':' == rString[1])) - { - buf.append("/cygdrive/"); - buf.append(static_cast<sal_Char>(tolower(rString[0]))); - i = 2; - } - for (; i < len; ++i) - { - sal_Char const c(rString[i]); - switch (c) - { - case '\\': - buf.append('/'); - break; - case ' ': - buf.append("\\ "); - break; - default: - buf.append(c); - break; - } - } - return buf.makeStringAndClear(); -} -#endif - -static OString -lcl_Convert(OUString const& rString) -{ - return -#ifdef WNT - lcl_ConvertToCygwin -#endif - (OUStringToOString(rString, RTL_TEXTENCODING_UTF8)); -} - struct WriteDep { SvFileStream & m_rStream; @@ -883,14 +840,14 @@ struct WriteDep void operator() (OUString const& rItem) { m_rStream << " \\\n "; - m_rStream << lcl_Convert(rItem).getStr(); + m_rStream << OUStringToOString(rItem, RTL_TEXTENCODING_UTF8).getStr(); } }; bool SvIdlDataBase::WriteDepFile( SvFileStream & rStream, OUString const& rTarget) { - rStream << lcl_Convert(rTarget).getStr(); + rStream << OUStringToOString(rTarget, RTL_TEXTENCODING_UTF8).getStr(); rStream << " :"; ::std::for_each(m_DepFiles.begin(), m_DepFiles.end(), WriteDep(rStream)); return rStream.GetError() == SVSTREAM_OK; |