Removed some dead code in calc (mostly view).
From 844bea185f34d5dc4388298e8959811992634259 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Sun, 16 Jan 2011 19:11:44 +0100
Subject: [PATCH 1/2] Remove some dead code in 'view'
---
sc/source/ui/view/cellsh1.cxx | 3 -
sc/source/ui/view/cellsh3.cxx | 9 ----
sc/source/ui/view/colrowba.cxx | 2 -
sc/source/ui/view/dbfunc3.cxx | 2 -
sc/source/ui/view/drawvie3.cxx | 1 -
sc/source/ui/view/formatsh.cxx | 24 ------------
sc/source/ui/view/galwrap.cxx | 2 +-
sc/source/ui/view/gridwin.cxx | 81 ++--------------------------------------
sc/source/ui/view/gridwin2.cxx | 9 ----
sc/source/ui/view/gridwin3.cxx | 45 ----------------------
sc/source/ui/view/gridwin4.cxx | 5 --
sc/source/ui/view/hdrcont.cxx | 8 ----
sc/source/ui/view/olinewin.cxx | 2 -
sc/source/ui/view/output.cxx | 16 --------
sc/source/ui/view/output2.cxx | 25 +------------
sc/source/ui/view/preview.cxx | 4 --
sc/source/ui/view/prevwsh.cxx | 3 -
sc/source/ui/view/reffact.cxx | 24 ------------
sc/source/ui/view/tabcont.cxx | 20 ----------
sc/source/ui/view/tabview.cxx | 1 -
sc/source/ui/view/tabview2.cxx | 11 -----
sc/source/ui/view/tabview3.cxx | 5 --
sc/source/ui/view/tabview4.cxx | 2 -
sc/source/ui/view/tabview5.cxx | 14 -------
sc/source/ui/view/tabvwsh4.cxx | 7 ---
sc/source/ui/view/tabvwsha.cxx | 2 -
sc/source/ui/view/tabvwshb.cxx | 6 ---
sc/source/ui/view/tabvwshg.cxx | 2 -
sc/source/ui/view/viewdata.cxx | 2 -
sc/source/ui/view/viewfun2.cxx | 10 +----
sc/source/ui/view/viewfun3.cxx | 3 -
sc/source/ui/view/viewfun4.cxx | 1 -
sc/source/ui/view/viewfun5.cxx | 3 -
sc/source/ui/view/viewfun7.cxx | 4 +-
sc/source/ui/view/viewfunc.cxx | 7 ---
sc/source/ui/view/viewutil.cxx | 9 ----
36 files changed, 8 insertions(+), 366 deletions(-)
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index ba01b1f..15319ff 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1534,7 +1534,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
break;
case SID_SPELL_DIALOG:
-// pTabViewShell->DoSpellingChecker();
{
SfxViewFrame* pViewFrame = pTabViewShell->GetViewFrame();
if( rReq.GetArgs() )
@@ -1683,8 +1682,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
const SfxBoolItem* pOkItem = (const SfxBoolItem*)&pReqArgs->Get( SID_DLG_RETOK );
-// pScMod->SetFunctionDlg( NULL );
-
if ( pOkItem->GetValue() ) // OK
{
String aFormula;
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index c56d826..316e9de 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -871,16 +871,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
// TODO/LATER: when is this code executed?
pTabViewShell->Escape();
- //SfxObjectShell* pObjSh = GetViewData()->GetSfxDocShell();
- //if (pObjSh->GetInPlaceObject() &&
- // pObjSh->GetInPlaceObject()->GetIPClient())
- //{
- // GetViewData()->GetDocShell()->
- // DoInPlaceActivate(FALSE); // OLE beenden
- //}
}
-
-// SetSumAssignMode(); //ScInputWindow
}
break;
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 4f4bc7a..ec55d54 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -128,7 +128,6 @@ void ScColBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
nSizeTwips = (USHORT) ( nNewSize / pViewData->GetPPTX() );
ScMarkData& rMark = pViewData->GetMarkData();
-// SCTAB nTab = pViewData->GetTabNo();
SCCOLROW* pRanges = new SCCOLROW[MAXCOL+1];
SCCOL nRangeCnt = 0;
@@ -294,7 +293,6 @@ void ScRowBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize )
nSizeTwips = (USHORT) ( nNewSize / pViewData->GetPPTY() );
ScMarkData& rMark = pViewData->GetMarkData();
-// SCTAB nTab = pViewData->GetTabNo();
SCCOLROW* pRanges = new SCCOLROW[MAXROW+1];
SCROW nRangeCnt = 0;
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 60bf4b873..c47055c 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -498,7 +498,6 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
pUndoDB = new ScDBCollection( *pDocDB );
}
-// pDoc->SetOutlineTable( nTab, NULL );
ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab );
if (pOut)
pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen
@@ -530,7 +529,6 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord,
if (bRecord)
{
-// ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL;
pDocSh->GetUndoManager()->AddUndoAction(
new ScUndoSubTotals( pDocSh, nTab,
rParam, aNewParam.nRow2,
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index afb41ac..8d111af 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -62,7 +62,6 @@ ScDrawView::ScDrawView( OutputDevice* pOut, ScViewData* pData ) :
pDropMarker( NULL ),
pDropMarkObj( NULL ),
bInConstruct( TRUE )
- //HMHbDisableHdl( FALSE )
{
// #i73602# Use default from the configuration
SetBufferedOverlayAllowed(getOptionsDrawinglayer().IsOverlayBuffer_Calc());
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 4b2c51b..88f08a9 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -330,8 +330,6 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
String aStyleName;
USHORT nRetMask = 0xffff;
-// #96983# only stylist sends focus to sheet
-// BOOL bGrabFocus = ( SID_STYLE_APPLY == nSlotId );
pStylePool->SetSearchMask( eFamily, SFXSTYLEBIT_ALL );
@@ -813,8 +811,6 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
if ( SFX_STYLE_FAMILY_PARA == eFam )
{
-// pDoc->CellStyleChanged( *pStyleSheet,
aOldSet );
-
SfxItemSet& rNewSet = pStyleSheet->GetItemSet();
BOOL bNumFormatChanged;
if ( ScGlobal::CheckWidthInvalidate(
@@ -889,13 +885,8 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
}
}
-// if ( nRetMask != 0xffff )// Irgendein Wert MUSS geliefert werden JN
rReq.SetReturnValue( SfxUInt16Item( nSlotId, nRetMask ) );
-// #96983# only stylist sends focus to sheet
-// if ( bGrabFocus )
-// pTabViewShell->GetActiveWin()->GrabFocus();
-
if ( bAddUndo && bUndo)
pDocSh->GetUndoManager()->AddUndoAction(
new ScUndoModifyStyle( pDocSh, eFamily, aOldData, aNewData ) );
@@ -1340,7 +1331,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_LEFT : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_LEFT );
//break;
case SID_ALIGNRIGHT:
@@ -1350,7 +1340,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_RIGHT );
//break;
case SID_ALIGNCENTERHOR:
@@ -1360,7 +1349,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_CENTER : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_CENTER );
//break;
case SID_ALIGNBLOCK:
@@ -1370,7 +1358,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_HOR_JUSTIFY_BLOCK : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_BLOCK );
//break;
case SID_ALIGNTOP:
@@ -1380,7 +1367,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_VER_JUSTIFY_TOP : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_TOP );
//break;
case SID_ALIGNBOTTOM:
@@ -1390,7 +1376,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_VER_JUSTIFY_BOTTOM : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_BOTTOM );
//break;
case SID_ALIGNCENTERVER:
@@ -1400,7 +1385,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
SVX_VER_JUSTIFY_CENTER : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) );
ExecuteSlot( rReq, GetInterface() );
return;
-// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_CENTER );
//break;
default:
@@ -1410,7 +1394,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
}
rBindings.Update();
-// rReq.Done();
if( pNewSet )
{
@@ -1737,13 +1720,6 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
rSet.Put( rBrushItem, GetPool().GetWhich(nWhich) );
}
break;
-/* case SID_ATTR_ALIGN_LINEBREAK:
- {
- const SfxBoolItem& rBreakItem = (const SfxBoolItem&)rAttrSet.Get( ATTR_LINEBREAK );
- rSet.Put( rBreakItem, GetPool().GetWhich(nWhich) );
- }
- break;
-*/
}
nWhich = aIter.NextWhich();
}
diff --git a/sc/source/ui/view/galwrap.cxx b/sc/source/ui/view/galwrap.cxx
index ea36d24..7d7db5b 100644
--- a/sc/source/ui/view/galwrap.cxx
+++ b/sc/source/ui/view/galwrap.cxx
@@ -63,7 +63,7 @@ String GalleryGetFullPath()
{
GalleryExplorer* pGal = SVX_GALLERY();
DBG_ASSERT( pGal, "Wo ist die Gallery?" );
-// return pGal->GetPath().GetFull();
+
return pGal->GetURL().GetMainURL(INetURLObject::NO_DECODE);
// URL as stored in GraphicLink must be encoded
}
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 5481822..6cc6587 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -476,7 +476,6 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic
SetBackground();
SetMapMode(pViewData->GetLogicMode(eWhich));
-// EnableDrop();
EnableChildTransparentMode();
SetDialogControlFlags( WINDOW_DLGCTRL_RETURN | WINDOW_DLGCTRL_WANTFOCUS );
@@ -796,11 +795,6 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
}
// SetSize spaeter
-/*
- pFilterBox->SetSelectionMode( SINGLE_SELECTION );
- pFilterBox->SetTabs( nFilterBoxTabs, MapUnit( MAP_APPFONT ));
- pFilterBox->SetTabJustify( 1, bLayoutRTL ? AdjustRight : AdjustLeft );
-*/
// ParentSize Abfrage fehlt
Size aSize( nSizeX, nHeight );
@@ -860,18 +854,14 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
pFilterBox->SetUpdateMode(TRUE);
pFilterBox->GrabFocus();
- // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet
-//! SvLBoxEntry* pSelect = NULL;
USHORT nPos = LISTBOX_ENTRY_NOTFOUND;
if (aCurrent.Len())
{
nPos = pFilterBox->GetEntryPos( aCurrent );
-//! pSelect = pFilterBox->GetEntry( nPos );
}
- if (/*!pSelect*/ LISTBOX_ENTRY_NOTFOUND == nPos && pFilterBox->GetEntryCount() > 0 )
+ if (LISTBOX_ENTRY_NOTFOUND == nPos && pFilterBox->GetEntryCount() > 0 )
nPos = 0;
-//! pSelect = pFilterBox->GetEntry(0); // einer sollte immer
selektiert sein
- if (/*pSelect*/ LISTBOX_ENTRY_NOTFOUND != nPos )
+ if (LISTBOX_ENTRY_NOTFOUND != nPos )
pFilterBox->SelectEntryPos(nPos);
pFilterBox->EndInit();
@@ -927,11 +917,6 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect
)
}
// SetSize spaeter
-/*
- pFilterBox->SetSelectionMode( SINGLE_SELECTION );
- pFilterBox->SetTabs( nFilterBoxTabs, MapUnit( MAP_APPFONT ));
- pFilterBox->SetTabJustify( 1, bLayoutRTL ? AdjustRight : AdjustLeft );
-*/
BOOL bEmpty = FALSE;
TypedScStrCollection aStrings( 128, 128 );
@@ -1031,7 +1016,6 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL
bDataSelect )
pFilterBox->SetUpdateMode(TRUE);
}
-//! SvLBoxEntry* pSelect = NULL;
USHORT nSelPos = LISTBOX_ENTRY_NOTFOUND;
if (!bDataSelect) // AutoFilter: aktiven Eintrag
selektieren
@@ -1060,7 +1044,6 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL
bDataSelect )
if (pStr)
{
nSelPos = pFilterBox->GetEntryPos( *pStr );
-//! pSelect = pFilterBox->GetEntry(
nPos );
}
}
else if (rEntry.eOp == SC_TOPVAL && rEntry.pStr &&
@@ -1131,7 +1114,6 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL
bDataSelect )
}
else
{
-// pFilterBox->Show(); // schon vorne
pFilterBox->GrabFocus();
// Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet
@@ -1158,17 +1140,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL
bDataSelect )
void ScGridWindow::FilterSelect( ULONG nSel )
{
- String aString;
-/*
- SvLBoxEntry* pEntry = pFilterBox->GetEntry( nSel );
- if (pEntry)
- {
- SvLBoxString* pStringEntry = (SvLBoxString*) pEntry->GetFirstItem( SV_ITEM_ID_LBOXSTRING );
- if ( pStringEntry )
- aString = pStringEntry->GetText();
- }
-*/
- aString = pFilterBox->GetEntry( static_cast< USHORT >( nSel ) );
+ String aString = pFilterBox->GetEntry( static_cast< USHORT >( nSel ) );
SCCOL nCol = pFilterBox->GetCol();
SCROW nRow = pFilterBox->GetRow();
@@ -1465,7 +1437,6 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction )
if (!bNewPointer && bAction)
{
-// SetPointer( POINTER_ARROW ); // in Fu...
pViewData->ResetFillMode();
}
@@ -1543,7 +1514,6 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
if ( !nButtonDown || !bDouble ) // single (first) click is always valid
nButtonDown = rMEvt.GetButtons(); // set nButtonDown first, so StopMarking works
-// pViewData->GetViewShell()->GetViewFrame()->GetWindow().GrabFocus();
if ( ( bEditMode && pViewData->GetActivePart() == eWhich ) || !bFormulaMode )
GrabFocus();
@@ -1640,7 +1610,6 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
if ( pViewData->GetActivePart() != eWhich )
pViewData->GetView()->ActivatePart( eWhich ); //! schon oben immer ???
- // CaptureMouse();
StartTracking();
return;
}
@@ -1661,7 +1630,6 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
if (nPagebreakMouse)
{
bPagebreakDrawn = FALSE;
- // CaptureMouse();
StartTracking();
PagebreakMove( rMEvt, FALSE );
return;
@@ -1672,8 +1640,6 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
{
if ( !bCrossPointer && DrawMouseButtonDown(rMEvt) )
{
- //if (DrawHasMarkedObj())
- // pViewData->GetViewShell()->SetDrawShellOrSub(); // Draw-Objekt selektiert
return;
}
@@ -1926,8 +1892,6 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
SCCOL nEndCol;
SCROW nEndRow;
pViewData->GetFillData( nStartCol, nStartRow, nEndCol, nEndRow );
-// DBG_ASSERT( nStartCol==pViewData->GetRefStartX() &&
nStartRow==pViewData->GetRefStartY(),
-// "Block falsch fuer AutoFill" );
ScRange aDelRange;
BOOL bIsDel = pViewData->GetDelMark( aDelRange );
@@ -2184,7 +2148,6 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
if ( rMEvt.IsLeft() && pViewData->GetView()->GetSelEngine()->SelMouseButtonUp( rMEvt ) )
{
-// rMark.MarkToSimple();
pViewData->GetView()->SelectionChanged();
SfxDispatcher* pDisp = pViewData->GetViewShell()->GetDispatcher();
@@ -2201,8 +2164,6 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt )
String aAddr; //
CurrentCell
if( rMark.IsMarked() )
{
-// BOOL bKeep = rMark.IsMultiMarked(); //! wohin damit ???
-
ScRange aScRange;
rMark.GetMarkArea( aScRange );
aScRange.Format( aAddr, SCR_ABS );
@@ -3212,10 +3173,6 @@ void ScGridWindow::UpdateInputContext()
BOOL ScGridWindow::DropScroll( const Point& rMousePos )
{
-/* doch auch auf nicht aktiven Views...
- if ( !pViewData->IsActive() )
- return FALSE;
-*/
SCsCOL nDx = 0;
SCsROW nDy = 0;
Size aSize = GetOutputSizePixel();
@@ -3239,16 +3196,10 @@ BOOL ScGridWindow::DropScroll( const Point& rMousePos )
if ( nDx != 0 || nDy != 0 )
{
-// if (bDragRect)
-// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX,
nDragEndY, eWhich );
-
if ( nDx != 0 )
pViewData->GetView()->ScrollX( nDx, WhichH(eWhich) );
if ( nDy != 0 )
pViewData->GetView()->ScrollY( nDy, WhichV(eWhich) );
-
-// if (bDragRect)
-// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX,
nDragEndY, eWhich );
}
return FALSE;
@@ -3315,8 +3266,6 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
{
if ( rEvt.mbLeaving )
{
- // if (bDragRect)
- // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY,
eWhich );
bDragRect = FALSE;
UpdateDragRectOverlay();
return rEvt.mnAction;
@@ -3346,7 +3295,6 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
{
if (bDragRect) // Rechteck loeschen
{
- // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX,
nDragEndY, eWhich );
bDragRect = FALSE;
UpdateDragRectOverlay();
}
@@ -3354,15 +3302,9 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
//! highlight chart? (selection border?)
sal_Int8 nRet = rEvt.mnAction;
-//! if ( rEvt.GetAction() == DROP_LINK )
-//! bOk = rEvt.SetAction( DROP_COPY ); //
can't link onto chart
return nRet;
}
}
-//! else
-//! if ( rEvt.GetAction() == DROP_MOVE )
-//! rEvt.SetAction( DROP_COPY ); //
different doc: default=COPY
-
if ( rData.pCellTransfer->GetDragSourceFlags() & SC_DROP_TABLE ) // whole
sheet?
{
@@ -3403,7 +3345,6 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
{
if (bDragRect)
{
- // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX,
nDragEndY, eWhich );
bDragRect = FALSE;
UpdateDragRectOverlay();
}
@@ -3521,9 +3462,6 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
nDragStartX+nSizeX-1 != nDragEndX || nDragStartY+nSizeY-1 != nDragEndY ||
!bDragRect || eDragInsertMode != meDragInsertMode )
{
- // if (bDragRect)
- // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY,
eWhich );
-
nDragStartX = nNewDragX;
nDragStartY = nNewDragY;
nDragEndX = nDragStartX+nSizeX-1;
@@ -3531,8 +3469,6 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
bDragRect = TRUE;
meDragInsertMode = eDragInsertMode;
- // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY,
eWhich );
-
UpdateDragRectOverlay();
}
}
@@ -3814,8 +3750,6 @@ ULONG lcl_GetDropLinkId( const uno::Reference<datatransfer::XTransferable>&
xTra
sal_Int8 ScGridWindow::ExecutePrivateDrop( const ExecuteDropEvent& rEvt )
{
// hide drop marker
- // if (bDragRect)
- // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich
);
bDragRect = FALSE;
UpdateDragRectOverlay();
@@ -4411,7 +4345,6 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY )
HideNoteMarker();
bIsInScroll = TRUE;
- //BOOL bXor=DrawBeforeScroll();
SetMapMode(MAP_PIXEL);
Scroll( nDifX, nDifY, SCROLL_CHILDREN );
@@ -4419,7 +4352,7 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY )
UpdateEditViewPos();
- DrawAfterScroll(); //bXor);
+ DrawAfterScroll();
bIsInScroll = FALSE;
}
@@ -4627,8 +4560,6 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner,
// zusammengefasste (einzeln/Bereich) ???
ScAddress aAddr( nPosX, nPosY, nTab );
-// Point aNext = pViewData->GetScrPos( nPosX+1, nPosY+1, eWhich );
-
Point aNext = pViewData->GetScrPos( nPosX, nPosY, eWhich, TRUE );
long nSizeXPix;
long nSizeYPix;
@@ -5072,7 +5003,6 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos,
Point aLogicClick = PixelToLogic(rPos,aEditMode);
if ( aLogicEdit.IsInside(aLogicClick) )
{
-// aEngine.SetUpdateMode(FALSE);
EditView aTempView( &aEngine, this );
aTempView.SetOutputArea( aLogicEdit );
@@ -5639,7 +5569,6 @@ void ScGridWindow::UpdateDragRectOverlay()
aScrPos.X() -= 2 * nLayoutSign;
aScrPos.Y() -= 2;
-// Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) );
Rectangle aRect( aScrPos.X(), aScrPos.Y(),
aScrPos.X() + ( nSizeXPix + 2 ) * nLayoutSign, aScrPos.Y() + nSizeYPix +
2 );
if ( bLayoutRTL )
@@ -5675,7 +5604,6 @@ void ScGridWindow::UpdateDragRectOverlay()
if(pOverlayManager)
{
- // Color aHighlight = GetSettings().GetStyleSettings().GetHighlightColor();
std::vector< basegfx::B2DRange > aRanges;
const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
@@ -5795,7 +5723,6 @@ void ScGridWindow::UpdateShrinkOverlay()
if(pOverlayManager)
{
- // Color aHighlight = GetSettings().GetStyleSettings().GetHighlightColor();
std::vector< basegfx::B2DRange > aRanges;
const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation());
basegfx::B2DRange aRB(aPixRect.Left(), aPixRect.Top(), aPixRect.Right() + 1,
aPixRect.Bottom() + 1);
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 69db948..d09910f 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -639,8 +639,6 @@ void ScGridWindow::UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect )
return; // everything unchanged
}
- // if ( bDragRect )
- // DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, FALSE );
if ( bShowRange )
{
nDragStartX = nStartX;
@@ -648,7 +646,6 @@ void ScGridWindow::UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect )
nDragEndX = nEndX;
nDragEndY = nEndY;
bDragRect = TRUE;
- // DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, FALSE );
}
else
bDragRect = FALSE;
@@ -814,8 +811,6 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
{
if ( bPagebreakDrawn ) // weginvertieren
{
- // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
- // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE
);
bPagebreakDrawn = FALSE;
UpdateDragRectOverlay();
}
@@ -922,16 +917,12 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp )
if ( bPagebreakDrawn )
{
// weginvertieren
- // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
- // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE
);
bPagebreakDrawn = FALSE;
}
aPagebreakDrag = aDrawRange;
if ( !bUp && !bHide )
{
// hininvertieren
- // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(),
- // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE
);
bPagebreakDrawn = TRUE;
}
UpdateDragRectOverlay();
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 37673bc..002552c 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -287,19 +287,6 @@ MapMode ScGridWindow::GetDrawMapMode( BOOL bForce )
return aDrawMode;
}
-//BOOL ScGridWindow::DrawBeforeScroll()
-//{
-// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
-//
-// BOOL bXor = FALSE;
-// if (pDrView)
-// {
-// bXor=pDrView->IsShownXorVisible(this);
-// if (bXor) pDrView->HideShownXor(this);
-// }
-// return bXor;
-//}
-
void ScGridWindow::DrawAfterScroll(/*BOOL bVal*/)
{
Update(); // immer, damit das Verhalten mit/ohne DrawingLayer gleich ist
@@ -307,28 +294,12 @@ void ScGridWindow::DrawAfterScroll(/*BOOL bVal*/)
ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
if (pDrView)
{
- //if (bVal)
- // pDrView->ShowShownXor(this);
-
OutlinerView* pOlView = pDrView->GetTextEditOutlinerView();
if (pOlView && pOlView->GetWindow() == this)
pOlView->ShowCursor(FALSE); // ist beim
Scrollen weggekommen
}
}
-//void ScGridWindow::DrawMarks()
-//{
-// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
-// if (pDrView)
-// pDrView->DrawMarks(this);
-//}
-
-//BOOL ScGridWindow::NeedDrawMarks()
-//{
-// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
-// return pDrView && pDrView->IsMarkHdlShown() && pDrView->AreObjectsMarked();
-//}
-
void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress)
{
ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
@@ -417,22 +388,6 @@ BOOL ScGridWindow::DrawHasMarkedObj()
return p ? p->AreObjectsMarked() : FALSE;
}
-//void ScGridWindow::DrawStartTimer()
-//{
- //ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
- //if (pDrView)
- //{
- /* jetzt in DrawMarks
- USHORT nWinNum = pDrView->FindWin(this);
- if (nWinNum!=SDRVIEWWIN_NOTFOUND)
- pDrView->AfterInitRedraw(nWinNum);
- */
-
- // pDrView->PostPaint();
- // pDrView->RestartAfterPaintTimer();
- //}
-//}
-
void ScGridWindow::DrawMarkDropObj( SdrObject* pObj )
{
ScDrawView* pDrView = pViewData->GetView()->GetScDrawView();
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 2cf4dbb..657f751 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -294,8 +294,6 @@ void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData,
void ScGridWindow::DoInvertRect( const Rectangle& rPixel )
{
-// Invert( PixelToLogic(rPixel) );
-
if ( rPixel == aInvertRect )
aInvertRect = Rectangle(); // aufheben
else
@@ -1428,7 +1426,6 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
if (bTestMerge)
if (bWasHidden) // auf versteckte
zusammengefasste testen
{
-// --nY; // nY
geaendert -> vorherige zeichnen
bDoHidden = TRUE;
bDoRow = TRUE;
}
@@ -1713,8 +1710,6 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects
)
nScrY = nEndY + 1;
}
}
-
-// aInvert.Flush(); // before restoring MapMode
}
// -------------------------------------------------------------------------
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index b964d78..979d0fa 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -291,12 +291,10 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
long nLayoutSign = bLayoutRTL ? -1 : 1;
BOOL bMirrored = IsMirrored();
-// const FunctionSet* pFuncSet = pSelEngine->GetFunctionSet();
String aString;
USHORT nBarSize;
Point aScrPos;
Size aTextSize;
-// Size aSize = GetOutputSizePixel();
if (bVertical)
nBarSize = (USHORT) GetSizePixel().Width();
@@ -329,7 +327,6 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
// aeussere Linien komplett durchzeichnen
// Zuerst Ende der letzten Zelle finden
-// long nLineEnd = -1;
long nLineEnd = nInitScrPos - nLayoutSign;
for (SCCOLROW i=nPos; i<nSize; i++)
@@ -622,8 +619,6 @@ SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder )
{
SCCOLROW nEntryNo = nCount + nPos;
-// nScrPos = GetScrPos( nEntryNo ) - 1;
-
if (nEntryNo > nSize)
nScrPos = nEndPos + nLayoutSign;
else
@@ -716,7 +711,6 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
ShowDragHelp();
DrawInvert( nDragPos );
- // CaptureMouse();
StartTracking();
bDragging = TRUE;
bDragMoved = FALSE;
@@ -758,8 +752,6 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& rMEvt )
SetMarking( FALSE );
bIgnoreMove = FALSE;
-// BOOL bFound;
-// SCCOLROW nHitNo = GetMousePos( rMEvt, bFound );
if ( bDragging )
{
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index 642aaa6..1340547 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -394,7 +394,6 @@ bool ScOutlineWindow::ItemHit( const Point& rPos, size_t& rnLevel, size_t& rnEnt
if ( nLevel == SC_OL_NOLEVEL )
return false;
-// long nLevelPos = GetLevelPos( nLevel );
long nEntryMousePos = mbHoriz ? rPos.X() : rPos.Y();
// --- level buttons ---
@@ -697,7 +696,6 @@ void ScOutlineWindow::Paint( const Rectangle& /* rRect */ )
const ScOutlineEntry* pEntry = pArray->GetEntry( sal::static_int_cast<USHORT>(nLevel),
sal::static_int_cast<USHORT>(nEntry)
);
SCCOLROW nStart = pEntry->GetStart();
-// SCCOLROW nEnd = pEntry->GetEnd();
// visible range?
bool bDraw = (nStartIndex <= nStart) && (nStart <= nEndIndex + 1);
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 292f74f..686e070 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -453,9 +453,6 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
if (pThisRowInfo->bChanged && !bHOver)
{
- //Point aStart( nPosX-nSignedOneX, nPosY );
- //Point aEnd( nPosX-nSignedOneX, nNextY-nOneY );
- //pDev->DrawLine( aStart, aEnd );
aGrid.AddVerLine( nPosX-nSignedOneX, nPosY, nNextY-nOneY );
}
nPosY = nNextY;
@@ -463,9 +460,6 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
}
else
{
- //Point aStart( nPosX-nSignedOneX, nScrY );
- //Point aEnd( nPosX-nSignedOneX, nScrY+nScrH-nOneY );
- //pDev->DrawLine( aStart, aEnd );
aGrid.AddVerLine( nPosX-nSignedOneX, nScrY, nScrY+nScrH-nOneY );
}
}
@@ -556,9 +550,6 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
}
if (!bVOver)
{
- //Point aStart( nPosX, nPosY-nOneY );
- //Point aEnd( nNextX-nSignedOneX, nPosY-nOneY );
- //pDev->DrawLine( aStart, aEnd );
aGrid.AddHorLine( nPosX, nNextX-nSignedOneX, nPosY-nOneY );
}
}
@@ -567,9 +558,6 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
}
else
{
- //Point aStart( nScrX, nPosY-nOneY );
- //Point aEnd( nScrX+nScrW-nOneX, nPosY-nOneY );
- //pDev->DrawLine( aStart, aEnd );
aGrid.AddHorLine( nScrX, nScrX+nScrW-nOneX, nPosY-nOneY );
}
}
@@ -981,10 +969,6 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL
bBot
nMaxWidth = pRowInfo[0].pCellInfo[nWx+1].nWidth;
}
-// Rectangle aRect( Point(nPosX,nPosY),
-// Size(
pRowInfo[0].pCellInfo[nArrX].nWidth,
-//
pRowInfo[nArrY].nHeight ) );
-
// rectangle is in logical orientation
Rectangle aRect( nPosX, nPosY,
nPosX + ( nThisWidth - 1 ) * nLayoutSign,
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 1dc8a92..bc5d6d0 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -420,13 +420,8 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const
SfxItemSet*
// Zahlenformat
-// ULONG nOld = nValueFormat;
nValueFormat = pPattern->GetNumberFormat( pOutput->pDoc->GetFormatTable(), pCondSet );
-/* s.u.
- if (nValueFormat != nOld)
- pLastCell = NULL; // immer neu formatieren
-*/
// Raender
pMargin = (const SvxMarginItem*)&pPattern->GetItem( ATTR_MARGIN, pCondSet );
@@ -459,7 +454,6 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt
// Zahlenformat
ULONG nOld = nValueFormat;
-// nValueFormat = pPattern->GetNumberFormat( pFormatter );
const SfxPoolItem* pFormItem;
if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,TRUE,&pFormItem) != SFX_ITEM_SET )
pFormItem = &pPattern->GetItem(ATTR_VALUE_FORMAT);
@@ -879,11 +873,6 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
else if ( pInfo->bVOverlapped )
bDoMerge = bIsTop;
- // weiter solange versteckt
-/* if (!bDoMerge)
- return FALSE;
-*/
-
rOverX = nX;
rOverY = nY;
BOOL bHOver = pInfo->bHOverlapped;
@@ -899,14 +888,11 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
if (rOverX >= nX1 && !bHidden)
{
-// rVirtPosX -= pRowInfo[0].pCellInfo[rOverX+1].nWidth;
bHOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bHOverlapped;
bVOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bVOverlapped;
}
else
{
-// if (!bClipVirt)
-// rVirtPosX -= (long) (pDoc->GetColWidth( rOverX, nTab ) * nPPTX);
USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue();
bHOver = ((nOverlap & SC_MF_HOR) != 0);
@@ -929,14 +915,11 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY,
!pDoc->RowHidden(rOverY, nTab) &&
pRowInfo[nArrY].nRowNo == rOverY)
{
-// rVirtPosY -= pRowInfo[nArrY].nHeight;
bHOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bHOverlapped;
bVOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bVOverlapped;
}
else
{
-// if (!bClipVirt)
-// rVirtPosY -= (long) (pDoc->GetRowHeight( rOverY, nTab ) * nPPTY);
USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr(
rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue();
bHOver = ((nOverlap & SC_MF_HOR) != 0);
@@ -1354,7 +1337,6 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
BOOL bWasIdleDisabled = pDoc->IsIdleDisabled();
pDoc->DisableIdle( TRUE );
Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird
ausgegeben
-// UINT32 nMinHeight = aMinSize.Height() / 200; // 1/2 Pixel
ScDrawStringsVars aVars( this, bPixelToLogic );
@@ -1395,7 +1377,6 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic )
if ( pThisRowInfo->bChanged )
{
SCROW nY = pThisRowInfo->nRowNo;
-// long nCellHeight = (long) pThisRowInfo->nHeight;
long nPosX = nInitPosX;
if ( nLoopStartX < nX1 )
nPosX -= pRowInfo[0].pCellInfo[nLoopStartX+1].nWidth * nLayoutSign;
@@ -2383,7 +2364,6 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
{
vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() );
Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird
ausgegeben
-// UINT32 nMinHeight = aMinSize.Height() / 200; // 1/2 Pixel
ScModule* pScMod = SC_MOD();
sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor;
@@ -2416,7 +2396,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von
zusammengefassten
{
RowInfo* pThisRowInfo = &pRowInfo[nArrY];
-// long nCellHeight = (long) pThisRowInfo->nHeight;
+
if (nArrY==1) nRowPosY = nScrY; //
vorher wird einzeln berechnet
if ( pThisRowInfo->bChanged || nArrY==0 )
@@ -3034,7 +3014,6 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
short nOriVal = 0;
if (aAlignParam.meOrient == SVX_ORIENTATION_TOPBOTTOM)
{
- // nOriVal = -900;
nOriVal = 2700;
if (aAlignParam.meHorJust != SVX_HOR_JUSTIFY_BLOCK)
{
@@ -3639,8 +3618,6 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
nEngineWidth = (long) ( nRealHeight / fabs( nSin ) );
}
- // BOOL bVClip = ( nEngineHeight > aCellSize.Height() );
-
long nClipStartX = nStartX;
if (nX<nX1)
{
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index da68231..0058ee8 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -226,7 +226,6 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ )
ScDocument* pDoc = pDocShell->GetDocument();
nTabCount = pDoc->GetTableCount();
- //SCTAB nAnz = Min( nTabCount, SCTAB(nToWhichTab+1) );
SCTAB nAnz = nTabCount;
SCTAB nStart = nTabsTested;
if (!bValid)
@@ -320,8 +319,6 @@ void ScPreview::RecalcPages() // nur
nPageNo geaendert
nTab = i;
nTabPage = nPageNo - nThisStart;
nTabStart = nThisStart;
-
-// aPageSize = aPrintFunc.GetPageSize();
}
}
@@ -400,7 +397,6 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation )
DBG_ASSERT(nPrinted<=1, "was'n nu los?");
SetMapMode(aMMMode);
-// USHORT nPrintZoom = pPrintFunc->GetZoom();
if (nPrinted) // wenn nichts, alles grau zeichnen
{
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 4f82704..fc5c923 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -136,7 +136,6 @@ void ScPreviewShell::Construct( Window* pParent )
if (pDrawBC)
StartListening(*pDrawBC);
-// pPreview->Show(); // wird vom Sfx angezeigt
pHorScroll->Show();
pVerScroll->Show();
pCorner->Show();
@@ -246,8 +245,6 @@ void ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize )
{
long nBarW = GetViewFrame()->GetWindow().GetSettings().GetStyleSettings().GetScrollBarSize();
long nBarH = nBarW;
-// long nBarW = pVerScroll->GetSizePixel().Width();
-// long nBarH = pHorScroll->GetSizePixel().Height();
Size aOutSize( rSize.Width()-nBarW, rSize.Height()-nBarH );
pPreview->SetPosSizePixel( rPos, aOutSize );
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 8bb3a3b..fde082b 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -218,8 +218,6 @@ ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( Window* pParentP,
SfxChildWinInfo* pInfo )
: SfxChildWindow(pParentP, nId)
{
-// ScTabViewShell* pViewShell =
-// PTR_CAST( ScTabViewShell, SfxViewShell::Current() );
ScTabViewShell* pViewShell = NULL;
SfxDispatcher* pDisp = p->GetDispatcher();
@@ -363,28 +361,6 @@ void ScAcceptChgDlgWrapper::ReInitDlg()
IMPL_CHILD_CTOR( ScHighlightChgDlgWrapper, FID_CHG_SHOW )
-/*------------------------------------------------------------------------*/
-/*@@@
- //-------------------------------------------------------------------------
- // ScFunctionDlgWrapper
- //-------------------------------------------------------------------------
-
- IMPL_CHILD_CTOR( ScFunctionDlgWrapper, SID_OPENDLG_FUNCTION )
-
- //-------------------------------------------------------------------------
- // ScEditFunctionDlgWrapper
- //-------------------------------------------------------------------------
-
- IMPL_CHILD_CTOR( ScEditFunctionDlgWrapper, SID_OPENDLG_EDITFUNCTION )
-
- //-------------------------------------------------------------------------
- // ScArgumentDlgWrapper
- //-------------------------------------------------------------------------
-
- IMPL_CHILD_CTOR( ScArgumentDlgWrapper, SID_OPENDLG_ARGUMENT )
-@@@*/
-/*------------------------------------------------------------------------*/
-
//<!--Added by PengYunQuan for Validity Cell Range Picker
namespace
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 14d0a33..8953f23 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -255,12 +255,6 @@ void ScTabControl::Select()
for (i=0; i<nCount; i++)
rMark.SelectTable( i, IsPageSelected(static_cast<sal_uInt16>(i)+1) );
-/* Markierungen werden per Default nicht pro Tabelle gehalten
- USHORT nSelCnt = GetSelectPageCount();
- if (nSelCnt>1)
- pDoc->ExtendMarksFromTable( nPage );
-*/
-
SfxDispatcher& rDisp = pViewData->GetDispatcher();
if (rDisp.IsLocked())
pViewData->GetView()->SetTabNo( static_cast<SCTAB>(nPage) );
@@ -384,26 +378,12 @@ void ScTabControl::UpdateStatus()
void ScTabControl::ActivateView(BOOL bActivate)
{
-// ScDocument* pDoc = pViewData->GetDocument();
ScMarkData& rMark = pViewData->GetMarkData();
-// ResetMark direkt in TabView
-// pDoc->ResetMark();
-
USHORT nCurId = GetCurPageId();
if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles
versteckt ist
USHORT nPage = nCurId - 1;
-// USHORT nCount = GetMaxId();
- /*
- USHORT i;
- for (i=0; i<nCount; i++)
- {
- SelectPage( i+1, FALSE );
- if (bActivate)
- rMark.SelectTable( i, FALSE );
- }
- */
if (bActivate)
{
SelectPage( nPage+1, TRUE );
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 0f0af78..fc0f9ad 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -373,7 +373,6 @@ void ScTabView::ResetTimer()
IMPL_LINK( ScTabView, TimerHdl, Timer*, EMPTYARG )
{
-// aScrollTimer.Stop();
if (pTimerWindow)
pTimerWindow->MouseMove( aTimerMEvt );
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 926f326..fe38231 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -110,7 +110,6 @@ void ScTabView::InitOwnBlockMode()
if (!rMark.IsMarked() && !rMark.IsMultiMarked())
GetSelEngine()->CursorPosChanging( FALSE, FALSE );
-// bIsBlockMode = TRUE;
bIsBlockMode = SC_BLOCKMODE_OWN; //! Variable umbenennen!
nBlockStartX = 0;
nBlockStartY = 0;
@@ -148,7 +147,6 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
bBlockNeg = FALSE;
rMark.SetMarkNegative(bBlockNeg);
-// bIsBlockMode = TRUE;
bIsBlockMode = SC_BLOCKMODE_NORMAL; //! Variable umbenennen!
bBlockCols = bCols;
bBlockRows = bRows;
@@ -210,7 +208,6 @@ void ScTabView::DoneBlockMode( BOOL bContinue ) // Default FALSE
else
rMark.ResetMark();
}
-// bIsBlockMode = FALSE;
bIsBlockMode = SC_BLOCKMODE_NONE; //! Variable umbenennen!
rMark.SetMarking(bFlag);
@@ -380,9 +377,6 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
nDrawEndCol, nDrawEndRow, bCont );
if ( bDraw )
{
-//? PutInOrder( nDrawStartCol, nDrawEndCol );
-//? PutInOrder( nDrawStartRow, nDrawEndRow );
-
HideAllCursors();
InvertBlockMark( nDrawStartCol, nDrawStartRow, nDrawEndCol, nDrawEndRow );
if (bCont)
@@ -399,7 +393,6 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
nOldCurY = nCurY;
aViewData.GetViewShell()->UpdateInputHandler();
-// InvalidateAttribs();
}
if ( !bCols && !bRows )
@@ -1027,7 +1020,6 @@ void ScTabView::SelectAllTables()
{
ScDocument* pDoc = aViewData.GetDocument();
ScMarkData& rMark = aViewData.GetMarkData();
-// SCTAB nTab = aViewData.GetTabNo();
SCTAB nCount = pDoc->GetTableCount();
if (nCount>1)
@@ -1035,9 +1027,6 @@ void ScTabView::SelectAllTables()
for (SCTAB i=0; i<nCount; i++)
rMark.SelectTable( i, TRUE );
- // Markierungen werden per Default nicht pro Tabelle gehalten
-// pDoc->ExtendMarksFromTable( nTab );
-
aViewData.GetDocShell()->PostPaintExtras();
SfxBindings& rBind = aViewData.GetBindings();
rBind.Invalidate( FID_FILL_TAB );
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index d33a16a..32d096a 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -2371,8 +2371,6 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst )
if (!bRefMode)
{
- //pScMod->InputEnterHandler();
-
// #80843# pass view to GetInputHdl, this view may not be current anymore
ScInputHandler* pHdl = SC_MOD()->GetInputHdl(aViewData.GetViewShell());
if (pHdl)
@@ -2391,9 +2389,6 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst )
else if (!bFirst)
ShowAllCursors();
- //HMHif (pDrawView)
- //HMH DrawShowMarkHdl(bActivate); // Drawing-Markierung
-
if (bActivate)
{
if ( bFirst )
diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx
index 100e641..08a5e02 100644
--- a/sc/source/ui/view/tabview4.cxx
+++ b/sc/source/ui/view/tabview4.cxx
@@ -334,7 +334,6 @@ void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eT
}
}
-// static
void ScTabView::SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL
bLayoutRTL )
{
if ( nVisible == 0 )
@@ -358,7 +357,6 @@ void ScTabView::SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible,
}
}
-// static
long ScTabView::GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL )
{
if ( bLayoutRTL )
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 57e804c..6b69efe 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -533,20 +533,6 @@ void ScTabView::DrawEnableAnim(BOOL bSet)
}
}
-//HMHvoid ScTabView::DrawShowMarkHdl(BOOL bShow)
-//HMH{
- //HMHif (!pDrawView)
- //HMH return;
-
- //HMHif (bShow)
- //HMH{
- //HMH if (!pDrawView->IsDisableHdl())
- //HMH pDrawView->ShowMarkHdl();
- //HMH}
- //HMHelse
- //HMH pDrawView->HideMarkHdl();
-//HMH}
-
void ScTabView::UpdateDrawTextOutliner()
{
if ( pDrawView )
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 8d71563..920db77 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -412,7 +412,6 @@ void ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &rSize )
UpdateOleZoom(); //
Zoom fuer In-Place berechnen
-// GetViewData()->GetDocShell()->UpdateOle( GetViewData() );
GetViewData()->GetDocShell()->SetDocumentModified();
}
@@ -1570,7 +1569,6 @@ BOOL ScTabViewShell::SfxKeyInput(const KeyEvent& rKeyEvent)
bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent )
{
-// return SfxViewShell::KeyInput( rKeyEvent );
return TabKeyInput( rKeyEvent );
}
@@ -1617,7 +1615,6 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent )
bPrintSelected(FALSE), \
bReadOnly(FALSE), \
pScSbxObject(NULL), \
- /*bChartDlgIsEdit(FALSE),*/ \
bChartAreaValid(FALSE), \
nCurRefDlgId(0), \
pAccessibilityBroadcaster(NULL)
@@ -1635,7 +1632,6 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode )
SetName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("View")) ); // fuer SBX
Color aColBlack( COL_BLACK );
-// SetPool( &pSfxApp->GetPool() );
SetPool( &SC_MOD()->GetPool() );
SetWindow( GetActiveWin() );
@@ -1862,9 +1858,6 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
SetZoomType( rAppOpt.GetZoomType(), TRUE );
}
- /*uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame().GetFrameInterface();
- if (xFrame.is())
- xFrame->setComponent( uno::Reference<awt::XWindow>(), new ScTabViewObj( this ) );*/
// make Controller known to SFX
new ScTabViewObj( this );
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 11a1100..3af81cf 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -782,8 +782,6 @@ void ScTabViewShell::ExecuteUndo(SfxRequest& rReq)
GetViewFrame()->GetBindings().InvalidateAll(sal_False);
}
break;
-// default:
-// GetViewFrame()->ExecuteSlot( rReq );
}
}
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 0977423..eba271b 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -125,10 +125,6 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
ErrCode nErr = ERRCODE_NONE;
BOOL bErrorShown = FALSE;
- // linked objects aren't supported
-// if ( xIPObj->IsLink() )
-// nErr = xIPObj->DoVerb(nVerb); // gelinkt -> ohne Client etc.
-// else
{
SfxInPlaceClient* pClient = FindIPClient( xObj, pWin );
if ( !pClient )
@@ -284,7 +280,6 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
ScDrawView* pView = pTabView->GetScDrawView();
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScDocument* pDoc = pDocSh->GetDocument();
-// SdrModel* pDrModel = pDocSh->MakeDrawLayer();
SdrModel* pDrModel = pView->GetModel();
switch ( nSlot )
@@ -301,7 +296,6 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
case SID_INSERT_DIAGRAM:
FuInsertChart(this, pWin, pView, pDrModel, rReq);
-//? SC_MOD()->SetFunctionDlg( NULL );//XXX
break;
case SID_INSERT_OBJECT:
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index 8ad149e..004a9ec 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -72,7 +72,6 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL,
MakeDrawLayer();
ScTabView* pView = pViewData->GetView();
-// SdrView* pDrView = pView->GetSdrView();
ScDrawView* pDrView = pView->GetScDrawView();
SdrModel* pModel = pDrView->GetModel();
@@ -125,7 +124,6 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL,
aPos.X() -= aSize.Width();
pObj->SetLogicRect(Rectangle(aPos, aSize));
-// pObj->Resize(Point(), Fraction(1, 1), Fraction(1, 1));
// am alten VC-Button musste die Position/Groesse nochmal explizit
// gesetzt werden - das scheint mit UnoControls nicht noetig zu sein
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 3d4d046..c524668 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -3034,7 +3034,6 @@ ScAddress ScViewData::GetCurPos() const
}
-// static
void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY,
SCROW nEndRow, double nPPTY, const ScDocument * pDoc, SCTAB nTabNo )
{
@@ -3074,7 +3073,6 @@ void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY,
}
-// static
void ScViewData::AddPixelsWhileBackward( long & rScrY, long nEndPixels,
SCROW & rPosY, SCROW nStartRow, double nPPTY, const ScDocument * pDoc,
SCTAB nTabNo )
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 5c07a40..99a5c9c 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1405,12 +1405,11 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty,
BOOL
aMarkRange = ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(), nTab );
ScDocument* pUndoDoc = NULL;
-// if ( bRecord )
+
if (bUndo)
{
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
pUndoDoc->InitUndo( pDoc, nTab, nTab );
-// pUndoDoc->SelectTable( nTab, TRUE ); // nur fuer Markierung
SCTAB nTabCount = pDoc->GetTableCount();
for (SCTAB i=0; i<nTabCount; i++)
@@ -1420,7 +1419,6 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty,
BOOL
aMarkRange.aStart.SetTab( i );
aMarkRange.aEnd.SetTab( i );
pDoc->CopyToDocument( aMarkRange, IDF_ALL, bMulti, pUndoDoc );
-// pUndoDoc->SelectTable( i, TRUE );
}
}
@@ -1433,7 +1431,6 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty,
BOOL
pDoc->FillTab( aMarkRange, rMark, nFlags, nFunction, bSkipEmpty, bAsLink );
}
-// if ( bRecord )
if (bUndo)
{ //! fuer ChangeTrack erst zum Schluss
pDocSh->GetUndoManager()->AddUndoAction(
@@ -1685,7 +1682,6 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
SCCOL nCol = GetViewData()->GetCurX();
SCROW nRow = GetViewData()->GetCurY();
SCTAB nTab = GetViewData()->GetTabNo();
-// BOOL bAttrib = pSearchItem->GetPattern();
USHORT nCommand = pSearchItem->GetCommand();
BOOL bAllTables = pSearchItem->IsAllTables();
BOOL* pOldSelectedTables = NULL;
@@ -2218,11 +2214,8 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord )
if (bRecord)
{
pUndoDoc = new ScDocument( SCDOCMODE_UNDO );
-// pUndoDoc->InitDrawLayer( pDocSh );
SCTAB nCount = pDoc->GetTableCount();
-// pUndoDoc->InitUndo( pDoc, 0, nCount-1 ); // incl. Ref.
-
String aOldName;
for(i=0;i<TheTabs.Count();i++)
{
@@ -2430,7 +2423,6 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScDocument* pDoc = pDocSh->GetDocument();
BOOL bUndo(pDoc->IsUndoEnabled());
- //SCTAB nTab = GetViewData()->GetTabNo();
BOOL bError = FALSE;
BOOL bRefs = FALSE;
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index e5acd21..22a978e 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -623,7 +623,6 @@ void ScViewFunc::PasteFromSystem()
{
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard(
pWin ) );
-// if (pClipObj.Is())
{
ULONG nBiff8 = SotExchange::RegisterFormatName(
String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff8")));
@@ -1877,7 +1876,6 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow ,
}
USHORT nExtFlags = 0;
pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab , nEndCol, nEndRow,
nEndTab ); // content before the change
- //rMark.SetMarkArea( aUserRange );
pDoc->BeginDrawUndo();
for(sal_uInt16 i = 0; i < aColLength; i++)
@@ -1888,7 +1886,6 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow ,
pDoc->SetString( nStartCol + i, nCurrentRow, nTab, aFieldName );
}
}
- //pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, rMark, TRUE ); //
Refresh
pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nCurrentRow, nStartTab, nEndCol,
nCurrentRow, nEndTab ); // content after the change
SfxUndoAction* pUndo = new ScUndoDataForm( pDocSh,
nStartCol, nCurrentRow, nStartTab,
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index ec9056c..fa5a904 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -659,7 +659,6 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink )
Graphic aGraphic;
GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter();
-// GraphicProgress aGraphicProgress(&aGraphicFilter);
if (!pGraphicFilter->ImportGraphic(aGraphic, aURL,
GRFILTER_FORMAT_DONTKNOW, &nFilterFormat ))
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 480c1de..5376d6c 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -213,9 +213,6 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
}
else
{
-// uno::Reference < io::XInputStream > xStm;
-// TransferableObjectDescriptor aObjDesc;
-
if ( aDataHelper.GetTransferableObjectDescriptor(
SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE, aObjDesc ) )
{
::rtl::OUString aName;
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index a081ef3..b3daeff 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -70,7 +70,6 @@ using namespace com::sun::star;
void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize )
{
-// SdrPage* pPage = pData->GetDocument()->GetDrawLayer()->GetPage( pData->GetTabNo() );
SdrPage* pPage = pData->GetScDrawView()->GetModel()->GetPage(
static_cast<sal_uInt16>(pData->GetTabNo()) );
DBG_ASSERT(pPage,"pPage ???");
Size aPgSize( pPage->GetSize() );
@@ -162,7 +161,6 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel,
// #116235#
SdrObject* pNeuObj=pObj->Clone();
- //SdrObject* pNeuObj=pObj->Clone(pDestPage,pDrawModel);
if (pNeuObj!=NULL)
{
@@ -374,7 +372,7 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
}
Size aSize = pWin->LogicToLogic( rGraphic.GetPrefSize(), &aSourceMap, &aDestMap );
-// lcl_AdjustInsertPos( GetViewData(), aPos, aSize );
+
if ( GetViewData()->GetDocument()->IsNegativePage( GetViewData()->GetTabNo() ) )
aPos.X() -= aSize.Width();
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 2a8b576..ab639ef 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -723,11 +723,6 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double&
r
new ScUndoEnterValue( pDocSh, aPos, pUndoCell, rValue, bNeedHeight ) );
}
-/*! Zeilenhoehe anpassen? Dann auch bei Undo...
- if (bNeedHeight)
- AdjustRowHeight(nRow,nRow);
-*/
-
pDocSh->PostPaintCell( aPos );
pDocSh->UpdateOle(GetViewData());
aModificator.SetDocumentModified();
@@ -1956,7 +1951,6 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
aMarkRange.aEnd = aMarkRange.aStart;
if ( pDoc->HasAttrib( aMarkRange, HASATTR_MERGED ) )
{
-// InitOwnBlockMode();
aFuncMark.SetMarkArea( aMarkRange );
}
else
@@ -2053,7 +2047,6 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord )
else
{
pDoc->DeleteSelection( nFlags, aFuncMark );
-// aFuncMark.MarkToSimple();
}
if ( bRecord )
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 68a6f14..9347a60 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -68,7 +68,6 @@
//==================================================================
-// static
void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSet,
USHORT nWhichId, USHORT nScript )
{
@@ -87,7 +86,6 @@ void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSe
rShellSet.InvalidateItem( nWhichId );
}
-// static
USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos )
{
// used for thesaurus
@@ -117,7 +115,6 @@ USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos )
return eLnge;
}
-// static
sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID )
{
sal_Int32 nType = 0;
@@ -154,7 +151,6 @@ sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID )
return nType;
}
-// static
BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
const ScChangeViewSettings& rSettings,
ScDocument& rDocument )
@@ -255,7 +251,6 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction,
return TRUE;
}
-// static
void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc )
{
rMark.MarkToMulti();
@@ -294,7 +289,6 @@ void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc )
}
-// static
bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, ScDocument * pDoc, size_t nRows )
{
SCTAB nTab = rRange.aStart.Tab();
@@ -309,8 +303,6 @@ bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, ScDocument * pDoc, size_
return static_cast<size_t>(nCount) == nRows && bOneTabOnly;
}
-
-// static
bool ScViewUtil::HasFiltered( const ScRange& rRange, ScDocument* pDoc )
{
SCROW nStartRow = rRange.aStart.Row();
@@ -324,7 +316,6 @@ bool ScViewUtil::HasFiltered( const ScRange& rRange, ScDocument* pDoc )
return false;
}
-// static
void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USHORT nSlotId )
{
SvtCJKOptions aCJKOptions;
--
1.7.3.5
From d048a667c13129aa9f21dca0be1df2ffd45b4174 Mon Sep 17 00:00:00 2001
From: Thomas Arnhold <thomas@arnhold.org>
Date: Sun, 16 Jan 2011 19:21:03 +0100
Subject: [PATCH 2/2] Remove some dead code
---
sc/source/ui/dbgui/tpsort.cxx | 6 ---
sc/source/ui/docshell/docfunc.cxx | 19 +---------
sc/source/ui/docshell/docsh.cxx | 40 +-------------------
sc/source/ui/docshell/docsh5.cxx | 7 +---
sc/source/ui/docshell/docsh8.cxx | 3 -
sc/source/ui/docshell/impex.cxx | 4 --
.../ui/unoobj/ChartRangeSelectionListener.cxx | 10 -----
sc/source/ui/unoobj/dapiuno.cxx | 12 ------
sc/source/ui/unoobj/textuno.cxx | 8 ----
sc/source/ui/vba/vbaaxis.cxx | 3 -
sc/source/ui/vba/vbachart.cxx | 6 ---
sc/source/ui/vba/vbainterior.cxx | 3 -
sc/source/ui/vba/vbaworksheets.cxx | 2 +-
13 files changed, 4 insertions(+), 119 deletions(-)
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 8957631..517a9b5 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -577,8 +577,6 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window*
pParent,
aLineDirection ( this, ScResId( FL_DIRECTION ) ),
aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ),
aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ),
-// aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ),
-// aFtArea ( this, ScResId( FT_AREA ) ),
//
#if ENABLE_LAYOUT_EXPERIMENTAL
#undef this
@@ -700,10 +698,6 @@ void ScTabPageSortOptions::Init()
theArea += theDbName;
theArea += ')';
- //aFtArea.SetText( theArea );
- //theArea.Insert( aStrAreaLabel, 0 );
- //aFtAreaLabel.SetText( theArea );
-
aBtnHeader.SetText( aStrColLabel );
}
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index c940a93..85e31a5 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -687,7 +687,6 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
else
{
pDoc->DeleteSelection( nFlags, aMultiMark );
-// aMultiMark.MarkToSimple();
}
// add undo action after drawing undo is complete (objects and note captions)
@@ -701,10 +700,7 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
else if (nExtFlags & SC_PF_LINES)
lcl_PaintAbove( rDocShell, aExtendedRange ); // fuer Linien ueber dem Bereich
-// rDocShell.UpdateOle(GetViewData()); //! an der View?
aModificator.SetDocumentModified();
-//! CellContentChanged();
-//! ShowAllCursors();
return TRUE;
}
@@ -1333,14 +1329,8 @@ BOOL ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String&
rStyleName,
}
-// BOOL bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
-// pDoc->ApplySelectionPattern( rPattern, rMark );
-
pDoc->ApplySelectionStyle( (ScStyleSheet&)*pStyleSheet, rMark );
-// if (!bPaintExt)
-// bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
-// USHORT nExtFlags = bPaintExt ? SC_PF_LINES : 0;
USHORT nExtFlags = 0;
if (!AdjustRowHeight( aMultiRange ))
rDocShell.PostPaint( aMultiRange, PAINT_GRID, nExtFlags );
@@ -1751,7 +1741,6 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData*
pTabMark,
rDocShell.PostPaint( nPaintStartX, nPaintStartY, i, nPaintEndX, nPaintEndY,
i+nScenarioCount, nPaintFlags, nExtFlags );
}
}
- //aModificator.SetDocumentModified();
}
else
{
@@ -3598,7 +3587,6 @@ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich,
BOOL
aMultiMark.MarkToMulti();
aMultiMark.GetMultiMarkArea( aMarkRange );
-// if (bRecord)
if (bUndo)
{
SCTAB nStartTab = aMarkRange.aStart.Tab();
@@ -3639,7 +3627,6 @@ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL
bAp
ScRange aMarkRange;
rMark.GetMultiMarkArea( aMarkRange );
-// if (bRecord)
if (bUndo)
{
SCTAB nStartTab = aMarkRange.aStart.Tab();
@@ -3820,7 +3807,7 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData*
pTabMark,
WaitObject aWait( rDocShell.GetActiveDialogParent() );
ScDocument* pUndoDoc = NULL;
-// if (bRecord) // immer
+
if (bUndo)
{
//! auch bei Undo selektierte Tabellen beruecksichtigen
@@ -3856,7 +3843,6 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData*
pTabMark,
pDoc->InsertMatrixFormula( nStartCol, nStartRow, nEndCol, nEndRow,
aMark, rString, NULL, eGrammar);
-// if (bRecord) // immer
if (bUndo)
{
//! auch bei Undo selektierte Tabellen beruecksichtigen
@@ -4038,7 +4024,6 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
}
rDocShell.PostPaintGridAll();
-// rDocShell.PostPaintDataChanged();
aModificator.SetDocumentModified();
bSuccess = TRUE;
@@ -4147,7 +4132,6 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
AdjustRowHeight(rRange);
rDocShell.PostPaintGridAll();
-// rDocShell.PostPaintDataChanged();
aModificator.SetDocumentModified();
}
@@ -4288,7 +4272,6 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark,
FillDir e
}
rDocShell.PostPaintGridAll();
-// rDocShell.PostPaintDataChanged();
aModificator.SetDocumentModified();
rRange = aDestArea; // Zielbereich zurueckgeben (zum Markieren)
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 0789d89..105469b 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -161,11 +161,8 @@ const sal_Char ScDocShell::pStyleName[] = "SfxStyleSheets";
// Filter-Namen (wie in sclib.cxx)
static const sal_Char pFilterSc50[] = "StarCalc 5.0";
-//static const sal_Char pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
static const sal_Char pFilterSc40[] = "StarCalc 4.0";
-//static const sal_Char pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
static const sal_Char pFilterSc30[] = "StarCalc 3.0";
-//static const sal_Char pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
static const sal_Char pFilterSc10[] = "StarCalc 1.0";
static const sal_Char pFilterXML[] = "StarOffice XML (Calc)";
static const sal_Char pFilterAscii[] = "Text - txt - csv (StarCalc)";
@@ -1158,9 +1155,6 @@ BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium )
}
else
bRet = TRUE;
-
- // #93255# update of row height done inside of Excel filter to speed up chart import
-// bSetRowHeights = TRUE; // #75357# optimal row heights must be updated
}
else if (aFltName.EqualsAscii(pFilterAscii))
{
@@ -1483,12 +1477,6 @@ BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium )
nWidth + (USHORT)ScGlobal::nLastColWidthExtra );
}
}
-// if ( bSetRowHeights )
-// {
-// // nExtra must be 0
-// aDocument.SetOptimalHeight( 0, nEndRow, nTab, 0, &aVirtDev,
-// nPPTX, nPPTY, aZoom, aZoom, FALSE );
-// }
}
if (bSetRowHeights)
@@ -1605,13 +1593,6 @@ BOOL ScDocShell::SaveAs( SfxMedium& rMedium )
BOOL ScDocShell::IsInformationLost()
{
-/*
- const SfxFilter *pFilt = GetMedium()->GetFilter();
- BOOL bRet = pFilt && pFilt->IsAlienFormat() && bNoInformLost;
- if (bNoInformLost) // nur einmal!!
- bNoInformLost = FALSE;
- return bRet;
-*/
//!!! bei Gelegenheit ein korrekte eigene Behandlung einbauen
return SfxObjectShell::IsInformationLost();
@@ -1621,12 +1602,10 @@ BOOL ScDocShell::IsInformationLost()
// Xcl-like column width measured in characters of standard font.
xub_StrLen lcl_ScDocShell_GetColWidthInChars( USHORT nWidth )
{
- // double fColScale = 1.0;
- double f = nWidth;
+ double f = nWidth;
f *= 1328.0 / 25.0;
f += 90.0;
f *= 1.0 / 23.0;
- // f /= fColScale * 256.0;
f /= 256.0;
return xub_StrLen( f );
@@ -2074,19 +2053,6 @@ BOOL ScDocShell::ConvertTo( SfxMedium &rMed )
BOOL bRet = FALSE;
String aFltName = rMed.GetFilter()->GetFilterName();
-/*
- if (aFltName.EqualsAscii(pFilterLotus))
- {
- SvStream* pStream = rMed.GetOutStream();
- if (pStream)
- {
- FltError eError = ScFormatFilter::Get().ScExportLotus123( *pStream, &aDocument, ExpWK1,
- CHARSET_IBMPC_437 );
- bRet = eError == eERR_OK;
- }
- }
- else
-*/
if (aFltName.EqualsAscii(pFilterXML))
{
//TODO/LATER: this shouldn't happen!
@@ -2211,12 +2177,8 @@ BOOL ScDocShell::ConvertTo( SfxMedium &rMed )
if ( eError != eERR_OK && (eError & ERRCODE_WARNING_MASK) )
{
-//! if ( !rMed.GetError() )
-//! rMed.SetError( eError, ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
eError = eERR_OK;
}
-//! else if ( aDocument.GetTableCount() > 1 && !rMed.GetError() )
-//! rMed.SetError( SCWARN_EXPORT_ASCII, ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
INetURLObject aTmpFile( rMed.GetPhysicalName(), INET_PROT_FILE );
if ( bHasMemo )
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index 852e5b1..2bdad7c 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -260,15 +260,10 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode,
ScGe
nStartCol = nEndCol = nCol;
nStartRow = nEndRow = nRow;
nStartTab = nEndTab = nTab;
-// bMark = FALSE; // nichts zu
markieren
}
else
{
- if ( bSelected )
- {
-// bMark = FALSE;
- }
- else
+ if ( !bSelected )
{ //
zusammenhaengender Bereich
nStartCol = nCol;
nStartRow = nRow;
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 32fec8a..b35ac92 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -171,7 +171,6 @@ namespace
// -----------------------------------------------------------------------
// MoveFile/KillFile/IsDocument: similar to SfxContentHelper
-// static
BOOL ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& rDestObj )
{
sal_Bool bMoveData = sal_True;
@@ -216,7 +215,6 @@ BOOL ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject&
}
-// static
BOOL ScDocShell::KillFile( const INetURLObject& rURL )
{
sal_Bool bRet = sal_True;
@@ -236,7 +234,6 @@ BOOL ScDocShell::KillFile( const INetURLObject& rURL )
return bRet;
}
-// static
BOOL ScDocShell::IsDocument( const INetURLObject& rURL )
{
sal_Bool bRet = sal_False;
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 23b7238..9c07413 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -516,7 +516,6 @@ BOOL ScImportExport::ExportStream( SvStream& rStrm, const String& rBaseURL, ULON
}
-//static
void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero )
{
rtl_TextEncoding eEnc = rStrm.GetStreamCharSet();
@@ -547,7 +546,6 @@ void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const String& rS
// This function could be replaced by endlub()
-// static
void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm )
{
if ( rStrm.GetStreamCharSet() == RTL_TEXTENCODING_UNICODE )
@@ -1361,7 +1359,6 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
}
-// static
const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p,
String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool&
rbIsQuoted )
{
@@ -1519,7 +1516,6 @@ BOOL ScImportExport::Doc2Text( SvStream& rStrm )
if( nCol < nEndCol )
lcl_WriteSimpleString( rStrm, String(cSep) );
}
-// if( nRow < nEndRow )
WriteUnicodeOrByteEndl( rStrm );
if( rStrm.GetError() != SVSTREAM_OK )
break;
diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
index 95976b1..e7d4e6a 100644
--- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
+++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
@@ -70,16 +70,6 @@ void SAL_CALL ScChartRangeSelectionListener::selectionChanged( const lang::Event
{
m_pViewShell->DoChartSelection( aRanges );
}
-// SfxViewFrame *pFrame = SfxViewFrame::GetFirst( m_pDocShell );
-// while (pFrame)
-// {
-// SfxViewShell* pSh = pFrame->GetViewShell();
-// if (pSh && pSh->ISA(ScTabViewShell))
-// {
-// ScTabViewShell* pViewSh = (ScTabViewShell*)pSh;
-// }
-// pFrame = SfxViewFrame::GetNext( *pFrame, m_pDocShell );
-// }
}
}
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 3f7ef28..819a840 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1090,7 +1090,6 @@ sal_Int64 SAL_CALL ScDataPilotDescriptorBase::getSomething(
return 0;
}
-// static
const Sequence<sal_Int8>& ScDataPilotDescriptorBase::getUnoTunnelId()
{
static Sequence<sal_Int8> * pSeq = 0;
@@ -1107,7 +1106,6 @@ const Sequence<sal_Int8>& ScDataPilotDescriptorBase::getUnoTunnelId()
return *pSeq;
}
-// static
ScDataPilotDescriptorBase* ScDataPilotDescriptorBase::getImplementation(
const Reference<XDataPilotDescriptor> xObj )
{
@@ -1282,14 +1280,6 @@ void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException)
SolarMutexGuard aGuard;
if( ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName) )
RefreshDPObject( pDPObj, NULL, GetDocShell(), TRUE, TRUE );
- //if (pDPObj)
- //{
- // ScDPObject* pNew = new ScDPObject(*pDPObj);
- // ScDBDocFunc aFunc(*GetDocShell());
- // aFunc.DataPilotUpdate( pDPObj, pNew, TRUE, TRUE );
- // delete pNew; // DataPilotUpdate copies settings from "new" object
- //}
-
}
Sequence< Sequence<Any> > SAL_CALL ScDataPilotTableObj::getDrillDownData(const CellAddress& aAddr)
@@ -3035,8 +3025,6 @@ void ScDataPilotFieldGroupsObj::renameFieldGroup( const OUString& rOldName,
cons
aOldIt->maName = rNewName;
}
-// private
-
ScFieldGroups::iterator ScDataPilotFieldGroupsObj::implFindByName( const OUString& rName )
{
for( ScFieldGroups::iterator aIt = maGroups.begin(), aEnd = maGroups.end(); aIt != aEnd; ++aIt
)
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 0de4ab2..d2c9727 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -200,7 +200,6 @@ sal_Int64 SAL_CALL ScHeaderFooterContentObj::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScHeaderFooterContentObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -217,7 +216,6 @@ const uno::Sequence<sal_Int8>& ScHeaderFooterContentObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScHeaderFooterContentObj* ScHeaderFooterContentObj::getImplementation(
const uno::Reference<sheet::XHeaderFooterContent> xObj )
{
@@ -694,7 +692,6 @@ sal_Int64 SAL_CALL ScCellTextCursor::getSomething(
return SvxUnoTextCursor::getSomething( rId );
}
-// static
const uno::Sequence<sal_Int8>& ScCellTextCursor::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -711,7 +708,6 @@ const uno::Sequence<sal_Int8>& ScCellTextCursor::getUnoTunnelId()
return *pSeq;
}
-// static
ScCellTextCursor* ScCellTextCursor::getImplementation( const uno::Reference<uno::XInterface> xObj )
{
ScCellTextCursor* pRet = NULL;
@@ -798,7 +794,6 @@ sal_Int64 SAL_CALL ScHeaderFooterTextCursor::getSomething(
return SvxUnoTextCursor::getSomething( rId );
}
-// static
const uno::Sequence<sal_Int8>& ScHeaderFooterTextCursor::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -815,7 +810,6 @@ const uno::Sequence<sal_Int8>& ScHeaderFooterTextCursor::getUnoTunnelId()
return *pSeq;
}
-// static
ScHeaderFooterTextCursor* ScHeaderFooterTextCursor::getImplementation(
const uno::Reference<uno::XInterface> xObj )
{
@@ -902,7 +896,6 @@ sal_Int64 SAL_CALL ScDrawTextCursor::getSomething(
return SvxUnoTextCursor::getSomething( rId );
}
-// static
const uno::Sequence<sal_Int8>& ScDrawTextCursor::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -919,7 +912,6 @@ const uno::Sequence<sal_Int8>& ScDrawTextCursor::getUnoTunnelId()
return *pSeq;
}
-// static
ScDrawTextCursor* ScDrawTextCursor::getImplementation( const uno::Reference<uno::XInterface> xObj )
{
ScDrawTextCursor* pRet = NULL;
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index a1f0dc3..fc93458 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -173,7 +173,6 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept
{
double forigin = 0.0;
mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
-//obsolete double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
double fmin = 0.0;
mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
if (forigin == fmin)
@@ -195,11 +194,9 @@ ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw
(script::BasicErrorException
{
try
{
-// if (getCrosses() == xlAxisCrossesCustom){
setMaximumScaleIsAuto( sal_False );
setMinimumScaleIsAuto( sal_False );
mxPropertySet->setPropertyValue(ORIGIN, uno::makeAny(_fCrossesAt));
-// }
}
catch (uno::Exception& e)
{
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index 647e3ba..9c55800 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -1035,7 +1035,6 @@ ScVbaChart::isSeriesIndexValid(sal_Int32 _seriesindex) throw(
script::BasicError
try
{
uno::Reference< chart::XChartDataArray > xChartDataArray( mxChartDocument->getData(),
uno::UNO_QUERY_THROW );
- // dblValues = xChartDataArray.getData();
//TODO I guess we have to differentiate between XlRowCol
if ( !xChartDataArray.is() )
{
@@ -1213,13 +1212,8 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup)
thro
}
break;
case xlSeriesAxis:
-// if (_nAxisGroup == xlPrimary){
xAxisProps = xAxisZSupplier->getZAxis();
break;
-// }
-// else if (_nAxisGroup == xlSecondary){
- // return xTwoAxisXSupplier.getSecondaryZAxis();
- // }
case xlValue:
if (_nAxisGroup == xlPrimary)
xAxisProps = xAxisYSupplier->getYAxis();
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 9bf1482..5892acf 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -92,7 +92,6 @@ static PatternMap aPatternMap( lcl_getPatternMap() );
ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, const
uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertySet >&
xProps, ScDocument* pScDoc ) throw ( lang::IllegalArgumentException) : ScVbaInterior_BASE( xParent,
xContext ), m_xProps(xProps), m_pScDoc( pScDoc )
{
// auto color
- //m_aPattColor.SetColor( (sal_uInt32)0xFFFFFFFF );
m_aPattColor.SetColor( (sal_uInt32)0x0 );
m_nPattern = 0L;
if ( !m_xProps.is() )
@@ -113,7 +112,6 @@ ScVbaInterior::setColor( const uno::Any& _color ) throw (uno::RuntimeException)
if( _color >>= nColor )
{
SetUserDefinedAttributes( BACKCOLOR, SetAttributeData( XLRGBToOORGB( nColor ) ) );
- //m_xProps->setPropertyValue( BACKCOLOR , XLRGBToOORGB(_color));
SetMixedColor();
}
}
@@ -277,7 +275,6 @@ uno::Any
ScVbaInterior::SetAttributeData( sal_Int32 nValue )
{
xml::AttributeData aAttributeData;
- //aAttributeData.Namespace = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
"ooo.vba.excel.CellPatten"));
aAttributeData.Type = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "sal_Int32" ));
aAttributeData.Value = rtl::OUString::valueOf( nValue );
return uno::makeAny( aAttributeData );
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 5263b9a..23e77a3 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -480,7 +480,7 @@ ScVbaWorksheets::getServiceNames()
return sNames;
}
-/*static*/ bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>&
xSpreadDoc, const ::rtl::OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException )
+bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const
::rtl::OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException )
{
if (!xSpreadDoc.is())
throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"nameExists() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 );
--
1.7.3.5
Context
- [Libreoffice] [PATCH] Remove some dead code · Thomas Arnhold
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.