[Libreoffice-commits] .: binfilter/bf_sc
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Jan 3 07:45:20 PST 2011
binfilter/bf_sc/source/core/tool/makefile.mk | 1
binfilter/bf_sc/source/core/tool/sc_chartarr.cxx | 46 +++++++++++------------
binfilter/bf_sc/source/core/tool/sc_chartlis.cxx | 11 +++--
3 files changed, 30 insertions(+), 28 deletions(-)
New commits:
commit ba6201daed182ee801d7fd640bdf5ca9b12f26a2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 3 15:39:35 2011 +0000
WaE: this dir is warning free now
diff --git a/binfilter/bf_sc/source/core/tool/makefile.mk b/binfilter/bf_sc/source/core/tool/makefile.mk
index 927c2cd..f7955e0 100644
--- a/binfilter/bf_sc/source/core/tool/makefile.mk
+++ b/binfilter/bf_sc/source/core/tool/makefile.mk
@@ -25,7 +25,6 @@
#
#*************************************************************************
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
PRJ=..$/..$/..$/..
BFPRJ=..$/..$/..
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
index b6c9a1b..4490fe4 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
@@ -196,10 +196,10 @@ namespace binfilter {
/*N*/ if ( bNewChart )
/*N*/ {
/*N*/ bDummyUpperLeft = ( aOpt.GetChar(2) != '0' );
-/*N*/ xub_StrLen nInd = 4; // 111;
-/*N*/ eGlue = (ScChartGlue) aOpt.GetToken( 0, cTok, nInd ).ToInt32();
-/*N*/ nStartCol = (USHORT) aOpt.GetToken( 0, cTok, nInd ).ToInt32();
-/*N*/ nStartRow = (USHORT) aOpt.GetToken( 0, cTok, nInd ).ToInt32();
+/*N*/ xub_StrLen nLclInd = 4; // 111;
+/*N*/ eGlue = (ScChartGlue) aOpt.GetToken( 0, cTok, nLclInd ).ToInt32();
+/*N*/ nStartCol = (USHORT) aOpt.GetToken( 0, cTok, nLclInd ).ToInt32();
+/*N*/ nStartRow = (USHORT) aOpt.GetToken( 0, cTok, nLclInd ).ToInt32();
/*N*/ bInitOk = TRUE;
/*N*/ }
/*N*/ }
@@ -266,7 +266,7 @@ namespace binfilter {
/*N*/ ScRangePtr pR;
/*N*/ if ( aRangeListRef->Count() <= 1 )
/*N*/ {
-/*?*/ if ( pR = aRangeListRef->First() )
+/*?*/ if (( pR = aRangeListRef->First() ))
/*?*/ {
/*?*/ if ( pR->aStart.Tab() == pR->aEnd.Tab() )
/*?*/ eGlue = SC_CHARTGLUE_NONE;
@@ -304,7 +304,7 @@ namespace binfilter {
/*N*/ nEndRow = n2;
/*N*/ if ( (nTmp = n2 - n1 + 1) > nMaxRows )
/*N*/ nMaxRows = nTmp;
-/*N*/ } while ( pR = aRangeListRef->Next() );
+/*N*/ } while (( pR = aRangeListRef->Next() ));
/*N*/ USHORT nC = nEndCol - nStartCol + 1;
/*N*/ if ( nC == 1 )
/*N*/ {
@@ -805,13 +805,13 @@ namespace binfilter {
/*N*/ SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
/*N*/ if (pFormatter)
/*N*/ {
-/*N*/ ULONG nIndex = 0;
+/*N*/ ULONG nLclIndex = 0;
/*N*/ ULONG nCount = pPositionMap->GetCount();
/*N*/ const ScAddress* pPos;
/*N*/ do
/*N*/ {
-/*N*/ pPos = pPositionMap->GetPosition( nIndex );
-/*N*/ } while ( !pPos && ++nIndex < nCount );
+/*N*/ pPos = pPositionMap->GetPosition( nLclIndex );
+/*N*/ } while ( !pPos && ++nLclIndex < nCount );
/*N*/ ULONG nFormat = ( pPos ? pDocument->GetNumberFormat( *pPos ) : 0 );
/*N*/ pMemChart->SetDataType( pFormatter->GetType( nFormat ) );
/*N*/ }
@@ -852,13 +852,13 @@ namespace binfilter {
/*N*/ aCell.mnRow = nRow2;
/*N*/ aCellRangeAddress.maLowerRight.maCells.push_back( aCell );
/*N*/ aCellRangeAddress.mnTableNumber = nTab;
-/*N*/ String aName;
-/*N*/ pDocument->GetName( nTab, aName );
-/*N*/ aCellRangeAddress.msTableName = aName;
+/*N*/ String aLclName;
+/*N*/ pDocument->GetName( nTab, aLclName );
+/*N*/ aCellRangeAddress.msTableName = aLclName;
/*N*/ aChartRange.maRanges.push_back( aCellRangeAddress );
/*N*/ if ( aSheetNames.Len() )
/*N*/ aSheetNames += ';';
-/*N*/ aSheetNames += aName;
+/*N*/ aSheetNames += aLclName;
/*N*/ }
/*N*/ }
/*N*/ rMem.SetChartRange( aChartRange );
@@ -971,7 +971,7 @@ namespace binfilter {
/*N*/
/*N*/ // Anzahl der Daten
/*N*/ nColCount = (USHORT) pCols->Count();
-/*N*/ if ( pCol = (Table*) pCols->First() )
+/*N*/ if (( pCol = (Table*) pCols->First() ))
/*N*/ {
/*N*/ if ( bDummyUpperLeft )
/*?*/ pCol->Insert( 0, (void*)0 ); // Dummy fuer Beschriftung
@@ -1021,7 +1021,7 @@ namespace binfilter {
/*?*/ {
/*?*/ ULONG nKey = pFirstCol->GetCurKey();
/*?*/ pCols->First();
-/*?*/ while ( pCol = (Table*) pCols->Next() )
+/*?*/ while (( pCol = (Table*) pCols->Next() ))
/*?*/ pCol->Insert( nKey, (void*)0 ); // keine Daten
/*?*/ }
/*?*/ }
@@ -1041,12 +1041,12 @@ namespace binfilter {
/*N*/ ScChartPositionMap::ScChartPositionMap( USHORT nChartCols, USHORT nChartRows,
/*N*/ USHORT nColAdd, USHORT nRowAdd, Table& rCols ) :
-/*N*/ nCount( (ULONG) nChartCols * nChartRows ),
-/*N*/ nColCount( nChartCols ),
-/*N*/ nRowCount( nChartRows ),
/*N*/ ppData( new ScAddress* [ nChartCols * nChartRows ] ),
/*N*/ ppColHeader( new ScAddress* [ nChartCols ] ),
-/*N*/ ppRowHeader( new ScAddress* [ nChartRows ] )
+/*N*/ ppRowHeader( new ScAddress* [ nChartRows ] ),
+/*N*/ nCount( (ULONG) nChartCols * nChartRows ),
+/*N*/ nColCount( nChartCols ),
+/*N*/ nRowCount( nChartRows )
/*N*/ {
/*N*/ DBG_ASSERT( nColCount && nRowCount, "ScChartPositionMap without dimension" );
/*N*/ #ifdef WIN
@@ -1054,7 +1054,7 @@ namespace binfilter {
/*N*/ #endif
/*N*/
/*N*/ ScAddress* pPos;
-/*N*/ USHORT nCol, nRow;
+/*N*/ USHORT nCol;
/*N*/
/*N*/ Table* pCol = (Table*) rCols.First();
/*N*/
@@ -1064,7 +1064,7 @@ namespace binfilter {
/*N*/ pPos = (ScAddress*) pCol->Next();
/*N*/ if ( nColAdd )
/*N*/ { // eigenstaendig
-/*N*/ for ( nRow = 0; nRow < nRowCount; nRow++ )
+/*N*/ for ( USHORT nRow = 0; nRow < nRowCount; nRow++ )
/*N*/ {
/*N*/ ppRowHeader[ nRow ] = pPos;
/*N*/ pPos = (ScAddress*) pCol->Next();
@@ -1072,7 +1072,7 @@ namespace binfilter {
/*N*/ }
/*N*/ else
/*N*/ { // Kopie
-/*?*/ for ( nRow = 0; nRow < nRowCount; nRow++ )
+/*?*/ for ( USHORT nRow = 0; nRow < nRowCount; nRow++ )
/*?*/ {
/*?*/ ppRowHeader[ nRow ] = ( pPos ? new ScAddress( *pPos ) : NULL );
/*?*/ pPos = (ScAddress*) pCol->Next();
@@ -1104,7 +1104,7 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*?*/ ppColHeader[ nCol ] = NULL;
-/*?*/ for ( nRow = 0; nRow < nRowCount; nRow++, nIndex++ )
+/*?*/ for ( USHORT nRow = 0; nRow < nRowCount; nRow++, nIndex++ )
/*?*/ {
/*?*/ ppData[ nIndex ] = NULL;
/*?*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
index 4a60036..5abb4d4 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
@@ -67,8 +67,9 @@ using namespace ::com::sun::star;
/*N*/ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP,
/*N*/ const ScRange& rRange ) :
/*N*/ StrData( rName ),
-/*N*/ pDoc( pDocP ),
+/*N*/ SfxListener(),
/*N*/ pUnoData( NULL ),
+/*N*/ pDoc( pDocP ),
/*N*/ bUsed( FALSE ),
/*N*/ bDirty( FALSE ),
/*N*/ bSeriesRangesScheduled( FALSE )
@@ -79,9 +80,10 @@ using namespace ::com::sun::star;
/*N*/ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP,
/*N*/ const ScRangeListRef& rRangeList ) :
/*N*/ StrData( rName ),
+/*N*/ SfxListener(),
/*N*/ aRangeListRef( rRangeList ),
-/*N*/ pDoc( pDocP ),
/*N*/ pUnoData( NULL ),
+/*N*/ pDoc( pDocP ),
/*N*/ bUsed( FALSE ),
/*N*/ bDirty( FALSE ),
/*N*/ bSeriesRangesScheduled( FALSE )
@@ -90,8 +92,9 @@ using namespace ::com::sun::star;
/*N*/ ScChartListener::ScChartListener( const ScChartListener& r ) :
/*N*/ StrData( r ),
-/*N*/ pDoc( r.pDoc ),
+/*N*/ SfxListener(),
/*N*/ pUnoData( NULL ),
+/*N*/ pDoc( r.pDoc ),
/*N*/ bUsed( FALSE ),
/*N*/ bDirty( r.bDirty ),
/*N*/ bSeriesRangesScheduled( r.bSeriesRangesScheduled )
@@ -287,7 +290,7 @@ using namespace ::com::sun::star;
/*N*/ aTimer.Start();
/*N*/ }
-/*N*/ IMPL_LINK( ScChartListenerCollection, TimerHdl, Timer*, pTimer )
+/*N*/ IMPL_LINK( ScChartListenerCollection, TimerHdl, Timer*, EMPTYARG )
/*N*/ {
/*N*/ if ( Application::AnyInput( INPUT_KEYBOARD ) )
/*N*/ {
More information about the Libreoffice-commits
mailing list