svx/source/svdraw/svdedxv.cxx | 6 +++---
sw/inc/tabcol.hxx | 2 +-
sw/source/core/bastyp/tabcol.cxx | 4 ++--
sw/source/core/doc/tblafmt.cxx | 14 +++++++-------
4 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit fd19e3f823ef8b83f4185da173365ba1b129e4a9
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Feb 19 09:01:16 2015 +0100
sw: nAnz -> nCount
Change-Id: Ia8c237009634eb0c750db42da4f68a31d40c5368
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index 72e495d..aaf0548 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -69,7 +69,7 @@ public:
void Insert( long nValue, bool bValue, size_t nPos );
void Insert( long nValue, long nMin, long nMax, bool bValue, size_t nPos );
- void Remove( size_t nPos, size_t nAnz = 1 );
+ void Remove( size_t nPos, size_t nCount = 1 );
const SwTabColsEntry& GetEntry( size_t nPos ) const { return aData[nPos]; }
SwTabColsEntry& GetEntry( size_t nPos ) { return aData[nPos]; }
diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index 0f5c789..b6e4cd1 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -105,10 +105,10 @@ void SwTabCols::Insert( long nValue, bool bValue, size_t
nPos )
#endif
}
-void SwTabCols::Remove( size_t nPos, size_t nAnz )
+void SwTabCols::Remove( size_t nPos, size_t nCount )
{
SwTabColsEntries::iterator aStart = aData.begin() + nPos;
- aData.erase( aStart, aStart + nAnz );
+ aData.erase( aStart, aStart + nCount );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index e4eea4a..71cb1ba 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1161,21 +1161,21 @@ bool SwTableAutoFmtTbl::Load( SvStream& rStream )
aVersions.Load( rStream, nVal ); // Item versions
SwTableAutoFmt* pNew;
- sal_uInt16 nAnz = 0;
- rStream.ReadUInt16( nAnz );
+ sal_uInt16 nCount = 0;
+ rStream.ReadUInt16( nCount );
bRet = 0 == rStream.GetError();
if (bRet)
{
const size_t nMinRecordSize = sizeof(sal_uInt16);
const size_t nMaxRecords = rStream.remainingSize() /
nMinRecordSize;
- if (nAnz > nMaxRecords)
+ if (nCount > nMaxRecords)
{
- SAL_WARN("vcl.gdi", "Parsing error: " << nMaxRecords <<
- " max possible entries, but " << nAnz << "
claimed, truncating");
- nAnz = nMaxRecords;
+ SAL_WARN("sw.core", "Parsing error: " << nMaxRecords <<
+ " max possible entries, but " << nCount << "
claimed, truncating");
+ nCount = nMaxRecords;
}
- for (sal_uInt16 i = 0; i < nAnz; ++i)
+ for (sal_uInt16 i = 0; i < nCount; ++i)
{
pNew = new SwTableAutoFmt( OUString() );
bRet = pNew->Load( rStream, aVersions );
commit 998d30b6c96aa4b05bcc1360d36791af81c9924c
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Feb 19 09:01:04 2015 +0100
svx: nViewAnz -> nViewCount
Change-Id: I76e7f2b29c6583c32a3c2b49f3365688f8f81bce
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 67d9514..f8b234b 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -297,14 +297,14 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow&
rPaintWindow) const
if(pActiveOutliner)
{
- const sal_uInt32 nViewAnz(pActiveOutliner->GetViewCount());
+ const sal_uInt32 nViewCount(pActiveOutliner->GetViewCount());
- if(nViewAnz)
+ if(nViewCount)
{
const vcl::Region& rRedrawRegion =
rPaintWindow.GetRedrawRegion();
const Rectangle aCheckRect(rRedrawRegion.GetBoundRect());
- for(sal_uInt32 i(0); i < nViewAnz; i++)
+ for(sal_uInt32 i(0); i < nViewCount; i++)
{
OutlinerView* pOLV = pActiveOutliner->GetView(i);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
