Kaydet (Commit) 49417b0b authored tarafından Noel Power's avatar Noel Power

use "doUnitTest" as the method to search for, tweak error reporting

Change-Id: I0c0f4ce1304b561bf94af5444c83d8920062568b
üst a9fc6ee7
...@@ -89,7 +89,7 @@ class MacroSnippet ...@@ -89,7 +89,7 @@ class MacroSnippet
void LoadSourceFromFile( const OUString& sMacroFileURL ) void LoadSourceFromFile( const OUString& sMacroFileURL )
{ {
OUString sSource; OUString sSource;
printf("loadSource opening macro file %s\n", OUStringToOString( sMacroFileURL, RTL_TEXTENCODING_UTF8 ).getStr() ); fprintf(stderr,"loadSource opening macro file %s\n", OUStringToOString( sMacroFileURL, RTL_TEXTENCODING_UTF8 ).getStr() );
osl::File aFile(sMacroFileURL); osl::File aFile(sMacroFileURL);
if(osl::FileBase::E_None == aFile.open(osl_File_OpenFlag_Read)) if(osl::FileBase::E_None == aFile.open(osl_File_OpenFlag_Read))
...@@ -119,7 +119,7 @@ class MacroSnippet ...@@ -119,7 +119,7 @@ class MacroSnippet
SbxVariableRef pReturn = NULL; SbxVariableRef pReturn = NULL;
if ( !Compile() ) if ( !Compile() )
return pReturn; return pReturn;
SbMethod* pMeth = mpMod ? static_cast<SbMethod*>(mpMod->Find( OUString("test"), SbxCLASS_METHOD )) : NULL; SbMethod* pMeth = mpMod ? static_cast<SbMethod*>(mpMod->Find( OUString("doUnitTest"), SbxCLASS_METHOD )) : NULL;
if ( pMeth ) if ( pMeth )
{ {
if ( rArgs.getLength() ) if ( rArgs.getLength() )
...@@ -179,7 +179,9 @@ class MacroSnippet ...@@ -179,7 +179,9 @@ class MacroSnippet
IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/) IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/)
{ {
fprintf(stderr,"Got error: \n\t%s!!!\n", OUStringToOString( StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() ); fprintf(stderr,"(%d:%d)\n",
StarBASIC::GetLine(), StarBASIC::GetCol1());
fprintf(stderr,"Basic error: %s\n", rtl::OUStringToOString( StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() );
mbError = true; mbError = true;
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment