extensions/source/activex/SOActiveX.cxx | 2 +-
extensions/source/propctrlr/formmetadata.cxx | 2 +-
extensions/source/scanner/grid.cxx | 16 ++++++++--------
extensions/source/scanner/scanwin.cxx | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 998532d8542b87b4069416ca48d1fc90e8d8ed70
Author: Jens Carl <j.car...@gmx.de>
Date: Fri Jun 23 07:44:37 2017 +0000
tdf#96505 Get rid of cargo cult "long" integer literals
Remove "long" integer literals in extensions/
Change-Id: I2eb5daa178ec9adcaddb999bad410aff0e94220c
Reviewed-on: https://gerrit.libreoffice.org/39149
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/extensions/source/activex/SOActiveX.cxx
b/extensions/source/activex/SOActiveX.cxx
index 4137d823b064..f93ad01018e2 100644
--- a/extensions/source/activex/SOActiveX.cxx
+++ b/extensions/source/activex/SOActiveX.cxx
@@ -598,7 +598,7 @@ HRESULT CSOActiveX::CreateFrameOldWay( HWND hwnd, int
width, int height )
// the second sequence element
nInitInd = 1;
- CComVariant pStrArr( 1L );
+ CComVariant pStrArr( 1 );
SafeArrayPutElement( pInitVals, &nInitInd, &pStrArr );
// the third sequence element
diff --git a/extensions/source/propctrlr/formmetadata.cxx
b/extensions/source/propctrlr/formmetadata.cxx
index 2920f1d26590..2b29a7bba297 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -528,7 +528,7 @@ namespace pcr
// Initialization
if(!s_pPropertyInfos)
getPropertyInfo();
- OPropertyInfoImpl aSearch(_rName, 0L, OUString(), 0, "", 0);
+ OPropertyInfoImpl aSearch(_rName, 0, OUString(), 0, "", 0);
const OPropertyInfoImpl* pInfo = std::lower_bound(
s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch,
PropertyInfoLessByName() );
diff --git a/extensions/source/scanner/grid.cxx
b/extensions/source/scanner/grid.cxx
index fac5f706ca10..9867fc6d000a 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -369,13 +369,13 @@ void GridWindow::computeChunk( double fMin, double fMax,
double& fChunkOut, doub
void GridWindow::computeNew()
{
- if(2L == m_aHandles.size())
+ if(2 == m_aHandles.size())
{
// special case: only left and right markers
double xleft, yleft;
double xright, yright;
- transform(m_aHandles[0L].maPos, xleft, yleft);
- transform(m_aHandles[1L].maPos, xright, yright );
+ transform(m_aHandles[0].maPos, xleft, yleft);
+ transform(m_aHandles[1].maPos, xright, yright );
double factor = (yright-yleft)/(xright-xleft);
for( int i = 0; i < m_nValues; i++ )
{
@@ -393,7 +393,7 @@ void GridWindow::computeNew()
std::unique_ptr<double[]> nodex(new double[ nSorted ]);
std::unique_ptr<double[]> nodey(new double[ nSorted ]);
- for( i = 0L; i < nSorted; i++ )
+ for( i = 0; i < nSorted; i++ )
transform( m_aHandles[i].maPos, nodex[ i ], nodey[ i ] );
for( i = 0; i < m_nValues; i++ )
@@ -543,7 +543,7 @@ void GridWindow::MouseMove( const MouseEvent& rEvt )
{
Point aPoint( rEvt.GetPosPixel() );
- if( m_nDragIndex == 0 || m_nDragIndex == m_aHandles.size() - 1L)
+ if( m_nDragIndex == 0 || m_nDragIndex == m_aHandles.size() - 1)
{
aPoint.X() = m_aHandles[m_nDragIndex].maPos.X();
}
@@ -590,7 +590,7 @@ void GridWindow::MouseButtonDown( const MouseEvent& rEvt )
Point aPoint( rEvt.GetPosPixel() );
Handles::size_type nMarkerIndex = npos;
- for(Handles::size_type a(0L); nMarkerIndex == npos && a <
m_aHandles.size(); a++)
+ for(Handles::size_type a(0); nMarkerIndex == npos && a <
m_aHandles.size(); a++)
{
if(m_aHandles[a].isHit(*this, aPoint))
{
@@ -611,7 +611,7 @@ void GridWindow::MouseButtonDown( const MouseEvent& rEvt )
// user wants to add/delete a button
if( nMarkerIndex != npos )
{
- if( nMarkerIndex != 0L && nMarkerIndex != m_aHandles.size() - 1L)
+ if( nMarkerIndex != 0 && nMarkerIndex != m_aHandles.size() - 1L)
{
// delete marker under mouse
if( m_nDragIndex == nMarkerIndex )
@@ -692,7 +692,7 @@ void GridWindow::ChangeMode(ResetType nType)
}
if( 0 == i )
m_aHandles[i].maPos = transform( m_fMinX, m_pNewYValues[
nIndex ] );
- else if( m_aHandles.size() - 1L == i )
+ else if( m_aHandles.size() - 1 == i )
m_aHandles[i].maPos = transform( m_fMaxX, m_pNewYValues[
nIndex ] );
else
m_aHandles[i].maPos = transform( m_pXValues[ nIndex ],
m_pNewYValues[ nIndex ] );
diff --git a/extensions/source/scanner/scanwin.cxx
b/extensions/source/scanner/scanwin.cxx
index 579cb48bd390..117e8d55f80e 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -436,7 +436,7 @@ void ImpTwain::ImplXfer()
nYRes = FIXTOLONG( aInfo.YResolution );
}
else
- nWidth = nHeight = nXRes = nYRes = -1L;
+ nWidth = nHeight = nXRes = nYRes = -1;
switch( PFUNC( &aAppIdent, &aSrcIdent, DG_IMAGE, DAT_IMAGENATIVEXFER,
MSG_GET, &hDIB ) )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
