summaryrefslogtreecommitdiff
path: root/xmloff
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 /xmloff
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 'xmloff')
-rw-r--r--xmloff/source/core/xmluconv.cxx2
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx12
-rw-r--r--xmloff/source/draw/sdxmlimp.cxx4
-rw-r--r--xmloff/source/draw/shapeexport.cxx6
-rw-r--r--xmloff/source/draw/xexptran.cxx8
-rw-r--r--xmloff/source/draw/ximpnote.cxx2
6 files changed, 17 insertions, 17 deletions
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index e63bb1fae8d7..fb22fa8281b7 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -491,7 +491,7 @@ static bool lcl_getPositions(const OUString& _sValue,OUString& _rContentX,OUStri
if(_sValue.isEmpty() || _sValue[0] != '(')
return false;
- sal_Int32 nPos(1L);
+ sal_Int32 nPos(1);
sal_Int32 nFound = _sValue.indexOf(' ', nPos);
if(nFound == -1 || nFound <= nPos)
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 0d0c02a9daa6..bd41599a6b90 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -389,9 +389,9 @@ SdXMLExport::SdXMLExport(
bool bIsDraw, SvXMLExportFlags nExportFlags )
: SvXMLExport( util::MeasureUnit::CM, xContext, implementationName,
(bIsDraw) ? XML_GRAPHICS : XML_PRESENTATION, nExportFlags ),
- mnDocMasterPageCount(0L),
- mnDocDrawPageCount(0L),
- mnObjectCount(0L),
+ mnDocMasterPageCount(0),
+ mnDocDrawPageCount(0),
+ mnObjectCount(0),
mpPageMasterInfoList(new ImpXMLEXPPageMasterList),
mpPageMasterUsageList(new ImpXMLEXPPageMasterList),
mpNotesPageMasterUsageList(new ImpXMLEXPPageMasterList),
@@ -604,13 +604,13 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent
// #82003# helper function for recursive object count
sal_uInt32 SdXMLExport::ImpRecursiveObjectCount(const Reference< drawing::XShapes >& xShapes)
{
- sal_uInt32 nRetval(0L);
+ sal_uInt32 nRetval(0);
if(xShapes.is())
{
sal_Int32 nCount = xShapes->getCount();
- for(sal_Int32 a(0L); a < nCount; a++)
+ for(sal_Int32 a(0); a < nCount; a++)
{
Any aAny(xShapes->getByIndex(a));
Reference< drawing::XShapes > xGroup;
@@ -2174,7 +2174,7 @@ void SdXMLExport::ExportAutoStyles_()
}
// create auto style infos for objects on master pages
- for(sal_Int32 nMPageId(0L); nMPageId < mnDocMasterPageCount; nMPageId++)
+ for(sal_Int32 nMPageId(0); nMPageId < mnDocMasterPageCount; nMPageId++)
{
Reference< XDrawPage > xMasterPage(mxDocMasterPages->getByIndex(nMPageId), UNO_QUERY );
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index 10010ca83ec0..b99022d4f471 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -268,8 +268,8 @@ SdXMLImport::SdXMLImport(
OUString const & implementationName,
bool bIsDraw, SvXMLImportFlags nImportFlags )
: SvXMLImport( xContext, implementationName, nImportFlags ),
- mnNewPageCount(0L),
- mnNewMasterPageCount(0L),
+ mnNewPageCount(0),
+ mnNewMasterPageCount(0),
mbIsDraw(bIsDraw),
mbLoadDoc(true),
mbPreview(false),
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 375de1e64ba6..364750933364 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1920,7 +1920,7 @@ void XMLShapeExport::ImpExportTextBoxShape(
XML_FRAME, bCreateNewline, true );
// evtl. corner radius?
- sal_Int32 nCornerRadius(0L);
+ sal_Int32 nCornerRadius(0);
xPropSet->getPropertyValue("CornerRadius") >>= nCornerRadius;
if(nCornerRadius)
{
@@ -1954,7 +1954,7 @@ void XMLShapeExport::ImpExportRectangleShape(
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
// evtl. corner radius?
- sal_Int32 nCornerRadius(0L);
+ sal_Int32 nCornerRadius(0);
xPropSet->getPropertyValue("CornerRadius") >>= nCornerRadius;
if(nCornerRadius)
{
@@ -2934,7 +2934,7 @@ void XMLShapeExport::ImpExportCaptionShape(
ImpExportNewTrans(xPropSet, nFeatures, pRefPoint);
// evtl. corner radius?
- sal_Int32 nCornerRadius(0L);
+ sal_Int32 nCornerRadius(0);
xPropSet->getPropertyValue("CornerRadius") >>= nCornerRadius;
if(nCornerRadius)
{
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 250a5b0064e6..afa03e0857cb 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -248,7 +248,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
OUString aEmptySpace(" ");
const sal_uInt32 nCount = maList.size();
- for(sal_uInt32 a(0L); a < nCount; a++)
+ for(sal_uInt32 a(0); a < nCount; a++)
{
ImpSdXMLExpTransObj2DBase* pObj = maList[a].get();
switch(pObj->mnType)
@@ -481,7 +481,7 @@ void SdXMLImExTransform2D::GetFullTransform(::basegfx::B2DHomMatrix& rFullTrans)
rFullTrans.identity();
const sal_uInt32 nCount = maList.size();
- for(sal_uInt32 a(0L); a < nCount; a++)
+ for(sal_uInt32 a(0); a < nCount; a++)
{
ImpSdXMLExpTransObj2DBase* pObj = maList[a].get();
switch(pObj->mnType)
@@ -626,7 +626,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
OUString aEmptySpace(" ");
const sal_uInt32 nCount = maList.size();
- for(sal_uInt32 a(0L); a < nCount; a++)
+ for(sal_uInt32 a(0); a < nCount; a++)
{
ImpSdXMLExpTransObj3DBase* pObj = maList[a].get();
switch(pObj->mnType)
@@ -959,7 +959,7 @@ void SdXMLImExTransform3D::GetFullTransform(::basegfx::B3DHomMatrix& rFullTrans)
rFullTrans.identity();
const sal_uInt32 nCount = maList.size();
- for(sal_uInt32 a(0L); a < nCount; a++)
+ for(sal_uInt32 a(0); a < nCount; a++)
{
ImpSdXMLExpTransObj3DBase* pObj = maList[a].get();
switch(pObj->mnType)
diff --git a/xmloff/source/draw/ximpnote.cxx b/xmloff/source/draw/ximpnote.cxx
index bb30e4510aac..d7ab3c60d38a 100644
--- a/xmloff/source/draw/ximpnote.cxx
+++ b/xmloff/source/draw/ximpnote.cxx
@@ -75,7 +75,7 @@ SdXMLNotesContext::SdXMLNotesContext( SdXMLImport& rImport,
uno::Reference< drawing::XShape > xShape;
while(rShapes->getCount())
{
- rShapes->getByIndex(0L) >>= xShape;
+ rShapes->getByIndex(0) >>= xShape;
if(xShape.is())
rShapes->remove(xShape);
}