Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2935
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2935/1
fdo#39445 writing out tools/fsys.hxx (idl)
Removed uses of fsys from database.cxx, command.cxx, module.cxx, svidl.cxx.
Also removed a lot of cruft from svidl.cxx and command.hxx; unused variables
and code relating to them, eg. variables aCxxFile, aHxxFile, aSrcFile, aODLFile.
Changed some Strings to OUStrings in svidl.cxx and command.hxx.
Someone please test this patch under Windows.
Change-Id: I708284f70435c8f65cdcfc954af43976e28b8c9d
---
M idl/inc/command.hxx
M idl/source/objects/module.cxx
M idl/source/prj/command.cxx
M idl/source/prj/database.cxx
M idl/source/prj/svidl.cxx
5 files changed, 138 insertions(+), 159 deletions(-)
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 5ca38db..b77ab2f 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -30,25 +30,18 @@
class SvCommand
{
public:
-String aDataBaseFile;
+OUStringaDataBaseFile;
StringList aInFileList;
-String aListFile;
-String aSlotMapFile;
-String aSfxItemFile;
-String aODLFile;
-String aCallingFile;
-String aCxxFile;
-String aHxxFile;
-String aSrcFile;
+OUStringaListFile;
+OUStringaSlotMapFile;
+OUStringaSfxItemFile;
String aPath;
-String aCHeaderFile;
-String aCSourceFile;
String aTargetFile;
-String aHelpIdFile;
-String aCSVFile;
-String aExportFile;
-String aDocuFile;
-::rtl::OUString m_DepFile;
+OUStringaHelpIdFile;
+OUStringaCSVFile;
+OUStringaExportFile;
+OUStringaDocuFile;
+OUStringm_DepFile;
sal_uInt32 nVerbosity;
sal_uInt32 nFlags;
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 4b97510..e83c23b 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -24,8 +24,8 @@
#include module.hxx
#include globals.hxx
#include database.hxx
-#include tools/fsys.hxx
#include tools/debug.hxx
+#include osl/file.hxx
SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern );
@@ -222,12 +222,16 @@
SvToken * pTok = rInStm.GetToken_Next();
if( pTok-IsString() )
{
-DirEntry aFullName( rtl::OStringToOUString(pTok-GetString(),
RTL_TEXTENCODING_ASCII_US) );
-rBase.StartNewFile( aFullName.GetFull() );
-if( aFullName.Find( rBase.GetPath() ) )
+OUString aFullName(rtl::OStringToOUString(pTok-GetString(),
RTL_TEXTENCODING_ASCII_US));
+rBase.StartNewFile( aFullName );
+osl::FileBase::RC searchError =
osl::File::searchFileURL(aFullName, rBase.GetPath(), aFullName);
+osl::FileBase::getSystemPathFromFileURL( aFullName, aFullName );
+
+if( osl::FileBase::E_None == searchError )
{
-rBase.AddDepFile(aFullName.GetFull());
-SvTokenStream aTokStm( aFullName.GetFull() );
+rBase.AddDepFile( aFullName );
+SvTokenStream aTokStm( aFullName );
+
if( SVSTREAM_OK == aTokStm.GetStream().GetError() )
{
// rescue error from old file
@@ -252,19 +256,15 @@
}
else
{
-rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
-cannot open file: ));
-aStr.append(rtl::OUStringToOString(aFullName.GetFull(),
-RTL_TEXTENCODING_UTF8));
+rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(cannot
open file: ));
+aStr.append(rtl::OUStringToOString(aFullName,
RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
}
else
{
-rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
-cannot find file:));
-aStr.append(rtl::OUStringToOString(aFullName.GetFull(),
-RTL_TEXTENCODING_UTF8));
+rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(cannot
find file:));
+aStr.append(rtl::OUStringToOString(aFullName,
RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
}
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index a61804f..f538bec 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -26,7 +26,7 @@
#include command.hxx
#include globals.hxx
#include database.hxx
-#include tools/fsys.hxx
+#include sal/config.h
char const * SyntaxStrings[] = {
basic-type:,
@@ -320,7 +320,7 @@
{ // define include paths
String aName(
