diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-09 10:19:00 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-09 10:19:00 +0000 |
| commit | d9c70f53251ba307841323005fa4823bc5192a1e (patch) | |
| tree | 7dd9ce93976ac1bc74e66a184524a994ac6004a8 /basic/source | |
| parent | 483d79947fc4730cadbe5c0fb764a0cb14528ff0 (diff) | |
INTEGRATION: CWS ooo20040815 (1.56.14); FILE MERGED
2004/07/28 11:55:28 waratah 1.56.14.1: Add some initialisers and remove some bad merging
Diffstat (limited to 'basic/source')
| -rw-r--r-- | basic/source/app/app.cxx | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index d6188b268df3..83b37443873c 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -2,17 +2,9 @@ * * $RCSfile: app.cxx,v $ * -<<<<<<< app.cxx - * $Revision: 1.56 $ -======= - * $Revision: 1.56 $ ->>>>>>> 1.53.36.2 + * $Revision: 1.57 $ * -<<<<<<< app.cxx - * last change: $Author: obo $ $Date: 2004-07-07 10:08:42 $ -======= - * last change: $Author: obo $ $Date: 2004-07-07 10:08:42 $ ->>>>>>> 1.53.36.2 + * last change: $Author: hr $ $Date: 2004-09-09 11:19:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -614,13 +606,13 @@ BasicFrame::BasicFrame() : WorkWindow( NULL, , bIsAutoRun( FALSE ) , pDisplayHidDlg( NULL ) , pEditVar ( 0 ) -, bAutoReload( FALSE ) -, bAutoSave( TRUE ) , pBasic( NULL ) , pExecutionStatus( NULL ) , pStatus( NULL ) , pList( NULL ) , pWork( NULL ) +, bAutoReload( FALSE ) +, bAutoSave( TRUE ) , pPrn( NULL ) { @@ -1934,10 +1926,10 @@ void BasicFrame::SaveLibrary() String BasicFrame::GenRealString( const String &aResString ) { - xub_StrLen nStart,nGleich,nEnd,nStartPos = 0; + xub_StrLen nStart,nGleich = 0,nEnd = 0,nStartPos = 0; String aType,aValue,aResult(aResString); String aString; - xub_StrLen nInsertPos; + xub_StrLen nInsertPos = 0; BOOL bFound; bFound = FALSE; |