diff options
| author | hg <hg@oosvn01.> | 2009-10-08 15:22:38 +0000 |
|---|---|---|
| committer | hg <hg@oosvn01.> | 2009-10-08 15:22:38 +0000 |
| commit | 9eeb9044d88c3281d77ec187e7e2230875223128 (patch) | |
| tree | 55e18eb3a6e24dad6e12635baeb2a4604792c8ef /automation | |
| parent | d6240c5a6319ee130d21de56e13ff5d62c09e1ba (diff) | |
| parent | d9f36d24332f4c15aeeaff4e9fdae32d0b717843 (diff) | |
merge
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/source/app/testbasi.cxx | 6 | ||||
| -rw-r--r-- | automation/source/inc/testapp.hxx | 4 | ||||
| -rw-r--r-- | automation/source/miniapp/testapp.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/automation/source/app/testbasi.cxx b/automation/source/app/testbasi.cxx index dc9eefb52a8e..a7454dc549bd 100644 --- a/automation/source/app/testbasi.cxx +++ b/automation/source/app/testbasi.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: testbasi.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.14.1 $ * * This file is part of OpenOffice.org. * @@ -152,9 +152,9 @@ void TTBasic::ReportRuntimeError( AppBasEd *pEditWin ) { SbxVariableRef aDummy = new SbxVariable; aDummy->SetUserData( 24 ); // ID_MaybeAddErr - ((TestToolObj*)pTestObject)->SFX_NOTIFY( pTestObject->GetBroadcaster(), xx, SbxHint( SBX_HINT_DATAWANTED, aDummy ), xx ); + ((TestToolObj*)pTestObject)->Notify( pTestObject->GetBroadcaster(), SbxHint( SBX_HINT_DATAWANTED, aDummy ) ); aDummy->SetUserData( 18 ); // ID_ExceptLog - ((TestToolObj*)pTestObject)->SFX_NOTIFY( pTestObject->GetBroadcaster(), xx, SbxHint( SBX_HINT_DATAWANTED, aDummy ), xx ); + ((TestToolObj*)pTestObject)->Notify( pTestObject->GetBroadcaster(), SbxHint( SBX_HINT_DATAWANTED, aDummy ) ); MyBasic::ReportRuntimeError( pEditWin ); } diff --git a/automation/source/inc/testapp.hxx b/automation/source/inc/testapp.hxx index ebce5f079774..cf76571a81de 100644 --- a/automation/source/inc/testapp.hxx +++ b/automation/source/inc/testapp.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: testapp.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.24.1 $ * * This file is part of OpenOffice.org. * @@ -122,7 +122,7 @@ public: private: ImplTestToolObj *pImpl; // Alles was von der Implementation abhängt - static CErrors* const GetFehlerListe() { return pFehlerListe; } + static const CErrors* GetFehlerListe() { return pFehlerListe; } BOOL bUseIPC; Link aLogHdl; // Zum Logen der Fehlermeldungen im Testtool Link aWinInfoHdl; // Anzeigen der Windows/Controls der zu testenden App diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx index 4ee712e1f2c2..babe0e428440 100644 --- a/automation/source/miniapp/testapp.cxx +++ b/automation/source/miniapp/testapp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: testapp.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.24.1 $ * * This file is part of OpenOffice.org. * @@ -147,7 +147,7 @@ void MainWindow::SysDlg() switch (QueryBox(this,WB_YES_NO_CANCEL | WB_DEF_YES, CUniString("Want to open another Dialog?")).Execute()) { case RET_YES: - while ( WarningBox(this,WB_OK_CANCEL | WB_DEF_OK,CUniString("Well this is the last box now!")).Execute() == RET_OK ); + while ( WarningBox(this,WB_OK_CANCEL | WB_DEF_OK,CUniString("Well this is the last box now!")).Execute() == RET_OK ) ; break; case RET_NO: break; |