[Libreoffice-commits] .: 3 commits - binfilter/bf_sc binfilter/bf_svx binfilter/bf_sw binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Dec 15 00:57:52 PST 2010
binfilter/bf_sc/source/core/data/sc_bcaslot.cxx | 2 +-
binfilter/bf_sc/source/core/data/sc_documen2.cxx | 5 -----
binfilter/bf_sc/source/core/data/sc_document.cxx | 20 +-------------------
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx | 8 --------
binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx | 4 +---
binfilter/bf_sw/source/core/fields/sw_usrfld.cxx | 2 +-
binfilter/inc/bf_sc/bigrange.hxx | 8 ++++----
binfilter/inc/bf_sc/chgtrack.hxx | 12 ++++++------
binfilter/inc/bf_sc/document.hxx | 6 ------
9 files changed, 14 insertions(+), 53 deletions(-)
New commits:
commit e05c6d03ffda79c9a65aef37065836ada54cdf15
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 14 21:25:05 2010 +0000
drop some warnings
diff --git a/binfilter/bf_sc/source/core/data/sc_bcaslot.cxx b/binfilter/bf_sc/source/core/data/sc_bcaslot.cxx
index c70d48d..e0ea23b 100644
--- a/binfilter/bf_sc/source/core/data/sc_bcaslot.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_bcaslot.cxx
@@ -389,7 +389,7 @@ TYPEINIT1( ScAreaChangedHint, SfxHint );
/*N*/ pBCAlwaysList->Insert( pBCA, LIST_APPEND );
/*N*/ return ;
/*N*/ }
-/*N*/ ScBroadcastArea* pLast;
+/*N*/ ScBroadcastArea* pLast(NULL);
/*N*/ for ( pBCA = pBCAlwaysList->First(); pBCA; pBCA = pBCAlwaysList->Next() )
/*N*/ {
/*N*/ if ( pListener->IsListening( *pBCA ) )
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index a1f5d4a..4867adf 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -517,11 +517,6 @@ namespace binfilter {
/*N*/ return *pEditEngine;
/*N*/ }
-/*N*/ void ScDocument::ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if (bIsClip)
-/*N*/ }
-
/*N*/ void lcl_RefreshPivotData( ScPivotCollection* pColl )
/*N*/ {
/*N*/ USHORT nCount = pColl->GetCount();
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index abed98c..15d1eab 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -929,7 +929,6 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ DBG_ERROR("CopyToClip: no ClipDoc
/*N*/
/*N*/ pClipDoc->aDocName = aDocName;
/*N*/ pClipDoc->aClipRange = ScRange( nCol1,nRow1,0, nCol2,nRow2,0 );
-/*N*/ pClipDoc->ResetClip( this, pMarks );
/*N*/ USHORT i, j;
/*N*/ pClipDoc->pRangeName->FreeAll();
/*N*/ for (i = 0; i < pRangeName->GetCount(); i++) //! DB-Bereiche Pivot-Bereiche auch !!!
@@ -2540,23 +2539,6 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RefreshAutoFilter( nStartCol, nSt
/*N*/ }
/*N*/ }
-
-/*N*/ void ScDocument::ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 for (USHORT i=0; i<=MAXTAB; i++)
-/*N*/ }
-
-
-/*N*/ void ScDocument::ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 for (USHORT i=0; i<=MAXTAB; i++)
-/*N*/ }
-
-
-
-
-
-
/*N*/ ScPatternAttr* ScDocument::GetDefPattern() const
/*N*/ {
/*N*/ return (ScPatternAttr*) &xPoolHelper->GetDocPool()->GetDefaultItem(ATTR_PATTERN);
@@ -2681,7 +2663,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 /*?*/ RefreshAutoFilter( nStartCol, nSt
/*N*/ }
-/*N*/ BOOL ScDocument::LoadPool( SvStream& rStream, BOOL bLoadRefCounts )
+/*N*/ BOOL ScDocument::LoadPool( SvStream& rStream, BOOL /*bLoadRefCounts*/ )
/*N*/ {
/*N*/ // bLoadingDone wird beim Laden des StylePools (ScStyleSheet::GetItemSet) gebraucht
/*N*/ bLoadingDone = FALSE;
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index a47d1f1..a543723 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -1206,18 +1206,12 @@ using namespace ::com::sun::star;
/*?*/ return FALSE;
/*N*/ }
/*N*/
-/*N*/ // #i12940# ClearItems is called (from setPropertyToDefault) directly with uno object's cached
-/*N*/ // MarkData (GetMarkData), so rMark must be changed to multi selection for ClearSelectionItems
-/*N*/ // here.
-/*N*/
/*N*/ ScRange aMarkRange;
/*N*/ ScMarkData aMultiMark = rMark;
/*N*/ aMultiMark.SetMarking(FALSE); // for MarkToMulti
/*N*/ aMultiMark.MarkToMulti();
/*N*/ aMultiMark.GetMultiMarkArea( aMarkRange );
/*N*/
-/*N*/ pDoc->ClearSelectionItems( pWhich, aMultiMark );
-/*N*/
/*N*/ rDocShell.PostPaint( aMarkRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE );
/*N*/ aModificator.SetDocumentModified();
/*N*/
@@ -1240,8 +1234,6 @@ using namespace ::com::sun::star;
/*N*/ ScRange aMarkRange;
/*N*/ rMark.GetMultiMarkArea( aMarkRange );
/*N*/
-/*N*/ pDoc->ChangeSelectionIndent( bIncrement, rMark );
-/*N*/
/*N*/ rDocShell.PostPaint( aMarkRange, PAINT_GRID, SC_PF_LINES | SC_PF_TESTMERGE );
/*N*/ aModificator.SetDocumentModified();
/*N*/
diff --git a/binfilter/inc/bf_sc/bigrange.hxx b/binfilter/inc/bf_sc/bigrange.hxx
index 55e2ca1..0e04a39 100644
--- a/binfilter/inc/bf_sc/bigrange.hxx
+++ b/binfilter/inc/bf_sc/bigrange.hxx
@@ -45,13 +45,13 @@ class ScBigAddress
INT32 nTab;
public:
- ScBigAddress() : nCol(0), nRow(0), nTab(0) {}
+ ScBigAddress() : nRow(0), nCol(0), nTab(0) {}
ScBigAddress( INT32 nColP, INT32 nRowP, INT32 nTabP )
- : nCol( nColP ), nRow( nRowP ), nTab( nTabP ) {}
+ : nRow( nRowP ), nCol( nColP ), nTab( nTabP ) {}
ScBigAddress( const ScBigAddress& r )
- : nCol( r.nCol ), nRow( r.nRow ), nTab( r.nTab ) {}
+ : nRow( r.nRow ), nCol( r.nCol ), nTab( r.nTab ) {}
ScBigAddress( const ScAddress& r )
- : nCol( r.Col() ), nRow( r.Row() ), nTab( r.Tab() ) {}
+ : nRow( r.Row() ), nCol( r.Col() ), nTab( r.Tab() ) {}
INT32 Col() const { return nCol; }
INT32 Row() const { return nRow; }
diff --git a/binfilter/inc/bf_sc/chgtrack.hxx b/binfilter/inc/bf_sc/chgtrack.hxx
index 289e1b2..026cbea 100644
--- a/binfilter/inc/bf_sc/chgtrack.hxx
+++ b/binfilter/inc/bf_sc/chgtrack.hxx
@@ -118,10 +118,10 @@ public:
ScChangeActionLinkEntry(
ScChangeActionLinkEntry** ppPrevP,
ScChangeAction* pActionP )
- : ppPrev( ppPrevP ),
- pNext( *ppPrevP ),
- pAction( pActionP ),
- pLink( NULL )
+ : pNext( *ppPrevP )
+ , ppPrev( ppPrevP )
+ , pAction( pActionP )
+ , pLink( NULL )
{
if ( pNext )
pNext->ppPrev = &pNext;
@@ -202,8 +202,8 @@ class ScChangeActionCellListEntry
ScChangeActionCellListEntry(
ScChangeActionContent* pContentP,
ScChangeActionCellListEntry* pNextP )
- : pContent( pContentP ),
- pNext( pNextP )
+ : pNext( pNextP )
+ , pContent( pContentP )
{}
public:
diff --git a/binfilter/inc/bf_sc/document.hxx b/binfilter/inc/bf_sc/document.hxx
index c7837cc..1dd59ed 100644
--- a/binfilter/inc/bf_sc/document.hxx
+++ b/binfilter/inc/bf_sc/document.hxx
@@ -776,9 +776,6 @@ public:
BOOL IsUndo() const { return bIsUndo; }
BOOL IsClipboard() const { return bIsClip; }
BOOL IsUndoEnabled() const { return !bImportingXML; }
- void ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks );
-
-
void DeleteArea(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2,
const ScMarkData& rMark, USHORT nDelFlag);
@@ -871,9 +868,6 @@ public:
const SvxBoxItem* pLineOuter,
const SvxBoxInfoItem* pLineInner );
- void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
- void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark );
-
ULONG AddCondFormat( const ScConditionalFormat& rNew );
void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges );
void FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, USHORT nTab );
commit 7814f9e24f0fd96cb1e4792fb6b6ea4b035688f4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 14 20:52:49 2010 +0000
cppcheck: uninit variable
diff --git a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
index 8198a19..809aa1e 100644
--- a/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
+++ b/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
@@ -338,7 +338,7 @@ void SwUserField::SetPar2(const String& rStr)
/*N*/ {
/*N*/ case FIELD_PROP_DOUBLE:
/*N*/ {
-/*N*/ double fVal;
+/*N*/ double fVal(0.0);
/*N*/ rAny >>= fVal;
/*N*/ nValue = fVal;
/*N*/
commit eeb24625f3bca4fd0571b9dfa4d0aeb4fe07e068
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Dec 14 20:44:53 2010 +0000
cppcheck: remove unused variable
diff --git a/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx b/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx
index 26b161e..be79bc9 100644
--- a/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_impgrfll.cxx
@@ -69,9 +69,7 @@ namespace binfilter {
/*N*/ sal_Int32 nDX( ((SdrShadowXDistItem&)(rSet.Get(SDRATTR_SHADOWXDIST))).GetValue() );
/*N*/ sal_Int32 nDY( ((SdrShadowYDistItem&)(rSet.Get(SDRATTR_SHADOWYDIST))).GetValue() );
/*N*/
-/*N*/ GDIMetaFile* pMtf=NULL;
-/*N*/ if( eFillStyle != XFILL_NONE &&
-/*N*/ (pMtf=mrXOut.GetOutDev()->GetConnectMetaFile()) )
+/*N*/ if( eFillStyle != XFILL_NONE && mrXOut.GetOutDev()->GetConnectMetaFile() )
/*?*/ {DBG_BF_ASSERT(0, "STRIP");//STRIP001
/*?*/ }
/*N*/ }
More information about the Libreoffice-commits
mailing list