diff options
| author | Christian Barth <Christian.Barth@zoho.com> | 2019-10-03 20:22:04 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-10-09 16:25:24 +0200 |
| commit | 261fa8cdf4626c9785e0ca4776e44eab4b9222e0 (patch) | |
| tree | ca2389706b771e891a553a6b413ab5e567ed60ae /basctl | |
| parent | a73cb32c7285343cbb30b4647e8e7e448eebbb02 (diff) | |
tdf#114441 changed some sal_uLong to better fitting types
Change-Id: I114a6b028eb59a1ae38c31bc20439a35643fe972
Reviewed-on: https://gerrit.libreoffice.org/80159
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/basides1.cxx | 8 | ||||
| -rw-r--r-- | basctl/source/basicide/basides2.cxx | 4 | ||||
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 2486543d1635..9c06a7c93c20 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -1155,10 +1155,10 @@ void Shell::SetCurWindow( BaseWindow* pNewWin, bool bUpdateTabBar, bool bRemembe } if ( bUpdateTabBar ) { - sal_uLong nKey = GetWindowId( pCurWin ); - if ( pCurWin && ( pTabBar->GetPagePos( static_cast<sal_uInt16>(nKey) ) == TAB_PAGE_NOTFOUND ) ) - pTabBar->InsertPage( static_cast<sal_uInt16>(nKey), pCurWin->GetTitle() ); // has just been faded in - pTabBar->SetCurPageId( static_cast<sal_uInt16>(nKey) ); + sal_uInt16 nKey = GetWindowId( pCurWin ); + if ( pCurWin && ( pTabBar->GetPagePos( nKey ) == TAB_PAGE_NOTFOUND ) ) + pTabBar->InsertPage( nKey, pCurWin->GetTitle() ); // has just been faded in + pTabBar->SetCurPageId( nKey ); } if ( pCurWin && pCurWin->IsSuspended() ) // if the window is shown in the case of an error... pCurWin->SetStatus( pCurWin->GetStatus() & ~BASWIN_SUSPENDED ); diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx index 1715afb81f98..675ff8d5c093 100644 --- a/basctl/source/basicide/basides2.cxx +++ b/basctl/source/basicide/basides2.cxx @@ -134,7 +134,7 @@ VclPtr<ModulWindow> Shell::CreateBasWin( const ScriptDocument& rDocument, const { bCreatingWindow = true; - sal_uLong nKey = 0; + sal_uInt16 nKey = 0; VclPtr<ModulWindow> pWin; OUString aLibName( rLibName ); @@ -192,7 +192,7 @@ VclPtr<ModulWindow> Shell::CreateBasWin( const ScriptDocument& rDocument, const aModName += " (" + sObjName + ")"; } } - pTabBar->InsertPage( static_cast<sal_uInt16>(nKey), aModName ); + pTabBar->InsertPage( nKey, aModName ); pTabBar->Sort(); if(pWin) { diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 01d5f4a1d199..6d9b75af2f8d 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -732,8 +732,8 @@ void Shell::RemoveWindow( BaseWindow* pWindow_, bool bDestroy, bool bAllowChange VclPtr<BaseWindow> pWindowTmp( pWindow_ ); DBG_ASSERT( pWindow_, "Cannot delete NULL-Pointer!" ); - sal_uLong nKey = GetWindowId( pWindow_ ); - pTabBar->RemovePage( static_cast<sal_uInt16>(nKey) ); + sal_uInt16 nKey = GetWindowId( pWindow_ ); + pTabBar->RemovePage( nKey ); aWindowTable.erase( nKey ); if ( pWindow_ == pCurWin ) { |