WaE: gcc 4.6.0 various warnings

8 files changed, 6 insertions, 31 deletions

diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 9ad7765b1b84..4e0752656837 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 f5a6de0a6ab0..33aca2b4832f 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 29b1e9dfbd76..2032d0a49afd 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 c4a322d9ee3c..96c91a3b8992 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 7ac0b16b66d7..1e9a6b996bc4 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 7ecb0049eabe..7d0e45a4c3fb 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 12a088c2c4a1..fb70950b2b2d 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 8a3a6897cb22..e2e9c4de3bd9 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();