diff options
| author | Krisztian Pinter <pin.terminator@gmail.com> | 2013-03-06 20:30:30 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-03-14 10:36:24 +0000 |
| commit | de99bcde8a66a410287c7fb9c4ae6d6c9b7f05a6 (patch) | |
| tree | 78b9f3a4f31df4722e41c899b6b9f2f1ad0220c7 /rsc | |
| parent | c03448ddbb11d96e0c9985ddfaa4f2c5d6cd426e (diff) | |
fdo#39445 writing out tools/fsys.hxx
removed unused <tools/fsys.hxx> include from gengal.cxx
changed file copying to sal version in htmlex.cxx
rewrote OutputFile in rsctools.cxx
very minor change in rsc.cxx - instead of creating an empty DirEntry
and getting its path, just used "."
Change-Id: Ifd57d73847ff271bcb64b12a26a564acc051fcef
Reviewed-on: https://gerrit.libreoffice.org/2680
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 3 | ||||
| -rw-r--r-- | rsc/source/tools/rsctools.cxx | 13 |
2 files changed, 7 insertions, 9 deletions
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 007f4263069c..393e2e097b8c 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -92,8 +92,7 @@ void RscCmdLine::Init() nCommands = 0; nByteOrder = RSC_BIGENDIAN; - DirEntry aEntry; - aPath = rtl::OUStringToOString(aEntry.GetFull(), RTL_TEXTENCODING_ASCII_US); //Immer im Aktuellen Pfad suchen + aPath = OString("."); m_aOutputFiles.clear(); m_aOutputFiles.push_back( OutputFile() ); } diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 857f6633d662..7e94c6e1e505 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -28,8 +28,6 @@ #include <string.h> #include <ctype.h> -#include <tools/fsys.hxx> - // Include #include <rscdef.hxx> #include <rsctools.hxx> @@ -174,13 +172,14 @@ sal_Bool Append(const rtl::OString &rOutputSrs, const rtl::OString &rTmpFile) *************************************************************************/ rtl::OString OutputFile(const rtl::OString &rInput, const char * pExt) { - rtl::OUString aUniInput(rtl::OStringToOUString(rInput, RTL_TEXTENCODING_ASCII_US)); - DirEntry aFileName(aUniInput); + sal_Int32 nSepInd = rInput.lastIndexOf("."); - OUString aExt = OStringToOUString( pExt, RTL_TEXTENCODING_ASCII_US ); - aFileName.SetExtension( aExt ); + if( nSepInd != -1 ) + { + return rInput.copy(0, rInput.getLength() - nSepInd).concat(OString(pExt)); + } - return rtl::OUStringToOString(aFileName.GetFull(), RTL_TEXTENCODING_ASCII_US); + return rInput.concat(OString(".")).concat(OString(pExt)); } /************************************************************************* |