INTEGRATION: CWS sb87 (1.2.14); FILE MERGED
2008/04/10 07:25:27 sb 1.2.14.1: #i87730# use tools::getProcessWorkingDir instead of osl_getProcessWorkingDir (in TEST_LAYOUT code; enabling it would require to link against TOOLSLIB)
This commit is contained in:
@@ -3,9 +3,9 @@
|
||||
#include <list>
|
||||
#if TEST_LAYOUT
|
||||
#include <stdio.h>
|
||||
#include "tools/getprocessworkingdir.hxx"
|
||||
#endif
|
||||
|
||||
#include <osl/process.h>
|
||||
#include <unotools/bootstrap.hxx>
|
||||
#include <unotools/localfilehelper.hxx>
|
||||
#include <unotools/ucbhelper.hxx>
|
||||
@@ -81,7 +81,7 @@ readRightTranslation( OUString const& aXMLName )
|
||||
= getLocaleSubdirList( Application::GetSettings().GetUILocale() );
|
||||
#if TEST_LAYOUT // read from cwd first
|
||||
OUString aCurrentWorkingUrl;
|
||||
osl_getProcessWorkingDir( &aCurrentWorkingUrl.pData );
|
||||
tools::getProcessWorkingDir( &aCurrentWorkingUrl );
|
||||
String aCurrentWorkingDir;
|
||||
LocalFileHelper::ConvertURLToPhysicalName( aCurrentWorkingUrl, aCurrentWorkingDir );
|
||||
aXMLFile = getFirstExisting( aCurrentWorkingDir, aSubdirs, aXMLName );
|
||||
|
Reference in New Issue
Block a user