summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-08-16 14:45:49 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-17 08:14:31 +0200
commitff1f6a5fc25db062e9a83521a657062f62f03ba6 (patch)
tree272dfa9af5ead31b61c1be34afcaf4402ff4ad77 /sd
parent224b770fa77fe12ad5dc543ce020aca316b6558d (diff)
remove UL/L suffixes from integer constants in initialiser/call expressions
Change-Id: Iae081567c4fa5b88edbd12cf2fbafd2b8f31b300 Reviewed-on: https://gerrit.libreoffice.org/41214 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/PageListWatcher.cxx6
-rw-r--r--sd/source/ui/accessibility/AccessibleViewForwarder.cxx2
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx2
-rw-r--r--sd/source/ui/dlg/brkdlg.cxx2
-rw-r--r--sd/source/ui/dlg/copydlg.cxx8
-rw-r--r--sd/source/ui/func/fumorph.cxx26
-rw-r--r--sd/source/ui/unoidl/unomodel.cxx4
-rw-r--r--sd/source/ui/view/sdwindow.cxx8
8 files changed, 29 insertions, 29 deletions
diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx
index d5e5dad9845f..283a798020e7 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -33,7 +33,7 @@ void ImpPageListWatcher::ImpRecreateSortedPageListOnDemand()
// build up vectors again
const sal_uInt32 nPageCount(ImpGetPageCount());
- for(sal_uInt32 a(0L); a < nPageCount; a++)
+ for(sal_uInt32 a(0); a < nPageCount; a++)
{
SdPage* pCandidate = ImpGetPage(a);
DBG_ASSERT(pCandidate, "ImpPageListWatcher::ImpRecreateSortedPageListOnDemand: Invalid PageList in Model (!)");
@@ -127,7 +127,7 @@ SdPage* ImpPageListWatcher::GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum)
sal_uInt32 ImpPageListWatcher::GetSdPageCount(PageKind ePgKind)
{
- sal_uInt32 nRetval(0L);
+ sal_uInt32 nRetval(0);
if(!mbPageListValid)
{
@@ -167,7 +167,7 @@ sal_uInt32 ImpPageListWatcher::GetVisibleSdPageCount()
// build up vectors again
const sal_uInt32 nPageCount(ImpGetPageCount());
- for(sal_uInt32 a(0L); a < nPageCount; a++)
+ for(sal_uInt32 a(0); a < nPageCount; a++)
{
SdPage* pCandidate = ImpGetPage(a);
if ((pCandidate->GetPageKind() == PageKind::Standard)&&(!pCandidate->IsExcluded())) nVisiblePageCount++;
diff --git a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
index 5190622366d5..aedc5882a34c 100644
--- a/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
+++ b/sd/source/ui/accessibility/AccessibleViewForwarder.cxx
@@ -36,7 +36,7 @@ AccessibleViewForwarder::AccessibleViewForwarder (SdrPaintView* pView, OutputDev
mnWindowId (0)
{
// Search the output device to determine its id.
- for(sal_uInt32 a(0L); a < mpView->PaintWindowCount(); a++)
+ for(sal_uInt32 a(0); a < mpView->PaintWindowCount(); a++)
{
SdrPaintWindow* pPaintWindow = mpView->GetPaintWindow(a);
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 7468dd549a22..cc882a230eff 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -275,7 +275,7 @@ void SdPathHdl::CreateB2dIAObject()
if(pPageView)
{
- for(sal_uInt32 b(0L); b < pPageView->PageWindowCount(); b++)
+ for(sal_uInt32 b(0); b < pPageView->PageWindowCount(); b++)
{
const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(b);
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 78d2ab62a195..1ac88bc5afdd 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -105,7 +105,7 @@ IMPL_LINK( BreakDlg, UpDate, void*, nInit, bool )
return true;
// update status bar or show a error message?
- if(nInit == reinterpret_cast<void*>(1L))
+ if(nInit == reinterpret_cast<void*>(1))
{
ScopedVclPtrInstance< MessageDialog > aErrBox(this, SdResId(STR_BREAK_FAIL));
aErrBox->Execute();
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index fc39e1b57777..288612d7cad3 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -127,7 +127,7 @@ void CopyDlg::Reset()
// Set Min/Max values
::tools::Rectangle aRect = mpView->GetAllMarkedRect();
Size aPageSize = mpView->GetSdrPageView()->GetPage()->GetSize();
- SetMetricValue( *m_pMtrFldMoveX, Fraction(1000000L) / maUIScale, MapUnit::Map100thMM);
+ SetMetricValue( *m_pMtrFldMoveX, Fraction(1000000) / maUIScale, MapUnit::Map100thMM);
double fScaleFactor = m_pMtrFldMoveX->GetValue()/1000000.0;
long nPageWidth = aPageSize.Width() * fScaleFactor;
@@ -151,7 +151,7 @@ void CopyDlg::Reset()
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_NUMBER, true, &pPoolItem ) )
m_pNumFldCopies->SetValue( static_cast<const SfxUInt16Item*>( pPoolItem )->GetValue() );
else
- m_pNumFldCopies->SetValue( 1L );
+ m_pNumFldCopies->SetValue( 1 );
long nMoveX = 500L;
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_MOVE_X, true, &pPoolItem ) )
@@ -166,7 +166,7 @@ void CopyDlg::Reset()
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_ANGLE, true, &pPoolItem ) )
m_pMtrFldAngle->SetValue( static_cast<const SfxInt32Item*>( pPoolItem )->GetValue() );
else
- m_pMtrFldAngle->SetValue( 0L );
+ m_pMtrFldAngle->SetValue( 0 );
long nWidth = 0L;
if( SfxItemState::SET == mrOutAttrs.GetItemState( ATTR_COPY_WIDTH, true, &pPoolItem ) )
@@ -286,7 +286,7 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData, Button*, void)
*/
IMPL_LINK_NOARG(CopyDlg, SetDefault, Button*, void)
{
- m_pNumFldCopies->SetValue( 1L );
+ m_pNumFldCopies->SetValue( 1 );
long nValue = 500L;
SetMetricValue( *m_pMtrFldMoveX, Fraction(nValue) / maUIScale, MapUnit::Map100thMM);
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 39a11f7da83c..1808a75f0597 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -128,11 +128,11 @@ void FuMorph::DoExecute( SfxRequest& )
{
aPolyPoly1 = ::basegfx::tools::correctOrientations(aPolyPoly1);
aPolyPoly1.removeDoublePoints();
- ::basegfx::B2VectorOrientation eIsClockwise1(::basegfx::tools::getOrientation(aPolyPoly1.getB2DPolygon(0L)));
+ ::basegfx::B2VectorOrientation eIsClockwise1(::basegfx::tools::getOrientation(aPolyPoly1.getB2DPolygon(0)));
aPolyPoly2 = ::basegfx::tools::correctOrientations(aPolyPoly2);
aPolyPoly2.removeDoublePoints();
- ::basegfx::B2VectorOrientation eIsClockwise2(::basegfx::tools::getOrientation(aPolyPoly2.getB2DPolygon(0L)));
+ ::basegfx::B2VectorOrientation eIsClockwise2(::basegfx::tools::getOrientation(aPolyPoly2.getB2DPolygon(0)));
// set same orientation
if(eIsClockwise1 != eIsClockwise2)
@@ -149,7 +149,7 @@ void FuMorph::DoExecute( SfxRequest& )
aPolyPoly2.flip();
// force same point counts
- for( sal_uInt32 a(0L); a < aPolyPoly1.count(); a++ )
+ for( sal_uInt32 a(0); a < aPolyPoly1.count(); a++ )
{
::basegfx::B2DPolygon aSub1(aPolyPoly1.getB2DPolygon(a));
::basegfx::B2DPolygon aSub2(aPolyPoly2.getB2DPolygon(a));
@@ -198,11 +198,11 @@ void FuMorph::DoExecute( SfxRequest& )
const double fStep(::basegfx::tools::getLength(rCandidate) / (double)(rCandidate.isClosed() ? nNum : nNum - 1L));
double fDestPos(0.0);
double fSrcPos(0.0);
- sal_uInt32 nSrcPos(0L);
+ sal_uInt32 nSrcPos(0);
sal_uInt32 nSrcPosNext((nSrcPos + 1L == rCandidate.count()) ? 0L : nSrcPos + 1L);
double fNextSrcLen(::basegfx::B2DVector(rCandidate.getB2DPoint(nSrcPos) - rCandidate.getB2DPoint(nSrcPosNext)).getLength());
- for(sal_uInt32 b(0L); b < nNum; b++)
+ for(sal_uInt32 b(0); b < nNum; b++)
{
// calc fDestPos in source
while(fSrcPos + fNextSrcLen < fDestPos)
@@ -262,9 +262,9 @@ void FuMorph::ImpEqualizePolyPointCount(
// transpose points to have smooth linear blending
::basegfx::B2DPolygon aPoly2;
aPoly2.append(::basegfx::B2DPoint(), nCnt);
- sal_uInt32 nInd(ImpGetNearestIndex(aPoly1, aTrans * rBig.getB2DPoint(0L)));
+ sal_uInt32 nInd(ImpGetNearestIndex(aPoly1, aTrans * rBig.getB2DPoint(0)));
- for(sal_uInt32 a(0L); a < nCnt; a++)
+ for(sal_uInt32 a(0); a < nCnt; a++)
{
aPoly2.setB2DPoint((a + nCnt - nInd) % nCnt, aPoly1.getB2DPoint(a));
}
@@ -281,7 +281,7 @@ sal_uInt32 FuMorph::ImpGetNearestIndex(
double fMinDist = 0.0;
sal_uInt32 nActInd = 0;
- for(sal_uInt32 a(0L); a < rPoly.count(); a++)
+ for(sal_uInt32 a(0); a < rPoly.count(); a++)
{
double fNewDist(::basegfx::B2DVector(rPoly.getB2DPoint(a) - rPos).getLength());
@@ -310,13 +310,13 @@ void FuMorph::ImpAddPolys(
::basegfx::B2DPoint aNewPoint(aToBeCopiedPolySize.getCenter());
::basegfx::B2DPolygon aNewPoly;
- const ::basegfx::B2DRange aSrcSize(::basegfx::tools::getRange(rBigger.getB2DPolygon(0L)));
+ const ::basegfx::B2DRange aSrcSize(::basegfx::tools::getRange(rBigger.getB2DPolygon(0)));
const ::basegfx::B2DPoint aSrcPos(aSrcSize.getCenter());
- const ::basegfx::B2DRange aDstSize(::basegfx::tools::getRange(rSmaller.getB2DPolygon(0L)));
+ const ::basegfx::B2DRange aDstSize(::basegfx::tools::getRange(rSmaller.getB2DPolygon(0)));
const ::basegfx::B2DPoint aDstPos(aDstSize.getCenter());
aNewPoint = aNewPoint - aSrcPos + aDstPos;
- for(sal_uInt32 a(0L); a < aToBeCopied.count(); a++)
+ for(sal_uInt32 a(0); a < aToBeCopied.count(); a++)
{
aNewPoly.append(aNewPoint);
}
@@ -455,14 +455,14 @@ void FuMorph::ImpInsertPolygons(
::basegfx::B2DPolyPolygon* pNewPolyPolygon = new ::basegfx::B2DPolyPolygon();
const double fFactor = 1.0 - fMorphingFactor;
- for(sal_uInt32 a(0L); a < rPolyPolyStart.count(); a++)
+ for(sal_uInt32 a(0); a < rPolyPolyStart.count(); a++)
{
const ::basegfx::B2DPolygon aPolyStart(rPolyPolyStart.getB2DPolygon(a));
const ::basegfx::B2DPolygon aPolyEnd(rPolyPolyEnd.getB2DPolygon(a));
const sal_uInt32 nCount(aPolyStart.count());
::basegfx::B2DPolygon aNewPolygon;
- for(sal_uInt32 b(0L); b < nCount; b++)
+ for(sal_uInt32 b(0); b < nCount; b++)
{
const ::basegfx::B2DPoint& aPtStart(aPolyStart.getB2DPoint(b));
const ::basegfx::B2DPoint& aPtEnd(aPolyEnd.getB2DPoint(b));
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 26ae2ba7ac39..e3f49c9c2321 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2245,9 +2245,9 @@ void SdXImpressDocument::paintTile( VirtualDevice& rDevice,
// that VirtualDevices use a DPI of 96.
// We specifically calculate these scales first as we're still
// in TWIPs, and might as well minimize the number of conversions.
- Fraction scaleX = Fraction( nOutputWidth, 96 ) * Fraction(1440L) /
+ Fraction scaleX = Fraction( nOutputWidth, 96 ) * Fraction(1440) /
Fraction( nTileWidth);
- Fraction scaleY = Fraction( nOutputHeight, 96 ) * Fraction(1440L) /
+ Fraction scaleY = Fraction( nOutputHeight, 96 ) * Fraction(1440) /
Fraction( nTileHeight);
// svx seems to be the only component that works natively in
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index ce5d5ba1fa43..92c0be3b69bd 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -396,8 +396,8 @@ long Window::GetZoomForRect( const ::tools::Rectangle& rZoomRect )
// rectangle being fully visible (when translated accordingly) as
// large as possible in the output area independently in both
// coordinate directions .
- sal_uLong nX(0L);
- sal_uLong nY(0L);
+ sal_uLong nX(0);
+ sal_uLong nY(0);
const Size aWinSize( PixelToLogic(GetOutputSizePixel()) );
if(rZoomRect.GetHeight())
@@ -470,8 +470,8 @@ long Window::SetZoomRect (const ::tools::Rectangle& rZoomRect)
// rectangle being fully visible (when translated accordingly) as
// large as possible in the output area independently in both
// coordinate directions .
- sal_uLong nX(0L);
- sal_uLong nY(0L);
+ sal_uLong nX(0);
+ sal_uLong nY(0);
if(rZoomRect.GetHeight())
{