[Libreoffice-commits] .: 4 commits - binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx hwpfilter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Jan 18 02:53:52 PST 2011
binfilter/bf_starmath/source/starmath_xchar.cxx | 265 ---------------------
binfilter/bf_svtools/source/misc1/svt_adrparse.cxx | 2
binfilter/bf_svx/source/outliner/makefile.mk | 2
binfilter/bf_svx/source/outliner/svx_outliner.cxx | 30 +-
binfilter/bf_svx/source/outliner/svx_outlobj.cxx | 6
hwpfilter/source/hbox.cpp | 4
hwpfilter/source/hbox.h | 6
hwpfilter/source/hpara.cpp | 2
hwpfilter/source/hwpread.cpp | 2
9 files changed, 24 insertions(+), 295 deletions(-)
New commits:
commit 87776cce7cfd30e64ee42b08f4b9bfda0fc1598e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 18 10:53:42 2011 +0000
disambiguate between two different SkipBlocks
diff --git a/hwpfilter/source/hbox.cpp b/hwpfilter/source/hbox.cpp
index 61a83e6..1fa7478 100644
--- a/hwpfilter/source/hbox.cpp
+++ b/hwpfilter/source/hbox.cpp
@@ -85,13 +85,13 @@ hunit HBox::Height(CharShape *csty)
// skip block
-SkipBlock::SkipBlock(hchar hch):HBox(hch)
+SkipData::SkipData(hchar hch):HBox(hch)
{
data_block = 0;
}
-SkipBlock::~SkipBlock(void)
+SkipData::~SkipData(void)
{
delete[]data_block;
}
diff --git a/hwpfilter/source/hbox.h b/hwpfilter/source/hbox.h
index 610d823..a6781bb 100644
--- a/hwpfilter/source/hbox.h
+++ b/hwpfilter/source/hbox.h
@@ -84,14 +84,14 @@ struct HBox
/**
* @short Class for saving data to be skipped.
*/
-struct SkipBlock: public HBox
+struct SkipData: public HBox
{
ulong data_block_len;
hchar dummy;
char *data_block;
- SkipBlock(hchar);
- virtual ~SkipBlock();
+ SkipData(hchar);
+ virtual ~SkipData();
virtual int Read(HWPFile &hwpf);
};
struct DateCode;
diff --git a/hwpfilter/source/hpara.cpp b/hwpfilter/source/hpara.cpp
index 78c162e..2110b55 100644
--- a/hwpfilter/source/hpara.cpp
+++ b/hwpfilter/source/hpara.cpp
@@ -221,7 +221,7 @@ HBox *HWPPara::readHBox(HWPFile & hwpf)
if (hh > 31 || hh == CH_END_PARA)
hbox = new HBox(hh);
else if (IS_SP_SKIP_BLOCK(hh))
- hbox = new SkipBlock(hh);
+ hbox = new SkipData(hh);
else
{
switch (hh)
diff --git a/hwpfilter/source/hwpread.cpp b/hwpfilter/source/hwpread.cpp
index 579630f..0452d87 100644
--- a/hwpfilter/source/hwpread.cpp
+++ b/hwpfilter/source/hwpread.cpp
@@ -52,7 +52,7 @@ int HBox::Read(HWPFile & )
// skip block
-int SkipBlock::Read(HWPFile & hwpf)
+int SkipData::Read(HWPFile & hwpf)
{
hwpf.Read4b(&data_block_len, 1);
hwpf.Read2b(&dummy, 1);
commit 997a7929c6af85bd479d535e5e7f9ae6378e0830
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 18 10:49:49 2011 +0000
this file isn't built, remove it
diff --git a/binfilter/bf_starmath/source/starmath_xchar.cxx b/binfilter/bf_starmath/source/starmath_xchar.cxx
deleted file mode 100644
index 331130f..0000000
--- a/binfilter/bf_starmath/source/starmath_xchar.cxx
+++ /dev/null
@@ -1,265 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include <tools/stream.hxx>
-#include <bf_svx/xoutx.hxx>
-
-#include "xchar.hxx"
-#include "types.hxx"
-
-#include "smdll.hxx"
-#include "starmath.hrc"
-namespace binfilter {
-
-
-
-
-
-
-
-
-
-////////////////////////////////////////
-
-
-
-
-
-
-
-////////////////////////////////////////
-
-
-/*?*/ class SmPolygonLoader : public Resource
-/*?*/ {
-/*?*/ public:
-/*?*/ SmPolygonLoader(const SmResId &rId, SmPolygon &rSmPolygon);
-/*?*/ };
-
-
-/*N*/ SmPolygonLoader::SmPolygonLoader(const SmResId& rId, SmPolygon &rSmPolygon)
-/*N*/ : Resource (rId)
-/*N*/ {
-/*N*/ USHORT nBytesLeft; // upper size limit to a single resource is 64 kB!
-/*N*/
-/*N*/ // set cursor to begin of resource
-/*N*/ //GetClassRes(); // it's done automatically!
-/*N*/
-/*N*/ // get number of bytes from actual position to end of resource
-/*N*/ nBytesLeft = GetRemainSizeRes();
-/*N*/
-/*N*/ char *pStr = (char *) GetClassRes();
-/*N*/ SvMemoryStream aStrm(pStr, nBytesLeft, STREAM_READ);
-/*N*/
-/*N*/ aStrm >> rSmPolygon.cChar
-/*N*/ >> rSmPolygon.aFontSize
-/*N*/ >> rSmPolygon.aOrigPos
-/*N*/ >> rSmPolygon.aOrigSize
-/*N*/ >> rSmPolygon.aPoly;
-/*N*/
-/*N*/ //! Warning: don't know why, but it has to be done!
-/*N*/ IncrementRes(nBytesLeft);
-/*N*/ }
-
-
-////////////////////////////////////////
-// SmPolygon
-//
-
-/*N*/ SmPolygon::SmPolygon()
-/*N*/ {
-/*N*/ cChar = sal_Char('\x00'),
-/*N*/ fScaleX = fScaleY =
-/*N*/ fDelayedFactorX = fDelayedFactorY = 1.0;
-/*N*/ bDelayedScale = bDelayedBoundRect = FALSE;
-/*N*/ }
-
-
-/*N*/ SmPolygon::SmPolygon(sal_Unicode cCharP)
-/*N*/ {
-/*N*/ cChar = cCharP;
-/*N*/ fScaleX = fScaleY =
-/*N*/ fDelayedFactorX = fDelayedFactorY = 1.0;
-/*N*/ bDelayedScale = bDelayedBoundRect = FALSE;
-/*N*/
-/*N*/ if (cChar == sal_Char('\0'))
-/*N*/ return;
-/*N*/
-/*N*/ // get appropriate resource id
-/*N*/ int nResId = 0;
-/*N*/ switch (cChar)
-/*N*/ {
-/*N*/ case MS_LINE : nResId = RID_XPP_LINE; break;
-/*N*/ case MS_DLINE : nResId = RID_XPP_DLINE; break;
-/*N*/ case MS_SQRT : nResId = RID_XPP_SQRT; break;
-/*N*/ case MS_SQRT2 : nResId = RID_XPP_SQRT2; break;
-/*N*/ case MS_HAT : nResId = RID_XPP_HAT; break;
-/*N*/ case MS_TILDE : nResId = RID_XPP_TILDE; break;
-/*N*/ case MS_BAR : nResId = RID_XPP_BAR; break;
-/*N*/ case MS_VEC : nResId = RID_XPP_VEC; break;
-/*N*/ case MS_LBRACE : nResId = RID_XPP_LBRACE; break;
-/*N*/ case MS_RBRACE : nResId = RID_XPP_RBRACE; break;
-/*N*/ case MS_LPARENT : nResId = RID_XPP_LPARENT; break;
-/*N*/ case MS_RPARENT : nResId = RID_XPP_RPARENT; break;
-/*N*/ case MS_LANGLE : nResId = RID_XPP_LANGLE; break;
-/*N*/ case MS_RANGLE : nResId = RID_XPP_RANGLE; break;
-/*N*/ case MS_LBRACKET : nResId = RID_XPP_LBRACKET; break;
-/*N*/ case MS_RBRACKET : nResId = RID_XPP_RBRACKET; break;
-/*N*/ case MS_LDBRACKET : nResId = RID_XPP_LDBRACKET; break;
-/*N*/ case MS_RDBRACKET : nResId = RID_XPP_RDBRACKET; break;
-/*N*/ case MS_LCEIL : nResId = RID_XPP_LCEIL; break;
-/*N*/ case MS_RCEIL : nResId = RID_XPP_RCEIL; break;
-/*N*/ case MS_LFLOOR : nResId = RID_XPP_LFLOOR; break;
-/*N*/ case MS_RFLOOR : nResId = RID_XPP_RFLOOR; break;
-/*N*/ case MS_OVERBRACE : nResId = RID_XPP_OVERBRACE; break;
-/*N*/ case MS_UNDERBRACE : nResId = RID_XPP_UNDERBRACE; break;
-/*N*/
-/*N*/ default :
-/*N*/ DBG_ASSERT(0, "Sm: char hat kein Polygon");
-/*N*/ }
-/*N*/
-/*N*/ if (nResId)
-/*N*/ {
-/*N*/ // SmPolygon (XPolyPolygon, ...) aus der Resource laden
-/*N*/ SmResId aSmResId(nResId);
-/*N*/ SmPolygonLoader(aSmResId, *this);
-/*N*/
-/*N*/ // die verbleibenden member Variablen setzen
-/*N*/ aBoundRect = aPoly.GetBoundRect();
-/*N*/ aPos = GetOrigPos();
-/*N*/
-/*N*/ // jetzt nach (0, 0) verschieben verbessert die Chancen, dass in Scale()
-/*N*/ // (welches ia oefter aufgerufen wird) nicht das MoveTo ausgefuehrt
-/*N*/ // werden muss
-/*N*/ MoveTo(Point());
-/*N*/ }
-/*N*/ }
-
-
-/*N*/ void SmPolygon::Scale()
-/*N*/ {
-/*N*/ DBG_ASSERT(bDelayedScale, "Sm: es gibt nichts zu skalieren");
-/*N*/
-/*N*/ Point aOrigin,
-/*N*/ aDelta;
-/*N*/
-/*N*/ if (aPos != aOrigin)
-/*N*/ {
-/*?*/ aDelta = aOrigin - aPos;
-/*?*/ aPoly.Move(aDelta.X(), aDelta.Y());
-/*N*/ }
-/*N*/
-/*N*/ aPoly.Scale(fDelayedFactorX, fDelayedFactorY);
-/*N*/ fScaleX *= fDelayedFactorX;
-/*N*/ fScaleY *= fDelayedFactorY;
-/*N*/
-/*N*/ bDelayedScale = FALSE;
-/*N*/ fDelayedFactorX = fDelayedFactorY = 1.0;
-/*N*/
-/*N*/ // Anm.: aBoundRect stimmt hier immer noch nicht!
-/*N*/ // Das passiert erst wenn es benoetigt wird.
-/*N*/
-/*N*/ // ggf Ausgangsposition wiederherstellen
-/*N*/ if (aPos != aOrigin)
-/*?*/ aPoly.Move(-aDelta.X(), -aDelta.Y());
-/*?*/
-/*N*/ }
-
-
-/*N*/ void SmPolygon::ScaleBy(double fFactorX, double fFactorY)
-/*N*/ {
-/*N*/ if (fFactorX != 1.0 || fFactorY != 1.0)
-/*N*/ {
-/*N*/ fDelayedFactorX *= fFactorX;
-/*N*/ fDelayedFactorY *= fFactorY;
-/*N*/
-/*N*/ bDelayedScale = TRUE;
-/*N*/ bDelayedBoundRect = TRUE;
-/*N*/ }
-/*N*/ }
-
-
-/*N*/ void SmPolygon::AdaptToX(const OutputDevice &rDev, ULONG nWidth)
-/*N*/ {
-/*N*/ DBG_ASSERT(aOrigSize.Width() != 0, "Sm: Polygon hat keine Breite");
-/*N*/ if (aOrigSize.Width() != 0)
-/*N*/ {
-/*N*/ double fFactor = 1.0 / GetScaleX() * nWidth / aOrigSize.Width();
-/*N*/ ScaleBy(fFactor, 1.0);
-/*N*/ }
-/*N*/ }
-
-
-/*N*/ void SmPolygon::AdaptToY(const OutputDevice &rDev, ULONG nHeight)
-/*N*/ {
-/*N*/ DBG_ASSERT(aOrigSize.Height() != 0, "Sm: Polygon hat keine Hoehe");
-/*N*/ if (aOrigSize.Height() != 0)
-/*N*/ {
-/*N*/ double fFactor = 1.0 / GetScaleY() * nHeight / aOrigSize.Height();
-/*N*/ ScaleBy(1.0, fFactor);
-/*N*/ }
-/*N*/ }
-
-
-/*N*/ void SmPolygon::Move(const Point &rPoint)
-/*N*/ {
-/*N*/ long nX = rPoint.X(),
-/*N*/ nY = rPoint.Y();
-/*N*/
-/*N*/ aPoly .Move(nX, nY);
-/*N*/ aBoundRect.Move(nX, nY);
-/*N*/ aPos .Move(nX, nY);
-/*N*/ }
-
-
-
-
-/*N*/ const Rectangle & SmPolygon::GetBoundRect(const OutputDevice &rDev) const
-/*N*/ {
-/*N*/ SmPolygon *pNCthis = ((SmPolygon *) this);
-/*N*/
-/*N*/ if (bDelayedScale)
-/*N*/ pNCthis->Scale();
-/*N*/ if (bDelayedBoundRect)
-/*N*/ {
-/*N*/ pNCthis->aBoundRect = aPoly.GetBoundRect((OutputDevice *) &rDev);
-/*N*/ pNCthis->bDelayedBoundRect = FALSE;
-/*N*/ }
-/*N*/ return aBoundRect;
-/*N*/ }
-
-
-
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a31f3be3a99cb6f8c9b10af3996bf5c8b608091c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 18 10:44:36 2011 +0000
cppcheck: object destroyed immediately
diff --git a/binfilter/bf_svtools/source/misc1/svt_adrparse.cxx b/binfilter/bf_svtools/source/misc1/svt_adrparse.cxx
index 4a83612..22112b4 100644
--- a/binfilter/bf_svtools/source/misc1/svt_adrparse.cxx
+++ b/binfilter/bf_svtools/source/misc1/svt_adrparse.cxx
@@ -767,7 +767,7 @@ SvAddressParser_Impl::SvAddressParser_Impl(SvAddressParser * pParser,
SvAddressParser::SvAddressParser(UniString const & rInput): m_bHasFirst(false)
{
- SvAddressParser_Impl(this, rInput);
+ SvAddressParser_Impl aDoParse(this, rInput);
}
//============================================================================
commit 3efcc47719b8aea781c2f1d05ffb13ecd7222711
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jan 18 10:40:37 2011 +0000
WaE: this dir is now warnings free
diff --git a/binfilter/bf_svx/source/outliner/makefile.mk b/binfilter/bf_svx/source/outliner/makefile.mk
index 2f7acb4..1c42961 100644
--- a/binfilter/bf_svx/source/outliner/makefile.mk
+++ b/binfilter/bf_svx/source/outliner/makefile.mk
@@ -25,8 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
PRJ=..$/..$/..
BFPRJ=..$/..
diff --git a/binfilter/bf_svx/source/outliner/svx_outliner.cxx b/binfilter/bf_svx/source/outliner/svx_outliner.cxx
index 5f35bf7..dba03af 100644
--- a/binfilter/bf_svx/source/outliner/svx_outliner.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outliner.cxx
@@ -101,8 +101,8 @@ namespace binfilter {
/*N*/ rnDepth = nMaxDepth;
/*N*/ }
-/*N*/ Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, USHORT nDepth)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;//STRIP001
+/*N*/ Paragraph* Outliner::Insert(const XubString&, ULONG, USHORT)
+/*N*/ {DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
@@ -532,7 +532,6 @@ namespace binfilter {
/*N*/ DBG_ASSERT( ( nDepth >= nMinDepth ) && ( nDepth <= nMaxDepth ), "ImplInitDepth - Depth is invalid!" );
/*N*/
/*N*/ Paragraph* pPara = pParaList->GetParagraph( nPara );
-/*N*/ USHORT nOldDepth = pPara->GetDepth();
/*N*/ pPara->SetDepth( nDepth );
/*N*/
/*N*/ // Bei IsInUndo brauchen Attribute und Style nicht eingestellt werden,
@@ -558,7 +557,7 @@ namespace binfilter {
/*N*/ #ifndef SVX_LIGHT
/*N*/ if ( bUndo )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 InsertUndo( new OutlinerUndoChangeDepth( this, nPara, nOldDepth, nDepth ) );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ #endif
/*N*/
@@ -566,7 +565,7 @@ namespace binfilter {
/*N*/ }
/*N*/ }
-/*N*/ void Outliner::SetParaAttribs( ULONG nPara, const SfxItemSet& rSet, bool bApiCall /* = false */ )
+/*N*/ void Outliner::SetParaAttribs( ULONG nPara, const SfxItemSet& rSet, bool /*bApiCall = false */ )
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
/*N*/
@@ -585,7 +584,7 @@ namespace binfilter {
/*N*/ if( bLRSpaceChanged )
/*N*/ {
/*N*/ const SvxNumBulletItem& rNumBullet = (const SvxNumBulletItem&)pEditEngine->GetParaAttrib( (USHORT)nPara, EE_PARA_NUMBULLET );
-/*N*/ Paragraph* pPara = pParaList->GetParagraph( nPara );
+/*N*/ pPara = pParaList->GetParagraph( nPara );
/*N*/ const USHORT nDepth = pPara->GetDepth();
/*N*/ if ( rNumBullet.GetNumRule()->GetLevelCount() > nDepth )
/*N*/ {
@@ -662,8 +661,8 @@ namespace binfilter {
/*N*/ return aBulletFont;
/*N*/ }
-/*N*/ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
-/*N*/ const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
+/*N*/ void Outliner::PaintBullet( USHORT nPara, const Point& /*rStartPos*/,
+/*N*/ const Point& /*rOrigin*/, short /*nOrientation*/, OutputDevice* /*pOutDev*/ )
/*N*/ {
/*N*/ DBG_CHKTHIS(Outliner,0);
/*N*/
@@ -908,7 +907,6 @@ namespace binfilter {
/*?*/ const SfxUInt16Item& rLevel = (const SfxUInt16Item&) pEditEngine->GetParaAttrib( nPara, EE_PARA_OUTLLEVEL );
/*?*/ if ( pPara->GetDepth() != rLevel.GetValue() )
/*?*/ {
-/*?*/ USHORT nMin = Min( pPara->GetDepth(), (USHORT)rLevel.GetValue() );
/*?*/ pPara->SetDepth( rLevel.GetValue() );
/*?*/ ImplCalcBulletText( nPara, TRUE, TRUE );
/*?*/ }
@@ -1068,27 +1066,27 @@ namespace binfilter {
/*N*/ return pEditEngine->GetParaAttribs( (USHORT)nPara );
/*N*/ }
-/*N*/ IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, pPara )
+/*N*/ IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, EMPTYARG )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ return 0;
/*N*/ }
-/*N*/ IMPL_LINK( Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo*, pInfos )
+/*N*/ IMPL_LINK( Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo*, EMPTYARG )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ return 0;
/*N*/ }
-/*N*/ IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos )
+/*N*/ IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos*, EMPTYARG )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ return 0;
/*N*/ }
-/*N*/ IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos )
+/*N*/ IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, EMPTYARG )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ return 0;
/*N*/ }
-/*N*/ IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo*, pInfos )
+/*N*/ IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo*, EMPTYARG )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ return 0;
/*N*/ }
@@ -1214,7 +1212,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ IMPL_LINK( Outliner, EditEngineNotifyHdl, EENotify*, pNotify )
+/*N*/ IMPL_LINK( Outliner, EditEngineNotifyHdl, EENotify*, EMPTYARG )
/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
/*N*/ return 0;
/*N*/ }
@@ -1235,8 +1233,6 @@ namespace binfilter {
/*?*/ ubidi_setPara(pBidi, reinterpret_cast<const UChar *>(rText.GetBuffer()), rText.Len(), nDefaultDir, NULL, &nError); // UChar != sal_Unicode in MinGW
/*?*/ nError = U_ZERO_ERROR;
/*?*/
-/*?*/ sal_Int32 nCount(ubidi_countRuns(pBidi, &nError));
-/*?*/
/*?*/ int32_t nStart(0);
/*?*/ int32_t nEnd;
/*?*/ UBiDiLevel nCurrDir;
diff --git a/binfilter/bf_svx/source/outliner/svx_outlobj.cxx b/binfilter/bf_svx/source/outliner/svx_outlobj.cxx
index e8dadee..292e3e4 100644
--- a/binfilter/bf_svx/source/outliner/svx_outlobj.cxx
+++ b/binfilter/bf_svx/source/outliner/svx_outlobj.cxx
@@ -185,9 +185,9 @@ namespace binfilter {
/*N*/ nCurPara++;
/*N*/ if( nCount )
/*N*/ {
-/*N*/ sal_uInt32 nSync = 0;
-/*N*/ rStream >> nSync;
-/*N*/ DBG_ASSERT(nSync==nSyncRef,"Stream out of sync");
+/*N*/ sal_uInt32 nLclSync = 0;
+/*N*/ rStream >> nLclSync;
+/*N*/ DBG_ASSERT(nLclSync==nSyncRef,"Stream out of sync");
/*N*/ }
/*N*/ }
/*N*/ if( nVersion == 3 )
More information about the Libreoffice-commits
mailing list