[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/ado/AResultSet.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 83cc9a3fae1cf8fa8b6753d1db8ccf7226797613
Author: Asela Dasanayaka <rukmal...@gmail.com>
Date: Thu Oct 13 15:58:45 2016 +0530
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
Fix a bug on connectivity/source/drivers/ado/AResultSet.cxx
Change-Id: I164732100ff3bdc4e73f80e2495610cb53581b0d
Reviewed-on: https://gerrit.libreoffice.org/29758
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx
b/connectivity/source/drivers/ado/AResultSet.cxx
index 020c643..f22c99f 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -61,10 +61,7 @@ OUString SAL_CALL OResultSet::getImplementationName( )
throw (css::uno::Runtime
css::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(
) throw(css::uno::RuntimeException)
{
-css::uno::Sequence< OUString > aSupported(2);
-aSupported[0] = "com.sun.star.sdbc.ResultSet";
-aSupported[1] = "com.sun.star.sdbcx.ResultSet";
-return aSupported;
+return {"com.sun.star.sdbc.ResultSet","com.sun.star.sdbcx.ResultSet"};
}
sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName )
throw(css::uno::RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idlc/inc idlc/source
idlc/inc/idlc.hxx |2 +-
idlc/inc/idlctypes.hxx |3 ---
idlc/inc/options.hxx|4 ++--
idlc/source/idlcmain.cxx|4 ++--
idlc/source/idlcproduce.cxx |8
idlc/source/parser.y| 22 +++---
6 files changed, 20 insertions(+), 23 deletions(-)
New commits:
commit 4f0f1b6b5554f49dfe8cca1088d3e5b342b4fd2a
Author: Asela Dasanayaka <rukmal...@gmail.com>
Date: Thu Oct 13 14:42:16 2016 +0530
tdf#96099 Reduce no of typedefs used for trivial containers
Removed various pinter typedefs in idlc module
Change-Id: Id850558a4550085d47a5e1122b1ce871f15956f2
Reviewed-on: https://gerrit.libreoffice.org/29754
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/idlc/inc/idlc.hxx b/idlc/inc/idlc.hxx
index 56fda18..468bec2 100644
--- a/idlc/inc/idlc.hxx
+++ b/idlc/inc/idlc.hxx
@@ -132,7 +132,7 @@ private:
sal_uInt32 m_offsetStart;
sal_uInt32 m_offsetEnd;
ParseState m_parseState;
-StringSet m_includes;
+std::set< OString > m_includes;
};
diff --git a/idlc/inc/idlctypes.hxx b/idlc/inc/idlctypes.hxx
index 12c665c..931afbf 100644
--- a/idlc/inc/idlctypes.hxx
+++ b/idlc/inc/idlctypes.hxx
@@ -30,9 +30,6 @@
#include
#include
-typedef ::std::list< OString > StringList;
-typedef ::std::vector< OString > StringVector;
-typedef ::std::set< OString >StringSet;
class AstDeclaration;
diff --git a/idlc/inc/options.hxx b/idlc/inc/options.hxx
index 3fbfc45..709cfc6 100644
--- a/idlc/inc/options.hxx
+++ b/idlc/inc/options.hxx
@@ -64,14 +64,14 @@ public:
const OString& getOption(const OString& option)
throw( IllegalArgument );
-const StringVector& getInputFiles() const { return m_inputFiles; }
+const std::vector< OString >& getInputFiles() const { return m_inputFiles;
}
bool readStdin() const { return m_stdin; }
bool verbose() const { return m_verbose; }
bool quiet() const { return m_quiet; }
protected:
OString m_program;
-StringVectorm_inputFiles;
+std::vector< OString >m_inputFiles;
boolm_stdin;
boolm_verbose;
boolm_quiet;
diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx
index d610246..59a656a 100644
--- a/idlc/source/idlcmain.cxx
+++ b/idlc/source/idlcmain.cxx
@@ -72,14 +72,14 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
idlc()->reset();
}
-StringVector const & files = options.getInputFiles();
+std::vector< OString > const & files = options.getInputFiles();
if ( options.verbose() )
{
fprintf( stdout, "%s: compiling %i source files ... \n",
options.getProgramName().getStr(), (int)files.size() );
fflush( stdout );
}
-for (StringVector::const_iterator i(files.begin());
+for (std::vector< OString >::const_iterator i(files.begin());
i != files.end() && nErrors == 0; ++i)
{
OString sysFileName( convertToAbsoluteSystemPath(*i) );
diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx
index 1588dd3..32e53db 100644
--- a/idlc/source/idlcproduce.cxx
+++ b/idlc/source/idlcproduce.cxx
@@ -39,7 +39,7 @@
using namespace ::osl;
-StringList* pCreatedDirectories = nullptr;
+std::list< OString >* pCreatedDirectories = nullptr;
static bool checkOutputPath(const OString& completeName)
{
@@ -83,7 +83,7 @@ static bool checkOutputPath(const OString& completeName)
} else
{
if ( !pCreatedDirectories )
-pCreatedDirectories = new StringList();
+pCreatedDirectories = new std::list< OString >();
pCreatedDirectories->push_front(buffer.getStr());
}
}
@@ -96,8 +96,8 @@ static bool cleanPath()
{
if ( pCreatedDirectories )
{
-StringList::iterator iter = pCreatedDirectories->begin();
-StringList::iterator end = pCreatedDirectories->end();
+std::list< OString >::iterator iter = pCreatedDirectories->begin();
+std::list< OString >::iterator end = pCreatedDirectories->end();
while ( iter != end )
{
//#ifdef SAL_UNX
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index c045916..6e7bf78 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -235,7 +235,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration
const * type2) {
sal_uInt32 ulval; /* sal_uInt32 value */
double dval; /* double value */
float fval; /* float value */
-
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/LocaleNode.cxx |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit bb06f2c00eea15c287fc06988d6f9b1f21098936
Author: Asela Dasanayaka <rukmal...@gmail.com>
Date: Fri Sep 23 06:13:58 2016 +0530
tdf#100726 Improve readability of OUString concatination
concat string in module i18npool to improve readability
Change-Id: I7f447d64703cf5eb07742329ff2656f67214898b
Reviewed-on: https://gerrit.libreoffice.org/29206
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: jan iversen <j...@documentfoundation.org>
diff --git a/i18npool/source/localedata/LocaleNode.cxx
b/i18npool/source/localedata/LocaleNode.cxx
index 13ff853..1aad3d4 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -723,13 +723,7 @@ void LCFormatNode::generateCode (const OFileWriter )
const
OUString aKey( aUsage + "," + aType);
if (!aDefaultsSet.insert( aKey).second)
{
-OUString aStr( "Duplicated default for usage=\"");
-aStr += aUsage;
-aStr += "\" type=\"";
-aStr += aType;
-aStr += "\": formatindex=\"";
-aStr += aFormatIndex;
-aStr += "\".";
+OUString aStr = "Duplicated default for usage=\"" + aUsage +
"\" type=\"" + aType + "\": formatindex=\"" + aFormatIndex + "\".";
incError( aStr);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/classes/image.cxx |4 ++--
basic/source/classes/sb.cxx |6 +++---
basic/source/comp/buffer.cxx |2 +-
basic/source/inc/filefmt.hxx |6 +++---
basic/source/runtime/ddectrl.cxx |2 +-
basic/source/runtime/methods.cxx |2 +-
basic/source/sbx/sbxbase.cxx |2 +-
basic/source/sbx/sbxobj.cxx |2 +-
basic/source/sbx/sbxvar.cxx |2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 057ae1cfcac518e5693e75aca87d307ce90ba6fb
Author: Asela Dasanayaka <rukmal...@gmail.com>
Date: Wed Aug 3 10:18:16 2016 +0530
tdf#96505 get rid of "long" integer literals 'L'
Remove L from integer literals in module basic all 0L, 1L, 2L and 3L
Change-Id: Ia46ce3d206020e16fc17e95731244a557941528c
Reviewed-on: https://gerrit.libreoffice.org/27816
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 1e1fecc..05ec8a2 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -579,7 +579,7 @@ void SbiImage::AddString( const OUString& r )
{
sal_Int32 len = r.getLength() + 1;
sal_uInt32 needed = nStringOff + len;
-if( needed > 0xFF00L )
+if( needed > 0xFF00 )
{
bError = true; // out of mem!
}
@@ -696,7 +696,7 @@ void SbiImage::ReleaseLegacyBuffer()
bool SbiImage::ExceedsLegacyLimits()
{
-return ( nStringSize > 0xFF00L ) || ( CalcLegacyOffset( nCodeSize ) >
0xFF00L );
+return ( nStringSize > 0xFF00 ) || ( CalcLegacyOffset( nCodeSize ) >
0xFF00 );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index a4de8a1..6964406 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1527,7 +1527,7 @@ sal_uInt16 StarBASIC::GetVBErrorCode( SbError nError )
SbError StarBASIC::GetSfxFromVBError( sal_uInt16 nError )
{
-SbError nRet = 0L;
+SbError nRet = 0;
if( SbiRuntime::isVBAEnabled() )
{
@@ -1539,7 +1539,7 @@ SbError StarBASIC::GetSfxFromVBError( sal_uInt16 nError )
case 8:
case 12:
case 73:
-return 0L;
+return 0;
case 10:
return ERRCODE_BASIC_ARRAY_FIX;
case 14:
@@ -1553,7 +1553,7 @@ SbError StarBASIC::GetSfxFromVBError( sal_uInt16 nError )
case 92:
return ERRCODE_BASIC_LOOP_NOT_INIT;
default:
-nRet = 0L;
+nRet = 0;
}
}
const SFX_VB_ErrorItem* pErrItem;
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index fdb2fa4..7d95705 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -20,7 +20,7 @@
#include "buffer.hxx"
#include "parser.hxx"
-const static sal_uInt32 UP_LIMIT=0xFF00L;
+const static sal_uInt32 UP_LIMIT=0xFF00;
// The SbiBuffer will be expanded in increments of at least 16 Bytes.
// This is necessary, because many classes emanate from a buffer length
diff --git a/basic/source/inc/filefmt.hxx b/basic/source/inc/filefmt.hxx
index d6ef8c8..94be6db 100644
--- a/basic/source/inc/filefmt.hxx
+++ b/basic/source/inc/filefmt.hxx
@@ -43,9 +43,9 @@ class SvStream;
// Version 13: tdf#94617 store methods nStart information greater than
sal_Int16 limit
//
-#define B_LEGACYVERSION 0x0011L
-#define B_EXT_IMG_VERSION 0x0012L
-#define B_CURVERSION 0x0013L
+#define B_LEGACYVERSION 0x0011
+#define B_EXT_IMG_VERSION 0x0012
+#define B_CURVERSION 0x0013
// The file contains either a module- or a library-record.
// Those records contain further records. Every record's got
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 384d19d..fb84c1a 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -133,7 +133,7 @@ SbError SbiDdeControl::Terminate( size_t nChannel )
delete pConv;
aConvList[nChannel-1] = DDE_FREECHANNEL;
-return 0L;
+return 0;
}
SbError SbiDdeControl::TerminateAll()
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 562c797..468cb9f 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -204,7 +204,7 @@ RTLFUNC(Error)
else
{
OUString aErrorMsg;
-SbError nErr = 0L;
+SbError nErr = 0;
sal_Int32 nCode = 0;
if( rPar.Count() == 1 )
{
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index f1f9518..7ff452d 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -248,7 +248,7 @@ bool SbxBase::Store( SvStream& rStrm )
.WriteUInt16( static_cast(GetFlags()) )
[Libreoffice-commits] core.git: rsc/source
rsc/source/res/rscrange.cxx |6 +++---
rsc/source/tools/rscdef.cxx |2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 9fcfe485cd23d7e560aa05efbd02401d62d144dd
Author: Asela Dasanayaka <rukmal...@gmail.com>
Date: Wed Aug 3 12:15:51 2016 +0530
tdf#96505 get rid of "long" integer literals 'L'
Remove L from integer literals in module rsc all OL and 1L
Change-Id: I4a47fead01c2e7f1febc5299eb0905ecf14cee2a
Reviewed-on: https://gerrit.libreoffice.org/27818
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx
index 9f7a730..6e379ff 100644
--- a/rsc/source/res/rscrange.cxx
+++ b/rsc/source/res/rscrange.cxx
@@ -100,8 +100,8 @@ RSCINST RscRange::Create( RSCINST * pInst, const RSCINST &
rDflt,
memmove( aInst.pData, rDflt.pData, sizeof( RscRangeInst ) );
else
{
-if( 0L >= nMin && 0L <= nMax )
-reinterpret_cast(aInst.pData)->nValue =
(sal_uInt16)(0L - nMin);
+if( 0 >= nMin && 0 <= nMax )
+reinterpret_cast(aInst.pData)->nValue =
(sal_uInt16)(0 - nMin);
else
reinterpret_cast(aInst.pData)->nValue = 0;
@@ -211,7 +211,7 @@ RSCINST RscLongRange::Create( RSCINST * pInst, const
RSCINST & rDflt,
else
{
sal_Int32 lDflt;
-if( 0L >= nMin && 0L <= nMax )
+if( 0 >= nMin && 0 <= nMax )
lDflt = 0;
else
lDflt = nMin;
diff --git a/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index e7f5f44..be4ea3f 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.cxx
@@ -301,7 +301,7 @@ bool RscExpression::Evaluate( sal_Int32 * plValue )
*plValue = lLeft << lRight;
else
{
-if( 0L == lRight )
+if( 0 == lRight )
return false;
*plValue = lLeft / lRight;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source
canvas/source/cairo/cairo_textlayout.cxx |2 +- canvas/source/directx/dx_9rm.cxx |4 ++-- canvas/source/directx/dx_vcltools.cxx| 18 +- 3 files changed, 12 insertions(+), 12 deletions(-) New commits: commit a9bda90b3ad8ad8bb1e76c73e10df5c73607907f Author: Asela Dasanayaka <rukmal...@gmail.com> Date: Wed Aug 3 11:04:47 2016 +0530 tdf#96505 get rid of long integer literals 'L' Remove L from integer literals in module canvas all 0L, 1L, 2L , 7L and 8L Change-Id: Idd41a31857b4bb58ed8e7b6f4e727a73806098b1 Reviewed-on: https://gerrit.libreoffice.org/27817 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Tor Lillqvist <t...@collabora.com> diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 7247ce8..7ace9c7 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -480,7 +480,7 @@ namespace cairocanvas //faux italics if (rSysFontData.bFakeItalic) -m.xy = -m.xx * 0x6000L / 0x1L; +m.xy = -m.xx * 0x6000 / 0x1; cairo_set_font_matrix(pSCairo.get(), ); diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index 6e7ba8c..2dcebf3 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -795,7 +795,7 @@ namespace dxcanvas LPDIRECT3DSURFACE9 pBackBuffer = NULL; mpSwapChain->GetBackBuffer(0,D3DBACKBUFFER_TYPE_MONO,); mpDevice->SetRenderTarget( 0, pBackBuffer ); -mpDevice->Clear(0,NULL,D3DCLEAR_TARGET,0,1.0f,0L); +mpDevice->Clear(0,NULL,D3DCLEAR_TARGET,0,1.0f,0); pBackBuffer->Release(); return true; @@ -964,7 +964,7 @@ namespace dxcanvas LPDIRECT3DSURFACE9 pBackBuffer = NULL; mpSwapChain->GetBackBuffer(0,D3DBACKBUFFER_TYPE_MONO,); mpDevice->SetRenderTarget( 0, pBackBuffer ); -mpDevice->Clear(0,NULL,D3DCLEAR_TARGET,0,1.0f,0L); +mpDevice->Clear(0,NULL,D3DCLEAR_TARGET,0,1.0f,0); pBackBuffer->Release(); } } diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx index 41d03f6..addbda6 100644 --- a/canvas/source/directx/dx_vcltools.cxx +++ b/canvas/source/directx/dx_vcltools.cxx @@ -49,7 +49,7 @@ namespace dxcanvas if( rBIH.biClrUsed ) return rBIH.biClrUsed; else -return 1L << rBIH.biBitCount; +return 1 << rBIH.biBitCount; } } else @@ -57,7 +57,7 @@ namespace dxcanvas BITMAPCOREHEADER* pCoreHeader = (BITMAPCOREHEADER*) if( pCoreHeader->bcBitCount <= 8 ) -return 1L << pCoreHeader->bcBitCount; +return 1 << pCoreHeader->bcBitCount; } return 0; // nothing known @@ -341,7 +341,7 @@ namespace dxcanvas BitmapColor aCol; int nCurrBit; -const int nMask( 1L ); +const int nMask( 1 ); const int nInitialBit(7); sal_uInt8* pCurrOutput( aBmpData.mpBitmapData.get() ); int x, y; @@ -378,8 +378,8 @@ namespace dxcanvas *pCurrOutput++ = aCol.GetGreen(); *pCurrOutput++ = aCol.GetRed(); -*pCurrOutput++ = aColorMap[ (pMScan[ (x & ~7L) >> 3L ] >> nCurrBit ) & nMask ]; -nCurrBit = ((nCurrBit - 1) % 8L) & 7L; +*pCurrOutput++ = aColorMap[ (pMScan[ (x & ~7) >> 3 ] >> nCurrBit ) & nMask ]; +nCurrBit = ((nCurrBit - 1) % 8) & 7; } } break; @@ -396,8 +396,8 @@ namespace dxcanvas *pCurrOutput++ = *pScan++; *pCurrOutput++ = *pScan++; -*pCurrOutput++ = aColorMap[ (pMScan[ (x & ~7L) >> 3L ] >> nCurrBit ) & nMask ]; -nCurrBit = ((nCurrBit - 1) % 8L) & 7L; +*pCurrOutput++ = aColorMap[ (pMScan[ (x & ~7) >> 3 ] >> nCurrBit ) & nMask ]; +nCurrBit = ((nCurrBit - 1) % 8) & 7;
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/curve/b2dcubicbezier.cxx |8 +-
basegfx/source/polygon/b2dlinegeometry.cxx|4 -
basegfx/source/polygon/b2dpolygonclipper.cxx | 10 +--
basegfx/source/polygon/b2dpolygoncutandtouch.cxx | 36 ++--
basegfx/source/polygon/b2dpolygontools.cxx| 66 +++---
basegfx/source/polygon/b2dpolygontriangulator.cxx | 10 +--
basegfx/source/polygon/b2dpolypolygoncutter.cxx | 10 +--
basegfx/source/polygon/b2dpolypolygontools.cxx|8 +-
basegfx/source/polygon/b3dpolygon.cxx | 44 +++---
basegfx/source/polygon/b3dpolygontools.cxx| 22 +++
basegfx/source/polygon/b3dpolypolygontools.cxx| 10 +--
basegfx/source/tools/unopolypolygon.cxx |2
basegfx/source/tools/unotools.cxx |4 -
13 files changed, 117 insertions(+), 117 deletions(-)
New commits:
commit cf0fea5546c9b6b30d18deb084ddaa5e08aad41b
Author: Asela Dasanayaka <rukmal...@gmail.com>
Date: Sat Jul 30 12:31:53 2016 +0530
tdf#96505 get rid of "long" integer literals 'L'
Remove L from integer literals in module basegfx all 0L, 1L, and 2L
Change-Id: Ia8a0d660033651f6d0a35392b74b67358b639fb3
Reviewed-on: https://gerrit.libreoffice.org/27717
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx
b/basegfx/source/curve/b2dcubicbezier.cxx
index 5b320de..ed81ea3 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -670,7 +670,7 @@ namespace basegfx
double B2DCubicBezier::getSmallestDistancePointToBezierSegment(const
B2DPoint& rTestPoint, double& rCut) const
{
-const sal_uInt32 nInitialDivisions(3L);
+const sal_uInt32 nInitialDivisions(3);
B2DPolygon aInitialPolygon;
// as start make a fix division, creates nInitialDivisions + 2L points
@@ -684,7 +684,7 @@ namespace basegfx
double fNewQuadDist;
sal_uInt32 nSmallestIndex(0);
-for(sal_uInt32 a(1L); a < nPointCount; a++)
+for(sal_uInt32 a(1); a < nPointCount; a++)
{
aVector = B2DVector(rTestPoint - aInitialPolygon.getB2DPoint(a));
fNewQuadDist = aVector.getX() * aVector.getX() + aVector.getY() *
aVector.getY();
@@ -697,8 +697,8 @@ namespace basegfx
}
// look right and left for even smaller distances
-double fStepValue(1.0 / (double)((nPointCount - 1L) * 2L)); // half
the edge step width
-double fPosition((double)nSmallestIndex / (double)(nPointCount - 1L));
+double fStepValue(1.0 / (double)((nPointCount - 1) * 2)); // half the
edge step width
+double fPosition((double)nSmallestIndex / (double)(nPointCount - 1));
bool bDone(false);
while(!bDone)
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx
b/basegfx/source/polygon/b2dlinegeometry.cxx
index abf80cc..574c9c1 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -46,7 +46,7 @@ namespace basegfx
double fShift)
{
B2DPolyPolygon aRetval;
-OSL_ENSURE(rCandidate.count() > 1L,
"createAreaGeometryForLineStartEnd: Line polygon has too less points (!)");
+OSL_ENSURE(rCandidate.count() > 1,
"createAreaGeometryForLineStartEnd: Line polygon has too less points (!)");
OSL_ENSURE(rArrow.count() > 0, "createAreaGeometryForLineStartEnd:
Empty arrow tools::PolyPolygon (!)");
OSL_ENSURE(fWidth > 0.0, "createAreaGeometryForLineStartEnd: Width
too small (!)");
OSL_ENSURE(fDockingPosition >= 0.0 && fDockingPosition <= 1.0,
@@ -98,7 +98,7 @@ namespace basegfx
// get the polygon vector we want to plant this arrow on
const double fConsumedLength(fArrowYLength * (1.0 -
fDockingPosition) - fShift);
-const B2DVector aHead(rCandidate.getB2DPoint((bStart) ? 0 :
rCandidate.count() - 1L));
+const B2DVector aHead(rCandidate.getB2DPoint((bStart) ? 0 :
rCandidate.count() - 1));
const B2DVector aTail(getPositionAbsolute(rCandidate,
(bStart) ? fConsumedLength : fCandidateLength -
fConsumedLength, fCandidateLength));
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx
b/basegfx/source/polygon/b2dpolygonclipper.cxx
index f0e8ede..2ec349e 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -93,7 +93,7 @@ namespace basegfx
bParallelToXAxis ? fValueOnOtherAxis :
aCandidateRange.getMaxY() + fSmallExtension);
const B2DPolygon aCandidate(addPointsAtCuts(rCandidate,
aStart, aEnd));
