[Libreoffice-commits] .: basic/inc basic/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Mon Mar 21 04:56:26 PDT 2011
basic/inc/basic/basmgr.hxx | 2
basic/inc/basic/sbdef.hxx | 1
basic/inc/basic/sbx.hxx | 2
basic/inc/basic/sbxform.hxx | 2
basic/inc/basic/sbxobj.hxx | 1
basic/inc/basic/testtool.hxx | 2
basic/source/app/app.cxx | 5
basic/source/app/app.hxx | 1
basic/source/app/apperror.cxx | 7 -
basic/source/app/apperror.hxx | 1
basic/source/app/appwin.cxx | 19 --
basic/source/app/basic.src | 124 ------------------
basic/source/app/basmsg.src | 2
basic/source/app/brkpnts.hxx | 1
basic/source/app/dialogs.cxx | 73 -----------
basic/source/app/dialogs.hxx | 1
basic/source/app/msgedit.cxx | 73 -----------
basic/source/app/msgedit.hxx | 5
basic/source/app/mybasic.cxx | 3
basic/source/app/process.cxx | 1
basic/source/app/processw.cxx | 2
basic/source/app/svtmsg.src | 2
basic/source/app/testtool.src | 2
basic/source/app/textedit.cxx | 5
basic/source/app/textedit.hxx | 3
basic/source/app/ttmsg.src | 20 ---
basic/source/basmgr/basicmanagerrepository.cxx | 7 -
basic/source/basmgr/basmgr.cxx | 14 --
basic/source/classes/disas.cxx | 2
basic/source/classes/eventatt.cxx | 2
basic/source/classes/image.cxx | 9 -
basic/source/classes/sb.cxx | 4
basic/source/classes/sbunoobj.cxx | 117 -----------------
basic/source/classes/sbxmod.cxx | 37 -----
basic/source/comp/codegen.cxx | 1
basic/source/comp/dim.cxx | 17 --
basic/source/comp/exprgen.cxx | 10 -
basic/source/comp/exprnode.cxx | 1
basic/source/comp/exprtree.cxx | 16 --
basic/source/comp/io.cxx | 28 ----
basic/source/comp/loops.cxx | 8 -
basic/source/comp/parser.cxx | 6
basic/source/comp/scanner.cxx | 11 -
basic/source/comp/symtbl.cxx | 2
basic/source/comp/token.cxx | 164 -------------------------
basic/source/inc/filefmt.hxx | 1
basic/source/inc/image.hxx | 1
basic/source/inc/runtime.hxx | 7 -
basic/source/inc/sbunoobj.hxx | 2
basic/source/inc/symtbl.hxx | 3
basic/source/runtime/inputbox.cxx | 1
basic/source/runtime/iosys.cxx | 40 ------
basic/source/runtime/methods.cxx | 44 ------
basic/source/runtime/methods1.cxx | 20 ---
basic/source/runtime/runtime.cxx | 30 ----
basic/source/runtime/stdobj.cxx | 2
basic/source/runtime/stdobj1.cxx | 68 ----------
basic/source/runtime/step0.cxx | 42 ------
basic/source/runtime/step1.cxx | 4
basic/source/runtime/step2.cxx | 15 --
basic/source/sample/object.cxx | 7 -
basic/source/sbx/sbxarray.cxx | 9 -
basic/source/sbx/sbxcoll.cxx | 2
basic/source/sbx/sbxdec.cxx | 4
basic/source/sbx/sbxform.cxx | 54 --------
basic/source/sbx/sbxobj.cxx | 54 --------
basic/source/sbx/sbxscan.cxx | 4
basic/source/sbx/sbxvalue.cxx | 7 -
basic/source/sbx/sbxvar.cxx | 2
basic/source/uno/namecont.cxx | 38 +----
basic/source/uno/scriptcont.cxx | 11 -
71 files changed, 52 insertions(+), 1236 deletions(-)
New commits:
commit 0035c6e463fed5d7d8712151b1d24c564a6837a3
Author: Xisco Faulà <anistenis at gmail.com>
Date: Mon Mar 21 12:55:40 2011 +0100
Remove most of dead code inlibs-core (basic)
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index feaddc8..9d7b44f 100755
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -25,7 +25,6 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-//
#ifndef _BASMGR_HXX
#define _BASMGR_HXX
@@ -88,7 +87,6 @@ public:
};
-//
class BasicLibs;
class ErrorManager;
diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx
index 03ae7c4..faa9ae4 100755
--- a/basic/inc/basic/sbdef.hxx
+++ b/basic/inc/basic/sbdef.hxx
@@ -99,7 +99,6 @@ void setBasicWatchMode( bool bOn );
#define SBX_HINT_BASICSTART SFX_HINT_USER04
#define SBX_HINT_BASICSTOP SFX_HINT_USER05
-// #115826
enum PropertyMode
{
PROPERTY_MODE_NONE,
diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx
index 631e4b1..570debb 100755
--- a/basic/inc/basic/sbx.hxx
+++ b/basic/inc/basic/sbx.hxx
@@ -55,9 +55,7 @@ class SbxFactory;
class SfxBroadcaster;
class SvDispatch;
-///////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
#ifndef __SBX_SBXPARAMINFO
#define __SBX_SBXPARAMINFO
diff --git a/basic/inc/basic/sbxform.hxx b/basic/inc/basic/sbxform.hxx
index 51ad59b..d607842 100755
--- a/basic/inc/basic/sbxform.hxx
+++ b/basic/inc/basic/sbxform.hxx
@@ -115,8 +115,6 @@ class SbxBasicFormater {
static sal_Bool isBasicFormat( String sFormatStrg );
private:
- //*** some helper methods ***
- //void ShowError( char *sErrMsg );
inline void ShiftString( String& sStrg, sal_uInt16 nStartPos );
inline void StrAppendChar( String& sStrg, sal_Unicode ch );
void AppendDigit( String& sStrg, short nDigit );
diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx
index 61f9dcf..a361b07 100755
--- a/basic/inc/basic/sbxobj.hxx
+++ b/basic/inc/basic/sbxobj.hxx
@@ -32,7 +32,6 @@
#include <svl/lstner.hxx>
#include <basic/sbxvar.hxx>
-///////////////////////////////////////////////////////////////////////////
class SbxProperty;
class SvDispatch;
diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx
index 05495ea..2f29b93 100755
--- a/basic/inc/basic/testtool.hxx
+++ b/basic/inc/basic/testtool.hxx
@@ -39,7 +39,7 @@
#define ASSERTION_STACK_PREFIX "Backtrace:"
-// #94145# Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
+// Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
// this routine became necessary
sal_Bool IsTTSignatureForUnicodeTextfile( String aLine );
diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index a3c5d9b..c5f6886 100755
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -172,7 +172,7 @@ extern "C" void SAL_CALL osl_TestToolDebugMessageFilter( const sal_Char *pString
#endif
-// #94145# Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
+// Due to a tab in TT_SIGNATURE_FOR_UNICODE_TEXTFILES which is changed to blanks by some editors
// this routine became necessary
sal_Bool IsTTSignatureForUnicodeTextfile( String aLine )
{
@@ -416,7 +416,6 @@ IMPL_LINK( BasicApp, LateInit, void *, pDummy )
return 0;
}
-//////////////////////////////////////////////////////////////////////////
class FloatingExecutionStatus : public FloatingWindow
{
@@ -467,7 +466,6 @@ IMPL_LINK(FloatingExecutionStatus, HideNow, FloatingExecutionStatus*, pFLC )
return 0;
}
-//////////////////////////////////////////////////////////////////////////
TYPEINIT1(TTExecutionStatusHint, SfxSimpleHint);
@@ -492,7 +490,6 @@ BasicFrame::BasicFrame() : WorkWindow( NULL,
bInBreak = sal_False;
bDisas = sal_False;
nFlags = 0;
-// Icon aAppIcon;
if ( pBasic->pTestObject ) // Are we the testtool?
{
diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx
index 0ea63ea..578da58 100755
--- a/basic/source/app/app.hxx
+++ b/basic/source/app/app.hxx
@@ -102,7 +102,6 @@ using Window::Command;
sal_Bool bIsAutoRun;
DisplayHidDlg* pDisplayHidDlg;
-// BreakPoint *pRunToCursorBP;
SbxVariable *pEditVar;
diff --git a/basic/source/app/apperror.cxx b/basic/source/app/apperror.cxx
index bb4eab5..441701b 100755
--- a/basic/source/app/apperror.cxx
+++ b/basic/source/app/apperror.cxx
@@ -44,9 +44,6 @@ AppError::AppError( BasicFrame* pParent, String aFileName )
bHasFile = pDataEdit->Load( aFileName );
DirEntry aEntry( aFileName );
UpdateFileInfo( HAS_BEEN_LOADED );
- // Define icon
-// pIcon = new Icon( ResId( RID_WORKICON ) );
-// if( pIcon ) SetIcon( *pIcon );
pDataEdit->Show();
GrabFocus();
@@ -102,14 +99,10 @@ void AppError::LoadIniFile()
String aFontStyle = String( aConf.ReadKey( "ScriptFontStyle", "normal" ), RTL_TEXTENCODING_UTF8 );
String aFontSize = String( aConf.ReadKey( "ScriptFontSize", "12" ), RTL_TEXTENCODING_UTF8 );
Font aFont = aFontList.Get( aFontName, aFontStyle );
-// sal_uIntPtr nFontSize = aFontSize.GetValue( FUNIT_POINT );
sal_uIntPtr nFontSize = aFontSize.ToInt32();
-// aFont.SetSize( Size( nFontSize, nFontSize ) );
aFont.SetHeight( nFontSize );
aFont.SetTransparent( sal_False );
-// aFont.SetAlign( ALIGN_BOTTOM );
-// aFont.SetHeight( aFont.GetHeight()+2 );
pDataEdit->SetFont( aFont );
}
diff --git a/basic/source/app/apperror.hxx b/basic/source/app/apperror.hxx
index 93bf611..77ecf18 100755
--- a/basic/source/app/apperror.hxx
+++ b/basic/source/app/apperror.hxx
@@ -37,7 +37,6 @@ public:
TYPEINFO();
AppError( BasicFrame*, String );
~AppError();
-// long Command( short nID );
virtual long InitMenu( Menu* );
virtual long DeInitMenu( Menu* );
sal_uInt16 GetLineNr();
diff --git a/basic/source/app/appwin.cxx b/basic/source/app/appwin.cxx
index 01002c7..d7f8b7e 100755
--- a/basic/source/app/appwin.cxx
+++ b/basic/source/app/appwin.cxx
@@ -193,11 +193,9 @@ void AppWin::Help()
// Trim leading whitespaces
while( s.GetChar(0) == ' ' )
s.Erase( 0, 1 );
-// aBasicApp.pHelp->Start( s );
}
else
{
-// aBasicApp.pHelp->Start( OOO_HELP_INDEX );
}
}
@@ -216,7 +214,6 @@ void AppWin::GetFocus()
if( pDataEdit ) // GetFocus is called by the destructor, so this check
{
pDataEdit->GrabFocus();
-// InitMenu(GetpApp()->GetAppMenu()->GetPopupMenu( RID_APPEDIT ));
}
}
@@ -254,7 +251,6 @@ long AppWin::InitMenu( Menu* pMenu )
pMenu->EnableItem( RID_EDITCOPY, bMarked );
pMenu->EnableItem( RID_EDITPASTE, ( ::svt::OStringTransfer::PasteString( aTemp, this ) ) );
pMenu->EnableItem( RID_EDITDEL, bMarked );
-// pMenu->EnableItem( RID_HELPTOPIC, bMarked );
sal_Bool bHasText;
if( pDataEdit )
@@ -322,7 +318,7 @@ void AppWin::Command( const CommandEvent& rCEvt )
}
break;
case RID_EDITDEL:
- /*if( bHasMark ) */pDataEdit->Delete();
+ pDataEdit->Delete();
break;
case RID_EDITUNDO:
pDataEdit->Undo();
@@ -375,8 +371,6 @@ sal_Bool AppWin::DiskFileChanged( sal_uInt16 nWhat )
else
return DiskFileChanged( SINCE_LAST_ASK_RELOAD );
}
-// uncomment to avoid compiler warning
-// break;
case SINCE_LAST_ASK_RELOAD:
{
String aFilename( GetText() );
@@ -387,8 +381,6 @@ sal_Bool AppWin::DiskFileChanged( sal_uInt16 nWhat )
return ( !aLastAccess.GetError() != !aStat.GetError() )
|| aLastAccess.IsYounger( aStat ) || aStat.IsYounger( aLastAccess );
}
-// uncomment to avoid compiler warning
-// break;
default:
OSL_FAIL("Not Implemented in AppWin::DiskFileChanged");
}
@@ -432,7 +424,6 @@ void AppWin::CheckReload()
if ( !aFile.Exists() )
return;
-// FileStat aStat( aFile );
if ( DiskFileChanged( SINCE_LAST_ASK_RELOAD ) && ReloadAllowed() )
{
@@ -466,8 +457,6 @@ sal_Bool AppWin::Load( const String& aName )
SkipReload();
sal_Bool bErr;
-// if( !QuerySave() )
-// return;
bErr = !pDataEdit->Load( aName );
if( bErr )
{
@@ -608,16 +597,10 @@ sal_Bool AppWin::Close()
delete this;
return sal_True;
}
-// uncomment to avoid compiler warning
-// break;
case SAVE_RES_ERROR:
return sal_False;
-// uncomment to avoid compiler warning
-// break;
case SAVE_RES_CANCEL:
return sal_False;
-// uncomment to avoid compiler warning
-// break;
default:
OSL_FAIL("Not Implemented in AppWin::Close");
return sal_False;
diff --git a/basic/source/app/basic.src b/basic/source/app/basic.src
index 073f8cc..4402142 100755
--- a/basic/source/app/basic.src
+++ b/basic/source/app/basic.src
@@ -34,12 +34,6 @@ ModalDialog RID_CALLDLG {
SVLook = TRUE;
MOVEABLE = TRUE;
CLOSEABLE = TRUE;
-// WinChilds = {
-// FixedText {
-// Text = "Aktuelle Parameter";
-// PosSize = MAP_SYSFONT (10,10,120,8);
-// };
-// };
FixedText RID_RETTYPE {
PosSize = MAP_SYSFONT (10,70,120,8);
};
@@ -68,41 +62,6 @@ ModalDialog IDD_ABOUT_DIALOG {
Pos = MAP_APPFONT( 58, 17 );
Size = MAP_APPFONT( 155, 106 );
SVLook = TRUE;
-/*
- WINCHILDS = {
- FixedText {
- Pos = MAP_APPFONT( 40, 5 );
- Size = MAP_APPFONT( 110, 10 );
- TEXT = "Testtool";
- CENTER = TRUE;
- };
- FixedText {
- Pos = MAP_APPFONT( 40, 20 );
- Size = MAP_APPFONT( 110, 20 );
- TEXT = "Ojektorientiertes BASIC-Entwicklungssystem";
- CENTER = TRUE;
- };
- FixedText {
- Pos = MAP_APPFONT( 40, 45 );
- Size = MAP_APPFONT( 110, 10 );
- TEXT = "Version 2.0 May 2002";
- CENTER = TRUE;
- };
- FixedText {
- Pos = MAP_APPFONT( 40, 60 );
- Size = MAP_APPFONT( 110, 10 );
- TEXT = "�1995-2010 Oracle";
- CENTER = TRUE;
- };
- };
-*/
-// FixedIcon RID_ICON {
-// Pos = MAP_APPFONT( 20, 26 );
-// Size = MAP_APPFONT( 20, 20 );
-// FIXED = Icon {
-// FILE = "basic.ico";
-// };
-// };
OKButton RID_OK {
Pos = MAP_APPFONT( 55, 80 );
Size = MAP_APPFONT( 40, 14 );
@@ -148,7 +107,6 @@ ModalDialog IDD_FIND_DIALOG {
Size = MAP_APPFONT( 185, 70 );
SVLook = TRUE;
MOVEABLE = TRUE;
- // CLOSEABLE = TRUE; // It has a cancelbutton
FixedText RID_FIXEDTEXT1 {
Pos = MAP_APPFONT( 5, 10 );
@@ -184,7 +142,6 @@ ModalDialog IDD_REPLACE_DIALOG {
Size = MAP_APPFONT( 185, 88 );
SVLook = TRUE;
MOVEABLE = TRUE;
- // CLOSEABLE = TRUE; // It has a cancelbutton
FixedText RID_FIXEDTEXT1 {
Pos = MAP_APPFONT( 5, 10 );
Size = MAP_APPFONT( 55, 10 );
@@ -425,15 +382,6 @@ String IDS_CANCEL {
String IDS_DISASWIN {
TEXT[ en-US ] = "Disassembly";
};
-//Icon RID_APPICON {
-// FILE = "basic.ico";
-//};
-//Icon RID_APPICON2 {
-// FILE = "testtool.ico";
-//};
-//Icon RID_WORKICON {
-// FILE = "work.ico";
-//};
Bitmap MBP_PLUS {
File = "plus.bmp";
@@ -542,12 +490,10 @@ Menu RID_EDIT {
MenuItem {
Identifier = RID_EDITUNDO;
TEXT[ en-US ] = "~Undo";
-// AccelKey = KeyCode { Function = KEYFUNC_CUT; };
};
MenuItem {
Identifier = RID_EDITREDO;
TEXT[ en-US ] = "~Redo";
-// AccelKey = KeyCode { Function = KEYFUNC_CUT; };
};
MenuItem {
SEPARATOR = TRUE;
@@ -588,7 +534,6 @@ Menu RID_EDIT {
Identifier = RID_EDITREPEAT;
TEXT[ en-US ] = "Repeat S~earch";
AccelKey = KeyCode { Code = KEY_F3; };
-// AccelKey = KeyCode { Function = KEYFUNC_REPEAT; };
};
};
};
@@ -617,11 +562,6 @@ Menu RID_RUN {
TEXT[ en-US ] = "Si~ngle Step over Procedure";
AccelKey = KeyCode { Code = KEY_F10; };
};
-// MenuItem {
-// Identifier = RID_RUNTOCURSOR;
-// TEXT = "Run to cursor";
-// AccelKey = KeyCode { Code = KEY_F7; };
-// };
MenuItem {
Identifier = RID_TOGLEBRKPNT;
TEXT[ en-US ] = "Set / Delete Break Point";
@@ -675,52 +615,11 @@ Menu RID_TT_EXTRAS {
};
Menu RID_WINDOW {
ITEMLIST = {
-/* MenuItem {
- Identifier = RID_WINCASCADE;
- TEXT[ en-US ] = "~Cascade";
- };
- MenuItem {
- Identifier = RID_WINTILE;
- TEXT[ en-US ] = "~Tile";
- };
- MenuItem {
- Identifier = RID_WINTILEHORZ;
- TEXT[ en-US ] = "~Arrange Horizontally";
- };
- MenuItem {
- Identifier = RID_WINTILEVERT;
- TEXT[ en-US ] = "~Arrange Vertically";
- };*/
};
};
Menu RID_HELP {
ITEMLIST = {
-/* MenuItem {
- Identifier = RID_HELPINDEX;
- TEXT = "~Index";
- };
MenuItem {
- SEPARATOR = TRUE;
- };
- MenuItem {
- Identifier = RID_HELPKEYS;
- TEXT = "~Tastaturbelegung";
- };
- MenuItem {
- Identifier = RID_HELPINTRO;
- TEXT = "~Anleitung";
- };
- MenuItem {
- SEPARATOR = TRUE;
- };
- MenuItem {
- Identifier = RID_HELPTOPIC;
- TEXT = "~Markierter Text";
- };
- MenuItem {
- SEPARATOR = TRUE;
- };
-*/ MenuItem {
ABOUT = TRUE;
Identifier = RID_HELPABOUT;
TEXT[ en-US ] = "~About...";
@@ -1243,12 +1142,6 @@ FloatingWindow IDD_DISPLAY_HID {
Border = TRUE;
Pos = MAP_APPFONT( 0, 0 );
Size = MAP_APPFONT( 260, 14 );
-/* ItemList = {
- ToolBoxItem {
- Text = "erster der Toolbox";
- };
- };*/
-// Hide = TRUE;
};
FixedText RID_FT_CONTROLS {
Pos = MAP_APPFONT( 4, 16 );
@@ -1335,22 +1228,6 @@ Accelerator MAIN_ACCEL {
Identifier = RID_QUIT;
Key = KeyCode { Function = KEYFUNC_QUIT; };
};
-// AcceleratorItem {
-// Identifier = RID_EDITCUT;
-// Key = KeyCode { Function = KEYFUNC_CUT; };
-// };
-// AcceleratorItem {
-// Identifier = RID_EDITCOPY;
-// Key = KeyCode { Function = KEYFUNC_COPY; };
-// };
-// AcceleratorItem {
-// Identifier = RID_EDITPASTE;
-// Key = KeyCode { Function = KEYFUNC_PASTE; };
-// };
-// AcceleratorItem {
-// Identifier = RID_EDITDEL;
-// Key = KeyCode { Function = KEYFUNC_DELETE; };
-// };
AcceleratorItem {
Identifier = RID_EDITSEARCH;
Key = KeyCode { Function = KEYFUNC_FIND; };
@@ -1358,7 +1235,6 @@ Accelerator MAIN_ACCEL {
AcceleratorItem {
Identifier = RID_EDITREPEAT;
Key = KeyCode { Code = KEY_F3; };
-// Key = KeyCode { Function = KEYFUNC_REPEAT; };
};
AcceleratorItem {
Identifier = RID_RUNSTART;
diff --git a/basic/source/app/basmsg.src b/basic/source/app/basmsg.src
index ba96cf5..208272e 100755
--- a/basic/source/app/basmsg.src
+++ b/basic/source/app/basmsg.src
@@ -30,7 +30,6 @@
// Here are included the messages of the folder /basic/source/app
-///////////////////////////////
// Error messages which go to the result file.
// *********************
// *** !!ATTENTION!! ***
@@ -38,7 +37,6 @@
// The numbers must NEVER(!) change,
// because they are saved in the result files and a renewed display
// would display new strings or no strings.
-///////////////////////////////
String S_PROG_START
{
diff --git a/basic/source/app/brkpnts.hxx b/basic/source/app/brkpnts.hxx
index f78649a..0ded6d8 100755
--- a/basic/source/app/brkpnts.hxx
+++ b/basic/source/app/brkpnts.hxx
@@ -41,7 +41,6 @@ using Window::Scroll;
public:
BreakpointWindow( Window *pParent );
-// ~BreakpointWindow();
void Reset();
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index cc02c09..8ccf09f 100755
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -74,7 +74,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& id )
FreeResource();
}
-////////////////////////////////////////////////////////////////////
FindDialog::FindDialog( Window* pParent, const ResId& id, String& Text )
: ModalDialog( pParent, id )
@@ -130,7 +129,6 @@ IMPL_LINK( ReplaceDialog, ButtonClick, Button *, pB )
return sal_True;
}
-////////////////////////////////////////////////////////////////////
void CheckButtons( ComboBox &aCB, Button &aNewB, Button &aDelB )
@@ -677,9 +675,6 @@ FontOptions::FontOptions( Window* pParent, Config &aConfig )
aFontName.EnableWYSIWYG();
aFontName.EnableSymbols();
-// aFontSize.SetUnit( FUNIT_POINT );
-// MapMode aMode( MAP_POINT );
-// aFTPreview.SetMapMode( aMode );
aFontName.SetModifyHdl( LINK( this, FontOptions, FontNameChanged ) );
aFontStyle.SetModifyHdl( LINK( this, FontOptions, FontStyleChanged ) );
@@ -722,7 +717,6 @@ IMPL_LINK( FontOptions, FontSizeChanged, void*, EMPTYARG )
void FontOptions::UpdatePreview()
{
Font aFont = aFontList.Get( aFontName.GetText(), aFontStyle.GetText() );
-// sal_uIntPtr nFontSize = aFontSize.GetValue( FUNIT_POINT );
sal_uIntPtr nFontSize = static_cast<sal_uIntPtr>((aFontSize.GetValue() + 5) / 10);
aFont.SetHeight( nFontSize );
aFTPreview.SetFont( aFont );
@@ -1081,15 +1075,6 @@ DisplayHidDlg::DisplayHidDlg( Window * pParent )
{
FreeResource();
-/* ResMgr* pRM = CREATERESMGR( svt );
- ToolBox aOrig( this, ResId( 12345, pRM ) );
- delete pRM;
-
- aTbConf.CopyItem( aOrig, 4 );
- aTbConf.InsertSeparator();
- aTbConf.CopyItem( aOrig, 5 );
- aTbConf.CopyItem( aOrig, 6 );
- aTbConf.CopyItem( aOrig, 7 ); */
aTbConf.SetOutStyle( TOOLBOX_STYLE_FLAT );
#if OSL_DEBUG_LEVEL < 2
@@ -1249,8 +1234,6 @@ void DisplayHidDlg::Resize()
}
else
{
-// SetUpdateMode( sal_False );
-
// Minimum size
Size aSize( GetOutputSizePixel() );
aSize.Width() = std::max( aSize.Width(), (long)(aOKClose.GetSizePixel().Width() * 3 ));
@@ -1304,9 +1287,6 @@ void DisplayHidDlg::Resize()
aPos.Move( nSpace, -aOKClose.GetSizePixel().Height() );
aPos.Move( pSplit->GetSizePixel().Width(), pSplit->GetSizePixel().Height() );
aOKClose.SetPosPixel( aPos );
-
-// SetUpdateMode( sal_True );
-// Invalidate();
}
FloatingWindow::Resize();
}
@@ -1346,9 +1326,6 @@ VarEditDialog::VarEditDialog( Window * pParent, SbxVariable *pPVar )
else
aRadioButtonRID_RB_NEW_BOOL_F.Check();
break;
-// case SbxCURRENCY:
-// case SbxDATE:
-// break;
case SbxINTEGER:
aNumericFieldRID_NF_NEW_INTEGER.Show();
aNumericFieldRID_NF_NEW_INTEGER.SetText( pVar->GetString() );
@@ -1362,8 +1339,6 @@ VarEditDialog::VarEditDialog( Window * pParent, SbxVariable *pPVar )
aNumericFieldRID_NF_NEW_LONG.SetMin( -aNumericFieldRID_NF_NEW_LONG.GetMax()-1 );
aNumericFieldRID_NF_NEW_LONG.SetFirst( -aNumericFieldRID_NF_NEW_LONG.GetLast()-1 );
break;
-// case SbxOBJECT: // cannot be edited
-// break;
case SbxSINGLE:
case SbxDOUBLE:
case SbxSTRING:
@@ -1389,41 +1364,6 @@ IMPL_LINK( VarEditDialog, OKClick, Button *, pButton )
SbxDataType eType = pVar->GetType();
-/*
-Boolean
-Currency
-Date
-Double
-Integer
-Long
-Object
-Single
-String
-Variant
-
-
-atof
-
- ecvt
- f
- gcvt
-
-SvNumberformat::
- static double StringToDouble( const xub_Unicode* pStr,
- const International& rIntl,
- int& nErrno,
- const xub_Unicode** ppEnd = NULL );
- // Converts just as strtod a decimal string to a double.
- // Decimal and thousand separators come from International,
- // leading spaces are omitted.
- // If ppEnd!=NULL then *ppEnd is set after the parsed data.
- // If pStr contains only the String to be parsed, then if success:
- // **ppEnd=='\0' and *ppEnd-pStr==strlen(pStr).
- // If overflow fVal=+/-HUGE_VAL, if underflow 0,
- // nErrno is in this cases set to ERANGE otherwise 0.
- // "+/-1.#INF" are recognized as +/-HUGE_VAL.
-
- */
@@ -1434,12 +1374,6 @@ SvNumberformat::
case SbxBOOL:
pVar->PutBool( aRadioButtonRID_RB_NEW_BOOL_T.IsChecked() );
break;
-// case SbxCURRENCY:
-// pVar->PutCurrency( aContent );
-// break;
-// case SbxDATE:
-// pVar->PutDate( aContent );
-// break;
case SbxINTEGER:
pVar->PutInteger( (sal_Int16)aNumericFieldRID_NF_NEW_INTEGER.GetValue() );
break;
@@ -1462,7 +1396,6 @@ SvNumberformat::
}
-// pVar->PutStringExt( aEditRID_ED_NEW_STRING.GetText() );
if ( !bWasError && SbxBase::IsError() )
{
bError = sal_True;
@@ -1475,12 +1408,6 @@ SvNumberformat::
return 1;
}
-// if ( aEditRID_ED_NEW_STRING.GetText().Compare( pVar->GetString() ) != COMPARE_EQUAL )
-// {
-// aFixedTextRID_FT_CONTENT_VALUE.SetText( pVar->GetString() );
-// aEditRID_ED_NEW_STRING.SetText( pVar->GetString() );
-// return 1;
-// }
Close();
return 0;
diff --git a/basic/source/app/dialogs.hxx b/basic/source/app/dialogs.hxx
index d8ea5e0..d1fa15d 100755
--- a/basic/source/app/dialogs.hxx
+++ b/basic/source/app/dialogs.hxx
@@ -81,7 +81,6 @@ public:
ReplaceDialog (Window*, const ResId&, String&, String&);
};
-////////////////////////////////////////////////////////////////////
class ConfEdit : public PushButton
{
diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx
index 227e501..05ddf36 100755
--- a/basic/source/app/msgedit.cxx
+++ b/basic/source/app/msgedit.cxx
@@ -75,7 +75,6 @@ MsgEdit::MsgEdit( AppError* pParent, BasicFrame *pBF, const WinBits& aBits )
, pAppError( pParent )
, aEditTree( pParent, pBF, aBits | WB_HASBUTTONS | WB_HASLINES | WB_HASBUTTONSATROOT )
{
-// SetFont( aEditTree.GetDefaultFont( DEFAULTFONT_FIXED, aEditTree.GetSettings().GetLanguage(), 0, &aEditTree ) );
aEditTree.SetNodeBitmaps( Bitmap( SttResId (MBP_PLUS) ), Bitmap( SttResId (MBP_MINUS) ) );
aEditTree.SetSelectionMode( MULTIPLE_SELECTION );
if ( aEditTree.GetModel()->GetSortMode() != SortNone )
@@ -422,36 +421,6 @@ void MsgEdit::AddQAError( String aMsg, TTDebugData aDebugData )
aEditTree.InvalidateEntry( pThisEntry );
}
-/*
- SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return SvLBox::GetEntry(pParent,nPos); }
- SvLBoxEntry* GetEntry( sal_uIntPtr nRootPos ) const { return SvLBox::GetEntry(nRootPos);}
-
-
-
- SvLBoxEntry* FirstChild(SvLBoxEntry* pParent ) const { return (SvLBoxEntry*)(pModel->FirstChild(pParent)); }
- SvLBoxEntry* NextSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->NextSibling( pEntry )); }
- SvLBoxEntry* PrevSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->PrevSibling( pEntry )); }
-
- SvLBoxEntry* FirstSelected() const { return (SvLBoxEntry*)SvListView::FirstSelected(); }
- SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::NextSelected(pEntry)); }
- SvLBoxEntry* PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); }
- SvLBoxEntry* LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); }
-
- SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
- SvLBoxEntry* GetEntry( sal_uIntPtr nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
-
- SvLBoxEntry* GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); }
- SvLBoxEntry* GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));}
-
- sal_Bool IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const;
- SvListEntry* GetEntry( SvListEntry* pParent, sal_uIntPtr nPos ) const;
- SvListEntry* GetEntry( sal_uIntPtr nRootPos ) const;
- SvListEntry* GetEntryAtAbsPos( sal_uIntPtr nAbsPos ) const;
- SvListEntry* GetParent( SvListEntry* pEntry ) const;
- SvListEntry* GetRootLevelParent( SvListEntry* pEntry ) const;
-*/
-
-//#define CHECK( pMemo ) if ( pMemo && !aEditTree.GetViewData( pMemo ) ) pMemo = NULL
#define CHECK( pMemo ) if ( pMemo && !aEditTree.GetModel()->IsInChildList( NULL, pMemo ) ) pMemo = NULL
void MsgEdit::Delete()
{
@@ -771,7 +740,6 @@ TTTreeListBox::TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinSt
: SvTreeListBox( pParent, nWinStyle )
, pBasicFrame(pBF)
, pAppError( pParent )
-//, nDeselectParent(0)
{}
sal_Bool TTTreeListBox::JumpToSourcecode( SvLBoxEntry *pThisEntry )
@@ -820,47 +788,6 @@ sal_Bool TTTreeListBox::DoubleClickHdl()
return JumpToSourcecode( GetHdlEntry() );
}
-/*sal_uIntPtr TTTreeListBox::SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect )
-{
- SvLBoxEntry *pEntry = FirstChild( pParent );
- sal_uIntPtr nRet = 0;
- while ( pEntry )
- {
- nRet++;
- Select( pEntry, bSelect );
- pEntry = NextSibling( pEntry );
- }
- return nRet;
-}
-
-
-void TTTreeListBox::SelectHdl()
-{
- SvLBoxEntry* pHdlEntry = GetHdlEntry();
-
- SelectChildren( pHdlEntry, sal_True );
- Select( pHdlEntry, sal_True );
-// InitMenu(pApp->GetAppMenu()->GetPopupMenu( RID_APPEDIT )); // so that delete works correct
-}
-
-void TTTreeListBox::DeselectHdl()
-{
- SvLBoxEntry* pHdlEntry = GetHdlEntry();
- if ( GetParent( pHdlEntry ) )
- {
- nDeselectParent++;
- Select( GetParent( pHdlEntry ), sal_False );
- nDeselectParent--;
- }
- if ( !nDeselectParent )
- {
- SelectChildren( pHdlEntry, sal_False );
- Select( pHdlEntry, sal_False );
- }
- Invalidate();
-} */
-
-
void TTTreeListBox::KeyInput( const KeyEvent& rKEvt )
{
switch ( rKEvt.GetKeyCode().GetFunction() )
diff --git a/basic/source/app/msgedit.hxx b/basic/source/app/msgedit.hxx
index d408809..8d9c703 100755
--- a/basic/source/app/msgedit.hxx
+++ b/basic/source/app/msgedit.hxx
@@ -49,8 +49,6 @@ typedef sal_uInt16 TTFeatures; // Bitfield for features of the entries
class TTTreeListBox : public SvTreeListBox
{
protected:
-// virtual void Command( const CommandEvent& rCEvt );
-// sal_uInt16 nDeselectParent;
BasicFrame *pBasicFrame;
void InitEntry( SvLBoxEntry*, const String&, const Image&,
const Image&, SvLBoxButtonKind eButtonKind );
@@ -62,13 +60,10 @@ public:
TTTreeListBox( AppError* pParent, BasicFrame* pBF, WinBits nWinStyle=0 );
~TTTreeListBox(){}
-// virtual void SelectHdl();
-// virtual void DeselectHdl();
virtual sal_Bool DoubleClickHdl();
virtual void KeyInput( const KeyEvent& rKEvt );
-// sal_uIntPtr SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect );
TTFeatures GetFeatures( SvLBoxEntry* );
};
diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx
index 5f1521d..adf1322 100755
--- a/basic/source/app/mybasic.cxx
+++ b/basic/source/app/mybasic.cxx
@@ -101,7 +101,6 @@ MyBasic::MyBasic() : StarBASIC()
// Box object into SbUnoObject
String aName( "UnoObject" );
SbxObjectRef xSbUnoObj = GetSbUnoObject( aName, aObjAny );
- //SbxObjectRef xSbUnoObj = new SbUnoObject( aName, aObjAny );
Insert( (SbxObject*)xSbUnoObj );
#endif
@@ -282,8 +281,6 @@ sal_uInt16 MyBasic::BreakHdl()
if( IsBreak() ) // If Breakpoint (or "Run to Cursor")
{
-// if ( GetActiveModule()->IsBP(GetLine()) )
-// GetActiveModule()->ClearBP(GetLine());
return aBasicApp.pFrame->BreakHandler();
}
else
diff --git a/basic/source/app/process.cxx b/basic/source/app/process.cxx
index 5dda13c..6289b5d 100755
--- a/basic/source/app/process.cxx
+++ b/basic/source/app/process.cxx
@@ -110,7 +110,6 @@ long Process::ImplGetExitCode()
}
-////////////////////////////////////////////////////////////////////////////
void Process::SetImage( const String &aAppPath, const String &aAppParams, const Environment *pEnv )
{ // Set image file of executable
diff --git a/basic/source/app/processw.cxx b/basic/source/app/processw.cxx
index f564b0f..9dbc6c2 100755
--- a/basic/source/app/processw.cxx
+++ b/basic/source/app/processw.cxx
@@ -216,10 +216,8 @@ SbxInfo* ProcessWrapper::GetInfo( short nIdx )
}
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
// Properties and methods save the return value in argv[0] (Get, bPut = sal_False)
// and store the value from argv[0] (Put, bPut = sal_True)
diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src
index 3bc51c1..cde4783 100755
--- a/basic/source/app/svtmsg.src
+++ b/basic/source/app/svtmsg.src
@@ -30,7 +30,6 @@
// Here are included the messages of the folder /basic/source/app
-///////////////////////////////
// Error messages which go to the result file.
// *********************
// *** !!ATTENTION!! ***
@@ -38,7 +37,6 @@
// The numbers must NEVER(!) change,
// because they are saved in the result files and a renewed display
// would display new strings or no strings.
-///////////////////////////////
String S_GPF_ABORT
{
Text[ en-US ] = "Program aborted with GPF";
diff --git a/basic/source/app/testtool.src b/basic/source/app/testtool.src
index 26d7741..d42218a 100755
--- a/basic/source/app/testtool.src
+++ b/basic/source/app/testtool.src
@@ -27,9 +27,7 @@
#include "basic/testtool.hrc"
-///////////////////////////////
// Strings
-///////////////////////////////
String S_INVALID_KEYCODE
{
Text[ en-US ] = "Is an invalid KeyCode!";
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index 52bcbf1..34d541d 100755
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -620,12 +620,9 @@ Variant(Empty)
switch ( eType )
{
case SbxBOOL:
-// case SbxCURRENCY:
-// case SbxDATE:
case SbxDOUBLE:
case SbxINTEGER:
case SbxLONG:
-// case SbxOBJECT: // cannot be edited
case SbxSINGLE:
case SbxSTRING:
@@ -707,7 +704,7 @@ void TextEdit::Highlight( sal_uIntPtr nLine, xub_StrLen nCol1, xub_StrLen nCol2
aEdit.pTextView->SetSelection( TextSelection(TextPaM(nLine,nCol2+1), TextPaM(nLine,nCol1)) );
if ( aEdit.ViewMoved() )
{
- aEdit.pTextView->SetSelection( TextSelection(TextPaM(TEXT_PARA_ALL,1)) ); // fix #105169#
+ aEdit.pTextView->SetSelection( TextSelection(TextPaM(TEXT_PARA_ALL,1)) );
aEdit.pTextView->SetSelection( TextSelection(TextPaM((nLine>=2?nLine-2:0),nCol2+1)) );
aEdit.pTextView->SetSelection( TextSelection(TextPaM(nLine,nCol2+1), TextPaM(nLine,nCol1)) );
}
diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx
index 90e1763..723f05f 100755
--- a/basic/source/app/textedit.hxx
+++ b/basic/source/app/textedit.hxx
@@ -97,10 +97,7 @@ public:
void Paint( const Rectangle& rRect );
void MouseButtonUp( const MouseEvent& rMouseEvent );
void MouseButtonDown( const MouseEvent& rMouseEvent );
-// void MouseMove( const MouseEvent& rMouseEvent );
void Command( const CommandEvent& rCEvt );
- //sal_Bool Drop( const DropEvent& rEvt );
- //sal_Bool QueryDrop( DropEvent& rEvt );
sal_Bool ViewMoved();
diff --git a/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src
index 876a769..22b447a 100755
--- a/basic/source/app/ttmsg.src
+++ b/basic/source/app/ttmsg.src
@@ -30,7 +30,6 @@
// Here are included the messages of the folder /basic/source/testtool
-///////////////////////////////
// Error messages which go to the result file.
// *********************
// *** !!ATTENTION!! ***
@@ -38,7 +37,6 @@
// The numbers must NEVER(!) change,
// because they are saved in the result files and a renewed display
// would display new strings or no strings.
-///////////////////////////////
String S_NAME_NOT_THERE
{
@@ -140,22 +138,4 @@ String S_UNKNOWN_METHOD
{
Text[ en-US ] = "Unknown method on object :($Arg1).($Arg2)";
};
-/*
-String
-{
- Text[ en-US ] = ;
-};
-String
-{
- Text[ en-US ] = ;
-};
-String
-{
- Text[ en-US ] = ;
-};
-String
-{
- Text[ en-US ] = ;
-};
-*/
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index b7341e7..628f97e 100755
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -301,11 +301,11 @@ namespace basic
if ( !aAppBasicDir.Len() )
aPathCFG.SetBasicPath( String::CreateFromAscii("$(prog)") );
- // #58293# soffice.new search only in user dir => first dir
+ // soffice.new search only in user dir => first dir
String aAppFirstBasicDir = aAppBasicDir.GetToken(1);
// Create basic and load it
- // MT: #47347# AppBasicDir is now a PATH
+ // AppBasicDir is now a PATH
INetURLObject aAppBasic( SvtPathOptions().SubstituteVariable( String::CreateFromAscii("$(progurl)") ) );
aAppBasic.insertName( Application::GetAppName() );
@@ -483,9 +483,6 @@ namespace basic
LibraryContainerInfo aInfo( xBasicLibs, xDialogLibs, dynamic_cast< OldBasicPassword* >( xBasicLibs.get() ) );
OSL_ENSURE( aInfo.mpOldBasicPassword, "ImplRepository::impl_createManagerForModel: wrong BasicLibraries implementation!" );
_out_rpBasicManager->SetLibraryContainerInfo( aInfo );
- //pBasicCont->setBasicManager( _out_rpBasicManager );
- // that's not needed anymore today. The containers will retrieve their associated
- // BasicManager from the BasicManagerRepository, when needed.
// initialize the containers
impl_initDocLibraryContainers_nothrow( xBasicLibs, xDialogLibs );
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 8ac6e7e..8d85cbb 100755
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -804,11 +804,6 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
String aStorName( rStorage.GetName() );
maStorageName = INetURLObject(aStorName, INET_PROT_FILE).GetMainURL( INetURLObject::NO_DECODE );
- // #91251: Storage name not longer available for documents < 5.0
- // Should be no real problem, because only relative storage names
- // (links) can be affected.
- // DBG_ASSERT( aStorName.Len(), "No Storage Name!" );
- // DBG_ASSERT(aStorageName.Len() != 0, "Bad storage name");
// If there is no Manager Stream, no further actions are necessary
if ( rStorage.IsStream( String(RTL_CONSTASCII_USTRINGPARAM(szManagerStream)) ) )
@@ -840,7 +835,6 @@ BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBA
StarBASIC* pBasic = GetLib( nBasic );
if ( pBasic )
{
-// pBasic->SetParent( pStdLib );
pStdLib->Insert( pBasic );
pBasic->SetFlag( SBX_EXTSEARCH );
}
@@ -1063,7 +1057,6 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
{
DBG_CHKTHIS( BasicManager, 0 );
-// StreamMode eStreamMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE;
SotStorageStreamRef xManagerStream = rStorage.OpenSotStream
( String(RTL_CONSTASCII_USTRINGPARAM(szManagerStream)), eStreamReadMode );
@@ -1082,8 +1075,6 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
String aRealStorageName = maStorageName; // for relative paths, can be modified through BaseURL
- // If loaded from template, only BaseURL is used:
- //String aBaseURL = INetURLObject::GetBaseURL();
if ( rBaseURL.Len() )
{
INetURLObject aObj( rBaseURL );
@@ -1119,9 +1110,6 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, const String& rBaseUR
aObj = aObj.smartRel2Abs( pInfo->GetRelStorageName(), bWasAbsolute );
//*** TODO: Replace if still necessary
- /* if ( SfxContentHelper::Exists( aObj.GetMainURL() ) )
- pInfo->SetStorageName( aObj.GetMainURL() );
- else */
//*** TODO-End
if ( pLibs->aBasicLibPath.Len() )
{
@@ -1155,7 +1143,6 @@ void BasicManager::LoadOldBasicManager( SotStorage& rStorage )
{
DBG_CHKTHIS( BasicManager, 0 );
-// StreamMode eStreamMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE;
SotStorageStreamRef xManagerStream = rStorage.OpenSotStream
( String::CreateFromAscii(szOldManagerStream), eStreamReadMode );
@@ -1549,7 +1536,6 @@ sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib, sal_Bool bDelBasicFromStorage
if ( !pLibInfo || !nLib )
{
-// String aErrorText( BasicResId( IDS_SBERR_REMOVELIB ) );
StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_REMOVELIB, String(), ERRCODE_BUTTON_OK );
pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_STDLIB, pLibInfo->GetLibName() ) );
return sal_False;
diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx
index 5962302..ba60d25 100755
--- a/basic/source/classes/disas.cxx
+++ b/basic/source/classes/disas.cxx
@@ -390,8 +390,6 @@ sal_Bool SbiDisas::DisasLine( String& rText )
n = s.Search( '\n' );
if( n != STRING_NOTFOUND ) bDone = sal_False, s.Erase( n, 1 );
} while( !bDone );
-// snprintf( cBuf, sizeof(cBuf), pMask[ 0 ], nPC );
-// rText += cBuf;
rText.AppendAscii( "; " );
rText += s;
rText.AppendAscii( _crlf() );
diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx
index 6b8fdf5..aa3a972 100755
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -214,8 +214,6 @@ void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeExc
void BasicScriptListener_Impl::firing_impl( const ScriptEvent& aScriptEvent, Any* pRet )
{
- //Guard< Mutex > aGuard( Mutex::getGlobalMutex() );
- //{
if( aScriptEvent.ScriptType.compareToAscii( "StarBasic" ) == 0 )
{
// Full qualified name?
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 12cdfc6..d3f611f 100755
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -157,18 +157,15 @@ sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
{
case B_NAME:
r.ReadByteString( aName, eCharSet );
- //r >> aName;
break;
case B_COMMENT:
r.ReadByteString( aComment, eCharSet );
- //r >> aComment;
break;
case B_SOURCE:
{
String aTmp;
r.ReadByteString( aTmp, eCharSet );
aOUSource = aTmp;
- //r >> aSource;
break;
}
#ifdef EXTENDED_BINARY_MODULES
@@ -250,8 +247,6 @@ sal_Bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
}
done:
r.Seek( nLast );
- //if( eCharSet != ::GetSystemCharSet() )
- //ConvertStrings();
if( !SbiGood( r ) )
bError = sal_True;
return sal_Bool( !bError );
@@ -291,7 +286,6 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
{
nPos = SbiOpenRecord( r, B_NAME, 1 );
r.WriteByteString( aName, eCharSet );
- //r << aName;
SbiCloseRecord( r, nPos );
}
// Comment?
@@ -299,7 +293,6 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
{
nPos = SbiOpenRecord( r, B_COMMENT, 1 );
r.WriteByteString( aComment, eCharSet );
- //r << aComment;
SbiCloseRecord( r, nPos );
}
// Source?
@@ -314,7 +307,6 @@ sal_Bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
else
aTmp = aOUSource;
r.WriteByteString( aTmp, eCharSet );
- //r << aSource;
SbiCloseRecord( r, nPos );
#ifdef EXTENDED_BINARY_MODULES
@@ -440,7 +432,6 @@ void SbiImage::AddString( const String& r )
if( !bError )
{
pStringOff[ nStringIdx++ ] = nStringOff;
- //ByteString aByteStr( r, eCharSet );
memcpy( pStrings + nStringOff, r.GetBuffer(), len * sizeof( sal_Unicode ) );
nStringOff = nStringOff + len;
// Last String? The update the size of the buffer
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 1d2e1ed..4541089 100755
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -688,7 +688,6 @@ SbClassModuleObject::SbClassModuleObject( SbModule* pClassModule )
pProcedureProp->SetFlag( SBX_NO_BROADCAST );
SbProcedureProperty* pNewProp = new SbProcedureProperty
( pProcedureProp->GetName(), pProcedureProp->GetType() );
- // ( pProcedureProp->GetName(), pProcedureProp->GetType(), this );
pNewProp->SetFlags( nFlags_ ); // Copy flags
pNewProp->ResetFlag( SBX_NO_BROADCAST ); // except the Broadcast if it was set
pProcedureProp->SetFlags( nFlags_ );
@@ -994,7 +993,6 @@ void* StarBASIC::operator new( size_t n )
{
if( n < sizeof( StarBASIC ) )
{
-// DBG_ASSERT( sal_False, "Warnung: inkompatibler BASIC-Stand!" );
n = sizeof( StarBASIC );
}
return ::operator new( n );
@@ -1141,7 +1139,6 @@ struct ClassModuleRunInitItem
SbModule* m_pModule;
bool m_bProcessing;
bool m_bRunInitDone;
- //ModuleVector m_vModulesDependingOnThisModule;
ClassModuleRunInitItem( void )
: m_pModule( NULL )
@@ -1166,7 +1163,6 @@ void SbModule::implProcessModuleRunInit( ModuleInitDependencyMap& rMap, ClassMod
{
rItem.m_bProcessing = true;
- //bool bAnyDependencies = true;
SbModule* pModule = rItem.m_pModule;
if( pModule->pClassData != NULL )
{
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index c66770c..8a079a6 100755
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -605,22 +605,11 @@ SbxDataType unoToSbxType( TypeClass eType )
case TypeClass_STRUCT:
case TypeClass_EXCEPTION: eRetType = SbxOBJECT; break;
- /* first we leave the following types out
- case TypeClass_SERVICE: break;
- case TypeClass_CLASS: break;
- case TypeClass_TYPEDEF: break;
- case TypeClass_UNION: break;
- case TypeClass_ARRAY: break;
- */
case TypeClass_ENUM: eRetType = SbxLONG; break;
case TypeClass_SEQUENCE:
eRetType = (SbxDataType) ( SbxOBJECT | SbxARRAY );
break;
- /*
- case TypeClass_VOID: break;
- case TypeClass_UNKNOWN: break;
- */
case TypeClass_ANY: eRetType = SbxVARIANT; break;
case TypeClass_BOOLEAN: eRetType = SbxBOOL; break;
@@ -628,18 +617,13 @@ SbxDataType unoToSbxType( TypeClass eType )
case TypeClass_STRING: eRetType = SbxSTRING; break;
case TypeClass_FLOAT: eRetType = SbxSINGLE; break;
case TypeClass_DOUBLE: eRetType = SbxDOUBLE; break;
- //case TypeClass_OCTET: break;
case TypeClass_BYTE: eRetType = SbxINTEGER; break;
- //case TypeClass_INT: eRetType = SbxINT; break;
case TypeClass_SHORT: eRetType = SbxINTEGER; break;
case TypeClass_LONG: eRetType = SbxLONG; break;
case TypeClass_HYPER: eRetType = SbxSALINT64; break;
- //case TypeClass_UNSIGNED_OCTET: break;
case TypeClass_UNSIGNED_SHORT: eRetType = SbxUSHORT; break;
case TypeClass_UNSIGNED_LONG: eRetType = SbxULONG; break;
case TypeClass_UNSIGNED_HYPER: eRetType = SbxSALUINT64;break;
- //case TypeClass_UNSIGNED_INT: eRetType = SbxUINT; break;
- //case TypeClass_UNSIGNED_BYTE: eRetType = SbxUSHORT; break;
default: break;
}
return eRetType;
@@ -869,14 +853,6 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
}
break;
- /* folgende Typen lassen wir erstmal weg
- case TypeClass_SERVICE: break;
- case TypeClass_CLASS: break;
- case TypeClass_TYPEDEF: break;
- case TypeClass_UNION: break;
- case TypeClass_ENUM: break;
- case TypeClass_ARRAY: break;
- */
case TypeClass_ENUM:
{
@@ -929,24 +905,9 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
pVar->PutObject( (SbxDimArray*)xArray );
pVar->SetFlags( nFlags );
- // The parameter mustn't deleted here
- //pVar->SetParameters( NULL );
}
break;
- /*
- case TypeClass_VOID: break;
- case TypeClass_UNKNOWN: break;
-
- case TypeClass_ANY:
- {
- // get Any and convert it
- //Any* pAny = (Any*)aValue.get();
- //if( pAny )
- //unoToSbxValue( pVar, *pAny );
- }
- break;
- */
case TypeClass_BOOLEAN: pVar->PutBool( *(sal_Bool*)aValue.getValue() ); break;
case TypeClass_CHAR:
@@ -957,18 +918,13 @@ void unoToSbxValue( SbxVariable* pVar, const Any& aValue )
case TypeClass_STRING: { ::rtl::OUString val; aValue >>= val; pVar->PutString( String( val ) ); } break;
case TypeClass_FLOAT: { float val = 0; aValue >>= val; pVar->PutSingle( val ); } break;
case TypeClass_DOUBLE: { double val = 0; aValue >>= val; pVar->PutDouble( val ); } break;
- //case TypeClass_OCTET: break;
case TypeClass_BYTE: { sal_Int8 val = 0; aValue >>= val; pVar->PutInteger( val ); } break;
- //case TypeClass_INT: break;
case TypeClass_SHORT: { sal_Int16 val = 0; aValue >>= val; pVar->PutInteger( val ); } break;
case TypeClass_LONG: { sal_Int32 val = 0; aValue >>= val; pVar->PutLong( val ); } break;
case TypeClass_HYPER: { sal_Int64 val = 0; aValue >>= val; pVar->PutInt64( val ); } break;
- //case TypeClass_UNSIGNED_OCTET:break;
case TypeClass_UNSIGNED_SHORT: { sal_uInt16 val = 0; aValue >>= val; pVar->PutUShort( val ); } break;
case TypeClass_UNSIGNED_LONG: { sal_uInt32 val = 0; aValue >>= val; pVar->PutULong( val ); } break;
case TypeClass_UNSIGNED_HYPER: { sal_uInt64 val = 0; aValue >>= val; pVar->PutUInt64( val ); } break;
- //case TypeClass_UNSIGNED_INT: break;
- //case TypeClass_UNSIGNED_BYTE: break;
default: pVar->PutEmpty(); break;
}
}
@@ -979,7 +935,6 @@ Type getUnoTypeForSbxBaseType( SbxDataType eType )
Type aRetType = getCppuVoidType();
switch( eType )
{
- //case SbxEMPTY: eRet = TypeClass_VOID; break;
case SbxNULL: aRetType = ::getCppuType( (const Reference< XInterface > *)0 ); break;
case SbxINTEGER: aRetType = ::getCppuType( (sal_Int16*)0 ); break;
case SbxLONG: aRetType = ::getCppuType( (sal_Int32*)0 ); break;
@@ -995,13 +950,9 @@ Type getUnoTypeForSbxBaseType( SbxDataType eType )
aRetType = ::getCppuType( (oleautomation::Date*)0 );
}
break;
- // case SbxDATE: aRetType = ::getCppuType( (double*)0 ); break;
case SbxSTRING: aRetType = ::getCppuType( (::rtl::OUString*)0 ); break;
- //case SbxOBJECT: break;
- //case SbxERROR: break;
case SbxBOOL: aRetType = ::getCppuType( (sal_Bool*)0 ); break;
case SbxVARIANT: aRetType = ::getCppuType( (Any*)0 ); break;
- //case SbxDATAOBJECT: break;
case SbxCHAR: aRetType = ::getCppuType( (sal_Unicode*)0 ); break;
case SbxBYTE: aRetType = ::getCppuType( (sal_Int8*)0 ); break;
case SbxUSHORT: aRetType = ::getCppuType( (sal_uInt16*)0 ); break;
@@ -1009,15 +960,6 @@ Type getUnoTypeForSbxBaseType( SbxDataType eType )
// map machine-dependent ones on hyper for secureness
case SbxINT: aRetType = ::getCppuType( (sal_Int32*)0 ); break;
case SbxUINT: aRetType = ::getCppuType( (sal_uInt32*)0 ); break;
- //case SbxVOID: break;
- //case SbxHRESULT: break;
- //case SbxPOINTER: break;
- //case SbxDIMARRAY: break;
- //case SbxCARRAY: break;
- //case SbxUSERDEF: break;
- //case SbxLPSTR: break;
- //case SbxLPWSTR: break;
- //case SbxCoreSTRING: break;
default: break;
}
return aRetType;
@@ -1037,8 +979,6 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
SbxBaseRef xObj = (SbxBase*)pVal->GetObject();
if( !xObj )
{
- // #109936 No error any more
- // StarBASIC::Error( SbERR_INVALID_OBJECT );
aRetType = getCppuType( static_cast<Reference<XInterface> *>(0) );
return aRetType;
}
@@ -1072,7 +1012,6 @@ Type getUnoTypeForSbxValue( SbxValue* pVal )
{
if( aType.getTypeClass() == TypeClass_VOID )
{
- // #88522
// if only first element is void: different types -> []any
// if all elements are void: []void is not allowed -> []any
aElementType = getCppuType( (Any*)0 );
@@ -1468,13 +1407,6 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
}
break;
- /* we leave out the following types
- case TypeClass_SERVICE: break;
- case TypeClass_CLASS: break;
- case TypeClass_TYPEDEF: break;
- case TypeClass_UNION: break;
- case TypeClass_ARRAY: break;
- */
case TypeClass_ENUM:
{
@@ -1510,7 +1442,6 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
typelib_typedescription_getByName( &pSeqTD, aClassName.pData );
OSL_ASSERT( pSeqTD );
Type aElemType( ((typelib_IndirectTypeDescription *)pSeqTD)->pType );
- // Reference< XIdlClass > xElementClass = TypeToIdlClass( aElemType );
// convert all array member and register them
sal_Int32 nIdx = nLower;
@@ -1590,10 +1521,6 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
}
break;
- /*
- case TypeClass_VOID: break;
- case TypeClass_UNKNOWN: break;
- */
// Use for Any the class indipendent converting routine
case TypeClass_ANY:
@@ -1617,7 +1544,6 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
case TypeClass_STRING: aRetVal <<= pVar->GetOUString(); break;
case TypeClass_FLOAT: aRetVal <<= pVar->GetSingle(); break;
case TypeClass_DOUBLE: aRetVal <<= pVar->GetDouble(); break;
- //case TypeClass_OCTET: break;
case TypeClass_BYTE:
{
@@ -1640,16 +1566,12 @@ Any sbxToUnoValue( SbxVariable* pVar, const Type& rType, Property* pUnoProperty
aRetVal <<= nByteVal;
break;
}
- //case TypeClass_INT: break;
case TypeClass_SHORT: aRetVal <<= (sal_Int16)( pVar->GetInteger() ); break;
case TypeClass_LONG: aRetVal <<= (sal_Int32)( pVar->GetLong() ); break;
case TypeClass_HYPER: aRetVal <<= (sal_Int64)( pVar->GetInt64() ); break;
- //case TypeClass_UNSIGNED_OCTET:break;
case TypeClass_UNSIGNED_SHORT: aRetVal <<= (sal_uInt16)( pVar->GetUShort() ); break;
case TypeClass_UNSIGNED_LONG: aRetVal <<= (sal_uInt32)( pVar->GetULong() ); break;
case TypeClass_UNSIGNED_HYPER: aRetVal <<= (sal_uInt64)( pVar->GetUInt64() ); break;
- //case TypeClass_UNSIGNED_INT: break;
- //case TypeClass_UNSIGNED_BYTE: break;
default: break;
}
@@ -2377,7 +2299,6 @@ void SbUnoObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
{
const ParamInfo& rInfo = pParamInfos[i];
const Reference< XIdlClass >& rxClass = rInfo.aType;
- //const XIdlClassRef& rxClass = pUnoParams[i];
com::sun::star::uno::Type aType( rxClass->getTypeClass(), rxClass->getName() );
@@ -2494,10 +2415,6 @@ SbUnoObject::SbUnoObject( const String& aName_, const Any& aUnoObj_ )
if( mxInvocation.is() )
{
- // #94670: This is WRONG because then the MaterialHolder doesn't refer
- // to the object implementing XInvocation but to the object passed to
- // the invocation service!!!
- // mxMaterialHolder = Reference< XMaterialHolder >::query( mxInvocation );
// get the ExactName
mxExactNameInvocation = Reference< XExactName >::query( mxInvocation );
@@ -2599,7 +2516,6 @@ void SbUnoObject::doIntrospection( void )
Reference< XInterface > xI = xFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.beans.Introspection")) );
if (xI.is())
xIntrospection = Reference< XIntrospection >::query( xI );
- //xI->queryInterface( ::getCppuType( (const Reference< XIntrospection > *)0 ), xIntrospection );
}
}
if( !xIntrospection.is() )
@@ -2742,7 +2658,6 @@ SbxInfo* SbUnoMethod::GetInfo()
const ParamInfo& rInfo = pParamInfos[i];
::rtl::OUString aParamName = rInfo.aName;
- // const Reference< XIdlClass >& rxClass = rInfo.aType;
SbxDataType t = SbxVARIANT;
sal_uInt16 nFlags_ = SBX_READ;
pInfo->AddParam( aParamName, t, nFlags_ );
@@ -3376,7 +3291,6 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrit
return;
Reference< XInterface > x1;
aAny1 >>= x1;
- //XInterfaceRef x1 = *(XInterfaceRef*)aAny1.get();
SbxVariableRef xParam2 = rPar.Get( 2 );
if( !xParam2->IsObject() )
@@ -3390,7 +3304,6 @@ void RTL_Impl_EqualUnoObjects( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrit
return;
Reference< XInterface > x2;
aAny2 >>= x2;
- //XInterfaceRef x2 = *(XInterfaceRef*)aAny2.get();
if( x1 == x2 )
refVar->PutBool( sal_True );
@@ -4019,8 +3932,6 @@ void SbUnoSingleton::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
//========================================================================
-//========================================================================
-//========================================================================
// Implementation of an EventAttacher-drawn AllListener, which
// solely transmits several events to an general AllListener
@@ -4035,9 +3946,6 @@ public:
BasicAllListener_Impl( const ::rtl::OUString& aPrefixName );
~BasicAllListener_Impl();
- // Methods of XInterface
- //virtual sal_Bool queryInterface( Uik aUik, Reference< XInterface > & rOut );
-
// Methods of XAllListener
virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException );
virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException );
@@ -4465,28 +4373,6 @@ void RTL_Impl_CreateUnoValue( StarBASIC* pBasic, SbxArray& rPar, sal_Bool bWrite
Any aVal = sbxToUnoValueImpl( pVal );
Any aConvertedVal = convertAny( aVal, aDestType );
- /*
- // Convert
- Reference< XTypeConverter > xConverter = getTypeConverter_Impl();
- try
- {
- aConvertedVal = xConverter->convertTo( aVal, aDestType );
- }
- catch( IllegalArgumentException& e1 )
- {
- StarBASIC::Error( ERRCODE_BASIC_EXCEPTION,
- implGetExceptionMsg( ::cppu::getCaughtException() ) );
- return;
- }
- catch( CannotConvertException& e2 )
- {
- String aCannotConvertExceptionName
- ( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.IllegalArgumentException" ) );
- StarBASIC::Error( ERRCODE_BASIC_EXCEPTION,
- implGetExceptionMsg( e2, aCannotConvertExceptionName ) );
- return;
- }
- */
SbxVariableRef refVar = rPar.Get(0);
SbxObjectRef xUnoAnyObject = new SbUnoAnyObject( aConvertedVal );
@@ -4584,14 +4470,11 @@ void SAL_CALL ModuleInvocationProxy::setValue( const ::rtl::OUString& rProperty,
SbxVariableRef xValue = new SbxVariable;
pMeth->SetParameters( xArray );
pMeth->Call( xValue );
- //aRet = sbxToUnoValue( xValue );
pMeth->SetParameters( NULL );
// TODO: OutParameter?
- // throw InvocationTargetException();
- //return aRet;
}
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 4cf888a..c61919f 100755
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -511,7 +511,6 @@ void VBAUnlockDocuments( StarBASIC* pBasic )
}
}
-/////////////////////////////////////////////////////////////////////////////
// A Basic module has set EXTSEARCH, so that the elements, that the modul contains,
// could be found from other module.
@@ -765,8 +764,6 @@ const String& SbModule::GetSource() const
void SbModule::SetParent( SbxObject* p )
{
- // #118083: Assertion is not valid any more
- // DBG_ASSERT( !p || p->IsA( TYPE(StarBASIC) ), "Register SbModules only in BASIC" );
pParent = p;
}
@@ -1123,7 +1120,6 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
#ifdef UNX
struct rlimit rl;
getrlimit ( RLIMIT_STACK, &rl );
- // printf( "RLIMIT_STACK = %ld\n", rl.rlim_cur );
#endif
#if defined LINUX
// Empiric value, 900 = needed bytes/Basic call level
@@ -1269,9 +1265,6 @@ void SbModule::RunInit()
// Set flag, so that RunInit get activ (Testtool)
GetSbData()->bRunInit = sal_True;
- // sal_Bool bDelInst = sal_Bool( pINST == NULL );
- // if( bDelInst )
- // pINST = new SbiInstance( (StarBASIC*) GetParent() );
SbModule* pOldMod = pMOD;
pMOD = this;
// The init code starts always here
@@ -1284,8 +1277,6 @@ void SbModule::RunInit()
pINST->pRun = pRt->pNext;
delete pRt;
pMOD = pOldMod;
- // if( bDelInst )
- // delete pINST, pINST = NULL;
pImage->bInit = sal_True;
pImage->bFirstInit = sal_False;
@@ -1339,24 +1330,12 @@ void SbModule::ClearPrivateVars()
{
SbxVariable* pj = PTR_CAST(SbxVariable,pArray->Get( j ));
pj->SbxValue::Clear();
- /*
- sal_uInt16 nFlags = pj->GetFlags();
- pj->SetFlags( (nFlags | SBX_WRITE) & (~SBX_FIXED) );
- pj->PutEmpty();
- pj->SetFlags( nFlags );
- */
}
}
}
else
{
p->SbxValue::Clear();
- /*
- sal_uInt16 nFlags = p->GetFlags();
- p->SetFlags( (nFlags | SBX_WRITE) & (~SBX_FIXED) );
- p->PutEmpty();
- p->SetFlags( nFlags );
- */
}
}
}
@@ -1825,7 +1804,6 @@ sal_Bool SbModule::StoreBinaryData( SvStream& rStrm, sal_uInt16 nVer )
}
// Called for >= OO 1.0 passwd protected libraries only
-//
sal_Bool SbModule::LoadBinaryData( SvStream& rStrm )
{
@@ -1948,7 +1926,6 @@ void SbModule::handleProcedureProperties( SfxBroadcaster& rBC, const SfxHint& rH
}
-/////////////////////////////////////////////////////////////////////////
// Implementation SbJScriptModule (Basic-Modul fuer JavaScript-Sourcen)
SbJScriptModule::SbJScriptModule( const String& rName )
:SbModule( rName )
@@ -1967,7 +1944,6 @@ sal_Bool SbJScriptModule::LoadData( SvStream& rStrm, sal_uInt16 nVer )
String aTmp;
rStrm.ReadByteString( aTmp, gsl_getSystemTextEncoding() );
aOUSource = aTmp;
- //rStrm >> aSource;
return sal_True;
}
@@ -1979,7 +1955,6 @@ sal_Bool SbJScriptModule::StoreData( SvStream& rStrm ) const
// Write the source string
String aTmp = aOUSource;
rStrm.WriteByteString( aTmp, gsl_getSystemTextEncoding() );
- //rStrm << aSource;
return sal_True;
}
@@ -1996,7 +1971,7 @@ SbMethod::SbMethod( const String& r, SbxDataType t, SbModule* p )
nLine2 = 0;
refStatics = new SbxArray;
mCaller = 0;
- // From: 1996-07.02: HACK due to 'Referenz could not be saved'
+ // HACK due to 'Referenz could not be saved'
SetFlag( SBX_NO_MODIFY );
}
@@ -2043,10 +2018,9 @@ sal_Bool SbMethod::LoadData( SvStream& rStrm, sal_uInt16 nVer )
sal_Int16 n;
rStrm >> n;
sal_Int16 nTempStart = (sal_Int16)nStart;
- // nDebugFlags = n; // From 1996-01-16: no longer take over
if( nVer == 2 )
rStrm >> nLine1 >> nLine2 >> nTempStart >> bInvalid;
- // From: 1996-07-02: HACK ue to 'Referenz could not be saved'
+ // HACK ue to 'Referenz could not be saved'
SetFlag( SBX_NO_MODIFY );
nStart = nTempStart;
return sal_True;
@@ -2077,7 +2051,7 @@ SbxInfo* SbMethod::GetInfo()
}
// Interface to execute a method of the applications
-// #34191# With special RefCounting, damit so that the Basic was not fired of by CloseDocument()
+// With special RefCounting, so that the Basic was not fired of by CloseDocument()
// The return value will be delivered as string.
ErrCode SbMethod::Call( SbxValue* pRet, SbxVariable* pCaller )
{
@@ -2160,7 +2134,6 @@ void SbMethod::Broadcast( sal_uIntPtr nHintId )
}
}
-/////////////////////////////////////////////////////////////////////////
// Implementation of SbJScriptMethod (method class as a wrapper for JavaScript-functions)
@@ -2173,7 +2146,6 @@ SbJScriptMethod::~SbJScriptMethod()
{}
-/////////////////////////////////////////////////////////////////////////
SbObjModule::SbObjModule( const String& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible )
: SbModule( rName, bIsVbaCompatible )
{
@@ -2217,7 +2189,6 @@ SbObjModule::GetObject()
SbxVariable*
SbObjModule::Find( const XubString& rName, SbxClassType t )
{
- //OSL_TRACE("SbObjectModule find for %s", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr() );
SbxVariable* pVar = NULL;
if ( pDocObject)
pVar = pDocObject->Find( rName, t );
@@ -2718,7 +2689,6 @@ SbUserFormModule::Find( const XubString& rName, SbxClassType t )
InitObject();
return SbObjModule::Find( rName, t );
}
-/////////////////////////////////////////////////////////////////////////
SbProperty::SbProperty( const String& r, SbxDataType t, SbModule* p )
: SbxProperty( r, t ), pMod( p )
@@ -2729,7 +2699,6 @@ SbProperty::SbProperty( const String& r, SbxDataType t, SbModule* p )
SbProperty::~SbProperty()
{}
-/////////////////////////////////////////////////////////////////////////
SbProcedureProperty::~SbProcedureProperty()
{}
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index ba2430c..edbbcc4 100755
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -255,7 +255,6 @@ void SbiCodeGen::Save()
{
pMeth = rMod.GetMethod( aProcName, pProc->GetType() );
- // #110004
if( !pProc->IsPublic() )
pMeth->SetFlag( SBX_PRIVATE );
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 932cb25..8fae1a4 100755
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -293,7 +293,7 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
SbiSymDef* pDef;
SbiDimList* pDim;
- // From 1997-07-09, #40689, Statics -> Modul-Initialising, skip in Sub
+ // #40689, Statics -> Modul-Initialising, skip in Sub
sal_uInt32 nEndOfStaticLbl = 0;
if( !bVBASupportOn && bStatic )
{
@@ -309,7 +309,7 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
if( bSwitchPool )
pPool = &aGlobals;
SbiSymDef* pOld = pPool->Find( pDef->GetName() );
- // From 1996-03-31, #25651#, search also in the Runtime-Library
+ // search also in the Runtime-Library
sal_Bool bRtlSym = sal_False;
if( !pOld )
{
@@ -362,7 +362,7 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
case SbGLOBAL: eOp2 = bPersistantGlobal ? _GLOBAL_P : _GLOBAL;
goto global;
case SbPUBLIC: eOp2 = bPersistantGlobal ? _PUBLIC_P : _PUBLIC;
- // From 1997-07-09, #40689, no own Opcode anymore
+ // #40689, no own Opcode anymore
if( bVBASupportOn && bStatic )
{
eOp2 = _STATIC;
@@ -450,7 +450,7 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
}
SbiExpression aVar( this, *pDef );
if( !TestToken( EQ ) )
- goto MyBreak; // From 1996-06-24 (see below)
+ goto MyBreak; // (see below)
SbiConstExpression aExpr( this );
if( !bDefined && aExpr.IsValid() )
{
@@ -501,9 +501,8 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
}
}
if( !TestComma() )
- goto MyBreak; // From 1996-06-24 (see below)
+ goto MyBreak;
- // #27963# From 1996-06-24
// Implementation of bSwitchPool (see above): pPool must not be set to &aGlobals
// at the VarDecl-Call.
// Apart from that the behavior should be absolutely identical,
@@ -516,7 +515,7 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
break;
}
- // From 1997-07-09, #40689, finalize the jump over statics declarations
+ // #40689, finalize the jump over statics declarations
if( !bVBASupportOn && bStatic )
{
// maintain the global chain
@@ -527,7 +526,6 @@ void SbiParser::DefVar( SbiOpcode eOp, sal_Bool bStatic )
aGen.BackChain( nEndOfStaticLbl );
}
- //pPool = pOldPool;
}
// Here were Arrays redimensioned.
@@ -936,9 +934,6 @@ SbiProcDef* SbiParser::ProcDecl( sal_Bool bDecl )
TypeDecl( *pDef );
if( eType != SbxVARIANT && pDef->GetType() != eType )
Error( SbERR_BAD_DECLARATION, aName );
-// if( pDef->GetType() == SbxOBJECT )
-// pDef->SetType( SbxVARIANT ),
-// Error( SbERR_SYNTAX );
if( pDef->GetType() == SbxVARIANT && !( bFunc || bProp ) )
pDef->SetType( SbxEMPTY );
return pDef;
diff --git a/basic/source/comp/exprgen.cxx b/basic/source/comp/exprgen.cxx
index 4ff8417..99855d6 100755
--- a/basic/source/comp/exprgen.cxx
+++ b/basic/source/comp/exprgen.cxx
@@ -109,7 +109,7 @@ void SbiExprNode::Gen( RecursiveMode eRecMode )
eOp = aVar.pDef->IsGlobal() ? _FIND_G : _FIND;
}
}
- // From 1995-12-17, special treatment for WITH
+ // special treatment for WITH
else if( (pWithParent_ = GetWithParent()) != NULL )
{
eOp = _ELEM; // .-Term in in WITH
@@ -207,9 +207,9 @@ void SbiExprList::Gen()
if( pFirst )
{
pParser->aGen.Gen( _ARGC );
- // From 1996-01-10: Type adjustment at DECLARE
- sal_uInt16 nCount = 1 /*, nParAnz = 0*/;
-// SbiSymPool* pPool = NULL;
+ // Type adjustment at DECLARE
+ sal_uInt16 nCount = 1;
+
for( SbiExpression* pExpr = pFirst; pExpr; pExpr = pExpr->pNext,nCount++ )
{
pExpr->Gen();
@@ -254,7 +254,7 @@ void SbiExprList::Gen()
void SbiExpression::Gen( RecursiveMode eRecMode )
{
- // From 1995-12-17, special treatment for WITH
+ // special treatment for WITH
// If pExpr == .-term in With, approximately Gen for Basis-Object
pExpr->Gen( eRecMode );
if( bByVal )
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index ff171ee..61bc6fa 100755
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -35,7 +35,6 @@
#include "sbcomp.hxx"
#include "expr.hxx"
-//////////////////////////////////////////////////////////////////////////
SbiExprNode::SbiExprNode( void )
{
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index 6554cf2..6191808 100755
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -407,13 +407,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
bError = sal_True;
}
}
- /* #118410 Allow type for Class methods and RTL object, e.g. RTL.Chr$(97)
- else
- {
- if( pParser->GetType() != SbxVARIANT )
- pParser->Error( SbERR_SYNTAX ), bError = sal_True;
- }
- */
+
if( bError )
return NULL;
@@ -473,7 +467,6 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
// Falls wir etwas mit Punkt einscannen, muss der
// Typ SbxOBJECT sein
- // AB, 3.1.96
// Es kann sein, dass pDef ein Objekt beschreibt, das bisher
// nur als SbxVARIANT erkannt wurde, dann Typ von pDef aendern
if( pDef->GetType() == SbxVARIANT )
@@ -918,7 +911,6 @@ SbiConstExpression::SbiConstExpression( SbiParser* p ) : SbiExpression( p )
// Ist es eine sal_Bool-Konstante?
sal_Bool bBoolVal = sal_False;
if( pVarDef->GetName().EqualsIgnoreCaseAscii( "true" ) )
- //if( pVarDef->GetName().ICompare( "true" ) == COMPARE_EQUAL )
{
bIsBool = sal_True;
bBoolVal = sal_True;
@@ -1074,8 +1066,6 @@ SbiParameters::SbiParameters( SbiParser* p, sal_Bool bStandaloneExpression, sal_
if( eTok == COMMA )
{
pExpr = new SbiExpression( pParser, 0, SbxEMPTY );
- //if( bConst )
- // pParser->Error( SbERR_SYNTAX ), bError = sal_True;
}
// Benannte Argumente: entweder .name= oder name:=
else
@@ -1122,8 +1112,6 @@ SbiParameters::SbiParameters( SbiParser* p, sal_Bool bStandaloneExpression, sal_
if( bByVal && pExpr->IsLvalue() )
pExpr->SetByVal();
- //pExpr = bConst ? new SbiConstExpression( pParser )
- // : new SbiExpression( pParser );
if( !bAssumeArrayMode )
{
if( pParser->Peek() == ASSIGN )
@@ -1134,8 +1122,6 @@ SbiParameters::SbiParameters( SbiParser* p, sal_Bool bStandaloneExpression, sal_
delete pExpr;
pParser->Next();
pExpr = new SbiExpression( pParser );
- //if( bConst )
- // pParser->Error( SbERR_SYNTAX ), bError = sal_True;
}
pExpr->GetName() = aName;
}
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 239772a..0fea281 100755
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -145,27 +145,7 @@ void SbiParser::Line()
void SbiParser::LineInput()
{
Channel( sal_True );
- // sal_Bool bChan = Channel( sal_True );
SbiExpression* pExpr = new SbiExpression( this, SbOPERAND );
- /* AB 15.1.96: Keinen allgemeinen Ausdruck mehr zulassen
- SbiExpression* pExpr = new SbiExpression( this );
- if( !pExpr->IsVariable() )
- {
- SbiToken eTok = Peek();
- if( eTok == COMMA || eTok == SEMICOLON ) Next();
- else Error( SbERR_EXPECTED, COMMA );
- // mit Prompt
- if( !bChan )
- {
- pExpr->Gen();
- aGen.Gen( _PROMPT );
- }
- else
- Error( SbERR_VAR_EXPECTED );
- delete pExpr;
- pExpr = new SbiExpression( this, SbOPERAND );
- }
- */
if( !pExpr->IsVariable() )
Error( SbERR_VAR_EXPECTED );
if( pExpr->GetType() != SbxVARIANT && pExpr->GetType() != SbxSTRING )
@@ -182,13 +162,7 @@ void SbiParser::Input()
{
aGen.Gen( _RESTART );
Channel( sal_True );
- // sal_Bool bChan = Channel( sal_True );
SbiExpression* pExpr = new SbiExpression( this, SbOPERAND );
- /* ALT: Jetzt keinen allgemeinen Ausdruck mehr zulassen
- SbiExpression* pExpr = new SbiExpression( this );
- ...
- siehe LineInput
- */
while( !bAbort )
{
if( !pExpr->IsVariable() )
@@ -235,7 +209,7 @@ void SbiParser::Open()
{
Next();
eTok = Next();
- // #27964# Nur STREAM_READ,STREAM_WRITE-Flags in nMode beeinflussen
+ // Nur STREAM_READ,STREAM_WRITE-Flags in nMode beeinflussen
nMode &= ~(STREAM_READ | STREAM_WRITE); // loeschen
if( eTok == READ )
{
diff --git a/basic/source/comp/loops.cxx b/basic/source/comp/loops.cxx
index b5b13ce..e8ad5bb 100755
--- a/basic/source/comp/loops.cxx
+++ b/basic/source/comp/loops.cxx
@@ -43,7 +43,7 @@ void SbiParser::If()
TestToken( THEN );
if( IsEoln( Next() ) )
{
- // AB 13.5.1996: #27720# Am Ende jeden Blocks muss ein Jump zu ENDIF
+ // Am Ende jeden Blocks muss ein Jump zu ENDIF
// eingefuegt werden, damit bei ELSEIF nicht erneut die Bedingung
// ausgewertet wird. Die Tabelle nimmt alle Absprungstellen auf.
#define JMP_TABLE_SIZE 100
@@ -62,10 +62,9 @@ void SbiParser::If()
Error( SbERR_BAD_BLOCK, IF ); bAbort = sal_True; return;
}
}
- // ELSEIF?
while( eTok == ELSEIF )
{
- // #27720# Bei erfolgreichem IF/ELSEIF auf ENDIF springen
+ // Bei erfolgreichem IF/ELSEIF auf ENDIF springen
if( iJmp >= JMP_TABLE_SIZE )
{
Error( SbERR_PROG_TOO_LARGE ); bAbort = sal_True; return;
@@ -105,7 +104,7 @@ void SbiParser::If()
else if( eTok == ENDIF )
Next();
- // #27720# Jmp-Tabelle abarbeiten
+ // Jmp-Tabelle abarbeiten
while( iJmp > 0 )
{
iJmp--;
@@ -473,7 +472,6 @@ void SbiParser::On()
SbiToken eTok = Peek();
String aString = SbiTokenizer::Symbol(eTok);
if (aString.EqualsIgnoreCaseAscii("ERROR"))
- //if (!aString.ICompare("ERROR"))
eTok = _ERROR_; // Error kommt als SYMBOL
if( eTok != _ERROR_ && eTok != LOCAL ) OnGoto();
else
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 39aacd7..a606a1a 100755
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -195,7 +195,6 @@ sal_Bool SbiParser::HasGlobalCode()
{
aGen.BackChain( nGblChain );
aGen.Gen( _LEAVE );
- // aGen.Gen( _STOP );
nGblChain = 0;
}
return bGblDefs;
@@ -515,7 +514,6 @@ void SbiParser::Symbol( const KeywordSymbolInfo* pKeywordSymbolInfo )
if( aRtlName.EqualsIgnoreCaseAscii("Mid") )
{
SbiExprNode* pExprNode = aVar.GetExprNode();
- // SbiNodeType eNodeType;
if( pExprNode && pExprNode->GetNodeType() == SbxVARVAL )
{
SbiExprList* pPar = pExprNode->GetParameters();
@@ -549,7 +547,6 @@ void SbiParser::Symbol( const KeywordSymbolInfo* pKeywordSymbolInfo )
SbiExpression aExpr( this );
aExpr.Gen();
SbiOpcode eOp = _PUT;
- // SbiSymDef* pDef = aVar.GetRealVar();
if( pDef )
{
if( pDef->GetConstDef() )
@@ -612,7 +609,6 @@ void SbiParser::Set()
TypeDecl( *pTypeDef, sal_True );
aLvalue.Gen();
- // aGen.Gen( _CLASS, pDef->GetTypeId() | 0x8000 );
aGen.Gen( _CREATE, pDef->GetId(), pTypeDef->GetTypeId() );
aGen.Gen( _SETCLASS, pDef->GetTypeId() );
}
@@ -641,7 +637,6 @@ void SbiParser::Set()
aGen.Gen( _SET );
}
}
- // aGen.Gen( _SET );
}
// JSM 07.10.95
@@ -695,7 +690,6 @@ void SbiParser::DefXXX()
else
{
ch2 = aSym.ToUpperAscii().GetBuffer()[0];
- //ch2 = aSym.Upper();
if( ch2 < ch1 ) Error( SbERR_SYNTAX ), ch2 = 0;
}
}
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index cc761a2..fac945f 100755
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -319,8 +319,6 @@ sal_Bool SbiScanner::NextSym()
{
pLine++; nCol++; continue;
}
-// if( toupper( *pLine ) == 'D' )
-// eScanType = SbxDOUBLE;
*p++ = 'E'; pLine++; nCol++;
// Vorzeichen hinter Exponent?
if( *pLine == '+' )
@@ -345,7 +343,6 @@ sal_Bool SbiScanner::NextSym()
// #57844 Lokalisierte Funktion benutzen
nVal = rtl_math_uStringToDouble( buf, buf+(p-buf), '.', ',', NULL, NULL );
- // ALT: nVal = atof( buf );
ndig = ndig - comma;
if( !comma && !exp )
@@ -358,12 +355,6 @@ sal_Bool SbiScanner::NextSym()
}
if( bBufOverflow )
GenError( SbERR_MATH_OVERFLOW );
- // zu viele Zahlen fuer SINGLE?
-// if (ndig > 15 || ncdig > 6)
-// eScanType = SbxDOUBLE;
-// else
-// if( nVal > SbxMAXSNG || nVal < SbxMINSNG )
-// eScanType = SbxDOUBLE;
// Typkennung?
SbxDataType t = GetSuffixType( *pLine );
@@ -382,7 +373,6 @@ sal_Bool SbiScanner::NextSym()
sal_Unicode cmp1[] = { '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F', 0 };
sal_Unicode cmp2[] = { '0', '1', '2', '3', '4', '5', '6', '7', 0 };
sal_Unicode *cmp = cmp1;
- //char *cmp = "0123456789ABCDEF";
sal_Unicode base = 16;
sal_Unicode ndig = 8;
sal_Unicode xch = *pLine++ & 0xFF; nCol++;
@@ -390,7 +380,6 @@ sal_Bool SbiScanner::NextSym()
{
case 'O':
cmp = cmp2; base = 8; ndig = 11; break;
- //cmp = "01234567"; base = 8; ndig = 11; break;
case 'H':
break;
default :
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 7799c39..b069512 100755
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -400,7 +400,6 @@ SbiSymScope SbiSymDef::GetScope() const
return pIn ? pIn->GetScope() : SbLOCAL;
}
-////////////////////////////////////////////////////////////////////////////
// Die Prozedur-Definition hat drei Pools:
// 1) aParams: wird durch die Definition gefuellt. Enthaelt die Namen
@@ -510,7 +509,6 @@ void SbiProcDef::setPropertyMode( PropertyMode ePropMode )
}
-//////////////////////////////////////////////////////////////////////////
SbiConstDef::SbiConstDef( const String& rName )
: SbiSymDef( rName )
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index 597b7e2..89b6eb2 100755
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -193,168 +193,6 @@ static TokenTable aTokTable_Basic [] = { // Token-Tabelle:
{ NIL, "" }
};
-/*
-TokenTable aTokTable_Java [] = { // Token-Tabelle:
-
- { JS_LOG_NOT, "!" },
- { JS_NE, "!=" },
- { JS_MOD, "%" },
- { JS_ASS_MOD, "%=" },
- { JS_BIT_AND, "&" },
- { JS_LOG_AND, "&&" },
- { JS_ASS_AND, "&=" },
- { JS_LPAREN, "(" },
- { JS_RPAREN, ")" },
- { JS_MUL, "*" },
- { JS_ASS_MUL, "*=" },
- { JS_PLUS, "+" },
- { JS_INC, "++" },
- { JS_ASS_PLUS, "+=" },
- { JS_COMMA, "," },
- { JS_MINUS, "-" },
- { JS_DEC, "--" },
- { JS_ASS_MINUS, "-=" },
- { JS_DIV, "/" },
- { JS_ASS_DIV, "/=" },
- { JS_COND_SEL, ":" },
- { JS_LT, "<" },
- { JS_LSHIFT, "<<" },
- { JS_ASS_LSHIFT,"<<=" },
- { JS_LE, "<=" },
- { JS_NE, "<>" },
- { JS_ASSIGNMENT,"=" },
- { JS_EQ, "==" },
- { JS_GT, ">" },
- { JS_RSHIFT, ">>" },
- { JS_ASS_RSHIFT,">>=" },
- { JS_RSHIFT_Z, ">>>" },
- { JS_ASS_RSHIFT_Z,">>>=" },
- { JS_GE, ">=" },
- { JS_COND_QUEST,"?" },
- { ACCESS, "Access" },
- { ALIAS, "Alias" },
- { AND, "And" },
- { ANY, "Any" },
- { APPEND, "Append" },
- { AS, "As" },
- { BASE, "Base" },
- { BINARY, "Binary" },
- { TBOOLEAN, "Boolean" },
- { BYVAL, "ByVal", },
- { CALL, "Call" },
- { CASE, "Case" },
- { _CDECL_, "Cdecl" },
- { CLOSE, "Close" },
- { COMPARE, "Compare" },
- { _CONST_, "Const" },
- { TCURRENCY,"Currency" },
- { TDATE, "Date" },
- { DECLARE, "Declare" },
- { DEFBOOL, "DefBool" },
- { DEFCUR, "DefCur" },
- { DEFDATE, "DefDate" },
- { DEFDBL, "DefDbl" },
- { DEFERR, "DefErr" },
- { DEFINT, "DefInt" },
- { DEFLNG, "DefLng" },
- { DEFOBJ, "DefObj" },
- { DEFSNG, "DefSng" },
- { DEFSTR, "DefStr" },
- { DEFVAR, "DefVar" },
- { DIM, "Dim" },
- { DO, "Do" },
- { TDOUBLE, "Double" },
- { EACH, "Each" },
- { ELSE, "Else" },
- { ELSEIF, "ElseIf" },
- { END, "End" },
- { ENDFUNC, "End Function" },
- { ENDIF, "End If" },
- { ENDSELECT,"End Select" },
- { ENDSUB, "End Sub" },
- { ENDTYPE, "End Type" },
- { ENDIF, "EndIf" },
- { EQV, "Eqv" },
- { ERASE, "Erase" },
- { _ERROR_, "Error" },
- { EXIT, "Exit" },
- { EXPLICIT, "Explicit" },
- { FOR, "For" },
- { FUNCTION, "Function" },
- { GLOBAL, "Global" },
- { GOSUB, "GoSub" },
- { GOTO, "GoTo" },
- { IF, "If" },
- { IMP, "Imp" },
- { _IN_, "In" },
- { INPUT, "Input" }, // auch INPUT #
- { TINTEGER, "Integer" },
- { IS, "Is" },
- { LET, "Let" },
- { LIB, "Lib" },
- { LINE, "Line" },
- { LINEINPUT,"Line Input" },
- { LOCAL, "Local" },
- { LOCK, "Lock" },
- { TLONG, "Long" },
- { LOOP, "Loop" },
- { LPRINT, "LPrint" },
- { LSET, "LSet" }, // JSM
- { MOD, "Mod" },
- { NAME, "Name" },
- { NEW, "New" },
- { NEXT, "Next" },
- { NOT, "Not" },
- { TOBJECT, "Object" },
- { ON, "On" },
- { OPEN, "Open" },
- { OPTION, "Option" },
- { _OPTIONAL_, "Optional" },
- { OR, "Or" },
- { OUTPUT, "Output" },
- { PRESERVE, "Preserve" },
- { PRINT, "Print" },
- { PRIVATE, "Private" },
- { PUBLIC, "Public" },
- { RANDOM, "Random" },
- { READ, "Read" },
- { REDIM, "ReDim" },
- { REM, "Rem" },
- { RESUME, "Resume" },
- { RETURN, "Return" },
- { RSET, "RSet" }, // JSM
- { SELECT, "Select" },
- { SET, "Set" },
- { SHARED, "Shared" },
- { TSINGLE, "Single" },
- { STATIC, "Static" },
- { STEP, "Step" },
- { STOP, "Stop" },
- { TSTRING, "String" },
- { SUB, "Sub" },
- { STOP, "System" },
- { TEXT, "Text" },
- { THEN, "Then" },
- { TO, "To", },
- { TYPE, "Type" },
- { UNTIL, "Until" },
- { TVARIANT, "Variant" },
- { WEND, "Wend" },
- { WHILE, "While" },
- { WITH, "With" },
- { WRITE, "Write" }, // auch WRITE #
- { XOR, "Xor" },
- { JS_LINDEX, "[" },
- { JS_RINDEX, "]" },
- { JS_BIT_XOR, "^" },
- { JS_ASS_XOR, "^=" },
- { JS_BIT_OR, "|" },
- { JS_ASS_OR, "|=" },
- { JS_LOG_OR, "||" },
- { JS_BIT_NOT, "~" },
- { NIL }
-};
-*/
// #i109076
TokenLabelInfo::TokenLabelInfo( void )
@@ -385,8 +223,6 @@ SbiTokenizer::SbiTokenizer( const ::rtl::OUString& rSrc, StarBASIC* pb )
: SbiScanner( rSrc, pb )
{
pTokTable = aTokTable_Basic;
- //if( StarBASIC::GetGlobalLanguageMode() == SB_LANG_JAVASCRIPT )
- // pTokTable = aTokTable_Java;
TokenTable *tp;
bEof = bAs = sal_False;
eCurTok = NIL;
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index e20cfb3..f1ff769 100755
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -168,7 +168,6 @@ class SvStream;
// sal_uInt16 Anzahl Objekte
// .... Objektdaten
-////////////////////////////////////////////////////////////////////////////
// Service-Routinen (in IMAGE.CXX)
diff --git a/basic/source/inc/image.hxx b/basic/source/inc/image.hxx
index 0b42098..e9c76fd 100755
--- a/basic/source/inc/image.hxx
+++ b/basic/source/inc/image.hxx
@@ -87,7 +87,6 @@ public:
::rtl::OUString& GetSource32() { return aOUSource; }
sal_uInt16 GetBase() const { return nDimBase; }
String GetString( short nId ) const;
- //const char* GetString( short nId ) const;
const SbxObject* FindType (String aTypeName) const;
SbxArrayRef GetEnums() { return rEnums; }
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 32dd7c3..bd6c465 100755
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -66,10 +66,6 @@ class AsciiEncoder
{
public:
static ::rtl::OUString decodeUnoUrlParamValue(const rtl::OUString & rSource);
- //static ::rtl::OUString encodeUnoUrlParamValue(const rtl::OUString & rSource);
- //static ::rtl::ByteSequence decode(const ::rtl::OUString & string);
- //static ::rtl::OUString encode(const ::rtl::ByteSequence & bytes);
- //static void test();
};
}
@@ -244,7 +240,7 @@ public:
sal_uInt32 GetStdTimeIdx() const { return nStdTimeIdx; }
sal_uInt32 GetStdDateTimeIdx() const { return nStdDateTimeIdx; }
- // #39629# NumberFormatter auch statisch anbieten
+ // NumberFormatter auch statisch anbieten
static void PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
sal_uInt32 &rnStdDateIdx, sal_uInt32 &rnStdTimeIdx, sal_uInt32 &rnStdDateTimeIdx,
LanguageType* peFormatterLangType=NULL, DateFormat* peFormatterDateFormat=NULL );
@@ -380,7 +376,6 @@ class SbiRuntime
// #56204 DIM-Funktionalitaet in Hilfsmethode auslagern (step0.cxx)
void DimImpl( SbxVariableRef refVar );
- // #115829
bool implIsClass( SbxObject* pObj, const String& aClass );
void StepSETCLASS_impl( sal_uInt32 nOp1, bool bHandleDflt = false );
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 791c732..daa614d 100755
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -172,7 +172,6 @@ public:
: SbxObject( aName_ )
, m_xClass( xClass_ )
{}
- //~SbUnoClass();
// Find ueberladen, um Elemente on Demand anzulegen
virtual SbxVariable* Find( const String&, SbxClassType );
@@ -180,7 +179,6 @@ public:
// Wert rausgeben
const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >& getUnoClass( void ) { return m_xClass; }
- //void SFX_NOTIFY( SfxBroadcaster&, const TypeId&, const SfxHint& rHint, const TypeId& );
};
SV_DECL_IMPL_REF(SbUnoClass);
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 8e2bb5d..5be485e 100755
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -45,7 +45,6 @@ class SbiParser;
enum SbiSymScope { SbLOCAL, SbPARAM, SbPUBLIC, SbGLOBAL, SbRTL };
-///////////////////////////////////////////////////////////////////////////
// Der String-Pool nimmt String-Eintraege auf und sorgt dafuer,
// dass sie nicht doppelt vorkommen.
@@ -68,7 +67,6 @@ public:
SbiParser* GetParser() { return pParser; }
};
-///////////////////////////////////////////////////////////////////////////
SV_DECL_PTRARR_DEL(SbiSymbols,SbiSymDef*,5,5)
@@ -109,7 +107,6 @@ public:
void CheckRefs(); // offene Referenzen suchen
};
-///////////////////////////////////////////////////////////////////////////
class SbiSymDef { // Allgemeiner Symboleintrag
friend class SbiSymPool;
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index ae45621..91616a3 100755
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -152,7 +152,6 @@ IMPL_LINK_INLINE_END( SvRTLInputBox, CancelHdl, Button *, pButton )
// *********************************************************************
// *********************************************************************
-// *********************************************************************
// Syntax: String InputBox( Prompt, [Title], [Default] [, nXpos, nYpos ] )
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index a295abc..940395c 100755
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -139,7 +139,6 @@ IMPL_LINK_INLINE_START( SbiInputDialog, Cancel, Window *, pWindow )
}
IMPL_LINK_INLINE_END( SbiInputDialog, Cancel, Window *, pWindow )
-//////////////////////////////////////////////////////////////////////////
SbiStream::SbiStream()
: pStrm( 0 )
@@ -451,40 +450,6 @@ public:
virtual void SetSize( sal_uIntPtr nSize );
};
-/*
-sal_uIntPtr UCBErrorToSvStramError( ucb::IOErrorCode nError )
-{
- sal_uIntPtr eReturn = ERRCODE_IO_GENERAL;
- switch( nError )
- {
- case ucb::IOErrorCode_ABORT: eReturn = SVSTREAM_GENERALERROR; break;
- case ucb::IOErrorCode_NOT_EXISTING: eReturn = SVSTREAM_FILE_NOT_FOUND; break;
- case ucb::IOErrorCode_NOT_EXISTING_PATH: eReturn = SVSTREAM_PATH_NOT_FOUND; break;
- case ucb::IOErrorCode_OUT_OF_FILE_HANDLES: eReturn = SVSTREAM_TOO_MANY_OPEN_FILES; break;
- case ucb::IOErrorCode_ACCESS_DENIED: eReturn = SVSTREAM_ACCESS_DENIED; break;
- case ucb::IOErrorCode_LOCKING_VIOLATION: eReturn = SVSTREAM_SHARING_VIOLATION; break;
-
- case ucb::IOErrorCode_INVALID_ACCESS: eReturn = SVSTREAM_INVALID_ACCESS; break;
- case ucb::IOErrorCode_CANT_CREATE: eReturn = SVSTREAM_CANNOT_MAKE; break;
- case ucb::IOErrorCode_INVALID_PARAMETER: eReturn = SVSTREAM_INVALID_PARAMETER; break;
-
- case ucb::IOErrorCode_CANT_READ: eReturn = SVSTREAM_READ_ERROR; break;
- case ucb::IOErrorCode_CANT_WRITE: eReturn = SVSTREAM_WRITE_ERROR; break;
- case ucb::IOErrorCode_CANT_SEEK: eReturn = SVSTREAM_SEEK_ERROR; break;
- case ucb::IOErrorCode_CANT_TELL: eReturn = SVSTREAM_TELL_ERROR; break;
-
- case ucb::IOErrorCode_OUT_OF_MEMORY: eReturn = SVSTREAM_OUTOFMEMORY; break;
-
- case SVSTREAM_FILEFORMAT_ERROR: eReturn = SVSTREAM_FILEFORMAT_ERROR; break;
- case ucb::IOErrorCode_WRONG_VERSION: eReturn = SVSTREAM_WRONGVERSION;
- case ucb::IOErrorCode_OUT_OF_DISK_SPACE: eReturn = SVSTREAM_DISK_FULL; break;
-
- case ucb::IOErrorCode_BAD_CRC: eReturn = ERRCODE_IO_BADCRC; break;
- }
- return eReturn;
-}
-*/
-
UCBStream::UCBStream( Reference< XInputStream > & rStm )
: xIS( rStm )
, xSeek( rStm, UNO_QUERY )
@@ -674,9 +639,6 @@ SbError SbiStream::Open
{
Reference< XStream > xIS = xSFI->openFileReadWrite( aNameStr );
pStrm = new UCBStream( xIS );
- // Open for writing is not implemented in ucb yet!!!
- //Reference< XOutputStream > xIS = xSFI->openFileWrite( aNameStr );
- //pStrm = new UCBStream( xIS );
}
else //if( nStrmMode & STREAM_READ )
{
@@ -815,7 +777,6 @@ SbError SbiStream::Write( const ByteString& rBuf, sal_uInt16 n )
return nError;
}
-//////////////////////////////////////////////////////////////////////////
// Zugriff auf das aktuelle I/O-System:
@@ -825,7 +786,6 @@ SbiIoSystem* SbGetIoSystem()
return pInst ? pInst->GetIoSystem() : NULL;
}
-//////////////////////////////////////////////////////////////////////////
SbiIoSystem::SbiIoSystem()
{
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index ead771b..8d144a6 100755
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -419,7 +419,6 @@ RTLFUNC(CurDir)
// DirEntry-Funktionalitaet keine Moeglichkeit besteht, das aktuelle so
// zu ermitteln, dass eine virtuelle URL geliefert werden koennte.
-// rPar.Get(0)->PutEmpty();
#if defined (WNT) || defined (OS2)
int nCurDir = 0; // Current dir // JSM
if ( rPar.Count() == 2 )
@@ -600,7 +599,6 @@ RTLFUNC(FileCopy) // JSM
{
String aSource = rPar.Get(1)->GetString();
String aDest = rPar.Get(2)->GetString();
- // <-- UCB
if( hasUno() )
{
com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
@@ -617,7 +615,6 @@ RTLFUNC(FileCopy) // JSM
}
}
else
- // --> UCB
{
#ifdef _OLD_FILE_IMPL
DirEntry aSourceDirEntry(aSource);
@@ -651,7 +648,6 @@ RTLFUNC(Kill) // JSM
{
String aFileSpec = rPar.Get(1)->GetString();
- // <-- UCB
if( hasUno() )
{
com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
@@ -674,7 +670,6 @@ RTLFUNC(Kill) // JSM
}
}
else
- // --> UCB
{
#ifdef _OLD_FILE_IMPL
if(DirEntry(aFileSpec).Kill() != FSYS_ERR_OK)
@@ -698,7 +693,6 @@ RTLFUNC(MkDir) // JSM
{
String aPath = rPar.Get(1)->GetString();
- // <-- UCB
if( hasUno() )
{
com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
@@ -745,7 +739,6 @@ RTLFUNC(MkDir) // JSM
}
}
else
- // --> UCB
{
#ifdef _OLD_FILE_IMPL
if (!DirEntry(aPath).MakeDir())
@@ -829,7 +822,6 @@ RTLFUNC(RmDir) // JSM
if (rPar.Count() == 2)
{
String aPath = rPar.Get(1)->GetString();
- // <-- UCB
if( hasUno() )
{
com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
@@ -864,7 +856,6 @@ RTLFUNC(RmDir) // JSM
}
}
else
- // --> UCB
{
#ifdef _OLD_FILE_IMPL
DirEntry aDirEntry(aPath);
@@ -916,7 +907,6 @@ RTLFUNC(FileLen)
SbxVariableRef pArg = rPar.Get( 1 );
String aStr( pArg->GetString() );
sal_Int32 nLen = 0;
- // <-- UCB
if( hasUno() )
{
com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
@@ -933,7 +923,6 @@ RTLFUNC(FileLen)
}
}
else
- // --> UCB
{
#ifdef _OLD_FILE_IMPL
FileStat aStat = DirEntry( aStr );
@@ -1782,9 +1771,6 @@ RTLFUNC(Val)
char* pEndPtr;
String aStr( rPar.Get(1)->GetString() );
-// lt. Mikkysoft bei Kommas abbrechen!
-// for( sal_uInt16 n=0; n < aStr.Len(); n++ )
-// if( aStr[n] == ',' ) aStr[n] = '.';
FilterWhiteSpace( aStr );
if ( aStr.GetBuffer()[0] == '&' && aStr.Len() > 1 )
@@ -1807,7 +1793,6 @@ RTLFUNC(Val)
// #57844 Lokalisierte Funktion benutzen
nResult = ::rtl::math::stringToDouble( aStr, '.', ',', NULL, NULL );
checkArithmeticOverflow( nResult );
- // ATL: nResult = strtod( aStr.GetStr(), &pEndPtr );
}
rPar.Get(0)->PutDouble( nResult );
@@ -2705,7 +2690,6 @@ RTLFUNC(Dir)
if( !pRTLData )
return;
- // <-- UCB
if( hasUno() )
{
com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
@@ -2776,7 +2760,6 @@ RTLFUNC(Dir)
}
catch( Exception & )
{
- //StarBASIC::Error( ERRCODE_IO_GENERAL );
}
}
@@ -2847,7 +2830,6 @@ RTLFUNC(Dir)
}
}
else
- // --> UCB
{
#ifdef _OLD_FILE_IMPL
if ( nParCount >= 2 )
@@ -3040,7 +3022,6 @@ RTLFUNC(GetAttr)
}
#endif
- // <-- UCB
if( hasUno() )
{
com::sun::star::uno::Reference< XSimpleFileAccess3 > xSFI = getFileAccess();
@@ -3075,7 +3056,6 @@ RTLFUNC(GetAttr)
}
}
else
- // --> UCB
{
DirectoryItem aItem;
DirectoryItem::get( getFullPathUNC( rPar.Get(1)->GetString() ), aItem );
@@ -3107,7 +3087,6 @@ RTLFUNC(FileDateTime)
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
{
- // <-- UCB
String aPath = rPar.Get(1)->GetString();
Time aTime;
Date aDate;
@@ -3129,7 +3108,6 @@ RTLFUNC(FileDateTime)
}
}
else
- // --> UCB
{
#ifdef _OLD_FILE_IMPL
DirEntry aEntry( aPath );
@@ -3225,8 +3203,7 @@ RTLFUNC(FileAttr)
(void)pBasic;
(void)bWrite;
- // AB 08/16/2000: No changes for UCB
-
+ // No changes for UCB
// #57064 Obwohl diese Funktion nicht mit DirEntry arbeitet, ist sie von
// der Anpassung an virtuelle URLs nich betroffen, da sie nur auf bereits
// geoeffneten Dateien arbeitet und der Name hier keine Rolle spielt.
@@ -3236,7 +3213,6 @@ RTLFUNC(FileAttr)
else
{
sal_Int16 nChannel = rPar.Get(1)->GetInteger();
-// nChannel--;
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
if ( !pSbStrm )
@@ -3258,7 +3234,7 @@ RTLFUNC(Loc)
(void)pBasic;
(void)bWrite;
- // AB 08/16/2000: No changes for UCB
+ // No changes for UCB
if ( rPar.Count() != 2 )
StarBASIC::Error( SbERR_BAD_ARGUMENT );
else
@@ -3323,7 +3299,7 @@ RTLFUNC(Seek)
(void)pBasic;
(void)bWrite;
- // AB 08/16/2000: No changes for UCB
+ // No changes for UCB
int nArgs = (int)rPar.Count();
if ( nArgs < 2 || nArgs > 3 )
{
@@ -3331,7 +3307,6 @@ RTLFUNC(Seek)
return;
}
sal_Int16 nChannel = rPar.Get(1)->GetInteger();
-// nChannel--;
SbiIoSystem* pIO = pINST->GetIoSystem();
SbiStream* pSbStrm = pIO->GetStream( nChannel );
if ( !pSbStrm )
@@ -3419,17 +3394,13 @@ RTLFUNC(Rnd)
}
-//
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list