summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-11-10 15:06:12 +0000
committerRüdiger Timm <rt@openoffice.org>2008-11-10 15:06:12 +0000
commit7e6737cc865d9f0ba44a88b4be0c8460325d7b84 (patch)
tree1a77c19de7eb263e582261883c19c36a2032e9ec /basic
parent72339a084c6879c8437aee34a1f9daac50d2366e (diff)
CWS-TOOLING: integrate CWS cmcfixes50
2008-11-10 13:31:50 +0100 cmc r263517 : gio doesn't do anything useful for remote stuff wrt info 2008-11-06 00:11:47 +0100 cmc r263359 : #i93436# pile of other 64bit new gcc warnings 2008-11-05 00:39:03 +0100 cmc r263340 : i95856 let a ppc64 vanilla build succeed 2008-11-04 14:00:25 +0100 cmc r263320 : #i93436# useless const 2008-11-04 11:53:10 +0100 cmc r263314 : #i93436# ambiguous 2008-11-04 11:48:05 +0100 cmc r263313 : #i93436# add some braces 2008-11-04 11:29:24 +0100 cmc r263312 : #i93436# ambiguous 2008-11-04 10:53:46 +0100 cmc r263311 :
Diffstat (limited to 'basic')
-rw-r--r--basic/source/app/app.cxx2
-rw-r--r--basic/source/app/appwin.cxx2
-rw-r--r--basic/source/app/dialogs.cxx2
-rw-r--r--basic/source/app/textedit.cxx2
-rw-r--r--basic/source/classes/sbxmod.cxx2
-rw-r--r--basic/source/runtime/iosys.cxx2
-rw-r--r--basic/source/uno/namecont.cxx2
7 files changed, 7 insertions, 7 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index 0461bc6c345d..793adb63da2c 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -306,7 +306,7 @@ void BasicApp::Main( )
// Install filter for OSLAsserts
DbgPrintMsgBox = DbgGetPrintMsgBox();
DbgSetPrintTestTool( DBG_TestToolDebugMessageFilter );
- DBG_INSTOUTERROR( DBG_OUT_TESTTOOL )
+ DBG_INSTOUTERROR( DBG_OUT_TESTTOOL );
if ( osl_setDebugMessageFunc( osl_TestToolDebugMessageFilter ) )
DBG_ERROR("osl_setDebugMessageFunc returns non NULL pointer");
diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx
index ceaa36c6d8df..96ade04d06a9 100644
--- a/basic/source/app/appwin.cxx
+++ b/basic/source/app/appwin.cxx
@@ -623,7 +623,7 @@ BOOL AppWin::Close()
// uncomment to avoid compiler warning
// break;
default:
- DBG_ERROR("Not Implemented in AppWin::Close")
+ DBG_ERROR("Not Implemented in AppWin::Close");
return FALSE;
}
}
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index 8e6045c6692a..9a7b468dbdc6 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -1010,7 +1010,7 @@ IMPL_LINK( GenericOptions, CheckButtonsHdl, ComboBox*, pCB )
void GenericOptions::Save( Config &aConfig )
{
(void) aConfig; /* avoid warning about unused parameter */
- DBG_ASSERT( &aConfig == &aConf, "Saving to different Configuration" )
+ DBG_ASSERT( &aConfig == &aConf, "Saving to different Configuration" );
// eventuelle �nderungen Speichern
LINK( this, GenericOptions, LoadGroup ).Call( NULL );
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index baaf487c0e76..0c715139c8cf 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -564,7 +564,7 @@ SbxBase* TextEditImp::GetSbxAtMousePos( String &aWord )
pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( TRUE );
SbxBase* pSBX = StarBASIC::FindSBXInCurrentScope( aWord );
pAppEdit->GetBasicFrame()->Basic().DebugFindNoErrors( FALSE );
- DBG_ASSERT( !( !bWasError && SbxBase::IsError()), "Error generated while retrieving Variable data for viewing" )
+ DBG_ASSERT( !( !bWasError && SbxBase::IsError()), "Error generated while retrieving Variable data for viewing" );
if ( !bWasError && SbxBase::IsError() )
SbxBase::ResetError();
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 9cb69dd1da47..9dc0b2efe4dc 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -808,7 +808,7 @@ USHORT SbModule::Run( SbMethod* pMeth )
// beim Programm-Ende freigeben, damit nichts gehalten wird.
ClearUnoObjectsInRTL_Impl( xBasic );
- DBG_ASSERT(pINST->nCallLvl==0,"BASIC-Call-Level > 0")
+ DBG_ASSERT(pINST->nCallLvl==0,"BASIC-Call-Level > 0");
delete pINST, pINST = NULL, bDelInst = FALSE;
// #i30690
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 3c729c4b53c1..3e7bfb86bdf1 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -638,7 +638,7 @@ void UCBStream::SetSize( ULONG nSize )
{
(void)nSize;
- DBG_ERROR( "not allowed to call from basic" )
+ DBG_ERROR( "not allowed to call from basic" );
SetError( ERRCODE_IO_GENERAL );
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 29a527d3d37a..b81e3cd93cd8 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1154,7 +1154,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
// #i93163
if( bCleanUp )
{
- DBG_ERROR( "Upgrade of Basic installation failed somehow" )
+ DBG_ERROR( "Upgrade of Basic installation failed somehow" );
static char strErrorSavFolderName[] = "__basic_80_err";
INetURLObject aPrevUserBasicInetObj_Err( aUserBasicInetObj );