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

4 files changed, 0 insertions, 26 deletions

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 17c8fc8144a1..f3a1e641b8bb 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -53,7 +53,6 @@
 #define RID_PRINTDLG_STRLIST            ( RID_BASICIDE_START + 78 )
 
 #define RID_IMGBTN_REMOVEWATCH          ( RID_BASICIDE_START +  8 )
-#define RID_IMGBTN_GOTOCALL             ( RID_BASICIDE_START +  9 )
 #define RID_IMG_INSTALLATION            ( RID_BASICIDE_START + 20 )
 #define RID_IMG_DOCUMENT                ( RID_BASICIDE_START + 22 )
 #define RID_IMG_MODLIB                  ( RID_BASICIDE_START + 24 )
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index c0a045e6382d..6af6c060411a 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 030a152f3509..7454b1b83358 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 32220753dd32..368bad4244de 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
 {