mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS os2port01 (1.26.14); FILE MERGED

Browse Source 
2007/08/07 12:13:37 obr 1.26.14.2: RESYNC: (1.26-1.33); FILE MERGED
2006/12/28 14:32:00 ydario 1.26.14.1: OS/2 initial import
This commit is contained in:
Vladimir Glazounov
2007-09-20 13:45:22 +00:00
parent 835966ef58
commit 37e6f177ef
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
automation/source/testtool/objtest.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: objtest.cxx,v $ * $RCSfile: objtest.cxx,v $
* *
* $Revision: 1.33 $ * $Revision: 1.34 $
* *
* last change: $Author: kz $ $Date: 2007-06-19 14:37:13 $ * last change: $Author: vg $ $Date: 2007-09-20 14:45:22 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -40,6 +40,13 @@
#include <com/sun/star/devtools/XInformationClient.hpp> #include <com/sun/star/devtools/XInformationClient.hpp>
using namespace com::sun::star::devtools; using namespace com::sun::star::devtools;
*/ */
#ifdef OS2
#define INCL_DOS
//#include <vcl/sysdep.hxx>
#ifndef _SVPM_H
#include <svpm.h>
#endif
#endif
#include "sysdir_win.hxx" #include "sysdir_win.hxx"
#include "registry_win.hxx" #include "registry_win.hxx"
@@ -94,13 +101,6 @@ using namespace rtl;
#include <svtools/svmedit.hxx> #include <svtools/svmedit.hxx>
#ifdef OS2
#define INCL_DOSPROCESS
//#include <vcl/sysdep.hxx>
#ifndef _SVPM_H
#include <tools/svpm.h>
#endif
#endif
#ifdef UNX #ifdef UNX
#include <unistd.h> // readlink #include <unistd.h> // readlink
@@ -2490,6 +2490,14 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
osl::FileBase::getSystemPathFromFileURL( aUrl, aPath ); osl::FileBase::getSystemPathFromFileURL( aUrl, aPath );
pVar->PutString( String( aPath ) ); pVar->PutString( String( aPath ) );
} }
#elif defined OS2
{
char* etc = getenv("ETC");
if (etc)
pVar->PutString( CUniString( etc ) );
else
pVar->PutString( CUniString( "/etc" ) );
}
#else #else
#if UNX #if UNX
pVar->PutString( CUniString( "/etc" ) ); pVar->PutString( CUniString( "/etc" ) );
@@ -2930,7 +2938,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType)
String TestToolObj::GetRevision( String const &aSourceIn ) String TestToolObj::GetRevision( String const &aSourceIn )
{ {
// search $Revision: 1.33 $ // search $Revision: 1.34 $
xub_StrLen nPos; xub_StrLen nPos;
if ( ( nPos = aSourceIn.SearchAscii( "$Revision:" ) ) != STRING_NOTFOUND ) if ( ( nPos = aSourceIn.SearchAscii( "$Revision:" ) ) != STRING_NOTFOUND )
return aSourceIn.Copy( nPos+ 10, aSourceIn.SearchAscii( "$", nPos+10 ) -nPos-10); return aSourceIn.Copy( nPos+ 10, aSourceIn.SearchAscii( "$", nPos+10 ) -nPos-10);