[Libreoffice-commits] .: sc/source

Caolán McNamara caolan at kemper.freedesktop.org
Tue Jan 25 06:48:26 PST 2011


 sc/source/filter/dif/difimp.cxx            |   11 -----------
 sc/source/filter/xml/xmlexprt.cxx          |    8 +-------
 sc/source/ui/cctrl/dpcontrol.cxx           |    1 -
 sc/source/ui/dbgui/fieldwnd.cxx            |    7 -------
 sc/source/ui/drawfunc/fuconcustomshape.cxx |    4 ----
 sc/source/ui/drawfunc/futext.cxx           |    3 ---
 sc/source/ui/formdlg/dwfunctr.cxx          |    2 --
 sc/source/ui/unoobj/datauno.cxx            |    9 ---------
 sc/source/ui/view/dbfunc3.cxx              |    2 --
 sc/source/ui/view/drawvie4.cxx             |    1 -
 10 files changed, 1 insertion(+), 47 deletions(-)

New commits:
commit ee87a18a3b2b3c58726abfef66c87f05dd98d161
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 25 12:34:28 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 82612f4..af65c23 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -77,9 +77,6 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
     String&	    rData = aDifParser.aData;
     BOOL		bData = FALSE;
 
-    SCCOL		nNumCols = 0;
-    SCROW		nNumRows = 0;
-
     rIn.Seek( 0 );
 
     ScfStreamProgressBar aPrgrsBar( rIn, pDoc->GetDocumentShell() );
@@ -106,20 +103,12 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc,
             {
                 if( aDifParser.nVector != 0 )
                     bSyntErrWarn = TRUE;
-                if( aDifParser.nVal > MAXCOL + 1 )
-                    nNumCols = SCCOL_MAX;
-                else
-                    nNumCols = static_cast<SCCOL>(aDifParser.nVal);
             }
                 break;
             case T_TUPLES:
             {
                 if( aDifParser.nVector != 0 )
                     bSyntErrWarn = TRUE;
-                if( aDifParser.nVal > MAXROW + 1 )
-                    nNumRows = SCROW_MAX;
-                else
-                    nNumRows = static_cast<SCROW>(aDifParser.nVal);
             }
                 break;
             case T_DATA:
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index faa2f20..62c80b7 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -978,7 +978,6 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAd
     sal_Bool bWasHeader (sal_False);
     sal_Bool bIsHeader (sal_False);
     sal_Bool bIsClosed (sal_True);
-    sal_Bool bIsFirst (sal_False);
     sal_Int32 nPrevIndex (-1);
     sal_Int32 nColumn;
     for (nColumn = 0; nColumn <= pSharedData->GetLastColumn(nTable); ++nColumn)
@@ -992,7 +991,6 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAd
         {
             if (bIsHeader)
             {
-                bIsFirst = sal_False;
                 if (nColumn > 0)
                 {
                     WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible);
@@ -1003,7 +1001,6 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAd
                 nPrevIndex = nIndex;
                 nPrevColumn = nColumn;
                 nColsRepeated = 1;
-                bIsFirst = sal_True;
                 if(pGroupColumns->IsGroupStart(nColumn))
                     pGroupColumns->OpenGroups(nColumn);
                 OpenHeaderColumn();
@@ -1032,14 +1029,12 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAd
                 pGroupColumns->OpenGroups(nColumn);
             bPrevIsVisible = bIsVisible;
             nPrevIndex = nIndex;
-            bIsFirst = sal_True;
         }
         else if ((bIsVisible == bPrevIsVisible) && (nIndex == nPrevIndex) &&
             !pGroupColumns->IsGroupStart(nColumn) && !pGroupColumns->IsGroupEnd(nColumn - 1))
             ++nColsRepeated;
         else
         {
-            bIsFirst = sal_False;
             WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible);
             if (pGroupColumns->IsGroupEnd(nColumn - 1))
             {
@@ -1063,8 +1058,7 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const table::CellRangeAd
             nColsRepeated = 1;
         }
     }
-    //if (nColsRepeated > 1 || bIsFirst)
-        WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible);
+    WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible);
     if (!bIsClosed)
         CloseHeaderColumn();
     if (pGroupColumns->IsGroupEnd(nColumn - 1))
diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx
index 74333ef..829ad7f 100644
--- a/sc/source/ui/cctrl/dpcontrol.cxx
+++ b/sc/source/ui/cctrl/dpcontrol.cxx
@@ -1010,7 +1010,6 @@ ScDPFieldPopupWindow::ScDPFieldPopupWindow(Window* pParent, ScDocument* pDoc) :
     Size aSize;
     getSectionPosSize(aPos, aSize, WHOLE);
     SetOutputSizePixel(aSize);
-    Size aOutSize = GetOutputSizePixel();
 
     getSectionPosSize(aPos, aSize, BTN_OK);
     maBtnOk.SetPosSizePixel(aPos, aSize);
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 26f6faf..7f3b1da 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -483,7 +483,6 @@ void ScDPFieldControlBase::DrawBackground( OutputDevice& rDev )
     const StyleSettings& rStyleSet = GetSettings().GetStyleSettings();
     Color aFaceColor = rStyleSet.GetFaceColor();
     Color aWinColor = rStyleSet.GetWindowColor();
-    Color aTextColor = rStyleSet.GetButtonTextColor();
     Color aWinTextColor = rStyleSet.GetWindowTextColor();
 
     Point aPos0;
@@ -768,12 +767,6 @@ bool ScDPHorFieldControl::GetFieldIndex( const Point& rPos, size_t& rnIndex )
 
 void ScDPHorFieldControl::Redraw()
 {
-    const StyleSettings& rStyleSet = GetSettings().GetStyleSettings();
-    Color aFaceColor = rStyleSet.GetFaceColor();
-    Color aWinColor = rStyleSet.GetWindowColor();
-    Color aTextColor = rStyleSet.GetButtonTextColor();
-    Color aWinTextColor = rStyleSet.GetWindowTextColor();
-
     VirtualDevice	aVirDev;
     // #i97623# VirtualDevice is always LTR while other windows derive direction from parent
     aVirDev.EnableRTL( IsRTLEnabled() );
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 91c7fda..3382a14 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -92,13 +92,9 @@ BOOL FuConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
         if ( pObj )
         {
             SetAttributes( pObj );
-            sal_Bool bForceFillStyle = sal_True;
             sal_Bool bForceNoFillStyle = sal_False;
             if ( ((SdrObjCustomShape*)pObj)->UseNoFillStyle() )
-            {
-                bForceFillStyle = sal_False;
                 bForceNoFillStyle = sal_True;
-            }
             if ( bForceNoFillStyle )
                 pObj->SetMergedItem( XFillStyleItem( XFILL_NONE ) );
         }
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 60cabce..7a9e6a1 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -373,8 +373,6 @@ BOOL FuText::MouseMove(const MouseEvent& rMEvt)
         pView->MovAction(aPnt);
     }
 
-//	ForcePointer(&rMEvt);
-
     return (bReturn);
 }
 
@@ -694,7 +692,6 @@ void FuText::SetInEditMode(SdrObject* pObj, const Point* pMousePixel,
         {
             SdrPageView* pPV = pView->GetSdrPageView();
             Rectangle aRect = pObj->GetLogicRect();
-            Point aPnt = aRect.Center();
 
             if ( pObj->HasTextEdit() )
             {
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 90e0706..03c8c08 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -422,8 +422,6 @@ void ScFunctionDockWin::SetMyWidthLeRi(Size &aNewSize)
 
     Point aCDTopLeft=aCatBox.GetPosPixel();
     Point aFLTopLeft=aFuncList.GetPosPixel();
-    Point aSplitterTopLeft=aPrivatSplit.GetPosPixel();
-    Point aFDTopLeft=aFiFuncDesc.GetPosPixel();
 
     aCDSize.Width()=aNewSize.Width()-aCDTopLeft.X()-aFLTopLeft.X();
     aFLSize.Width()=aNewSize.Width()-2*aFLTopLeft.X();
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 1cbaa7c..7bbe90a 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -384,8 +384,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 nProp = 0; nProp < nPropCount; nProp++)
@@ -395,7 +393,6 @@ 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 );
@@ -403,7 +400,6 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
         }
         else if (aPropName.EqualsAscii( SC_UNONAME_ISSORTCOLUMNS ))
         {
-            bNewSortDescriptor = sal_True;
             rParam.bByRow = !::cppu::any2bool(rProp.Value);
         }
         else if (aPropName.EqualsAscii( SC_UNONAME_CONTHDR ))
@@ -423,7 +419,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 i;
                 if ( nCount > MAXSORT )
@@ -445,7 +440,6 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
             }
             else if ( rProp.Value >>= aNewSeq )
             {
-                bNewSortDescriptor = sal_True;
                 INT32 nCount = aNewSeq.getLength();
                 INT32 i;
                 if ( nCount > MAXSORT )
@@ -473,7 +467,6 @@ 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 ))
@@ -500,12 +493,10 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
         }
         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/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index c1a4333..440eb22 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -435,11 +435,9 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
 
     WaitObject aWait( GetViewData()->GetDialogParent() );
     BOOL bOk = TRUE;
-    BOOL bDelete = FALSE;
     if (rParam.bReplace)
         if (pDoc->TestRemoveSubTotals( nTab, rParam ))
         {
-            bDelete = TRUE;
             bOk = ( MessBox( GetViewData()->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
                 // "StarCalc" "Daten loeschen?"
                 ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ),
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 8a848fb..47e0df6 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -233,7 +233,6 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable()
 
 void ScDrawView::CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const
 {
-    Point aLogic = pDev->LogicToPixel( Point(1000,1000), MAP_TWIP );
     double nPPTX = ScGlobal::nScreenPPTX;
     double nPPTY = ScGlobal::nScreenPPTY;
 


More information about the Libreoffice-commits mailing list