[Libreoffice-commits] .: 11 commits - basegfx/source comphelper/source i18npool/inc i18npool/source l10ntools/source regexp/source rsc/source sot/source svl/source svtools/source tools/source unotools/source vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 24 06:48:47 PST 2011
basegfx/source/polygon/b2dpolygon.cxx | 2 ++
basegfx/source/range/b2drangeclipper.cxx | 1 -
comphelper/source/container/embeddedobjectcontainer.cxx | 1 +
i18npool/inc/localedata.hxx | 2 +-
i18npool/source/localedata/localedata.cxx | 9 ++++-----
i18npool/source/nativenumber/nativenumbersupplier.cxx | 3 +--
l10ntools/source/helpmerge.cxx | 2 --
l10ntools/source/merge.cxx | 2 --
regexp/source/reclass.cxx | 3 +++
rsc/source/res/rscmgr.cxx | 1 -
rsc/source/rsc/rsc.cxx | 3 ---
sot/source/sdstor/stg.cxx | 4 ----
svl/source/items/style.cxx | 2 ++
svl/source/misc/filenotation.cxx | 1 +
svl/source/numbers/zforlist.cxx | 11 +++++++----
svl/source/numbers/zforscan.cxx | 4 ----
svtools/source/brwbox/brwbox2.cxx | 4 ----
svtools/source/contnr/fileview.cxx | 1 -
svtools/source/contnr/imivctl1.cxx | 10 ----------
svtools/source/contnr/svtreebx.cxx | 1 -
svtools/source/edit/texteng.cxx | 4 ----
svtools/source/filter.vcl/filter/sgvmain.cxx | 3 +--
svtools/source/filter.vcl/filter/sgvspln.cxx | 9 +++------
svtools/source/filter.vcl/wmf/winwmf.cxx | 5 ++---
tools/source/generic/poly.cxx | 1 +
tools/source/ref/pstm.cxx | 6 +++++-
tools/source/reversemap/bestreversemap.cxx | 3 ---
unotools/source/config/configmgr.cxx | 2 +-
unotools/source/i18n/localedatawrapper.cxx | 4 ----
vcl/unx/source/app/sm.cxx | 3 ++-
30 files changed, 37 insertions(+), 70 deletions(-)
New commits:
commit 73a8a5f713b65b0b5c42cc89db0395d62f62d742
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 14:48:36 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index af980b0..45b38b2 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.cxx
@@ -612,7 +612,6 @@ ERRTYPE RscMgr::SetRef( const RSCINST & rInst, const RscId & rRefId )
RscMgrInst * pClassData;
RscId aOldId, aId;
ERRTYPE aError;
- RSCINST aTmpI = rInst;
if( rRefId.IsId() &&
((rRefId.GetNumber() < 1) || (rRefId.GetNumber() > 0x7FFF)) )
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index e4bdcb6..c411f14 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -1226,7 +1226,6 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
SvFileStream aOStm( rSrsOutPath.GetFull(), STREAM_WRITE | STREAM_TRUNC );
::std::vector< ByteString > aMissingImages;
FILE* pSysListFile = rContext.aOutputSysList.getLength() ? fopen( rContext.aOutputSysList.getStr(), "ab" ) : NULL;
- bool bRet = true;
if( !aIStm.GetError() && !aOStm.GetError() )
{
@@ -1336,8 +1335,6 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile,
aOStm.WriteLine( aLine );
}
}
- else
- bRet = false;
if( aMissingImages.size() > 0 )
{
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index f27e136..4c31b74 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -578,12 +578,8 @@ BaseStorage* Storage::OpenStorage( const String& rName, StreamMode m, BOOL bDire
{
if( !Validate() || !ValidateMode( m ) )
return new Storage( pIo, NULL, m );
- BOOL bSetAutoCommit = FALSE;
if( bDirect && !pEntry->bDirect )
- {
- bSetAutoCommit = TRUE;
bDirect = FALSE;
- }
StgDirEntry* p = pIo->pTOC->Find( *pEntry, rName );
if( !p )
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx
index 5125ed2..6b1eda0 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/source/app/sm.cxx
@@ -378,7 +378,8 @@ void SessionManagerClient::SaveYourselfProc(
SessionManagerClient::saveDone();
return;
}
- Application::PostUserEvent( STATIC_LINK( (void*)(shutdown ? 0xffffffff : 0x0), SessionManagerClient, SaveYourselfHdl ) );
+ sal_uIntPtr nStateVal = shutdown ? 0xffffffff : 0x0;
+ Application::PostUserEvent( STATIC_LINK( (void*)nStateVal, SessionManagerClient, SaveYourselfHdl ) );
SMprintf( "waiting for save yourself event to be processed\n" );
#endif
}
commit a636e611a971c497cee3d833d39363318c3b9e73
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 11:26:13 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 7ac3db7..4b917fd 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -595,7 +595,6 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , Re
XMLElement* pXMLElement = NULL;
PFormEntrys *pEntrys = NULL;
XMLData *data = NULL;
- XMLParentNode *parent = NULL;
String sNewdata;
ByteString sLId;
@@ -615,7 +614,6 @@ void HelpParser::ProcessHelp( LangHashMap* aLangHM , const ByteString& sCur , Re
}
if( pXMLElement != NULL )
{
- parent = pXMLElement->GetParent();
sLId = pXMLElement->GetOldref();
pResData->sId = sLId;
diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx
index 4be41b2..6d4d157 100644
--- a/l10ntools/source/merge.cxx
+++ b/l10ntools/source/merge.cxx
@@ -402,7 +402,6 @@ void MergeDataFile::InsertEntry(
/*****************************************************************************/
{
MergeData *pData;
- BOOL bFound = FALSE;
// uniquify the filename to save memory.
ByteStringHashMap::const_iterator fit = aFilenames.find (rInFilename);
@@ -425,7 +424,6 @@ void MergeDataFile::InsertEntry(
aMap.insert( MergeDataHashMap::value_type( sKey, pData ) );
}
- bFound = FALSE;
PFormEntrys *pFEntrys = 0;
// search for PFormEntrys
commit 5ea40371ef37fd288cba803bde19885673def307
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 11:21:01 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 4161839..e325549 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -132,7 +132,7 @@ private :
getCalendarItemByName(const rtl::OUString& name,
const com::sun::star::lang::Locale& rLocale,
const com::sun::star::uno::Sequence< com::sun::star::i18n::Calendar >& calendarsSeq,
- sal_Int16 len, sal_Int16 item) throw( com::sun::star::uno::RuntimeException );
+ sal_Int16 item) throw( com::sun::star::uno::RuntimeException );
};
} } } }
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 399b0cc..7c488b0 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -459,7 +459,7 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName(
#define REF_ERAS 2
Sequence< CalendarItem > &LocaleData::getCalendarItemByName(const OUString& name,
- const Locale& rLocale, const Sequence< Calendar >& calendarsSeq, sal_Int16 len, sal_Int16 item)
+ const Locale& rLocale, const Sequence< Calendar >& calendarsSeq, sal_Int16 item)
throw(RuntimeException)
{
if (!ref_name.equals(name)) {
@@ -472,7 +472,6 @@ Sequence< CalendarItem > &LocaleData::getCalendarItemByName(const OUString& name
cals = calendarsSeq;
} else {
cals = getAllCalendars(loc);
- len = sal::static_int_cast<sal_Int16>( cals.getLength() );
}
const OUString& id = name.getToken(0, under, index);
for (index = 0; index < cals.getLength(); index++) {
@@ -520,7 +519,7 @@ LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException)
sal_Bool defaultCalendar = sal::static_int_cast<sal_Bool>( allCalendars[offset][0] );
offset++;
if (OUString(allCalendars[offset]).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ref"))) {
- days = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, i, REF_DAYS);
+ days = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, REF_DAYS);
offset += 2;
} else {
for(j = 0; j < allCalendars[0][i]; j++) {
@@ -531,7 +530,7 @@ LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException)
}
}
if (OUString(allCalendars[offset]).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ref"))) {
- months = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, i, REF_MONTHS);
+ months = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, REF_MONTHS);
offset += 2;
} else {
for(j = 0; j < allCalendars[1][i]; j++) {
@@ -542,7 +541,7 @@ LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException)
}
}
if (OUString(allCalendars[offset]).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ref"))) {
- eras = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, i, REF_ERAS);
+ eras = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, REF_ERAS);
offset += 2;
} else {
for(j = 0; j < allCalendars[2][i]; j++) {
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 35b5365..c335386 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -867,7 +867,6 @@ OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, sal
sal_Int64 value = 0;
sal_Int32 i, count = 0, len = aNumberString.getLength();
const sal_Unicode *src = aNumberString.getStr();
- sal_Bool neg = sal_False;
for (i = 0; i < len; i++) {
sal_Unicode ch = src[i];
@@ -877,7 +876,7 @@ OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, sal
value = value * 10 + (ch - NUMBER_ZERO);
}
else if (isSeparator(ch) && count > 0) continue;
- else if (isMinus(ch) && count == 0) neg = sal_True;
+ else if (isMinus(ch) && count == 0) continue;
else break;
}
commit e4a02d7b35391dc92ea92558c0b726105b3037c9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 11:16:49 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx
index 4b82df6..fb73eee 100644
--- a/regexp/source/reclass.cxx
+++ b/regexp/source/reclass.cxx
@@ -2773,6 +2773,9 @@ Regexpr::re_match2(struct re_registers *regs, sal_Int32 pos, sal_Int32 range)
POP_FAILURE_POINT(sdummy, pdummy,
dummy_low_reg, dummy_high_reg,
reg_dummy, reg_dummy, reg_info_dummy);
+
+ (void)sdummy;
+ (void)pdummy;
}
/* Note fall through. */
commit e1e800fa535fa54257aac571e41cb17b86f3e6dd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 11:11:23 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index f88069b..4e578a9 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -257,6 +257,8 @@ class ControlVectorPair2D
basegfx::B2DVector maNextVector;
public:
+ ControlVectorPair2D() {}
+
const basegfx::B2DVector& getPrevVector() const
{
return maPrevVector;
diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
index 978f31e..674003f 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -600,7 +600,6 @@ namespace basegfx
std::vector<B2DRange>::const_reverse_iterator aCurrRectR=rRanges.rbegin();
std::vector<B2VectorOrientation>::const_reverse_iterator aCurrOrientationR=rOrientations.rbegin();
const std::vector<B2DRange>::const_reverse_iterator aEndR=rRanges.rend();
- const std::vector<B2VectorOrientation>::const_reverse_iterator aEndOrientationR=rOrientations.rend();
while( aCurrRectR != aEndR )
{
const B2DRectangle& rCurrRect( *aCurrRectR++ );
commit 03bb621a6bc3a309ec34ec41cca7671b3249bf93
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 10:57:21 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 8110af3..f6ae031 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -1136,6 +1136,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e
}
OSL_ENSURE( bFound, "Object not found for removal!" );
+ (void)bFound;
if ( xPersist.is() )
{
// remove replacement image (if there is one)
commit cfd7e4a974201cec54f462064e718b69c8c66a77
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 10:41:38 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index f6c39ea..12dd661 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -946,7 +946,6 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
Color aDelimiterLineColor( ::svtools::ColorConfig().GetColorValue( ::svtools::CALCGRID ).nColor );
// redraw the invalid fields
- BOOL bRetouching = FALSE;
for ( ULONG nRelRow = nRelTopRow;
nRelRow <= nRelBottomRow && (ULONG)nTopRow+nRelRow < (ULONG)nRowCount;
++nRelRow, aPos.Y() += nDataRowHeigt )
@@ -1065,9 +1064,6 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
aPos.X() += pCol->Width();
}
- if ( nCol == pCols->Count() )
- bRetouching = TRUE;
-
// reset auto-highlight
if ( bRowSelected )
{
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index f5a6de0..33aca2b 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -802,7 +802,6 @@ void ViewTabListBox_Impl::Resize()
if ( mbAutoResize )
{
mbResizeDisabled = sal_True;
- Point aPos = GetPosPixel();
SetPosSizePixel( Point( 0, aBarSize.Height() ),
Size( aBoxSize.Width(), aBoxSize.Height() - aBarSize.Height() ) );
mbResizeDisabled = sal_False;
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 58b1fdb..7a444b3 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -544,7 +544,6 @@ void SvxIconChoiceCtrl_Impl::ResetVirtSize()
StopEditTimer();
aVirtOutputSize.Width() = 0;
aVirtOutputSize.Height() = 0;
- BOOL bLockedEntryFound = FALSE;
const ULONG nCount = aEntries.Count();
for( ULONG nCur = 0; nCur < nCount; nCur++ )
{
@@ -557,7 +556,6 @@ void SvxIconChoiceCtrl_Impl::ResetVirtSize()
FindBoundingRect( pCur );
else
AdjustVirtSize( pCur->aRect );
- bLockedEntryFound = TRUE;
}
else
InvalidateBoundingRect( pCur->aRect );
@@ -1212,14 +1210,6 @@ BOOL SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
if( bMod1 )
nFlags |= F_ADD_MODE;
- BOOL bDeselectAll = FALSE;
- if( eSelectionMode != SINGLE_SELECTION )
- {
- if( !bMod1 && !bShift )
- bDeselectAll = TRUE;
- if( bShift && !bMod1 && !pAnchor )
- bDeselectAll = TRUE;
- }
SvxIconChoiceCtrlEntry* pNewCursor;
SvxIconChoiceCtrlEntry* pOldCursor = pCursor;
diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index a02fd39..f245576 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.cxx
@@ -1371,7 +1371,6 @@ void SvTreeListBox::EditedText( const XubString& rStr )
DBG_CHKTHIS(SvTreeListBox,0);
if(pEdEntry) // we have to check if this entry is null that means that it is removed while editing
{
- Point aPos = GetEntryPosition( pEdEntry );
if( EditedEntry( pEdEntry, rStr ) )
{
((SvLBoxString*)pEdItem)->SetText( pEdEntry, rStr );
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index b3d35d6..e14ba7e 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -2390,7 +2390,6 @@ BOOL TextEngine::CreateLines( ULONG nPara )
while ( nIndex < pNode->GetText().Len() )
{
BOOL bEOL = FALSE;
- BOOL bEOC = FALSE;
USHORT nPortionStart = 0;
USHORT nPortionEnd = 0;
@@ -2455,7 +2454,6 @@ BOOL TextEngine::CreateLines( ULONG nPara )
nPortionStart = nTmpPos;
nTmpPortion--;
bEOL = FALSE;
- bEOC = FALSE;
nTmpWidth -= pPortion->GetWidth();
if ( pPortion->GetKind() == PORTIONKIND_TAB )
@@ -2467,7 +2465,6 @@ BOOL TextEngine::CreateLines( ULONG nPara )
else
{
bEOL = TRUE;
- bEOC = TRUE;
pLine->SetEnd( nPortionEnd );
DBG_ASSERT( pTEParaPortion->GetTextPortions().Count(), "Keine TextPortions?" );
pLine->SetEndPortion( (USHORT)pTEParaPortion->GetTextPortions().Count() - 1 );
@@ -2482,7 +2479,6 @@ BOOL TextEngine::CreateLines( ULONG nPara )
{
pLine->SetEnd( nPortionStart+1 );
pLine->SetEndPortion( nTmpPortion-1 );
- bEOC = FALSE; // wurde oben gesetzt, vielleich mal die if's umstellen?
}
else if ( !bEOL )
{
diff --git a/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter.vcl/filter/sgvmain.cxx
index e30793a..70ab0be 100644
--- a/svtools/source/filter.vcl/filter/sgvmain.cxx
+++ b/svtools/source/filter.vcl/filter/sgvmain.cxx
@@ -792,8 +792,7 @@ void BmapType::Draw(OutputDevice& rOut)
case SGF_BITIMAGE: {
GraphicFilter aFlt;
Graphic aGrf;
- USHORT nRet;
- nRet=aFlt.ImportGraphic(aGrf,aFNam);
+ aFlt.ImportGraphic(aGrf,aFNam);
aGrf.Draw(&rOut,Point(Pos1.x,Pos1.y),Size(Pos2.x-Pos1.x,Pos2.y-Pos1.y));
} break;
case SGF_SIMPVECT: {
diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter.vcl/filter/sgvspln.cxx
index 18a7262..59a4300 100644
--- a/svtools/source/filter.vcl/filter/sgvspln.cxx
+++ b/svtools/source/filter.vcl/filter/sgvspln.cxx
@@ -652,7 +652,7 @@ USHORT ParaSpline(USHORT n, double* x, double* y, BYTE MargCond,
double* bx, double* cx, double* dx,
double* by, double* cy, double* dy)
{
- USHORT Error,Marg;
+ USHORT Error;
USHORT i;
double deltX,deltY,delt,
alphX = 0,alphY = 0,
@@ -670,9 +670,8 @@ USHORT ParaSpline(USHORT n, double* x, double* y, BYTE MargCond,
}
}
switch (MargCond) {
- case 0: Marg=0; break;
+ case 0: break;
case 1: case 2: {
- Marg=MargCond;
alphX=Marg01; betX=MargN1;
alphY=Marg02; betY=MargN2;
} break;
@@ -681,7 +680,6 @@ USHORT ParaSpline(USHORT n, double* x, double* y, BYTE MargCond,
if (y[n]!=y[0]) return 4;
} break;
case 4: {
- Marg=1;
if (abs(Marg01)>=MAXROOT) {
alphX=0.0;
alphY=sign(1.0,y[1]-y[0]);
@@ -736,7 +734,7 @@ BOOL CalcSpline(Polygon& rPoly, BOOL Periodic, USHORT& n,
double*& cx, double*& cy, double*& dx, double*& dy, double*& T)
{
BYTE Marg;
- double Marg01,Marg02;
+ double Marg01;
double MargN1,MargN2;
USHORT i;
Point P0(-32768,-32768);
@@ -775,7 +773,6 @@ BOOL CalcSpline(Polygon& rPoly, BOOL Periodic, USHORT& n,
T =new double[n+1];
Marg01=0.0;
- Marg02=0.0;
MargN1=0.0;
MargN2=0.0;
if (n>0) n--; // n Korregieren (Anzahl der Teilpolynome)
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx
index 44e1ae8..193807a 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/winwmf.cxx
@@ -1322,7 +1322,7 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
case W_META_SETPIXEL:
{
- const Color aColor = ReadColor();
+ ReadColor();
GetWinExtMax( ReadYX(), rPlaceableBound, nMapMode );
}
break;
@@ -1343,12 +1343,11 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
case W_META_EXTTEXTOUT:
{
sal_uInt16 nLen, nOptions;
- sal_Int32 nRecordPos, nRecordSize;
+ sal_Int32 nRecordSize;
Point aPosition;
Rectangle aRect;
pStm->SeekRel(-6);
- nRecordPos = pStm->Tell();
*pStm >> nRecordSize;
pStm->SeekRel(2);
aPosition = ReadYX();
commit 9e30151fa1a1e6475a987a34e74f9f881817b8d4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 10:41:14 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 4530313..a8a5fb8 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -826,6 +826,7 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
void SfxStyleSheetBasePool::Insert( SfxStyleSheetBase* p )
{
+#if OSL_DEBUG_LEVEL > 0
DBG_ASSERT( p, "svl::SfxStyleSheetBasePool::Insert(), no stylesheet?" );
SfxStyleSheetIterator aIter(this, p->GetFamily(), p->GetMask());
@@ -836,6 +837,7 @@ void SfxStyleSheetBasePool::Insert( SfxStyleSheetBase* p )
pOld = aIter.Find( p->GetParent() );
DBG_ASSERT( pOld, "svl::SfxStyleSheetBasePool::Insert(), Parent not found!" );
}
+#endif
aStyles.push_back( rtl::Reference< SfxStyleSheetBase >( p ) );
Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *p ) );
}
diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx
index 6656dc2..8287963 100644
--- a/svl/source/misc/filenotation.cxx
+++ b/svl/source/misc/filenotation.cxx
@@ -124,6 +124,7 @@ namespace svt
}
OSL_ENSURE( bSuccess, "OFileNotation::OFileNotation: could not detect the format!" );
+ (void)bSuccess;
}
//---------------------------------------------------------------------
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 2b1481d..48c1fe7 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -426,7 +426,7 @@ void SvNumberFormatter::ReplaceSystemCL( LanguageType eOldLanguage )
// a duplicate. Also won't mix up any LastInsertKey.
ChangeIntl( eOldLanguage );
LanguageType eLge = eOldLanguage; // ConvertMode changes this
- BOOL bCheck = FALSE;
+ bool bCheck = false;
SvNumberformat* pNewEntry = new SvNumberformat( aString, pFormatScanner,
pStringScanner, nCheckPos, eLge );
if ( nCheckPos != 0 )
@@ -442,9 +442,10 @@ void SvNumberFormatter::ReplaceSystemCL( LanguageType eOldLanguage )
if ( !aFTable.Insert( nKey, pNewEntry ) )
delete pNewEntry;
else
- bCheck = TRUE;
+ bCheck = true;
}
DBG_ASSERT( bCheck, "SvNumberFormatter::ReplaceSystemCL: couldn't convert" );
+ (void)bCheck;
delete pOldEntry;
}
@@ -1376,7 +1377,8 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType )
nDefaultFormat = CLOffset + ZF_STANDARD;
}
}
- aDefaultFormatKeys.Insert( nSearch, (void*) nDefaultFormat );
+ sal_uIntPtr nFormat = nDefaultFormat;
+ aDefaultFormatKeys.Insert( nSearch, (void*) nFormat );
}
return nDefaultFormat;
}
@@ -3265,8 +3267,9 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultCurrencyFormat()
pEntry->SetStandard();
}
}
+ sal_uIntPtr nFormat = nDefaultCurrencyFormat;
aDefaultFormatKeys.Insert( CLOffset + ZF_STANDARD_CURRENCY,
- (void*) nDefaultCurrencyFormat );
+ (void*) nFormat );
}
return nDefaultCurrencyFormat;
}
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index ef33c00..776d44f 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1545,7 +1545,6 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
case NUMBERFORMAT_SCIENTIFIC:
case NUMBERFORMAT_FRACTION:
{
- sal_Unicode cThousandFill = ' ';
while (i < nAnzStrings)
{
// TODO: rechecking eScannedType is unnecessary.
@@ -1743,10 +1742,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
{
nPos = nPos + sStrArray[i].Len();
if (!bThousand) // only once
- {
bThousand = TRUE;
- cThousandFill = sStrArray[i+1].GetChar(0);
- }
// Eat it, will be reinserted at proper
// grouping positions further down.
nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;
commit c4cc9eeff41b45d0bbc69789a34deb416485b3c0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 24 09:44:32 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index ce81ab6..7d90b68 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -2173,6 +2173,7 @@ basegfx::B2DPolygon Polygon::getB2DPolygon() const
// assert invalid polygons
OSL_ENSURE(bControlA == bControlB, "Polygon::getB2DPolygon: Invalid source polygon (!)");
+ (void)bControlB;
if(a < nCount)
{
diff --git a/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index 48db826..a71c975 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.cxx
@@ -158,6 +158,8 @@ SvPersistStream& operator >> ( SvPersistStream & rStm,
aStr += ByteString::CreateFromInt64(nObjLen);
DBG_ERROR( aStr.GetBuffer() );
}
+#else
+ (void)nObjLen;
#endif
return rStm;
}
@@ -762,6 +764,8 @@ UINT32 SvPersistStream::ReadObj
aStr += ByteString::CreateFromInt32( nClassId );
aStr += " registered";
DBG_WARNING( aStr.GetBuffer() );
+#else
+ (void)nObjLen;
#endif
SetError( ERRCODE_IO_NOFACTORY );
return 0;
@@ -881,7 +885,7 @@ SvStream& operator >>
{
SvPersistBase * pEle;
// Lesen, ohne in die Tabellen einzutragen
- UINT32 nId = rThis.ReadObj( pEle, FALSE );
+ sal_uIntPtr nId = rThis.ReadObj( pEle, FALSE );
if( rThis.GetError() )
break;
diff --git a/tools/source/reversemap/bestreversemap.cxx b/tools/source/reversemap/bestreversemap.cxx
index 693ea68..a4956c1 100644
--- a/tools/source/reversemap/bestreversemap.cxx
+++ b/tools/source/reversemap/bestreversemap.cxx
@@ -104,8 +104,6 @@ SAL_IMPLEMENT_MAIN()
printf("rtl_TextEncoding getBestMSEncodingByChar(sal_Unicode c)\n");
printf("{\n");
- bool bFirstOutput = true;
-
sal_Unicode c = 0;
while (c < 0xFFFF)
{
@@ -134,7 +132,6 @@ SAL_IMPLEMENT_MAIN()
sal_Unicode cEnd = c;
printf(" if (c < 0x%x)\n", c);
printf(" return %s;\n", aConverters[nMostCapable].getName());
- bFirstOutput = false;
while(c < 0xFFFF)
{
bool bNothingCapable = true;
commit 056e39a14c86aea101f89ac26780b54467549d83
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 23 20:44:24 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index bd77f58..c44b889 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -220,9 +220,9 @@ void ConfigManager::RegisterConfigItem(utl::ConfigItem& rCfgItem)
Reference< XHierarchicalNameAccess> ConfigManager::AcquireTree(utl::ConfigItem& rCfgItem)
{
- ConfigItemList::iterator aListIter = pMgrImpl->aItemList.begin();
#ifdef DBG_UTIL
sal_Bool bFound = sal_False;
+ ConfigItemList::iterator aListIter = pMgrImpl->aItemList.begin();
for(aListIter = pMgrImpl->aItemList.begin(); aListIter != pMgrImpl->aItemList.end(); ++aListIter)
{
ConfigItemListEntry_Impl& rEntry = *aListIter;
commit 3c6b6496eca13732eaa19a068ef7f000c911a1b0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jan 23 20:42:39 2011 +0000
WaE: 4.6.0 unused variables
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 0888fa8..911bc1c 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -1400,18 +1400,14 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf,
sal_Unicode* pNumBuf;
USHORT nNumLen;
USHORT i = 0;
- BOOL bNeg;
// negative number
if ( nNumber < 0 )
{
nNumber *= -1;
- bNeg = TRUE;
*pBuf = '-';
pBuf++;
}
- else
- bNeg = FALSE;
// convert number
pNumBuf = ImplAddUNum( aNumBuf, (sal_uInt64)nNumber );
More information about the Libreoffice-commits
mailing list