diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:30 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:39:30 +0200 |
| commit | 4ce1e4e639490d620f3dcd8a5cf5bcbbc9c14bb2 (patch) | |
| tree | c6f009b49b7acf7d3b1cd0eb67644a7f8d2f105d /basctl/source | |
| parent | 19ed36590e990b5281da9c54bd962031bd56ae82 (diff) | |
| parent | 574d1f2004244c86d4b73d0623674d7fe4c88aa0 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
extensions/source/svg/svgaction.cxx
extensions/source/svg/svguno.cxx
package/source/xstor/owriteablestream.cxx
package/source/xstor/xstorage.cxx
package/source/zippackage/ZipPackageStream.cxx
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
Diffstat (limited to 'basctl/source')
| -rw-r--r-- | basctl/source/basicide/baside2.hxx | 1 | ||||
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 19 | ||||
| -rw-r--r-- | basctl/source/basicide/basidesh.src | 5 |
3 files changed, 0 insertions, 25 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 573d7c610..a41bb3e0c 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -265,7 +265,6 @@ class StackWindow : public BasicDockingWindow { private: SvTreeListBox aTreeListBox; - ImageButton aGotoCallButton; String aStackStr; protected: diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 2ac4f1c7a..559769134 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -1497,7 +1497,6 @@ void WatchWindow::UpdateWatches( bool bBasicStopped ) StackWindow::StackWindow( Window* pParent ) : BasicDockingWindow( pParent ), aTreeListBox( this, WB_BORDER | WB_3DLOOK | WB_HSCROLL | WB_TABSTOP ), - aGotoCallButton( this, IDEResId( RID_IMGBTN_GOTOCALL ) ), aStackStr( IDEResId( RID_STR_STACK ) ) { aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST); @@ -1512,14 +1511,6 @@ StackWindow::StackWindow( Window* pParent ) : SetHelpId( HID_BASICIDE_STACKWINDOW ); - aGotoCallButton.SetClickHdl( LINK( this, StackWindow, ButtonHdl ) ); - aGotoCallButton.SetPosPixel( Point( DWBORDER, 2 ) ); - Size aSz( aGotoCallButton.GetModeImage().GetSizePixel() ); - aSz.Width() += 6; - aSz.Height() += 6; - aGotoCallButton.SetSizePixel( aSz ); - aGotoCallButton.Hide(); - // make stack window keyboard accessible GetSystemWindow()->GetTaskPaneList()->AddWindow( this ); } @@ -1560,16 +1551,6 @@ void StackWindow::Resize() IMPL_LINK_INLINE_START( StackWindow, ButtonHdl, ImageButton *, pButton ) { - if ( pButton == &aGotoCallButton ) - { - BasicIDEShell* pIDEShell = IDE_DLL()->GetShell(); - SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell->GetViewFrame() : NULL; - SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame->GetDispatcher() : NULL; - if( pDispatcher ) - { - pDispatcher->Execute( SID_BASICIDE_GOTOCALL ); - } - } return 0; } IMPL_LINK_INLINE_END( StackWindow, ButtonHdl, ImageButton *, pButton ) diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 6fab2c55e..babb05aab 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -324,11 +324,6 @@ ImageButton RID_IMGBTN_REMOVEWATCH }; QuickHelpText [ en-US ] = "Remove Watch" ; }; -ImageButton RID_IMGBTN_GOTOCALL -{ - HelpId = HID_BASICIDE_GOTOALL ; - SmallStyle = TRUE ; -}; String RID_STR_REMOVEWATCH { |