[Libreoffice-commits] core.git: accessibility/source basctl/source basic/source xmloff/source xmlsecurity/source
Christian Barth (via logerrit)
logerrit at kemper.freedesktop.org
Wed Oct 9 14:26:54 UTC 2019
accessibility/source/extended/accessibleiconchoicectrl.cxx | 4 +-
basctl/source/basicide/basides1.cxx | 8 ++--
basctl/source/basicide/basides2.cxx | 4 +-
basctl/source/basicide/basidesh.cxx | 4 +-
basic/source/runtime/methods1.cxx | 26 ++++++-------
xmloff/source/style/impastpl.cxx | 2 -
xmloff/source/text/XMLTextListAutoStylePool.cxx | 2 -
xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 2 -
8 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 261fa8cdf4626c9785e0ca4776e44eab4b9222e0
Author: Christian Barth <Christian.Barth at zoho.com>
AuthorDate: Thu Oct 3 20:22:04 2019 +0200
Commit: Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Oct 9 16:25:24 2019 +0200
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 at cib.de>
diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx
index ba0ec3c1e645..c16579694be2 100644
--- a/accessibility/source/extended/accessibleiconchoicectrl.cxx
+++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx
@@ -72,7 +72,7 @@ namespace accessibility
SvxIconChoiceCtrlEntry* pEntry = static_cast< SvxIconChoiceCtrlEntry* >( rVclWindowEvent.GetData() );
if ( pEntry )
{
- sal_uLong nPos = getCtrl()->GetEntryListPos( pEntry );
+ sal_Int32 nPos = getCtrl()->GetEntryListPos( pEntry );
Reference< XAccessible > xChild = new AccessibleIconChoiceCtrlEntry( *getCtrl(), nPos, this );
uno::Any aOldValue, aNewValue;
aNewValue <<= xChild;
@@ -96,7 +96,7 @@ namespace accessibility
}
if ( pEntry )
{
- sal_uLong nPos = pCtrl->GetEntryListPos( pEntry );
+ sal_Int32 nPos = pCtrl->GetEntryListPos( pEntry );
Reference< XAccessible > xChild = new AccessibleIconChoiceCtrlEntry( *pCtrl, nPos, this );
uno::Any aOldValue, aNewValue;
aNewValue <<= xChild;
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 )
{
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 267368ce669e..01ba74852f3d 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -2458,7 +2458,7 @@ static void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const OUSt
void SbRtl_SYD(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 4 )
{
@@ -2479,7 +2479,7 @@ void SbRtl_SYD(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_SLN(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 3 )
{
@@ -2499,7 +2499,7 @@ void SbRtl_SLN(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_Pmt(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 5 )
{
@@ -2541,7 +2541,7 @@ void SbRtl_Pmt(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_PPmt(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 4 || nArgCount > 6 )
{
@@ -2585,7 +2585,7 @@ void SbRtl_PPmt(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_PV(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 5 )
{
@@ -2627,7 +2627,7 @@ void SbRtl_PV(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_NPV(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 1 || nArgCount > 2 )
{
@@ -2652,7 +2652,7 @@ void SbRtl_NPV(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_NPer(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 5 )
{
@@ -2694,7 +2694,7 @@ void SbRtl_NPer(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_MIRR(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 3 )
{
@@ -2722,7 +2722,7 @@ void SbRtl_MIRR(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_IRR(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 1 || nArgCount > 2 )
{
@@ -2756,7 +2756,7 @@ void SbRtl_IRR(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_IPmt(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 4 || nArgCount > 6 )
{
@@ -2800,7 +2800,7 @@ void SbRtl_IPmt(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_FV(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 5 )
{
@@ -2842,7 +2842,7 @@ void SbRtl_FV(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_DDB(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 4 || nArgCount > 5 )
{
@@ -2878,7 +2878,7 @@ void SbRtl_DDB(StarBASIC *, SbxArray & rPar, bool)
void SbRtl_Rate(StarBASIC *, SbxArray & rPar, bool)
{
- sal_uLong nArgCount = rPar.Count()-1;
+ sal_uInt16 nArgCount = rPar.Count()-1;
if ( nArgCount < 3 || nArgCount > 6 )
{
diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index 2c2612a061cb..5c8e8eb8a3db 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -617,7 +617,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
{
XMLAutoStylePoolProperties *const pProperties =
rParent.GetPropertiesList()[j].get();
- sal_uLong nPos = pProperties->GetPos();
+ sal_uInt32 nPos = pProperties->GetPos();
assert(nPos < nCount);
assert(!aExpStyles[nPos].mpProperties);
aExpStyles[nPos].mpProperties = pProperties;
diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx
index d77ad5e8e7c3..aa23ec13bf29 100644
--- a/xmloff/source/text/XMLTextListAutoStylePool.cxx
+++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx
@@ -173,7 +173,7 @@ sal_uInt32 XMLTextListAutoStylePool::Find( const XMLTextListAutoStylePoolEntry_I
uno::Any aAny1, aAny2;
aAny1 <<= pEntry->GetNumRules();
- for( sal_uLong nPos = 0; nPos < nCount; nPos++ )
+ for( sal_uInt32 nPos = 0; nPos < nCount; nPos++ )
{
aAny2 <<= (*pPool)[nPos]->GetNumRules();
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index f733f3a6a4c1..1a7a33459572 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -55,7 +55,7 @@ uno::Reference< io::XInputStream > SAL_CALL UriBindingHelper::getUriBinding( con
else
{
SvFileStream* pStream = new SvFileStream( uri, StreamMode::READ );
- sal_uLong nBytes = pStream->TellEnd();
+ sal_uInt64 nBytes = pStream->TellEnd();
SvLockBytesRef xLockBytes = new SvLockBytes( pStream, true );
xInputStream = new utl::OInputStreamHelper( xLockBytes, nBytes );
}
More information about the Libreoffice-commits
mailing list