mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS ab33 (1.39.4); FILE MERGED

Browse Source 
2007/01/10 16:34:45 ab 1.39.4.1: #i69280# Removed warnings
This commit is contained in:
Vladimir Glazounov
2007-01-16 15:29:49 +00:00
parent a2b6e1b2f6
commit cbdd38247e
1 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
basctl/source/basicide/basidesh.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: basidesh.cxx,v $ * $RCSfile: basidesh.cxx,v $
* *
* $Revision: 1.39 $ * $Revision: 1.40 $
* *
* last change: $Author: hr $ $Date: 2007-01-02 15:49:40 $ * last change: $Author: vg $ $Date: 2007-01-16 16:29:49 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -133,8 +133,8 @@ static sal_Int32 GnBasicIDEShellCount;
sal_Int32 getBasicIDEShellCount( void ) sal_Int32 getBasicIDEShellCount( void )
{ return GnBasicIDEShellCount; } { return GnBasicIDEShellCount; }
BasicIDEShell::BasicIDEShell( SfxViewFrame *pFrame, Window * ): BasicIDEShell::BasicIDEShell( SfxViewFrame *pFrame_, Window * ):
SfxViewShell( pFrame, IDE_VIEWSHELL_FLAGS ), SfxViewShell( pFrame_, IDE_VIEWSHELL_FLAGS ),
aHScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_HSCROLL | WB_DRAG ) ), aHScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_HSCROLL | WB_DRAG ) ),
aVScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_VSCROLL | WB_DRAG ) ), aVScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_VSCROLL | WB_DRAG ) ),
aScrollBarBox( &GetViewFrame()->GetWindow(), WinBits( WB_SIZEABLE ) ), aScrollBarBox( &GetViewFrame()->GetWindow(), WinBits( WB_SIZEABLE ) ),
@@ -145,8 +145,8 @@ BasicIDEShell::BasicIDEShell( SfxViewFrame *pFrame, Window * ):
} }
BasicIDEShell::BasicIDEShell( SfxViewFrame *pFrame, const BasicIDEShell & rView): BasicIDEShell::BasicIDEShell( SfxViewFrame *pFrame_, const BasicIDEShell& ):
SfxViewShell( pFrame, IDE_VIEWSHELL_FLAGS ), SfxViewShell( pFrame_, IDE_VIEWSHELL_FLAGS ),
aHScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_HSCROLL | WB_DRAG ) ), aHScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_HSCROLL | WB_DRAG ) ),
aVScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_VSCROLL | WB_DRAG ) ), aVScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_VSCROLL | WB_DRAG ) ),
aScrollBarBox( &GetViewFrame()->GetWindow(), WinBits( WB_SIZEABLE ) ), aScrollBarBox( &GetViewFrame()->GetWindow(), WinBits( WB_SIZEABLE ) ),
@@ -157,8 +157,8 @@ BasicIDEShell::BasicIDEShell( SfxViewFrame *pFrame, const BasicIDEShell & rView)
} }
BasicIDEShell::BasicIDEShell( SfxViewFrame* pFrame, SfxViewShell* /* pOldShell */ ) : BasicIDEShell::BasicIDEShell( SfxViewFrame* pFrame_, SfxViewShell* /* pOldShell */ ) :
SfxViewShell( pFrame, IDE_VIEWSHELL_FLAGS ), SfxViewShell( pFrame_, IDE_VIEWSHELL_FLAGS ),
aHScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_HSCROLL | WB_DRAG ) ), aHScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_HSCROLL | WB_DRAG ) ),
aVScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_VSCROLL | WB_DRAG ) ), aVScrollBar( &GetViewFrame()->GetWindow(), WinBits( WB_VSCROLL | WB_DRAG ) ),
aScrollBarBox( &GetViewFrame()->GetWindow(), WinBits( WB_SIZEABLE ) ), aScrollBarBox( &GetViewFrame()->GetWindow(), WinBits( WB_SIZEABLE ) ),
@@ -211,7 +211,6 @@ void BasicIDEShell::Init()
pTabBar->SetSplitHdl( LINK( this, BasicIDEShell, TabBarSplitHdl ) ); pTabBar->SetSplitHdl( LINK( this, BasicIDEShell, TabBarSplitHdl ) );
bTabBarSplitted = FALSE; bTabBarSplitted = FALSE;
IDEBaseWindow* pTmpWin = 0;
nCurKey = 100; nCurKey = 100;
InitScrollBars(); InitScrollBars();
InitTabBar(); InitTabBar();
@@ -298,6 +297,8 @@ void BasicIDEShell::StoreAllWindowData( BOOL bPersistent )
USHORT __EXPORT BasicIDEShell::PrepareClose( BOOL bUI, BOOL bForBrowsing ) USHORT __EXPORT BasicIDEShell::PrepareClose( BOOL bUI, BOOL bForBrowsing )
{ {
(void)bForBrowsing;
// da es nach Drucken etc. (DocInfo) modifiziert ist, hier resetten // da es nach Drucken etc. (DocInfo) modifiziert ist, hier resetten
GetViewFrame()->GetObjectShell()->SetModified(FALSE); GetViewFrame()->GetObjectShell()->SetModified(FALSE);
@@ -375,6 +376,7 @@ void __EXPORT BasicIDEShell::OuterResizePixel( const Point &rPos, const Size &rS
IMPL_LINK_INLINE_START( BasicIDEShell, TabBarSplitHdl, TabBar *, pTBar ) IMPL_LINK_INLINE_START( BasicIDEShell, TabBarSplitHdl, TabBar *, pTBar )
{ {
(void)pTBar;
bTabBarSplitted = TRUE; bTabBarSplitted = TRUE;
ArrangeTabBar(); ArrangeTabBar();
@@ -406,7 +408,7 @@ BOOL BasicIDEShell::NextPage( BOOL bPrev )
else else
++nPos; ++nPos;
if ( nPos >= 0 && nPos < pTabBar->GetPageCount() ) if ( nPos < pTabBar->GetPageCount() )
{ {
IDEBaseWindow* pWin = aIDEWindowTable.Get( pTabBar->GetPageId( nPos ) ); IDEBaseWindow* pWin = aIDEWindowTable.Get( pTabBar->GetPageId( nPos ) );
SetCurWindow( pWin, TRUE ); SetCurWindow( pWin, TRUE );
@@ -459,9 +461,9 @@ void BasicIDEShell::ShowObjectDialog( BOOL bShow, BOOL bCreateOrDestroy )
{ {
pObjectCatalog->SetCancelHdl( LINK( this, BasicIDEShell, ObjectDialogCancelHdl ) ); pObjectCatalog->SetCancelHdl( LINK( this, BasicIDEShell, ObjectDialogCancelHdl ) );
BasicEntryDescriptor aDesc; BasicEntryDescriptor aDesc;
IDEBaseWindow* pCurWin = GetCurWindow(); IDEBaseWindow* pCurWin_ = GetCurWindow();
if ( pCurWin ) if ( pCurWin_ )
aDesc = pCurWin->CreateEntryDescriptor(); aDesc = pCurWin_->CreateEntryDescriptor();
pObjectCatalog->SetCurrentEntry( aDesc ); pObjectCatalog->SetCurrentEntry( aDesc );
} }
} }
@@ -892,13 +894,13 @@ void BasicIDEShell::UpdateWindows()
} }
} }
void BasicIDEShell::RemoveWindow( IDEBaseWindow* pWindow, BOOL bDestroy, BOOL bAllowChangeCurWindow ) void BasicIDEShell::RemoveWindow( IDEBaseWindow* pWindow_, BOOL bDestroy, BOOL bAllowChangeCurWindow )
{ {
DBG_ASSERT( pWindow, "Kann keinen NULL-Pointer loeschen!" ); DBG_ASSERT( pWindow_, "Kann keinen NULL-Pointer loeschen!" );
ULONG nKey = aIDEWindowTable.GetKey( pWindow ); ULONG nKey = aIDEWindowTable.GetKey( pWindow_ );
pTabBar->RemovePage( (USHORT)nKey ); pTabBar->RemovePage( (USHORT)nKey );
aIDEWindowTable.Remove( nKey ); aIDEWindowTable.Remove( nKey );
if ( pWindow == pCurWin ) if ( pWindow_ == pCurWin )
{ {
if ( bAllowChangeCurWindow ) if ( bAllowChangeCurWindow )
SetCurWindow( FindWindow(), TRUE ); SetCurWindow( FindWindow(), TRUE );
@@ -907,26 +909,26 @@ void BasicIDEShell::RemoveWindow( IDEBaseWindow* pWindow, BOOL bDestroy, BOOL bA
} }
if ( bDestroy ) if ( bDestroy )
{ {
if ( !( pWindow->GetStatus() & BASWIN_INRESCHEDULE ) ) if ( !( pWindow_->GetStatus() & BASWIN_INRESCHEDULE ) )
{ {
delete pWindow; delete pWindow_;
} }
else else
{ {
pWindow->AddStatus( BASWIN_TOBEKILLED ); pWindow_->AddStatus( BASWIN_TOBEKILLED );
pWindow->Hide(); pWindow_->Hide();
StarBASIC::Stop(); StarBASIC::Stop();
// Es kommt kein Notify... // Es kommt kein Notify...
pWindow->BasicStopped(); pWindow_->BasicStopped();
aIDEWindowTable.Insert( nKey, pWindow ); // wieder einhaegen aIDEWindowTable.Insert( nKey, pWindow_ ); // wieder einhaegen
} }
} }
else else
{ {
pWindow->Hide(); pWindow_->Hide();
pWindow->AddStatus( BASWIN_SUSPENDED ); pWindow_->AddStatus( BASWIN_SUSPENDED );
pWindow->Deactivating(); pWindow_->Deactivating();
aIDEWindowTable.Insert( nKey, pWindow ); // wieder einhaegen aIDEWindowTable.Insert( nKey, pWindow_ ); // wieder einhaegen
} }
} }