[Libreoffice-commits] .: 4 commits - binfilter/bf_sc binfilter/inc lotuswordpro/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Dec 13 12:38:20 PST 2010
binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx | 6 -
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx | 115 ++-------------------
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 2
binfilter/bf_sc/source/ui/inc/docfunc.hxx | 33 ------
binfilter/bf_sc/source/ui/inc/uiitems.hxx | 28 ++---
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 49 --------
binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx | 71 ++----------
binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx | 6 -
binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx | 2
binfilter/inc/bf_sc/autoform.hxx | 2
binfilter/inc/bf_sc/cell.hxx | 18 ++-
binfilter/inc/bf_sc/rangenam.hxx | 4
binfilter/inc/bf_sc/token.hxx | 24 ++--
binfilter/inc/bf_sc/zforauto.hxx | 2
lotuswordpro/source/filter/lwpcelllayout.cxx | 1
16 files changed, 88 insertions(+), 279 deletions(-)
New commits:
commit 7042fcf17d4d947e0fc8705735bae5b717e60b24
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 13 14:20:42 2010 +0000
cppcheck: init member variable
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 80adb5b..495b5cc 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -78,6 +78,7 @@
LwpCellLayout::LwpCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
: LwpMiddleLayout(objHdr, pStrm)
+ , cType(LDT_NONE)
{}
LwpCellLayout::~LwpCellLayout()
commit 203531bed3f5a2c4d1cf09ca669069da3e38d63c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 13 09:58:31 2010 +0000
WaE, silence some warnings and strip out some code
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
index 010bf21..0005524 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
@@ -388,12 +388,6 @@ namespace binfilter {
/*N*/ {
/*N*/ if (pDestData)
/*N*/ pDoc->DeleteAreaTab(aOldDest, IDF_CONTENTS); // Zielbereich vorher loeschen
-/*N*/
-/*N*/ ScRange aSource( rSortParam.nCol1,rSortParam.nRow1,nSrcTab,
-/*N*/ rSortParam.nCol2,rSortParam.nRow2,nSrcTab );
-/*N*/ ScAddress aDest( rSortParam.nDestCol, rSortParam.nDestRow, rSortParam.nDestTab );
-/*N*/
-/*N*/ rDocShell.GetDocFunc().MoveBlock( aSource, aDest, FALSE, FALSE, FALSE, TRUE );
/*N*/ }
/*N*/
/*N*/ // #105780# don't call ScDocument::Sort with an empty SortParam (may be empty here if bCopy is set)
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index c98446b..a47d1f1 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -134,7 +134,6 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ rDocShell.MakeDrawLayer();
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
-/*N*/ ScDrawLayer* pModel = pDoc->GetDrawLayer();
/*N*/ USHORT nCol = rPos.Col();
/*N*/ USHORT nRow = rPos.Row();
/*N*/ USHORT nTab = rPos.Tab();
@@ -175,11 +174,6 @@ using namespace ::com::sun::star;
/*N*/ return bDone;
/*N*/ }
-/*N*/ BOOL ScDocFunc::DetectiveAddSucc(const ScAddress& rPos)
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 ScDocShellModificator aModificator( rDocShell );
-/*N*/ }
-
/*N*/ BOOL ScDocFunc::DetectiveDelSucc(const ScAddress& rPos)
/*N*/ {
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
@@ -212,7 +206,6 @@ using namespace ::com::sun::star;
/*N*/ rDocShell.MakeDrawLayer();
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
/*N*/
-/*N*/ ScDrawLayer* pModel = pDoc->GetDrawLayer();
/*N*/ USHORT nCol = rPos.Col();
/*N*/ USHORT nRow = rPos.Row();
/*N*/ USHORT nTab = rPos.Tab();
@@ -235,8 +228,6 @@ using namespace ::com::sun::star;
/*N*/ rDocShell.MakeDrawLayer();
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
/*N*/
-/*N*/ ScDrawLayer* pModel = pDoc->GetDrawLayer();
-/*N*/
/*N*/ Window* pWaitWin = rDocShell.GetDialogParent();
/*N*/ if (pWaitWin)
/*N*/ pWaitWin->EnterWait();
@@ -270,8 +261,6 @@ using namespace ::com::sun::star;
/*N*/ BOOL bDone = ScDetectiveFunc( pDoc,nTab ).DeleteAll( SC_DET_DETECTIVE );
/*N*/ if (bDone)
/*N*/ {
-/*N*/ ScDetOpList* pOldList = pDoc->GetDetOpList();
-/*N*/
/*N*/ pDoc->ClearDetectiveOperations();
/*N*/
/*N*/ aModificator.SetDocumentModified();
@@ -280,7 +269,7 @@ using namespace ::com::sun::star;
/*N*/ return bDone;
/*N*/ }
-/*N*/ BOOL ScDocFunc::DetectiveRefresh( BOOL bAutomatic )
+/*N*/ BOOL ScDocFunc::DetectiveRefresh()
/*N*/ {
/*N*/ BOOL bDone = FALSE;
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
@@ -289,7 +278,6 @@ using namespace ::com::sun::star;
/*N*/ if ( pList && pList->Count() )
/*N*/ {
/*N*/ rDocShell.MakeDrawLayer();
-/*N*/ ScDrawLayer* pModel = pDoc->GetDrawLayer();
/*N*/
/*N*/ // Loeschen auf allen Tabellen
/*N*/
@@ -484,8 +472,6 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ }
/*N*/
-/*N*/ BOOL bEditCell(FALSE);
-/*N*/ BOOL bEditDeleted(FALSE);
/*N*/ BOOL bHeight = FALSE;
/*N*/ pDoc->PutCell( rPos, pNewCell );
/*N*/
@@ -507,7 +493,7 @@ using namespace ::com::sun::star;
/*N*/ return TRUE;
/*N*/ }
-/*N*/ void ScDocFunc::NotifyInputHandler( const ScAddress& rPos )
+/*N*/ void ScDocFunc::NotifyInputHandler( const ScAddress& /*rPos*/ )
/*N*/ {
/*N*/ }
@@ -516,8 +502,10 @@ using namespace ::com::sun::star;
/*N*/ USHORT nIndex;
/*N*/ SfxItemSet aItemSet;
/*N*/
-/*N*/ ScMyRememberItem(const SfxItemSet& rItemSet, USHORT nTempIndex) :
-/*N*/ aItemSet(rItemSet), nIndex(nTempIndex) {}
+/*N*/ ScMyRememberItem(const SfxItemSet& rItemSet, USHORT nTempIndex)
+ : nIndex(nTempIndex)
+ , aItemSet(rItemSet)
+ {}
/*N*/ };
/*N*/ typedef ::std::list<ScMyRememberItem*> ScMyRememberItemList;
@@ -564,13 +552,13 @@ using namespace ::com::sun::star;
/*N*/ // Set the paragraph attributes back to the EditEngine.
/*N*/ if (!aRememberItems.empty())
/*N*/ {
-/*N*/ ScMyRememberItem* pRememberItem = NULL;
+/*N*/ ScMyRememberItem* pInnerRememberItem = NULL;
/*N*/ ScMyRememberItemList::iterator aItr = aRememberItems.begin();
/*N*/ while (aItr != aRememberItems.end())
/*N*/ {
-/*N*/ pRememberItem = *aItr;
-/*N*/ rEngine.SetParaAttribs(pRememberItem->nIndex, pRememberItem->aItemSet);
-/*N*/ delete pRememberItem;
+/*N*/ pInnerRememberItem = *aItr;
+/*N*/ rEngine.SetParaAttribs(pInnerRememberItem->nIndex, pInnerRememberItem->aItemSet);
+/*N*/ delete pInnerRememberItem;
/*N*/ aItr = aRememberItems.erase(aItr);
/*N*/ }
/*N*/ }
@@ -829,27 +817,6 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*M*/ BOOL ScDocFunc::InsertCells( const ScRange& rRange, InsCellCmd eCmd,
-/*N*/ BOOL bRecord, BOOL bApi, BOOL bPartOfPaste )
-/*M*/ {
-/*M*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ScDocShellModificator aModificator( rDocShell );
-/*M*/ }
-
-/*N*/ BOOL ScDocFunc::DeleteCells( const ScRange& rRange, DelCellCmd eCmd, BOOL bRecord, BOOL bApi )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell );
-/*N*/ return TRUE;
-/*N*/ }
-
-/*N*/ BOOL ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
-/*N*/ BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell );
-/*N*/ return TRUE;
-/*N*/ }
-
-//------------------------------------------------------------------------
-
/*N*/ BOOL ScDocFunc::InsertTable( USHORT nTab, const String& rName, BOOL bRecord, BOOL bApi )
/*N*/ {
/*N*/ BOOL bSuccess = FALSE;
@@ -881,11 +848,6 @@ using namespace ::com::sun::star;
/*N*/ return bSuccess;
/*N*/ }
-/*N*/ BOOL ScDocFunc::DeleteTable( USHORT nTab, BOOL bRecord, BOOL bApi )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 WaitObject aWait( rDocShell.GetDialogParent() );
-/*N*/ }
-
/*N*/ BOOL ScDocFunc::SetTableVisible( USHORT nTab, BOOL bVisible, BOOL bApi )
/*N*/ {
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
@@ -1001,8 +963,6 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/
/*N*/ BOOL bSuccess = FALSE;
-/*N*/ USHORT nStart = pRanges[0];
-/*N*/ USHORT nEnd = pRanges[2*nRangeCnt-1];
/*N*/
/*N*/ BOOL bFormula = FALSE;
/*N*/ if ( eMode == SC_SIZE_OPTIMAL )
@@ -1108,15 +1068,8 @@ using namespace ::com::sun::star;
/*N*/ }
-/*N*/ BOOL ScDocFunc::InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
-/*N*/ BOOL bRecord, BOOL bSetModified, BOOL bApi )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell );
-/*N*/ return TRUE;
-/*N*/ }
-
/*N*/ BOOL ScDocFunc::RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
-/*N*/ BOOL bRecord, BOOL bSetModified, BOOL bApi )
+/*N*/ BOOL bRecord, BOOL bSetModified )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
/*N*/
@@ -1438,14 +1391,6 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ BOOL ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
-/*N*/ const ScTabOpParam& rParam, BOOL bRecord, BOOL bApi )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 ScDocShellModificator aModificator( rDocShell );
-/*N*/ }
-
-//------------------------------------------------------------------------
-
/*N*/ inline ScDirection DirFromFillDir( FillDir eDir )
/*N*/ {
/*N*/ if (eDir==FILL_TO_BOTTOM)
@@ -1458,22 +1403,6 @@ using namespace ::com::sun::star;
/*N*/ return DIR_LEFT;
/*N*/ }
-
-/*N*/ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
-/*N*/ FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
-/*N*/ double fStart, double fStep, double fMax,
-/*N*/ BOOL bRecord, BOOL bApi )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 ScDocShellModificator aModificator( rDocShell );
-/*N*/ }
-
-/*N*/ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
-/*N*/ FillDir eDir, USHORT nCount, BOOL bRecord, BOOL bApi )
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell );
-/*N*/ return TRUE;
-/*N*/ }
-
//------------------------------------------------------------------------
/*N*/ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord, BOOL bApi )
@@ -1530,18 +1459,9 @@ using namespace ::com::sun::star;
/*N*/ return TRUE;
/*N*/ }
-/*N*/ BOOL ScDocFunc::UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( rDocShell );
-/*N*/ return TRUE;
-/*N*/ }
-
//------------------------------------------------------------------------
-
-//------------------------------------------------------------------------
-
-/*N*/ BOOL ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi )
+/*N*/ BOOL ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
/*N*/
@@ -1578,8 +1498,6 @@ using namespace ::com::sun::star;
/*N*/ String aContent;
/*N*/ ScRange( nX1, nY1, nTab, nX2, nY2, nTab ).Format( aContent, SCR_ABS_3D, pDoc );
/*N*/
-/*N*/ ScRangeName* pList = pDoc->GetRangeName();
-/*N*/
/*N*/ BOOL bInsert = FALSE;
/*N*/ USHORT nOldPos;
/*N*/ if (rList.SearchName( aName, nOldPos )) // vorhanden ?
@@ -1703,7 +1621,7 @@ using namespace ::com::sun::star;
/*N*/ if ( bBottom && bRight )
/*N*/ CreateOneName( aNewRanges, nEndCol,nEndRow,nTab, nContX1,nContY1,nContX2,nContY2, bCancel, bApi );
/*N*/
-/*N*/ bDone = ModifyRangeNames( aNewRanges, bApi );
+/*N*/ bDone = ModifyRangeNames( aNewRanges );
/*N*/
/*N*/ aModificator.SetDocumentModified();
/*N*/ SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) );
@@ -1798,7 +1716,7 @@ using namespace ::com::sun::star;
/*N*/ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
/*N*/ const String& rOptions, const String& rSource,
/*N*/ const ScRange& rDestRange, ULONG nRefresh,
-/*N*/ BOOL bFitBlock, BOOL bApi )
+/*N*/ BOOL bFitBlock )
/*N*/ {
/*N*/ //! auch fuer ScViewFunc::InsertAreaLink benutzen!
/*N*/
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index d4cfb65..1792794 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -1217,7 +1217,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ if ( pList && ( aDocument.IsDetectiveDirty() || pList->HasAddError() ) &&
/*N*/ pList->Count() && !IsInUndo() && SC_MOD()->GetAppOptions().GetDetectiveAuto() )
/*N*/ {
-/*N*/ GetDocFunc().DetectiveRefresh(TRUE); // TRUE = caused by automatic update
+/*N*/ GetDocFunc().DetectiveRefresh();
/*N*/ }
/*N*/ aDocument.SetDetectiveDirty(FALSE); // always reset, also if not refreshed
/*N*/ }
diff --git a/binfilter/bf_sc/source/ui/inc/docfunc.hxx b/binfilter/bf_sc/source/ui/inc/docfunc.hxx
index 7fe5687..5164d75 100644
--- a/binfilter/bf_sc/source/ui/inc/docfunc.hxx
+++ b/binfilter/bf_sc/source/ui/inc/docfunc.hxx
@@ -68,12 +68,11 @@ public:
BOOL DetectiveAddPred(const ScAddress& rPos);
BOOL DetectiveDelPred(const ScAddress& rPos);
- BOOL DetectiveAddSucc(const ScAddress& rPos);
BOOL DetectiveDelSucc(const ScAddress& rPos);
BOOL DetectiveAddError(const ScAddress& rPos);
BOOL DetectiveMarkInvalid(USHORT nTab);
BOOL DetectiveDelAll(USHORT nTab);
- BOOL DetectiveRefresh(BOOL bAutomatic = FALSE);
+ BOOL DetectiveRefresh();
BOOL DeleteContents( const ScMarkData& rMark, USHORT nFlags,
BOOL bRecord, BOOL bApi );
@@ -96,16 +95,8 @@ public:
BOOL ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
BOOL bRecord, BOOL bApi );
- BOOL InsertCells( const ScRange& rRange, InsCellCmd eCmd, BOOL bRecord, BOOL bApi,
- BOOL bPartOfPaste = FALSE );
- BOOL DeleteCells( const ScRange& rRange, DelCellCmd eCmd, BOOL bRecord, BOOL bApi );
-
- BOOL MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
- BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi );
-
BOOL InsertTable( USHORT nTab, const String& rName, BOOL bRecord, BOOL bApi );
BOOL RenameTable( USHORT nTab, const String& rName, BOOL bRecord, BOOL bApi );
- BOOL DeleteTable( USHORT nTab, BOOL bRecord, BOOL bApi );
BOOL SetTableVisible( USHORT nTab, BOOL bVisible, BOOL bApi );
@@ -113,10 +104,8 @@ public:
USHORT nTab, ScSizeMode eMode, USHORT nSizeTwips,
BOOL bRecord, BOOL bApi );
- BOOL InsertPageBreak( BOOL bColumn, const ScAddress& rPos,
- BOOL bRecord, BOOL bSetModified, BOOL bApi );
BOOL RemovePageBreak( BOOL bColumn, const ScAddress& rPos,
- BOOL bRecord, BOOL bSetModified, BOOL bApi );
+ BOOL bRecord, BOOL bSetModified );
BOOL Protect( USHORT nTab, const String& rPassword, BOOL bApi );
BOOL Unprotect( USHORT nTab, const String& rPassword, BOOL bApi );
@@ -129,24 +118,10 @@ public:
BOOL EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
const String& rString, BOOL bApi, BOOL bEnglish );
- BOOL TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
- const ScTabOpParam& rParam, BOOL bRecord, BOOL bApi );
-
- BOOL FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
- FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
- double fStart, double fStep, double fMax,
- BOOL bRecord, BOOL bApi );
- // FillAuto: rRange wird von Source-Range auf Dest-Range angepasst
- BOOL FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
- FillDir eDir, USHORT nCount, BOOL bRecord, BOOL bApi );
-
-
BOOL MergeCells( const ScRange& rRange, BOOL bContents,
BOOL bRecord, BOOL bApi );
- BOOL UnmergeCells( const ScRange& rRange, BOOL bRecord, BOOL bApi );
-
- BOOL ModifyRangeNames( const ScRangeName& rNewRanges, BOOL bApi );
+ BOOL ModifyRangeNames( const ScRangeName& rNewRanges );
BOOL CreateNames( const ScRange& rRange, USHORT nFlags, BOOL bApi );
BOOL InsertNameList( const ScAddress& rStartPos, BOOL bApi );
@@ -154,7 +129,7 @@ public:
BOOL InsertAreaLink( const String& rFile, const String& rFilter,
const String& rOptions, const String& rSource,
const ScRange& rDestRange, ULONG nRefresh,
- BOOL bFitBlock, BOOL bApi );
+ BOOL bFitBlock );
};
diff --git a/binfilter/bf_sc/source/ui/inc/uiitems.hxx b/binfilter/bf_sc/source/ui/inc/uiitems.hxx
index 112c3f4..c6ca520 100644
--- a/binfilter/bf_sc/source/ui/inc/uiitems.hxx
+++ b/binfilter/bf_sc/source/ui/inc/uiitems.hxx
@@ -108,8 +108,8 @@ public:
ScSortItem( const ScSortItem& rItem );
~ScSortItem();
- virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP");return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;};
+ virtual SfxPoolItem* Clone( SfxItemPool * /*pPool*/ = 0 ) const{DBG_BF_ASSERT(0, "STRIP");return NULL;};
ScViewData* GetViewData () const { return pViewData; }
@@ -131,8 +131,8 @@ public:
ScQueryItem( const ScQueryItem& rItem );
~ScQueryItem();
- virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;};
+ virtual SfxPoolItem* Clone( SfxItemPool * /*pPool*/ = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;};
ScViewData* GetViewData () const { return pViewData; }
@@ -157,8 +157,8 @@ public:
ScSubTotalItem( const ScSubTotalItem& rItem );
~ScSubTotalItem();
- virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP"); return 0;};
+ virtual SfxPoolItem* Clone( SfxItemPool * /*pPool*/ = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;};
ScViewData* GetViewData () const { return pViewData; }
const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; }
@@ -179,8 +179,8 @@ public:
ScUserListItem( const ScUserListItem& rItem );
~ScUserListItem();
- virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;};
+ virtual SfxPoolItem* Clone( SfxItemPool * /*pPool*/ = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;};
private:
@@ -199,8 +199,8 @@ public:
ScConsolidateItem( const ScConsolidateItem& rItem );
~ScConsolidateItem();
- virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP"); return 0;};
+ virtual SfxPoolItem* Clone( SfxItemPool * /*pPool*/ = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;};
private:
@@ -219,8 +219,8 @@ public:
ScPivotItem( const ScPivotItem& rItem );
~ScPivotItem();
- virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP");return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;};
+ virtual SfxPoolItem* Clone( SfxItemPool * /*pPool*/ = 0 ) const{DBG_BF_ASSERT(0, "STRIP");return NULL;};
private:
@@ -241,8 +241,8 @@ public:
ScSolveItem( const ScSolveItem& rItem );
~ScSolveItem();
- virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;}; //STRIP001 virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}; //STRIP001 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
+ virtual int operator==( const SfxPoolItem& ) const{DBG_BF_ASSERT(0, "STRIP");return 0;};
+ virtual SfxPoolItem* Clone( SfxItemPool * /*pPool*/ = 0 ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;};
private:
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index 7d4ff85..806a855 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -4669,12 +4669,6 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress&
default:
bError = TRUE;
}
-
- if (!bError)
- {
- ScDocFunc aFunc(*pDocSh);
- aFunc.TabOp( aRange, NULL, aParam, TRUE, TRUE );
- }
}
}
@@ -4689,10 +4683,6 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti
ScDocFunc aFunc(*pDocSh);
if ( bMerge )
aFunc.MergeCells( aRange, FALSE, TRUE, TRUE );
- else
- aFunc.UnmergeCells( aRange, TRUE, TRUE );
-
- //! Fehler abfangen?
}
}
@@ -4774,13 +4764,6 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection,
default:
bError = TRUE;
}
-
- if (!bError)
- {
- ScDocFunc aFunc(*pDocSh);
- aFunc.FillSeries( aRange, NULL, eDir, eCmd, eDateCmd,
- MAXDOUBLE, fStep, fEndValue, TRUE, TRUE );
- }
}
}
@@ -4822,12 +4805,6 @@ void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection,
}
if (nCount > MAXROW) // Ueberlauf
bError = TRUE;
-
- if (!bError)
- {
- ScDocFunc aFunc(*pDocSh);
- aFunc.FillAuto( aSourceRange, NULL, eDir, nCount, TRUE, TRUE );
- }
}
}
@@ -6472,8 +6449,6 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& aRang
DBG_ASSERT( aRange.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
ScRange aScRange;
ScUnoConversion::FillScRange( aScRange, aRange );
- ScDocFunc aFunc(*pDocSh);
- aFunc.InsertCells( aScRange, eCmd, TRUE, TRUE );
}
}
}
@@ -6504,8 +6479,6 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& aRang
DBG_ASSERT( aRange.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
ScRange aScRange;
ScUnoConversion::FillScRange( aScRange, aRange );
- ScDocFunc aFunc(*pDocSh);
- aFunc.DeleteCells( aScRange, eCmd, TRUE, TRUE );
}
}
}
@@ -6521,9 +6494,6 @@ void SAL_CALL ScTableSheetObj::moveRange( const table::CellAddress& aDestination
DBG_ASSERT( aSource.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
ScRange aRange;
ScUnoConversion::FillScRange( aRange, aSource );
- ScAddress aDestPos( (USHORT)aDestination.Column, (USHORT)aDestination.Row, aDestination.Sheet );
- ScDocFunc aFunc(*pDocSh);
- aFunc.MoveBlock( aRange, aDestPos, TRUE, TRUE, TRUE, TRUE );
}
}
@@ -6538,9 +6508,6 @@ void SAL_CALL ScTableSheetObj::copyRange( const table::CellAddress& aDestination
DBG_ASSERT( aSource.Sheet == GetTab_Impl(), "falsche Tabelle in CellRangeAddress" );
ScRange aRange;
ScUnoConversion::FillScRange( aRange, aSource );
- ScAddress aDestPos( (USHORT)aDestination.Column, (USHORT)aDestination.Row, aDestination.Sheet );
- ScDocFunc aFunc(*pDocSh);
- aFunc.MoveBlock( aRange, aDestPos, FALSE, TRUE, TRUE, TRUE );
}
}
@@ -6964,9 +6931,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPo
{
USHORT nTab = GetTab_Impl();
DBG_ASSERT( aPosition.Sheet == nTab, "falsche Tabelle in CellAddress" );
- ScAddress aPos( (USHORT)aPosition.Column, (USHORT)aPosition.Row, nTab );
- ScDocFunc aFunc(*pDocSh);
- return aFunc.DetectiveAddSucc( aPos );
+ return false;
}
return FALSE;
}
@@ -7600,10 +7565,8 @@ void ScTableColumnObj::SetOnePropertyValue( const SfxItemPropertyMap* pMap, cons
else if ( pMap->nWID == SC_WID_UNO_NEWPAGE || pMap->nWID == SC_WID_UNO_MANPAGE )
{
BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
- if (bSet)
- aFunc.InsertPageBreak( TRUE, rRange.aStart, TRUE, TRUE, TRUE );
- else
- aFunc.RemovePageBreak( TRUE, rRange.aStart, TRUE, TRUE, TRUE );
+ if (!bSet)
+ aFunc.RemovePageBreak( TRUE, rRange.aStart, TRUE, TRUE );
}
else
ScCellRangeObj::SetOnePropertyValue(pMap, aValue); // base class, no Item WID
@@ -7761,10 +7724,8 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertyMap* pMap, const u
else if ( pMap->nWID == SC_WID_UNO_NEWPAGE || pMap->nWID == SC_WID_UNO_MANPAGE )
{
BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
- if (bSet)
- aFunc.InsertPageBreak( FALSE, rRange.aStart, TRUE, TRUE, TRUE );
- else
- aFunc.RemovePageBreak( FALSE, rRange.aStart, TRUE, TRUE, TRUE );
+ if (!bSet)
+ aFunc.RemovePageBreak( FALSE, rRange.aStart, TRUE, TRUE );
}
else
ScCellRangeObj::SetOnePropertyValue(pMap, aValue); // base class, no Item WID
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
index a3d4fe4..e991934 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
@@ -1229,9 +1229,7 @@ void SAL_CALL ScDrawPagesObj::remove( const uno::Reference<drawing::XDrawPage>&
SdrPage* pPage = pImp->GetSdrPage();
if (pPage)
{
- USHORT nPageNum = pPage->GetPageNum();
- ScDocFunc aFunc(*pDocShell);
- aFunc.DeleteTable( nPageNum, TRUE, TRUE );
+ /*USHORT nPageNum =*/ pPage->GetPageNum();
}
}
}
@@ -1447,18 +1445,7 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const ::rtl::OUString& aName, con
{
String aNamStr = aName;
USHORT nPosition;
- if ( pDocShell->GetDocument()->GetTable( aNamStr, nPosition ) )
- {
- ScDocFunc aFunc(*pDocShell);
- if ( aFunc.DeleteTable( nPosition, TRUE, TRUE ) )
- {
- // InsertTable kann jetzt eigentlich nicht schiefgehen...
- bDone = aFunc.InsertTable( nPosition, aNamStr, TRUE, TRUE );
- if (bDone)
- pSheetObj->InitInsertSheet( pDocShell, nPosition );
- }
- }
- else
+ if ( !pDocShell->GetDocument()->GetTable( aNamStr, nPosition ) )
{
// not found
throw container::NoSuchElementException();
@@ -1490,12 +1477,7 @@ void SAL_CALL ScTableSheetsObj::removeByName( const ::rtl::OUString& aName )
{
USHORT nIndex;
String aString = aName;
- if ( pDocShell->GetDocument()->GetTable( aString, nIndex ) )
- {
- ScDocFunc aFunc(*pDocShell);
- bDone = aFunc.DeleteTable( nIndex, TRUE, TRUE );
- }
- else
+ if ( !pDocShell->GetDocument()->GetTable( aString, nIndex ) )
{
// not found
throw container::NoSuchElementException();
@@ -1663,12 +1645,7 @@ void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 n
BOOL bDone = FALSE;
if ( pDocShell && nCount > 0 && nPosition >= 0 && nStartCol+nPosition <= nEndCol &&
nStartCol+nPosition+nCount-1 <= MAXCOL )
- {
- ScDocFunc aFunc(*pDocShell);
- ScRange aRange( (USHORT)(nStartCol+nPosition), 0, nTab,
- (USHORT)(nStartCol+nPosition+nCount-1), MAXROW, nTab );
- bDone = aFunc.InsertCells( aRange, INS_INSCOLS, TRUE, TRUE );
- }
+ bDone = false;
if (!bDone)
throw uno::RuntimeException(); // no other exceptions specified
}
@@ -1680,12 +1657,7 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou
BOOL bDone = FALSE;
// Der zu loeschende Bereich muss innerhalb des Objekts liegen
if ( pDocShell && nCount > 0 && nIndex >= 0 && nStartCol+nIndex+nCount-1 <= nEndCol )
- {
- ScDocFunc aFunc(*pDocShell);
- ScRange aRange( (USHORT)(nStartCol+nIndex), 0, nTab,
- (USHORT)(nStartCol+nIndex+nCount-1), MAXROW, nTab );
- bDone = aFunc.DeleteCells( aRange, DEL_DELCOLS, TRUE, TRUE );
- }
+ bDone = true;
if (!bDone)
throw uno::RuntimeException(); // no other exceptions specified
}
@@ -1828,10 +1800,8 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue(
//! single function to set/remove all breaks?
BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
for (USHORT nCol=nStartCol; nCol<=nEndCol; nCol++)
- if (bSet)
- aFunc.InsertPageBreak( TRUE, ScAddress(nCol,0,nTab), TRUE, TRUE, TRUE );
- else
- aFunc.RemovePageBreak( TRUE, ScAddress(nCol,0,nTab), TRUE, TRUE, TRUE );
+ if (!bSet)
+ aFunc.RemovePageBreak( TRUE, ScAddress(nCol,0,nTab), TRUE, TRUE );
}
}
@@ -1931,12 +1901,7 @@ void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCou
BOOL bDone = FALSE;
if ( pDocShell && nCount > 0 && nPosition >= 0 && nStartRow+nPosition <= nEndRow &&
nStartRow+nPosition+nCount-1 <= MAXROW )
- {
- ScDocFunc aFunc(*pDocShell);
- ScRange aRange( 0, (USHORT)(nStartRow+nPosition), nTab,
- MAXCOL, (USHORT)(nStartRow+nPosition+nCount-1), nTab );
- bDone = aFunc.InsertCells( aRange, INS_INSROWS, TRUE, TRUE );
- }
+ bDone = false;
if (!bDone)
throw uno::RuntimeException(); // no other exceptions specified
}
@@ -1948,12 +1913,7 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount
BOOL bDone = FALSE;
// Der zu loeschende Bereich muss innerhalb des Objekts liegen
if ( pDocShell && nCount > 0 && nIndex >= 0 && nStartRow+nIndex+nCount-1 <= nEndRow )
- {
- ScDocFunc aFunc(*pDocShell);
- ScRange aRange( 0, (USHORT)(nStartRow+nIndex), nTab,
- MAXCOL, (USHORT)(nStartRow+nIndex+nCount-1), nTab );
- bDone = aFunc.DeleteCells( aRange, DEL_DELROWS, TRUE, TRUE );
- }
+ bDone = true;
if (!bDone)
throw uno::RuntimeException(); // no other exceptions specified
}
@@ -2072,10 +2032,8 @@ void SAL_CALL ScTableRowsObj::setPropertyValue(
//! single function to set/remove all breaks?
BOOL bSet = ScUnoHelpFunctions::GetBoolFromAny( aValue );
for (USHORT nRow=nStartRow; nRow<=nEndRow; nRow++)
- if (bSet)
- aFunc.InsertPageBreak( FALSE, ScAddress(0,nRow,nTab), TRUE, TRUE, TRUE );
- else
- aFunc.RemovePageBreak( FALSE, ScAddress(0,nRow,nTab), TRUE, TRUE, TRUE );
+ if (!bSet)
+ aFunc.RemovePageBreak( FALSE, ScAddress(0,nRow,nTab), TRUE, TRUE );
}
}
@@ -2447,11 +2405,8 @@ void SAL_CALL ScScenariosObj::removeByName( const ::rtl::OUString& aName )
{
SolarMutexGuard aGuard;
USHORT nIndex;
- if ( pDocShell && GetScenarioIndex_Impl( aName, nIndex ) )
- {
- ScDocFunc aFunc(*pDocShell);
- aFunc.DeleteTable( nTab+nIndex+1, TRUE, TRUE );
- }
+ if ( pDocShell )
+ GetScenarioIndex_Impl( aName, nIndex );
}
// XEnumerationAccess
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
index 7e5645e..caca2f9 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
@@ -677,7 +677,7 @@ void ScAreaLinkObj::Modify_Impl( const ::rtl::OUString* pNewFile, const ::rtl::O
}
ScDocFunc aFunc(*pDocShell);
- aFunc.InsertAreaLink( aFile, aFilter, aOptions, aSource, aDest, nRefresh, bFitBlock, TRUE );
+ aFunc.InsertAreaLink( aFile, aFilter, aOptions, aSource, aDest, nRefresh, bFitBlock );
}
}
@@ -960,7 +960,7 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP
ScDocFunc aFunc(*pDocShell);
aFunc.InsertAreaLink( aFileStr, aFilterStr, aOptionStr,
aSourceStr, ScRange(aDestAddr),
- 0, FALSE, TRUE ); // keine Inhalte verschieben
+ 0, FALSE ); // keine Inhalte verschieben
}
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
index d6d8c9f..f22180d 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
@@ -163,7 +163,7 @@ void ScNamedRangeObj::Modify_Impl( const String* pNewName, const String* pNewCon
if ( aNewRanges.Insert(pNew) )
{
ScDocFunc aFunc(*pDocShell);
- aFunc.ModifyRangeNames( aNewRanges, sal_True );
+ aFunc.ModifyRangeNames( aNewRanges );
aName = aInsName; //! broadcast?
}
@@ -446,7 +446,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const ::rtl::OUString& aName,
if ( aNewRanges.Insert(pNew) )
{
ScDocFunc aFunc(*pDocShell);
- aFunc.ModifyRangeNames( aNewRanges, sal_True );
+ aFunc.ModifyRangeNames( aNewRanges );
bDone = TRUE;
}
else
@@ -503,7 +503,7 @@ void SAL_CALL ScNamedRangesObj::removeByName( const ::rtl::OUString& aName )
ScRangeName aNewRanges(*pNames);
aNewRanges.AtFree(nPos);
ScDocFunc aFunc(*pDocShell);
- aFunc.ModifyRangeNames( aNewRanges, sal_True );
+ aFunc.ModifyRangeNames( aNewRanges );
bDone = TRUE;
}
}
diff --git a/binfilter/inc/bf_sc/autoform.hxx b/binfilter/inc/bf_sc/autoform.hxx
index 6390a6f..1733a30 100644
--- a/binfilter/inc/bf_sc/autoform.hxx
+++ b/binfilter/inc/bf_sc/autoform.hxx
@@ -253,7 +253,7 @@ public:
virtual ~ScAutoFormat();
virtual DataObject* Clone() const { return new ScAutoFormat( *this ); }
ScAutoFormatData* operator[]( const USHORT nIndex ) const {return (ScAutoFormatData*)At( nIndex );}
- virtual short Compare( DataObject* pKey1, DataObject* pKey2 ) const{DBG_BF_ASSERT(0, "STRIP"); return 0;} //STRIP001 virtual short Compare( DataObject* pKey1, DataObject* pKey2 ) const;
+ virtual short Compare( DataObject* /*pKey1*/, DataObject* /*pKey2*/ ) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}
BOOL Load();
BOOL Save();
void SetSaveLater( BOOL bSet );
diff --git a/binfilter/inc/bf_sc/cell.hxx b/binfilter/inc/bf_sc/cell.hxx
index 13ea435..916f955 100644
--- a/binfilter/inc/bf_sc/cell.hxx
+++ b/binfilter/inc/bf_sc/cell.hxx
@@ -400,16 +400,20 @@ public:
// ScBaseCell
-inline ScBaseCell::ScBaseCell( CellType eNewType ) :
- eCellType( eNewType ),
- pNote( NULL ),
- pBroadcaster( NULL ), nTextWidth( TEXTWIDTH_DIRTY ), nScriptType( SC_SCRIPTTYPE_UNKNOWN )
+inline ScBaseCell::ScBaseCell( CellType eNewType )
+ : pNote( NULL )
+ , pBroadcaster( NULL )
+ , nTextWidth( TEXTWIDTH_DIRTY )
+ , eCellType( eNewType )
+ , nScriptType( SC_SCRIPTTYPE_UNKNOWN )
{
}
-inline ScBaseCell::ScBaseCell( const ScBaseCell& rBaseCell ) :
- eCellType( rBaseCell.eCellType ),
- pBroadcaster( NULL ), nTextWidth( rBaseCell.nTextWidth ), nScriptType( SC_SCRIPTTYPE_UNKNOWN )
+inline ScBaseCell::ScBaseCell( const ScBaseCell& rBaseCell )
+ : pBroadcaster( NULL )
+ , nTextWidth( rBaseCell.nTextWidth )
+ , eCellType( rBaseCell.eCellType )
+ , nScriptType( SC_SCRIPTTYPE_UNKNOWN )
{
if (rBaseCell.pNote)
pNote = new ScPostIt( *rBaseCell.pNote );
diff --git a/binfilter/inc/bf_sc/rangenam.hxx b/binfilter/inc/bf_sc/rangenam.hxx
index 93f606e..0859c82 100644
--- a/binfilter/inc/bf_sc/rangenam.hxx
+++ b/binfilter/inc/bf_sc/rangenam.hxx
@@ -180,8 +180,8 @@ public:
ScRangeName(const ScRangeName& rScRangeName, ScDocument* pDocument);
- virtual DataObject* Clone(ScDocument* pDoc) const
- { return new ScRangeName(*this, pDoc); }
+ virtual DataObject* Clone(ScDocument* pDoc_) const
+ { return new ScRangeName(*this, pDoc_); }
ScRangeData* operator[]( const USHORT nIndex) const
{ return (ScRangeData*)At(nIndex); }
virtual short Compare(DataObject* pKey1, DataObject* pKey2) const;
diff --git a/binfilter/inc/bf_sc/token.hxx b/binfilter/inc/bf_sc/token.hxx
index 03ef5d2..c589639 100644
--- a/binfilter/inc/bf_sc/token.hxx
+++ b/binfilter/inc/bf_sc/token.hxx
@@ -349,15 +349,21 @@ private:
String aExternal;
BYTE nByte;
public:
- ScExternalToken( OpCode e, BYTE n, const String& r ) :
- ScToken( e, svExternal ), nByte( n ),
- aExternal( r ) {}
- ScExternalToken( OpCode e, const String& r ) :
- ScToken( e, svExternal ), nByte( 0 ),
- aExternal( r ) {}
- ScExternalToken( const ScExternalToken& r ) :
- ScToken( r ), nByte( r.nByte ),
- aExternal( r.aExternal ) {}
+ ScExternalToken( OpCode e, BYTE n, const String& r )
+ : ScToken( e, svExternal )
+ , aExternal( r )
+ , nByte( n )
+ {}
+ ScExternalToken( OpCode e, const String& r )
+ : ScToken( e, svExternal )
+ , aExternal( r )
+ , nByte( 0 )
+ {}
+ ScExternalToken( const ScExternalToken& r )
+ : ScToken( r )
+ , aExternal( r.aExternal )
+ , nByte( r.nByte )
+ {}
virtual const String& GetExternal() const;
virtual BYTE GetByte() const;
virtual void SetByte( BYTE n );
diff --git a/binfilter/inc/bf_sc/zforauto.hxx b/binfilter/inc/bf_sc/zforauto.hxx
index f25fc81..44ce104 100644
--- a/binfilter/inc/bf_sc/zforauto.hxx
+++ b/binfilter/inc/bf_sc/zforauto.hxx
@@ -45,7 +45,7 @@ class ScNumFormatAbbrev
public:
ScNumFormatAbbrev();
ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat);
- ScNumFormatAbbrev(ULONG nFormat, SvNumberFormatter& rFormatter) {DBG_BF_ASSERT(0, "STRIP"); } //STRIP001 ScNumFormatAbbrev(ULONG nFormat, SvNumberFormatter& rFormatter);
+ ScNumFormatAbbrev(ULONG /*nFormat*/, SvNumberFormatter& /*rFormatter*/) {DBG_BF_ASSERT(0, "STRIP"); }
void Load( SvStream& rStream ); // Laden der Zahlenformate
void Save( SvStream& rStream ) const; // Speichern der Zahlenformate
};
commit 2230311e9ac6f7d196720e5a4ca70f34426eb6dd
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 13 09:00:05 2010 +0000
cppcheck: unused variables
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index b968b67..c98446b 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -369,7 +369,6 @@ using namespace ::com::sun::star;
/*N*/ ScMarkData aMultiMark = rMark;
/*N*/ aMultiMark.SetMarking(FALSE); // fuer MarkToMulti
/*N*/
-/*N*/ ScDocument* pUndoDoc = NULL;
/*N*/ BOOL bMulti = !bSimple && aMultiMark.IsMultiMarked();
/*N*/ if (!bSimple)
/*N*/ {
@@ -1011,9 +1010,7 @@ using namespace ::com::sun::star;
/*N*/ //! Option "Formeln anzeigen" - woher nehmen?
/*N*/ }
/*N*/
-/*N*/ ScDocument* pUndoDoc = NULL;
/*N*/ ScOutlineTable* pUndoTab = NULL;
-/*N*/ USHORT* pUndoRanges = NULL;
/*N*/
/*N*/ BOOL bShow = nSizeTwips > 0 || eMode != SC_SIZE_DIRECT;
/*N*/ BOOL bOutline = FALSE;
@@ -1331,7 +1328,6 @@ using namespace ::com::sun::star;
/*N*/ BOOL bSize = (*pAutoFormat)[nFormatNo]->GetIncludeWidthHeight();
/*N*/
/*N*/ USHORT nTabCount = pDoc->GetTableCount();
-/*N*/ ScDocument* pUndoDoc = NULL;
/*N*/
/*N*/ pDoc->AutoFormat( nStartCol, nStartRow, nEndCol, nEndRow, nFormatNo, aMark );
/*N*/
@@ -1726,7 +1722,6 @@ using namespace ::com::sun::star;
/*N*/ BOOL bDone = FALSE;
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
/*N*/ USHORT nTab = rStartPos.Tab();
-/*N*/ ScDocument* pUndoDoc = NULL;
/*N*/
/*N*/ ScRangeName* pList = pDoc->GetRangeName();
/*N*/ USHORT nCount = pList->GetCount();
commit b3cc585c97ece1de73a595dd6daefd692114077e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 13 08:56:24 2010 +0000
cppcheck: unused variable
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
index edfb9e0..749cfbb 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
@@ -810,7 +810,7 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const ::rtl::OUString& aName, cons
if ( !pStylePool->Find( aNameStr, eFamily ) ) // noch nicht vorhanden
{
- SfxStyleSheetBase& rStyle = pStylePool->Make( aNameStr, eFamily, SFXSTYLEBIT_USERDEF );
+ /*SfxStyleSheetBase& rStyle =*/ pStylePool->Make( aNameStr, eFamily, SFXSTYLEBIT_USERDEF );
pStyleObj->InitDoc( pDocShell, aNameStr ); // Objekt kann benutzt werden
More information about the Libreoffice-commits
mailing list