summaryrefslogtreecommitdiff
path: root/rsc/source/rsc/rsc.cxx
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-03-25 21:42:26 +0100
committerAndras Timar <atimar@suse.com>2013-03-25 21:44:02 +0100
commite902022d4b453f1bf06d8aca907b031e7bda3dad (patch)
tree1270c9a6d212a6d3288573cdcb7e48548b187a11 /rsc/source/rsc/rsc.cxx
parent0e1617554c34e62a467a5e1a188353178211e8fe (diff)
Revert "replace DirEntry to osl::FileBase in a few cases in rsc"
This reverts commit 7540bc8e105e114d4aecb1ed3f3044e5ce8a6fc6. Conflicts: rsc/source/rsc/rsc.cxx Change-Id: I7f89f7bf07f68e053d29283f659241aca8e48eed
Diffstat (limited to 'rsc/source/rsc/rsc.cxx')
-rw-r--r--rsc/source/rsc/rsc.cxx24
1 files changed, 10 insertions, 14 deletions
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 8ae15f2af1d2..8b6901189f6e 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -162,13 +162,11 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
;
if( *pEqual )
{
- OUString aSPath = OStringToOUString( OString( pEqual + 1 ), RTL_TEXTENCODING_ASCII_US );
- // replace forward slash to backslash on Windows
- osl::FileBase::getFileURLFromSystemPath( aSPath, aSPath );
- osl::FileBase::getSystemPathFromFileURL( aSPath, aSPath );
+ const rtl::OString aSPath( pEqual + 1 );
+ DirEntry aSDir(rtl::OStringToOUString(aSPath, RTL_TEXTENCODING_ASCII_US));
m_aReplacements.push_back( std::pair< OString, OString >( OString( (*ppStr)+4, pEqual - *ppStr - 4 ),
- rtl::OUStringToOString(aSPath, RTL_TEXTENCODING_ASCII_US) ) );
+ rtl::OUStringToOString(aSDir.GetFull(), RTL_TEXTENCODING_ASCII_US) ) );
}
}
else if( !rsc_stricmp( (*ppStr) + 1, "PreLoad" ) )
@@ -196,7 +194,7 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
nCommands |= INCLUDE_FLAG;
rtl::OStringBuffer aBuffer(aPath);
if (aBuffer.getLength())
- aBuffer.append(SAL_PATHSEPARATOR);
+ aBuffer.append(rtl::OUStringToOString(DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US));
aBuffer.append((*ppStr) + 2);
aPath = aBuffer.makeStringAndClear();
}
@@ -213,16 +211,14 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH )
// ignore empty -lip= arguments that we get lots of these days
if (!aSysSearchDir.isEmpty())
{
- OUString aSysDir = OStringToOUString(aSysSearchDir, RTL_TEXTENCODING_ASCII_US);
- // replace forward slash to backslash on Windows
- osl::FileBase::getFileURLFromSystemPath( aSysDir, aSysDir );
- osl::FileBase::getSystemPathFromFileURL( aSysDir, aSysDir );
+ DirEntry aSysDir(rtl::OStringToOUString(aSysSearchDir, RTL_TEXTENCODING_ASCII_US));
m_aOutputFiles.back().aSysSearchDirs.push_back(
- rtl::OUStringToOString(aSysDir, RTL_TEXTENCODING_ASCII_US) );
+ rtl::OUStringToOString(aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US) );
rtl::OString aLangSearchPath = m_aOutputFiles.back().aLangSearchPath;
if( !aLangSearchPath.isEmpty() )
{
- aLangSearchPath = aLangSearchPath + OString( SAL_PATHSEPARATOR );
+ aLangSearchPath = aLangSearchPath +
+ rtl::OUStringToOString(DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US);
}
aLangSearchPath = aLangSearchPath + aSysSearchDir;
@@ -846,8 +842,8 @@ ERRTYPE RscCompiler::Link()
pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() );
// Schreibe Datei
- sal_Char cSearchDelim = SAL_PATHSEPARATOR;
- sal_Char cAccessDelim = SAL_PATHDELIMITER;
+ sal_Char cSearchDelim = rtl::OUStringToOString(DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US)[0];
+ sal_Char cAccessDelim = rtl::OUStringToOString(DirEntry::GetAccessDelimiter(), RTL_TEXTENCODING_ASCII_US)[0];
pTC->ChangeLanguage( it->aLangName );
pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 );
pTC->ClearSysNames();