summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
authorPovilas Kanapickas <povilas.kanapickas@gmail.com>2010-10-20 11:21:22 +0200
committerKohei Yoshida <kyoshida@novell.com>2010-10-20 11:21:55 +0200
commitee9befa313473b8530ba2ab21c3b8ded1e599c90 (patch)
tree427ffbb0c2938fb33bb6cf8313a96d5e9e2c05e4 /sc/source/ui/view
parent9b05409ff7bf1e6bb52b288852a506b764ed6f76 (diff)
Removed lots of dead code.
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r--sc/source/ui/view/cellsh2.cxx27
-rw-r--r--sc/source/ui/view/drawvie4.cxx38
-rw-r--r--sc/source/ui/view/gridwin.cxx26
-rw-r--r--sc/source/ui/view/gridwin4.cxx32
-rw-r--r--sc/source/ui/view/hdrcont.cxx9
-rw-r--r--sc/source/ui/view/output.cxx40
-rw-r--r--sc/source/ui/view/output2.cxx35
-rw-r--r--sc/source/ui/view/preview.cxx7
-rw-r--r--sc/source/ui/view/select.cxx27
-rw-r--r--sc/source/ui/view/tabview.cxx48
-rw-r--r--sc/source/ui/view/tabview5.cxx26
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx32
-rw-r--r--sc/source/ui/view/tabvwshf.cxx14
-rw-r--r--sc/source/ui/view/viewfun5.cxx19
14 files changed, 2 insertions, 378 deletions
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index c619e34309fe..a74a73c85721 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -869,33 +869,6 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
if ( pNewDPObject )
pNewDPObject->SetOutRange( aDestPos );
-
-#if 0
- ScDBData* pDBData = pTabViewShell->GetDBData();
- String aErrMsg;
-
- pDBData->GetArea( nTab, nCol1, nRow1, nCol2, nRow2 );
-
- bAreaOk = TRUE;
- if ( nRow2-nRow1 < 1 )
- {
- // "mindestens eine Datenzeile"
- pTabViewShell->ErrorMessage(STR_PIVOT_INVALID_DBAREA);
- bAreaOk = FALSE;
- }
- else if (!pDBData->HasHeader())
- {
- if ( MessBox( pTabViewShell->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES),
- ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc"
- ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // Koepfe aus erster Zeile?
- ).Execute() == RET_YES )
- {
- pDBData->SetHeader( TRUE ); //! Undo ??
- }
- else
- bAreaOk = FALSE;
- }
-#endif
}
pTabViewShell->SetDialogDPObject( pNewDPObject ); // is copied
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index c88274d65dab..c2340aa0a474 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -105,44 +105,6 @@ void lcl_CheckOle( const SdrMarkList& rMarkList, BOOL& rAnyOle, BOOL& rOneOle )
}
}
-#if 0
-void lcl_RefreshChartData( SdrModel* pModel, ScDocument* pSourceDoc )
-{
- USHORT nPages = pModel->GetPageCount();
- for (SCTAB nTab=0; nTab<nPages; nTab++)
- {
- SdrPage* pPage = pModel->GetPage(nTab);
- SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS );
- SdrObject* pObject = aIter.Next();
- while (pObject)
- {
- if ( pObject->GetObjIdentifier() == OBJ_OLE2 )
- {
- SvInPlaceObjectRef aIPObj = ((SdrOle2Obj*)pObject)->GetObjRef();
- if ( aIPObj.Is() && SotExchange::IsChart( aIPObj->GetStorage()->GetClassName() ) )
- {
- SchMemChart* pOldData = SchDLL::GetChartData(aIPObj);
- if ( pOldData )
- {
- // create data from source document
- ScChartArray aArray( pSourceDoc, *pOldData );
- if ( aArray.IsValid() )
- {
- SchMemChart* pNewData = aArray.CreateMemChart();
- SchDLL::Update( aIPObj, pNewData );
- delete pNewData;
- ((SdrOle2Obj*)pObject)->GetNewReplacement();
- }
- }
- }
- }
- pObject = aIter.Next();
- }
- }
-}
-#endif
-
-
BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
{
BOOL bReturn = FALSE;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 3d11b21e26ec..1f21e93d28d3 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1512,17 +1512,6 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt )
// Filter-Popup beendet sich mit eigenem Mausklick, nicht erst beim Klick
// in das GridWindow, darum ist die folgende Abfrage nicht mehr noetig:
-#if 0
- // merken, dass FilterBox geloescht wird, damit sichergestellt
- // ist, dass in diesem Handler nicht an gleicher Stelle wieder
- // eine neue geoeffnet wird.
- BOOL bWasFilterBox = ( pFilterBox != NULL &&
- ((Window*)pFilterBox)->IsVisible() &&
- !pFilterBox->IsDataSelect() );
- SCCOL nOldColFBox = bWasFilterBox ? pFilterBox->GetCol() : 0;
- SCROW nOldRowFBox = bWasFilterBox ? pFilterBox->GetRow() : 0;
-#endif
-
ClickExtern(); // loescht FilterBox, wenn vorhanden
HideNoteMarker(); // Notiz-Anzeige
@@ -3544,21 +3533,6 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich );
UpdateDragRectOverlay();
-
- // show target position as tip help
-#if 0
- if (Help::IsQuickHelpEnabled())
- {
- ScRange aRange( nDragStartX, nDragStartY, nTab, nDragEndX, nDragEndY, nTab );
- String aHelpStr;
- aRange.Format( aHelpStr, SCA_VALID ); // non-3D
-
- Point aPos = Pointer::GetPosPixel();
- USHORT nAlign = QUICKHELP_BOTTOM|QUICKHELP_RIGHT;
- Rectangle aRect( aPos, aPos );
- Help::ShowQuickHelp(aRect, aHelpStr, nAlign);
- }
-#endif
}
}
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index f86f79a1d25a..a39216177922 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -826,38 +826,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
if ( pViewData->IsRefMode() && nTab >= pViewData->GetRefStartZ() && nTab <= pViewData->GetRefEndZ() )
{
- // The AutoFill shrink area has an own overlay now
-#if 0
- // Schraffur beim Loeschen per AutoFill
- if ( pViewData->GetRefType() == SC_REFTYPE_FILL )
- {
- ScRange aRange;
- if ( pViewData->GetDelMark( aRange ) )
- {
- if ( aRange.aStart.Col() < nX1 ) aRange.aStart.SetCol(nX1);
- if ( aRange.aEnd.Col() > nX2 ) aRange.aEnd.SetCol(nX2);
- if ( aRange.aStart.Row() < nY1 ) aRange.aStart.SetRow(nY1);
- if ( aRange.aEnd.Row() > nY2 ) aRange.aEnd.SetRow(nY2);
- if ( aRange.aStart.Col() <= aRange.aEnd.Col() &&
- aRange.aStart.Row() <= aRange.aEnd.Row() )
- {
- Point aStart = pViewData->GetScrPos( aRange.aStart.Col(),
- aRange.aStart.Row(), eWhich );
- Point aEnd = pViewData->GetScrPos( aRange.aEnd.Col()+1,
- aRange.aEnd.Row()+1, eWhich );
- aEnd.X() -= 1;
- aEnd.Y() -= 1;
-
- // Markierung aufheben - roter Rahmen bleibt stehen
- Rectangle aRect( aStart,aEnd );
- Invert( aRect, INVERT_HIGHLIGHT );
-
- //! Delete-Bereich extra kennzeichnen?!?!?
- }
- }
- }
-#endif
-
Color aRefColor( rColorCfg.GetColorValue(svtools::CALCREFERENCE).nColor );
aOutputData.DrawRefMark( pViewData->GetRefStartX(), pViewData->GetRefStartY(),
pViewData->GetRefEndX(), pViewData->GetRefEndY(),
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index f4a9fd4ddac2..1e2d45e4c091 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -422,15 +422,6 @@ void ScHeaderControl::Paint( const Rectangle& rRect )
}
}
-#if 0
- // 3D border is no longer used
- SetLineColor( rStyleSettings.GetLightColor() );
- if (bVertical)
- DrawLine( Point( 0, nPStart ), Point( 0, nLineEnd ) );
- else
- DrawLine( Point( nPStart, 0 ), Point( nLineEnd, 0 ) );
-#endif
-
SetLineColor( rStyleSettings.GetDarkShadowColor() );
if (bVertical)
{
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 2cf8bab95e61..fceb71a335db 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -402,20 +402,6 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt
- //! Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
- //! Umbruch mitten in den Wiederholungsspalten liegt.
- //! Dann lieber den aeusseren Rahmen zweimal ausgeben...
-#if 0
- // auf dem Drucker die Aussen-Linien weglassen (werden getrennt ausgegeben)
- if ( eType == OUTTYPE_PRINTER && !bMetaFile )
- {
- if ( nX == MAXCOL )
- bDraw = FALSE;
- else if (pDoc->HasColBreak(nXplus1, nTab))
- bDraw = FALSE;
- }
-#endif
-
USHORT nWidthXplus2 = pRowInfo[0].pCellInfo[nXplus2].nWidth;
bSingle = bSingleGrid; //! in Fillinfo holen !!!!!
if ( nX<MAXCOL && !bSingle )
@@ -531,20 +517,6 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage )
BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt
- //! Mit dieser Abfrage wird zuviel weggelassen, wenn ein automatischer
- //! Umbruch mitten in den Wiederholungszeilen liegt.
- //! Dann lieber den aeusseren Rahmen zweimal ausgeben...
-#if 0
- // auf dem Drucker die Aussen-Linien weglassen (werden getrennt ausgegeben)
- if ( eType == OUTTYPE_PRINTER && !bMetaFile )
- {
- if ( nY == MAXROW )
- bDraw = FALSE;
- else if (pDoc->HasRowBreak(nYplus1, nTab))
- bDraw = FALSE;
- }
-#endif
-
BOOL bNextYisNextRow = (pRowInfo[nArrYplus1].nRowNo == nYplus1);
bSingle = !bNextYisNextRow; // Hidden
for (SCCOL i=nX1; i<=nX2 && !bSingle; i++)
@@ -2447,12 +2419,6 @@ void ScOutputData::DrawClipMarks()
// visually left
Rectangle aMarkRect = aCellRect;
aMarkRect.Right() = aCellRect.Left()+nMarkPixel-1;
-#if 0
- //! Test
- pDev->SetLineColor(); pDev->SetFillColor(COL_YELLOW);
- pDev->DrawRect(aMarkRect);
- //! Test
-#endif
SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, TRUE );
}
if ( pInfo->nClipMark & ( bLayoutRTL ? SC_CLIPMARK_LEFT : SC_CLIPMARK_RIGHT ) )
@@ -2460,12 +2426,6 @@ void ScOutputData::DrawClipMarks()
// visually right
Rectangle aMarkRect = aCellRect;
aMarkRect.Left() = aCellRect.Right()-nMarkPixel+1;
-#if 0
- //! Test
- pDev->SetLineColor(); pDev->SetFillColor(COL_LIGHTGREEN);
- pDev->DrawRect(aMarkRect);
- //! Test
-#endif
SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, FALSE );
}
}
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 32e3c6d9e0ab..7f9c1a00deef 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1331,17 +1331,6 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY
rParam.maAlignRect.Justify();
rParam.maClipRect.Justify();
-
-#if 0
- //! Test !!!
- pDev->Push();
- pDev->SetLineColor();
- pDev->SetFillColor( COL_LIGHTGREEN );
- pDev->DrawRect( pDev->PixelToLogic(rParam.maClipRect) );
- pDev->DrawRect( rParam.maClipRect ); // print preview
- pDev->Pop();
- //! Test !!!
-#endif
}
void ScOutputData::DrawStrings( BOOL bPixelToLogic )
@@ -2403,11 +2392,6 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
long nInitPosX = nScrX;
if ( bLayoutRTL )
{
-#if 0
- Size aOnePixel = pDev->PixelToLogic(Size(1,1));
- long nOneX = aOnePixel.Width();
- nInitPosX += nMirrorW - nOneX;
-#endif
nInitPosX += nMirrorW - 1;
}
long nLayoutSign = bLayoutRTL ? -1 : 1;
@@ -2935,20 +2919,6 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
}
}
-#if 0
- long nClipStartY = nStartY;
- if (nArrY==0 || bVisChanged)
- {
- if ( nClipStartY < nRowPosY )
- {
- long nDif = nRowPosY - nClipStartY;
- bClip = TRUE;
- nClipStartY = nRowPosY;
- aClipSize.Height() -= nDif;
- }
- }
-#endif
-
Rectangle aLogicClip;
if (bClip || bSimClip)
{
@@ -3225,11 +3195,6 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic)
long nInitPosX = nScrX;
if ( bLayoutRTL )
{
-#if 0
- Size aOnePixel = pDev->PixelToLogic(Size(1,1));
- long nOneX = aOnePixel.Width();
- nInitPosX += nMirrorW - nOneX;
-#endif
nInitPosX += nMirrorW - 1;
}
long nLayoutSign = bLayoutRTL ? -1 : 1;
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 8a504720ea0a..8317d9df747c 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -175,13 +175,6 @@ void ScPreview::UpdateDrawView() // nTab muss richtig sein
pDrawView->SetPrintPreview( TRUE );
pDrawView->ShowSdrPage(pPage);
}
-#if 0
- else if ( !pDrawView->GetSdrPageView()) // angezeigte Page umstellen
- {
- pDrawView->HideSdrPage();
- pDrawView->ShowSdrPage(pDrawView->GetModel()->GetPage(nTab));
- }
-#endif
}
else if ( pDrawView )
{
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 292e155c132b..52139ccb8f04 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -423,25 +423,8 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
nEndX,nEndY,nTab ) );
pViewData->GetView()->UpdateShrinkOverlay();
-#if 0
- if ( bOldDelMark )
- {
- ScUpdateRect aRect( aDelRange.aStart.Col(), aDelRange.aStart.Row(),
- aDelRange.aEnd.Col(), aDelRange.aEnd.Row() );
- aRect.SetNew( nDelStartX,nDelStartY, nEndX,nEndY );
- SCCOL nPaintStartX;
- SCROW nPaintStartY;
- SCCOL nPaintEndX;
- SCROW nPaintEndY;
- if (aRect.GetDiff( nPaintStartX, nPaintStartY, nPaintEndX, nPaintEndY ))
- pViewData->GetView()->
- PaintArea( nPaintStartX, nPaintStartY,
- nPaintEndX, nPaintEndY, SC_UPDATE_MARKS );
- }
- else
-#endif
- pViewData->GetView()->
- PaintArea( nStartX,nDelStartY, nEndX,nEndY, SC_UPDATE_MARKS );
+ pViewData->GetView()->
+ PaintArea( nStartX,nDelStartY, nEndX,nEndY, SC_UPDATE_MARKS );
nPosX = nEndX; // roten Rahmen um ganzen Bereich lassen
nPosY = nEndY;
@@ -459,12 +442,6 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol
{
pViewData->ResetDelMark();
pViewData->GetView()->UpdateShrinkOverlay();
-
-#if 0
- pViewData->GetView()->
- PaintArea( aDelRange.aStart.Col(), aDelRange.aStart.Row(),
- aDelRange.aEnd.Col(), aDelRange.aEnd.Row(), SC_UPDATE_MARKS );
-#endif
}
BOOL bNegX = ( nPosX < (SCsCOL) nStartX );
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index d988338eb62a..01877252b078 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -31,36 +31,6 @@
//------------------------------------------------------------------
-
-#if 0
-#define _MACRODLG_HXX
-#define _BIGINT_HXX
-#define _SVCONTNR_HXX
-#define BASIC_NODIALOGS
-#define _SFXMNUITEM_HXX
-#define _SVDXOUT_HXX
-#define _SVDATTR_HXX
-#define _SFXMNUITEM_HXX
-#define _DLGCFG_HXX
-#define _SFXMNUMGR_HXX
-#define _SFXBASIC_HXX
-#define _MODALDLG_HXX
-#define _SFX_TEMPLDLG_HXX
-#define _SFXSTBMGR_HXX
-#define _SFXTBXMGR_HXX
-#define _BASE_DLGS_HXX
-#define _SFXIMGMGR_HXX
-#define _SFXMNUMGR_HXX
-#define _SFXSTBITEM_HXX
-#define _SFXTBXCTRL_HXX
-#define _PASSWD_HXX
-//#define _SFXFILEDLG_HXX
-//#define _SFXREQUEST_HXX
-#define _SFXOBJFACE_HXX
-
-#define _SDR_NOTRANSFORM
-#define _SVDXOUT_HXX
-#endif
#include <vcl/svapp.hxx>
///////////////////////////////////////////////////////////////////////////
@@ -69,24 +39,6 @@
// Die u.a. Aenderungen nehmen vorgeschlagene Konstante vorweg
///////////////////////////////////////////////////////////////////////////
-#if 0
-#define _SDR_NOTRANSFORM // Transformationen, selten verwendet
-#define _SDR_NOTOUCH // Hit-Tests, selten verwendet
-
-#define _SDR_NOUNDO // Undo-Objekte
-#define _SDR_NOPAGEOBJ // SdrPageObj
-#define _SDR_NOVIRTOBJ // SdrVirtObj
-#define _SDR_NOGROUPOBJ // SdrGroupObj
-#define _SDR_NOTEXTOBJ // SdrTextObj
-#define _SDR_NOPATHOBJ // SdrPathObj
-#define _SDR_NOEDGEOBJ // SdrEdgeObj
-#define _SDR_NORECTOBJ // SdrRectObj
-#define _SDR_NOCAPTIONOBJ // SdrCaptionObj
-#define _SDR_NOCIRCLEOBJ // SdrCircleObj
-#define _SDR_NOGRAFOBJ // SdrGrafObj
-#define _SDR_NOOLE2OBJ // SdrOle2Obj
-#endif
-
// Dieses define entfernt die VCControls aus SI.HXX
#define _SI_HXX // VCControls
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index b23d252248b2..c77034366c85 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -299,32 +299,6 @@ void ScTabView::TabChanged()
// (fuer disablete Slots auf geschuetzten Tabellen), darum hier einfach alles...
rBindings.InvalidateAll(FALSE);
-#if 0
- rBindings.Invalidate( SID_SELECT_SCENARIO );
- rBindings.Invalidate( FID_PROTECT_TABLE );
- rBindings.Invalidate( FID_DELETE_TABLE );
- rBindings.Invalidate( FID_TABLE_SHOW );
- rBindings.Invalidate( FID_TABLE_HIDE );
-
- // Auswirkungen von geschuetzten Tabellen.
- rBindings.Invalidate( FID_TAB_RENAME );
- rBindings.Invalidate( FID_TAB_MOVE );
- rBindings.Invalidate( SID_DEL_ROWS );
- rBindings.Invalidate( SID_DEL_COLS );
- rBindings.Invalidate( FID_INS_ROW );
- rBindings.Invalidate( FID_INS_COLUMN );
- rBindings.Invalidate( FID_INS_CELL );
- rBindings.Invalidate( FID_INS_CELLSDOWN );
- rBindings.Invalidate( FID_INS_CELLSRIGHT );
- rBindings.Invalidate( FID_DELETE_CELL );
-
- rBindings.Invalidate( SID_OPENDLG_CHART );
- rBindings.Invalidate( SID_INSERT_OBJECT );
- rBindings.Invalidate( SID_INSERT_DIAGRAM );
- rBindings.Invalidate( SID_INSERT_SMATH );
- rBindings.Invalidate( SID_INSERT_GRAPHIC );
-#endif
-
if (aViewData.GetViewShell()->HasAccessibilityObjects())
{
SfxSimpleHint aAccHint(SC_HINT_ACC_TABLECHANGED);
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 56e51c591466..493f45341ff4 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -281,13 +281,6 @@ void ScTabViewShell::SetActive()
// Die Sfx-View moechte sich gerne selbst aktivieren, weil dabei noch
// magische Dinge geschehen (z.B. stuerzt sonst evtl. der Gestalter ab)
ActiveGrabFocus();
-
-#if 0
- SfxViewFrame* pFrame = GetViewFrame();
- pFrame->GetFrame().Appear();
-
- SFX_APP()->SetViewFrame( pFrame ); // immer erst Appear, dann SetViewFrame (#29290#)
-#endif
}
USHORT __EXPORT ScTabViewShell::PrepareClose(BOOL bUI, BOOL bForBrowsing)
@@ -492,31 +485,6 @@ void __EXPORT ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const
pDoc->SnapVisArea( aLogicRect );
rRect.SetSize( pWin->LogicToPixel( aLogicRect.GetSize() ) );
-
-#if 0
- // auf ganze Zellen anpassen (in Pixeln)
-
- ScViewData* pViewData = ((ScTabViewShell*)this)->GetViewData();
- Size aSize = rRect.GetSize();
-
- ScSplitPos ePos = pViewData->GetActivePart();
- Window* pWin = ((ScTabViewShell*)this)->GetActiveWin();
-
- Point aTest( aSize.Width(), aSize.Height() );
- SCsCOL nPosX;
- SCsROW nPosY;
- pViewData->GetPosFromPixel( aTest.X(), aTest.Y(), ePos, nPosX, nPosY );
- BOOL bLeft;
- BOOL bTop;
- pViewData->GetMouseQuadrant( aTest, ePos, nPosX, nPosY, bLeft, bTop );
- if (!bLeft)
- ++nPosX;
- if (!bTop)
- ++nPosY;
- aTest = pViewData->GetScrPos( (SCCOL)nPosX, (SCROW)nPosY, ePos, TRUE );
-
- rRect.SetSize(Size(aTest.X(),aTest.Y()));
-#endif
}
//------------------------------------------------------------------
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index f9cd0eb20637..3baa549f2932 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -366,20 +366,6 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
( pDoc->IsTabProtected( nTabNr ) || nTabSelCount > 1 ) )
break; // kein Rename
-#if 0
- // ScSbxObject wird nicht mehr benutzt, stattdessen aus dem
- // ScSbxTable::Notify die richtige Tabelle an der Basic-View eingestellt
- if( rReq.IsAPI() )
- {
- SbxObject* pObj = GetScSbxObject();
- ScSbxTable* pSbxTab = PTR_CAST( ScSbxTable, pObj );
- DBG_ASSERT( pSbxTab, "pSbxTab???" );
-
- if( pSbxTab )
- nTabNr = pSbxTab->GetTableNr();
- }
-#endif
-
if( pReqArgs != NULL )
{
BOOL bDone = FALSE;
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 08d2e633a241..5ab159cf7dbc 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -326,12 +326,6 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
{
// Do CSV dialog if more than one line.
sal_Int32 nDelim = aStr.indexOf('\n');
-#if 0
- ::rtl::OString tmpStr = OUStringToOString( aStr,
- RTL_TEXTENCODING_UTF8 );
- fprintf( stderr, "String is '%s' (%d) [%d]\n", tmpStr.getStr(),
- tmpStr.getLength(), nDelim);
-#endif
if (nDelim >= 0 && nDelim != aStr.getLength () - 1)
{
ScImportStringStream aStrm( aStr);
@@ -540,10 +534,6 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
uno::Reference < io::XInputStream > xStm;
if( aDataHelper.GetInputStream( nFormatId, xStm ) )
{
-#if 0
- SotStorage aDest( "d:\\test.xls" ); // to see the file
- pStor->CopyTo( &aDest );
-#endif
ScDocument* pInsDoc = new ScDocument( SCDOCMODE_CLIP );
SCTAB nSrcTab = 0; // Biff5 in clipboard: always sheet 0
pInsDoc->ResetClip( pDoc, nSrcTab );
@@ -615,15 +605,6 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId,
String aFile = aFileList.GetFile( i );
PasteFile( aPos, aFile, bLink );
-#if 0
- SfxStringItem aNameItem( FID_INSERT_FILE, aFile );
- SfxPointItem aPosItem( FN_PARAM_1, aPos );
- SfxDispatcher* pDisp =
- GetViewData()->GetViewShell()->GetViewFrame()->GetDispatcher();
- if (pDisp)
- pDisp->Execute( FID_INSERT_FILE, SFX_CALLMODE_ASYNCHRON,
- &aNameItem, &aPosItem, (void*)0 );
-#endif
aPos.X() += 400;
aPos.Y() += 400;