[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx filter/source oox/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jan 27 12:02:39 PST 2011
binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx | 15 -----------
binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx | 2 -
binfilter/bf_svtools/source/items/svt_style.cxx | 2 -
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx | 5 ++-
binfilter/bf_svx/source/editeng/svx_impedit3.cxx | 2 +
binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx | 25 -------------------
filter/source/flash/swfwriter1.cxx | 4 ---
filter/source/graphicfilter/ipcx/ipcx.cxx | 5 ---
oox/source/export/shapes.cxx | 4 ++-
9 files changed, 12 insertions(+), 52 deletions(-)
New commits:
commit ee86b03dbf942fb766f2a1c58d89a54a42b7bc68
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 27 11:23:19 2011 +0000
WaE: gcc 4.6.0 various warnings
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
index 2223965..d677c1c 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
@@ -350,8 +350,6 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<beans::PropertyValue>& rSeq )
{
- sal_Bool bOldSortDescriptor(sal_False);
- sal_Bool bNewSortDescriptor(sal_False);
const beans::PropertyValue* pPropArray = rSeq.getConstArray();
long nPropCount = rSeq.getLength();
for (long i = 0; i < nPropCount; i++)
@@ -361,17 +359,13 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
if (aPropName.EqualsAscii( SC_UNONAME_ORIENT ))
{
- bOldSortDescriptor = sal_True;
//! test for correct enum type?
table::TableOrientation eOrient = (table::TableOrientation)
ScUnoHelpFunctions::GetEnumFromAny( rProp.Value );
rParam.bByRow = ( eOrient != table::TableOrientation_COLUMNS );
}
else if (aPropName.EqualsAscii( SC_UNONAME_ISSORTCOLUMNS ))
- {
- bNewSortDescriptor = sal_True;
rParam.bByRow = !::cppu::any2bool(rProp.Value);
- }
else if (aPropName.EqualsAscii( SC_UNONAME_CONTHDR ))
rParam.bHasHeader = ScUnoHelpFunctions::GetBoolFromAny( rProp.Value );
else if (aPropName.EqualsAscii( SC_UNONAME_MAXFLD ))
@@ -389,7 +383,6 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
uno::Sequence<table::TableSortField> aNewSeq;
if ( rProp.Value >>= aSeq )
{
- bOldSortDescriptor = sal_True;
INT32 nCount = aSeq.getLength();
INT32 k;
if ( nCount > MAXSORT )
@@ -411,7 +404,6 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
}
else if ( rProp.Value >>= aNewSeq )
{
- bNewSortDescriptor = sal_True;
INT32 nCount = aNewSeq.getLength();
INT32 k;
if ( nCount > MAXSORT )
@@ -438,10 +430,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
}
}
else if (aPropName.EqualsAscii( SC_UNONAME_ISCASE ))
- {
- bOldSortDescriptor = sal_True;
rParam.bCaseSens = ScUnoHelpFunctions::GetBoolFromAny( rProp.Value );
- }
else if (aPropName.EqualsAscii( SC_UNONAME_BINDFMT ))
rParam.bIncludePattern = ScUnoHelpFunctions::GetBoolFromAny( rProp.Value );
else if (aPropName.EqualsAscii( SC_UNONAME_COPYOUT ))
@@ -465,13 +454,9 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
rParam.nUserIndex = (USHORT)nVal;
}
else if (aPropName.EqualsAscii( SC_UNONAME_COLLLOC ))
- {
- bOldSortDescriptor = sal_True;
rProp.Value >>= rParam.aCollatorLocale;
- }
else if (aPropName.EqualsAscii( SC_UNONAME_COLLALG ))
{
- bOldSortDescriptor = sal_True;
::rtl::OUString sStr;
if ( rProp.Value >>= sStr )
rParam.aCollatorAlgorithm = sStr;
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
index f74c285..a14375b 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_progress.cxx
@@ -282,7 +282,6 @@ inline ULONG Get10ThSec()
/*N*/ if( pImp->pActiveProgress ) return TRUE;
/*N*/
/*N*/ // neuen Wert "ubernehmen
-/*N*/ BOOL bOver=FALSE;
/*N*/ nVal = nNewVal;
/*N*/
/*N*/ // neuer Range?
@@ -291,7 +290,6 @@ inline ULONG Get10ThSec()
/*?*/ DBG( DbgOutf( "SfxProgress: range changed from %lu to %lu",
/*?*/ pImp->nMax, nNewRange ) );
/*?*/ pImp->nMax = nNewRange;
-/*?*/ bOver = TRUE;
/*N*/ }
/*N*/
/*N*/ if ( !pImp->xStatusInd.is() )
diff --git a/binfilter/bf_svtools/source/items/svt_style.cxx b/binfilter/bf_svtools/source/items/svt_style.cxx
index 005631b..65015f9 100644
--- a/binfilter/bf_svtools/source/items/svt_style.cxx
+++ b/binfilter/bf_svtools/source/items/svt_style.cxx
@@ -738,6 +738,7 @@ void SfxStyleSheetBasePool::Insert( SfxStyleSheetBase* p )
pOld = aIter.Find( p->GetParent() );
DBG_ASSERT( pOld, "Parent nicht mehr vorhanden" );
}
+ (void)pOld;
aStyles.push_back( p );
Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *p ) );
}
@@ -746,7 +747,6 @@ void SfxStyleSheetBasePool::Clear()
{
while( aStyles.size() )
{
- SfxStyles::iterator it = aStyles.begin();
SfxStyleSheetBase* p = aStyles[ 0 ];
aStyles.erase( aStyles.begin() );
Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) );
diff --git a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
index b9fb4f6..f370762 100644
--- a/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
+++ b/binfilter/bf_svtools/source/numbers/svt_zforlist.cxx
@@ -446,6 +446,7 @@ void SvNumberFormatter::ReplaceSystemCL( LanguageType eOldLanguage )
bCheck = TRUE;
}
DBG_ASSERT( bCheck, "SvNumberFormatter::ReplaceSystemCL: couldn't convert" );
+ (void)bCheck;
delete pOldEntry;
}
@@ -1229,7 +1230,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType )
nDefaultFormat = CLOffset + ZF_STANDARD;
}
}
- aDefaultFormatKeys.Insert( nSearch, (void*) nDefaultFormat );
+ aDefaultFormatKeys.Insert( nSearch, (void*)(sal_uIntPtr) nDefaultFormat );
}
return nDefaultFormat;
}
@@ -2896,7 +2897,7 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultCurrencyFormat()
}
}
aDefaultFormatKeys.Insert( CLOffset + ZF_STANDARD_CURRENCY,
- (void*) nDefaultCurrencyFormat );
+ (void*)(sal_uIntPtr) nDefaultCurrencyFormat );
}
return nDefaultCurrencyFormat;
}
diff --git a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
index 3413b15..bb21e6f 100644
--- a/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
+++ b/binfilter/bf_svx/source/editeng/svx_impedit3.cxx
@@ -644,6 +644,7 @@ struct TabInfo
/*N*/ }
/*N*/ DBG_ASSERT( pPortion->GetKind() != PORTIONKIND_HYPHENATOR, "CreateLines: Hyphenator-Portion!" );
/*N*/ DBG_ASSERT( pPortion->GetLen() || bProcessingEmptyLine, "Leere Portion in CreateLines ?!" );
+/*N*/ (void)bProcessingEmptyLine;
/*N*/ if ( pNextFeature && ( pNextFeature->GetStart() == nTmpPos ) )
/*N*/ {
/*N*/ sal_uInt16 nWhich = pNextFeature->GetItem()->Which();
@@ -1727,6 +1728,7 @@ struct TabInfo
/*N*/ if ( nIdx && nIdx + 1 < aWord.Len() && 0x628 == cCh )
/*N*/ {
/*?*/ DBG_ASSERT( 0 != cPrevCh, "No previous character" );
+/*?*/ (void)cPrevCh;
/*?*/
/*?*/ // check if next character is Reh, Yeh or Alef Maksura
/*?*/ xub_Unicode cNextCh = aWord.GetChar( nIdx + 1 );
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
index e127026..a62e6cf 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdmrkv.cxx
@@ -311,31 +311,8 @@ namespace binfilter {
// } while (pOut==NULL && nWinNum<nWinAnz);
//}
-/*N*/ void SdrMarkView::ImpShowMarkHdl(OutputDevice* /*pOut*/, const Region* /*pRegion*/, BOOL bNoRefHdl)
+/*N*/ void SdrMarkView::ImpShowMarkHdl(OutputDevice* /*pOut*/, const Region* /*pRegion*/, BOOL /*bNoRefHdl*/)
/*N*/ {
-// if (IsSolidMarkHdl())
-/*N*/ bNoRefHdl=FALSE; // geht leider erstmal nicht anders
-/*N*/ if (!bHdlShown) {
-// if (aHdl.IsSolidHdl()) {
-// USHORT nAnz=pOut==NULL ? aWinList.GetCount() : 1;
-// for (USHORT i=0; i<nAnz; i++) {
-// USHORT nWinNum=pOut==NULL ? i : aWinList.Find(pOut);
-// if (nWinNum!=SDRVIEWWIN_NOTFOUND) {
-// if (aWinList[nWinNum].pVDev==NULL) {
-// aWinList[nWinNum].pVDev=new VirtualDevice;
-// }
-// aHdl.SaveBackground(*aWinList[nWinNum].pWin,*aWinList[nWinNum].pVDev,pRegion);
-// bSolidHdlBackgroundInvalid=FALSE;
-// }
-// }
-// }
-// DrawMarkHdl(pOut,bRefHdlShownOnly);
-/*N*/ bRefHdlShownOnly=FALSE;
-/*N*/ bHdlShown=TRUE;
-
- // refresh IAOs
-// RefreshAllIAOManagers();
-/*N*/ }
/*N*/ }
/*N*/ void SdrMarkView::ShowMarkHdl(OutputDevice* pOut, BOOL bNoRefHdl)
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 808ec85..70d468e 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1329,12 +1329,10 @@ bool Writer::Impl_writeFilling( SvtGraphicFill& rFilling )
aMatrix.set(2, 2, 1.0);
// scale bitmap
- Rectangle originalPixelRect = Rectangle(Point(), aGraphic.GetBitmapEx().GetSizePixel());
-
double XScale = (double)aNewRect.GetWidth()/aOldRect.GetWidth();
double YScale = (double)aNewRect.GetHeight()/aOldRect.GetHeight();
- aMatrix.scale( XScale, YScale );
+ aMatrix.scale( XScale, YScale );
FillStyle aFillStyle( nBitmapId, !rFilling.IsTiling(), aMatrix );
diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx
index 48085b1..af3861d 100644
--- a/filter/source/graphicfilter/ipcx/ipcx.cxx
+++ b/filter/source/graphicfilter/ipcx/ipcx.cxx
@@ -226,13 +226,10 @@ void PCXReader::ImplReadHeader()
void PCXReader::ImplReadBody()
{
BYTE *pPlane[ 4 ], * pDest, * pSource1, * pSource2, * pSource3, *pSource4;
- ULONG i, nx, ny, np, nCount, nUsedLineSize, nLineSize, nPercent;
+ ULONG i, nx, ny, np, nCount, nPercent;
ULONG nLastPercent = 0;
BYTE nDat = 0, nCol = 0;
- nUsedLineSize = (ULONG)( ( ( nWidth * (ULONG)nDestBitsPerPixel ) + 7 ) >> 3 );
- nLineSize = ( nUsedLineSize + 3 ) & 0xfffc;
-
for( np = 0; np < nPlanes; np++ )
pPlane[ np ] = new BYTE[ nBytesPerPlaneLin ];
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index d15710e..9c1b863 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -430,9 +430,11 @@ ShapeExport& ShapeExport::WriteBezierShape( Reference< XShape > xShape, sal_Bool
PolyPolygon aPolyPolygon = EscherPropertyContainer::GetPolyPolygon( xShape );
Rectangle aRect( aPolyPolygon.GetBoundRect() );
- awt::Size size = MapSize( awt::Size( aRect.GetWidth(), aRect.GetHeight() ) );
+#if OSL_DEBUG_LEVEL > 0
+ awt::Size size = MapSize( awt::Size( aRect.GetWidth(), aRect.GetHeight() ) );
DBG(printf("poly count %d\nsize: %d x %d", aPolyPolygon.Count(), int( size.Width ), int( size.Height )));
+#endif
// non visual shape properties
pFS->startElementNS( mnXmlNamespace, XML_nvSpPr, FSEND );
More information about the Libreoffice-commits
mailing list