summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-02-04 17:57:31 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-02-06 13:43:35 +0100
commit50c26300e5b5ae9671f18a9e449516604d16105f (patch)
treee4f0cf83c41bbd70bbe6021f85b8e97815134f42 /basctl
parente78706a8bf35d8471982e36c4543f2db8a35f1c2 (diff)
Remove lots of dead code
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/baside2.cxx23
-rw-r--r--basctl/source/basicide/baside2b.cxx7
-rw-r--r--basctl/source/basicide/baside3.cxx4
-rw-r--r--basctl/source/basicide/basides2.cxx37
-rw-r--r--basctl/source/basicide/basobj3.cxx10
-rw-r--r--basctl/source/basicide/brkdlg.cxx6
-rw-r--r--basctl/source/basicide/moduldl2.cxx12
-rw-r--r--basctl/source/basicide/tbxctl.hxx27
-rw-r--r--basctl/source/dlged/dlgedfunc.cxx19
-rw-r--r--basctl/source/dlged/dlgedlist.cxx14
-rw-r--r--basctl/source/dlged/propbrw.cxx6
11 files changed, 0 insertions, 165 deletions
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 6df383e07e2b..db185b2e6a94 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -29,10 +29,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-
#include <ide_pch.hxx>
-
#include <svtools/texteng.hxx>
#include <svtools/textview.hxx>
#include <svtools/xtextedt.hxx>
@@ -50,7 +48,6 @@
#include <sfx2/docfile.hxx>
#include <basic/basrdll.hxx>
-
#include <baside2.hrc>
#include <baside2.hxx>
#include <objdlg.hxx>
@@ -252,9 +249,7 @@ void ModulWindow::DoInit()
if ( GetVScrollBar() )
GetVScrollBar()->Hide();
GetHScrollBar()->Show();
-// GetEditorWindow().SetScrollBarRanges();
GetEditorWindow().InitScrollBars();
-// GetEditorWindow().GrabFocus();
}
@@ -460,8 +455,6 @@ BOOL ModulWindow::LoadBasic()
if ( aCurPath.Len() )
xFP->setDisplayDirectory ( aCurPath );
- //xFP->setTitle( String( IDEResId( RID_STR_OPEN ) ) );
-
Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY);
xFltMgr->appendFilter( String( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) );
xFltMgr->appendFilter( String( IDEResId( RID_STR_FILTER_ALLFILES ) ), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
@@ -522,8 +515,6 @@ BOOL ModulWindow::SaveBasicSource()
if ( aCurPath.Len() )
xFP->setDisplayDirectory ( aCurPath );
- //xFP->setTitle( String( IDEResId( RID_STR_SAVE ) ) );
-
Reference< XFilterManager > xFltMgr(xFP, UNO_QUERY);
xFltMgr->appendFilter( String( RTL_CONSTASCII_USTRINGPARAM( "BASIC" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.bas" ) ) );
xFltMgr->appendFilter( String( IDEResId( RID_STR_FILTER_ALLFILES ) ), String( RTL_CONSTASCII_USTRINGPARAM( FILTERMASK_ALL ) ) );
@@ -719,8 +710,6 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic )
BOOL bMarkError = ( pBasic == GetBasic() ) ? TRUE : FALSE;
if ( bMarkError )
aXEditorWindow.GetBrkWindow().SetMarkerPos( nErrorLine, TRUE );
-// ErrorBox( this, WB_OK | WB_DEF_OK, String( aErrorTextPrefix + aErrorText ) ).Execute();
-// ErrorHandler::HandleError( pBasic->GetErrorCode() );
// #i47002#
Reference< awt::XWindow > xWindow = VCLUnoHelper::GetInterface( this );
@@ -740,9 +729,6 @@ IMPL_LINK( ModulWindow, BasicErrorHdl, StarBASIC *, pBasic )
long ModulWindow::BasicBreakHdl( StarBASIC* pBasic )
{
DBG_CHKTHIS( ModulWindow, 0 );
- // Ein GoOnTop aktiviert da Fenster, das veraendert aber den Context fuer
- // das Programm!
-// GoOnTop();
// #i69280 Required in Window despite normal usage in next command!
(void)pBasic;
@@ -795,7 +781,6 @@ void ModulWindow::BasicAddWatch()
BOOL bAdd = TRUE;
if ( !GetEditView()->HasSelection() )
{
-// bAdd = GetEditView()->SelectCurrentWord();
TextPaM aWordStart;
String aWord = GetEditEngine()->GetWord( GetEditView()->GetSelection().GetEnd(), &aWordStart );
if ( aWord.Len() )
@@ -803,7 +788,6 @@ void ModulWindow::BasicAddWatch()
TextSelection aSel( aWordStart );
USHORT& rIndex = aSel.GetEnd().GetIndex();
rIndex = rIndex + aWord.Len();
- // aSel.GetEnd().GetIndex() += sal::static_int_cast<int>( aWord.Len() );
GetEditView()->SetSelection( aSel );
bAdd = TRUE;
}
@@ -890,9 +874,6 @@ void ModulWindow::StoreData()
// => Keine Unterbrechungen erwuenscht!
// Und bei SAVE, wenn AppBasic...
GetEditorWindow().SetSourceInBasic( TRUE );
- // Nicht das Modify loeschen, sonst wird das Basic nicht gespeichert
- // Es wird beim Speichern sowieso geloescht.
-// xModule->SetModified( FALSE );
}
BOOL ModulWindow::CanClose()
@@ -956,7 +937,6 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage )
MapMode eOldMapMode( pPrinter->GetMapMode() );
Font aOldFont( pPrinter->GetFont() );
-// Font aFont( GetEditEngine()->CreateFontFromItemSet( GetEditEngine()->GetEmptyItemSet() ) );
Font aFont( GetEditEngine()->GetFont() );
aFont.SetAlign( ALIGN_BOTTOM );
aFont.SetTransparent( TRUE );
@@ -1240,8 +1220,6 @@ String ModulWindow::GetTitle()
void ModulWindow::FrameWindowMoved()
{
-// if ( GetEditEngine() && GetEditEngine()->IsInSelectionMode() )
-// GetEditEngine()->StopSelectionMode();
}
@@ -1512,7 +1490,6 @@ void ModulWindowLayout::Resize()
{
// ScrollBars, etc. passiert in BasicIDEShell:Adjust...
ArrangeWindows();
-// Invalidate();
}
void ModulWindowLayout::Paint( const Rectangle& )
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 4dcaf94ef75f..1d1ede072ca8 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -855,12 +855,6 @@ IMPL_LINK( EditorWindow, SyntaxTimerHdl, Timer *, EMPTYARG )
p = aSyntaxLineTable.Next();
}
- // MT: Removed, because of idle format now when set/remove attribs...
- // pEditView->SetAutoScroll( FALSE ); // #101043# Don't scroll because of syntax highlight
- // pEditEngine->SetUpdateMode( TRUE );
- // pEditView->ShowCursor( FALSE, TRUE );
- // pEditView->SetAutoScroll( TRUE );
-
// #i45572#
if ( pEditView )
pEditView->ShowCursor( FALSE, TRUE );
@@ -1454,7 +1448,6 @@ IMPL_LINK_INLINE_START( WatchWindow, implEndDragHdl, HeaderBar *, pBar )
sal_Int32 nPos = 0;
USHORT nTabs = aHeaderBar.GetItemCount();
- // OSL_ASSERT( m_treelb->TabCount() == nTabs );
for( USHORT i = 1 ; i < nTabs ; ++i )
{
nPos += aHeaderBar.GetItemSize( i );
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 704da8350c33..613a05b32673 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -29,16 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-//svdraw.hxx
-//#define _SVDRAW_HXX ***
#define _SDR_NOITEMS
#define _SDR_NOTOUCH
#define _SDR_NOTRANSFORM
#define _SDR_NOOBJECTS
-//#define _SDR_NOVIEWS ***
#define _SDR_NOVIEWMARKER
#define _SDR_NODRAGMETHODS
-//#define _SDR_NOUNDO ***
#define _SDR_NOXOUTDEV
#include <ide_pch.hxx>
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 850bd4e627e2..bea7cb64825c 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -67,45 +67,11 @@ IMPL_LINK_INLINE_START( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, E
}
IMPL_LINK_INLINE_END( BasicIDEShell, ObjectDialogCancelHdl, ObjectCatalog *, EMPTYARG )
-/*
-IMPL_LINK( BasicIDEShell, ObjectDialogInsertHdl, ObjectCatalog *, pObjCat )
-{
- if ( !pCurWin )
- return 0;
-
- if ( pCurWin->IsA( TYPE( ModulWindow ) ) )
- {
- ModulWindow* pEditWin = (ModulWindow*)pCurWin;
- pEditWin->InsertFromObjectCatalog( pObjCat );
- }
- else
- Sound::Beep();
-
- return 0;
-}
-*/
-
Reference< view::XRenderable > BasicIDEShell::GetRenderable()
{
return Reference< view::XRenderable >( new basicide::BasicRenderable( pCurWin ) );
}
-#if 0
-USHORT BasicIDEShell::Print( SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog )
-{
- if ( pCurWin )
- {
- SfxPrinter* pPrinter = GetPrinter( TRUE );
- if ( pPrinter )
- {
- SfxViewShell::Print( rProgress, bIsAPI, pPrintDialog );
- pCurWin->PrintData( pPrinter );
- }
- }
- return 0;
-}
-#endif
-
BOOL BasicIDEShell::HasSelection( BOOL /* bText */ ) const
{
BOOL bSel = FALSE;
@@ -128,10 +94,7 @@ String BasicIDEShell::GetSelectionText( BOOL bWholeWord )
{
if ( bWholeWord && !pEditView->HasSelection() )
{
- // String aStrCurrentDelimiters = pEngine->GetWordDelimiters();
- // pEngine->SetWordDelimiters( " .,;\"'" );
aText = pEditView->GetTextEngine()->GetWord( pEditView->GetSelection().GetEnd() );
- // pEngine->SetWordDelimiters( aStrCurrentDelimiters );
}
else
{
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 35c4eafbebf1..6d15f5a9a74f 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -102,7 +102,6 @@ SbMethod* CreateMacro( SbModule* pModule, const String& rMacroName )
{
BOOL bValid = FALSE;
String aStdMacroText( RTL_CONSTASCII_USTRINGPARAM( "Macro" ) );
- //String aStdMacroText( IDEResId( RID_STR_STDMACRONAME ) );
USHORT nMacro = 1;
while ( !bValid )
{
@@ -386,15 +385,6 @@ void BasicStopped( BOOL* pbAppWindowDisabled,
*pnWaitCount = nWait;
}
- /*
- // Interactive = FALSE ?
- if ( SFX_APP()->IsDispatcherLocked() )
- {
- SFX_APP()->LockDispatcher( FALSE );
- if ( pbDispatcherLocked )
- *pbDispatcherLocked = TRUE;
- } */
-
Window* pDefParent = Application::GetDefDialogParent();
if ( pDefParent && !pDefParent->IsEnabled() )
{
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index be57acc4ed98..e4f4530ed2ff 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -33,7 +33,6 @@
#include <vcl/sound.hxx>
-// #define ITEMID_SEARCH SID_SEARCH_ITEM
#define _SVX_NOIDERESIDS
#include <brkdlg.hxx>
#include <brkdlg.hrc>
@@ -96,7 +95,6 @@ BreakPointDialog::BreakPointDialog( Window* pParent, BreakPointList& rBrkPntList
aOKButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
aNewButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
aDelButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
-// aShowButton.SetClickHdl( LINK( this, BreakPointDialog, ButtonHdl ) );
aCheckBox.SetClickHdl( LINK( this, BreakPointDialog, CheckBoxHdl ) );
aComboBox.SetSelectHdl( LINK( this, BreakPointDialog, ComboBoxHighlightHdl ) );
@@ -247,10 +245,6 @@ IMPL_LINK( BreakPointDialog, ButtonHdl, Button *, pButton )
}
CheckButtons();
}
-// else if ( pButton == &aShowButton )
-// {
-// ;
-// }
return 0;
}
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index ebceaed39af4..ff894606e74d 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -29,14 +29,12 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_basctl.hxx"
-
#define GLOBALOVERFLOW
#include <ide_pch.hxx>
#include <svtools/filedlg.hxx>
-
#include <sot/storinfo.hxx>
#include <moduldlg.hrc>
@@ -331,16 +329,6 @@ BOOL BasicCheckBox::EditingEntry( SvLBoxEntry* pEntry, Selection& )
// TODO: check if library is reference/link
- // Prueffen, ob Referenz...
- /*
- USHORT nLib = pBasMgr->GetLibId( GetEntryText( pEntry, 0 ) );
- DBG_ASSERT( nLib != LIB_NOTFOUND, "LibId ?!" );
- if ( pBasMgr->IsReference( nLib ) )
- {
- ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_CANNOTCHANGENAMEREFLIB ) ) ).Execute();
- return FALSE;
- }
- */
return TRUE;
}
diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx
index 6a1461c78640..62b550aa7348 100644
--- a/basctl/source/basicide/tbxctl.hxx
+++ b/basctl/source/basicide/tbxctl.hxx
@@ -31,33 +31,6 @@
#include <sfx2/tbxctrl.hxx>
#include <com/sun/star/frame/XLayoutManager.hpp>
-/*
-#ifdef _BASIDE_POPUPWINDOWTBX
-
-// class PopupWindowTbx --------------------------------------------------
-
-class PopupWindowTbx : public SfxPopupWindow
-{
-private:
- SfxToolBoxManager aTbx;
- Link aSelectLink;
-
- DECL_LINK( SelectHdl, void* );
-
-public:
- PopupWindowTbx( USHORT nId, WindowAlign eAlign,
- ResId aRIdWin, ResId aRIdTbx, SfxBindings& rBind );
- ~PopupWindowTbx();
-
- void StartSelection()
- { aTbx.GetToolBox().StartSelection(); }
- void Update();
-
- virtual SfxPopupWindow* Clone() const;
- virtual void PopupModeEnd();
-};
-#endif
-*/
//-------------------
// class TbxControls
//-------------------
diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx
index 9ef46deb69c0..5b640b648f54 100644
--- a/basctl/source/dlged/dlgedfunc.cxx
+++ b/basctl/source/dlged/dlgedfunc.cxx
@@ -580,28 +580,9 @@ BOOL DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
if (pView->IsAction() )
{
pView->EndAction();
- //if( bMarkAction )
- //pParent->UnmarkDialog();
}
}
-// USHORT nClicks = rMEvt.GetClicks();
-// if (nClicks == 2)
-// {
-// if ( pView->AreObjectsMarked() )
-// {
-// const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
-//
-// if (rMarkList.GetMarkCount() == 1)
-// {
-// SdrMark* pMark = rMarkList.GetMark(0);
-// SdrObject* pObj = pMark->GetMarkedSdrObj();
-//
-// // edit objects here
-// }
-// }
-// }
-
bMarkAction = FALSE;
pWindow->SetPointer( pView->GetPreferedPointer( aPnt, pWindow, nHitLog ) );
diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx
index 41fa01b262c8..1cef4b9762ba 100644
--- a/basctl/source/dlged/dlgedlist.cxx
+++ b/basctl/source/dlged/dlgedlist.cxx
@@ -53,13 +53,6 @@ DlgEdPropListenerImpl::~DlgEdPropListenerImpl()
void SAL_CALL DlgEdPropListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException)
{
- /*
- // disconnect the listener
- if (pDlgEdObj)
- {
- (pDlgEdObj->m_xPropertyChangeListener).clear();
- }
- */
}
// XPropertyChangeListener
@@ -94,13 +87,6 @@ DlgEdEvtContListenerImpl::~DlgEdEvtContListenerImpl()
void SAL_CALL DlgEdEvtContListenerImpl::disposing( const ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException)
{
- /*
- // disconnect the listener
- if (pDlgEdObj)
- {
- (pDlgEdObj->m_xContainerListener).clear();
- }
- */
}
// XContainerListener
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 080fca450279..a6d29fc5f464 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -483,12 +483,6 @@ void PropBrw::implSetNewObject( const Reference< XPropertySet >& _rxObject )
{
aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_NO_PROPERTIES)));
}
- // #i73075 Handled in implSetNewObjectSequence
- //else // multiselection
- //{
- // aName = ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_PROPERTIES)));
- // aName += ::rtl::OUString(String(IDEResId(RID_STR_BRWTITLE_MULTISELECT)));
- //}
return aName;
}