diff options
Diffstat (limited to 'sc/source/ui/view')
27 files changed, 421 insertions, 1176 deletions
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index a46e01f519bc..26a8e2122cba 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cellsh2.cxx,v $ - * $Revision: 1.35 $ + * $Revision: 1.34.24.2 $ * * This file is part of OpenOffice.org. * @@ -1098,6 +1098,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) bOk = pDBData->HasQueryParam() || pDBData->HasSortParam() || pDBData->HasSubTotalParam(); +#if OLD_PIVOT_IMPLEMENTATION if (!bOk) { // Pivottabelle mit den Daten als Quellbereich ? @@ -1112,6 +1113,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) bOk = TRUE; } } +#endif } } if (!bOk) diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 673c12bcbb25..4a5e54d19f31 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbfunc.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.24.1 $ * * This file is part of OpenOffice.org. * @@ -60,10 +60,10 @@ ScDBFunc::ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewSh { } -ScDBFunc::ScDBFunc( Window* pParent, const ScDBFunc& rDBFunc, ScTabViewShell* pViewShell ) : - ScViewFunc( pParent, rDBFunc, pViewShell ) -{ -} +//UNUSED2008-05 ScDBFunc::ScDBFunc( Window* pParent, const ScDBFunc& rDBFunc, ScTabViewShell* pViewShell ) : +//UNUSED2008-05 ScViewFunc( pParent, rDBFunc, pViewShell ) +//UNUSED2008-05 { +//UNUSED2008-05 } ScDBFunc::~ScDBFunc() { diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index 8c3ed942b6d7..bb58738e2d9c 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: drawvie3.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.32.1 $ * * This file is part of OpenOffice.org. * @@ -75,26 +75,6 @@ ScDrawView::ScDrawView( OutputDevice* pOut, ScViewData* pData ) : Construct(); } -ScDrawView::ScDrawView( OutputDevice* pOut, ScDocument* pDocument, SCTAB nTable ) : - FmFormView( pDocument->GetDrawLayer(), pOut ), - pViewData( NULL ), - pDev( pOut ), - pDoc( pDocument ), - nTab( nTable ), - pDropMarker( NULL ), - pDropMarkObj( NULL ), - bInConstruct( TRUE ) - //HMHbDisableHdl( FALSE ) -{ - // #i73602# Use default from the configuration - SetBufferedOverlayAllowed(getOptionsDrawinglayer().IsOverlayBuffer_Calc()); - - // #i74769#, #i75172# Use default from the configuration - SetBufferedOutputAllowed(getOptionsDrawinglayer().IsPaintBuffer_Calc()); - - Construct(); -} - // Verankerung setzen void ScDrawView::SetAnchor( ScAnchorType eType ) diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 91ebb9f41be3..b1da55da179a 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -716,22 +716,22 @@ BOOL ScDrawView::SelectObject( const String& rName ) return ( pFound != NULL ); } -String ScDrawView::GetSelectedChartName() const -{ - // used for modifying a chart's data area - PersistName must always be used - // (as in ScDocument::FindChartData and UpdateChartArea) - - const SdrMarkList& rMarkList = GetMarkedObjectList(); - if (rMarkList.GetMarkCount() == 1) - { - SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - if (pObj->GetObjIdentifier() == OBJ_OLE2) - if ( pDoc->IsChart(pObj) ) - return static_cast<SdrOle2Obj*>(pObj)->GetPersistName(); - } - - return EMPTY_STRING; // nichts gefunden -} +//UNUSED2008-05 String ScDrawView::GetSelectedChartName() const +//UNUSED2008-05 { +//UNUSED2008-05 // used for modifying a chart's data area - PersistName must always be used +//UNUSED2008-05 // (as in ScDocument::FindChartData and UpdateChartArea) +//UNUSED2008-05 +//UNUSED2008-05 const SdrMarkList& rMarkList = GetMarkedObjectList(); +//UNUSED2008-05 if (rMarkList.GetMarkCount() == 1) +//UNUSED2008-05 { +//UNUSED2008-05 SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); +//UNUSED2008-05 if (pObj->GetObjIdentifier() == OBJ_OLE2) +//UNUSED2008-05 if ( pDoc->IsChart(pObj) ) +//UNUSED2008-05 return static_cast<SdrOle2Obj*>(pObj)->GetPersistName(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 return EMPTY_STRING; // nichts gefunden +//UNUSED2008-05 } FASTBOOL ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions) { diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index ac33d3141fbf..9af0be53a4c4 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formatsh.cxx,v $ - * $Revision: 1.41 $ + * $Revision: 1.41.24.1 $ * * This file is part of OpenOffice.org. * @@ -1971,15 +1971,6 @@ void ScFormatShell::GetAlignState( SfxItemSet& rSet ) } } -void ScFormatShell::ExecBckCol( SfxRequest& rReq ) -{ - ExecuteAttr( rReq ); -} - -void ScFormatShell::GetBckColState( SfxItemSet& rSet ) -{ - GetAttrState( rSet ); -} void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index f2278ba9880a..fc5de4cbca97 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: gridwin.cxx,v $ - * $Revision: 1.96 $ + * $Revision: 1.94.20.2 $ * * This file is part of OpenOffice.org. * @@ -420,7 +420,9 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic bEEMouse( FALSE ), nMouseStatus( SC_GM_NONE ), nNestedButtonState( SC_NESTEDBUTTON_NONE ), +#if OLD_PIVOT_IMPLEMENTATION bPivotMouse( FALSE ), +#endif bDPMouse( FALSE ), bRFMouse( FALSE ), nPagebreakMouse( SC_PD_NONE ), @@ -1826,12 +1828,14 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) return; } +#if OLD_PIVOT_IMPLEMENTATION if (bPivotMouse) { PivotMouseButtonUp( rMEvt ); bPivotMouse = FALSE; return; } +#endif if (bDPMouse) { @@ -2221,11 +2225,13 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) return; } +#if OLD_PIVOT_IMPLEMENTATION if (bPivotMouse) { PivotMouseMove( rMEvt ); return; } +#endif if (bDPMouse) { @@ -2435,8 +2441,10 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt ) { if (!pViewData->GetView()->IsInActivatePart()) { +#if OLD_PIVOT_IMPLEMENTATION if (bPivotMouse) bPivotMouse = FALSE; // gezeichnet wird per bDragRect +#endif if (bDPMouse) bDPMouse = FALSE; // gezeichnet wird per bDragRect if (bDragRect) diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 3b5aa9ccb536..92743ef65524 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: gridwin2.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.32.1 $ * * This file is part of OpenOffice.org. * @@ -102,11 +102,12 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); + ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); + +#if OLD_PIVOT_IMPLEMENTATION ScPivotCollection* pPivotCollection = pDoc->GetPivotCollection(); ScPivot* pPivot = pPivotCollection->GetPivotAtCursor(nCol, nRow, nTab); - ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); - if (pPivot) // alte Pivottabellen { if (pPivot->IsFilterAtCursor(nCol, nRow, nTab)) @@ -186,7 +187,9 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt } } } - else if (pDPObj) +#endif + + if (pDPObj) { USHORT nOrient = sheet::DataPilotFieldOrientation_HIDDEN; ScAddress aPos( nCol, nRow, nTab ); @@ -253,6 +256,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt } } +#if OLD_PIVOT_IMPLEMENTATION void ScGridWindow::DoPivotDrop( BOOL bDelete, BOOL bToCols, SCSIZE nDestPos ) { if ( nPivotField == PIVOT_DATA_FIELD && bDelete ) @@ -609,6 +613,7 @@ void ScGridWindow::PivotMouseButtonUp( const MouseEvent& rMEvt ) PivotTestMouse( rMEvt, FALSE ); SetPointer( Pointer( POINTER_ARROW ) ); } +#endif // ----------------------------------------------------------------------- // diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 4b97058a15f0..4122882468c2 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -353,79 +353,6 @@ void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddres } } -void ScGridWindow::OutlinerViewPaint( const Rectangle& rRect ) -{ - ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); - if (pDrView && pDrView->GetTextEditOutlinerView()) - { - Outliner* pOut = pDrView->GetTextEditOutliner(); - ULONG nViewCount = pOut ? pOut->GetViewCount() : 0; - for (ULONG nView=0; nView<nViewCount; nView++) - { - OutlinerView* pOlView = pOut->GetView(nView); - - if (pOlView && pOlView->GetWindow() == this) - { - BOOL bFrame = FALSE; - Rectangle aEditRect = pOlView->GetOutputArea(); - SdrObject* pEditObj = GetEditObject(); - if (pEditObj && pEditObj->ISA(SdrTextObj)) - { - SdrTextObj* pTextObj = (SdrTextObj*)pEditObj; - Rectangle aMinRect; - pTextObj->TakeTextEditArea(NULL,NULL,NULL,&aMinRect); // PageView Offset ist 0 - aEditRect.Union(aMinRect); - bFrame = sal::static_int_cast<BOOL>( pTextObj->IsTextFrame() ); - } - - if ( aEditRect.IsOver( rRect ) ) - { - ULONG nOldDrawMode = GetDrawMode(); - if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) - { - SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | - DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); - } - - Rectangle aEffRect = rRect.GetIntersection( aEditRect ); - if (bFrame) - { - if ( pEditObj->GetLayer() ==SC_LAYER_INTERN ) // cell note? - { - // #78828# always draw the edit background in case notes overlap - SetFillColor( pOlView->GetBackgroundColor() ); - SetLineColor(); - DrawRect( aEffRect ); - } - - // DrawLayer mit dem Text-Rechteck zeichnet nur die Outliner-View - // und den Text-Rahmen (an den kommt man sonst von aussen nicht heran). - - SdrPageView* pPV = pDrView->GetSdrPageView(); - DBG_ASSERT(pPV, "keine PageView"); - if (pPV) - { - SdrLayerID nLayer = pEditObj ? pEditObj->GetLayer() : SC_LAYER_FRONT; - // Region aDrawRegion(aEffRect); - // pPV->DrawLayer( nLayer, aDrawRegion, this ); - pPV->DrawLayer( nLayer, this ); - } - } - else - { - SetFillColor( pOlView->GetBackgroundColor() ); - SetLineColor(); - DrawRect( aEffRect ); - pOlView->Paint( aEffRect ); - } - - SetDrawMode( nOldDrawMode ); - } - } - } - } -} - SdrObject* ScGridWindow::GetEditObject() { ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 256a28ac7100..748d3591418e 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1200,63 +1200,6 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, } } -void ScGridWindow::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, - SCCOL nRefEndX, SCROW nRefEndY, - const Color& rColor, BOOL bHandle ) -{ - PutInOrder( nRefStartX, nRefEndX ); - PutInOrder( nRefStartY, nRefEndY ); - - SCTAB nTab = pViewData->GetTabNo(); - ScDocument* pDoc = pViewData->GetDocument(); - if ( nRefStartX == nRefEndX && nRefStartY == nRefEndY ) - pDoc->ExtendMerge( nRefStartX, nRefStartY, nRefEndX, nRefEndY, nTab ); - - MapMode aOld = GetMapMode(); - SetMapMode(MAP_PIXEL); - - SCCOL nCurX = pViewData->GetCurX(); - SCROW nCurY = pViewData->GetCurY(); - BOOL bHide = ( nCurX+1 >= nRefStartX && nCurX <= nRefEndX+1 && - nCurY+1 >= nRefStartY && nCurY <= nRefEndY+1 ); - - BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); - long nLayoutSign = bLayoutRTL ? -1 : 1; - - Point aStartPos = pViewData->GetScrPos( nRefStartX, nRefStartY, eWhich, TRUE ); - Point aEndPos = pViewData->GetScrPos( nRefEndX+1, nRefEndY+1, eWhich, TRUE ); - aEndPos.X() -= 2 * nLayoutSign; - aEndPos.Y() -= 2; // don't paint over the grid - - // begrenzen um Ueberlaeufe mit Paint-Fehlern zu vermeiden - long nMinY = -10; - long nMaxY = GetOutputSizePixel().Height() + 10; // mit Abstand fuer Handle - if (aStartPos.Y() < nMinY) aStartPos.Y() = nMinY; - if (aStartPos.Y() > nMaxY) aStartPos.Y() = nMaxY; - if (aEndPos.Y() > nMaxY) aEndPos.Y() = nMaxY; - if (aEndPos.Y() < nMinY) aEndPos.Y() = nMinY; - - if (bHide) - HideCursor(); - - SetLineColor( rColor ); - SetFillColor(); - DrawRect( Rectangle( aStartPos, aEndPos ) ); - - if ( bHandle ) - { - SetLineColor(); - SetFillColor( rColor ); - DrawRect( Rectangle( aEndPos.X()-3*nLayoutSign, aEndPos.Y()-3, - aEndPos.X()+nLayoutSign, aEndPos.Y()+1 ) ); - } - - if (bHide) - ShowCursor(); - - SetMapMode(aOld); -} - void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2*/, ScTableInfo& rTabInfo, OutputDevice* pContentDev ) { aComboButton.SetOutputDevice( pContentDev ); @@ -1884,72 +1827,72 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) // ------------------------------------------------------------------------- -void ScGridWindow::DrawDragRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ) -{ - if ( nX2 < pViewData->GetPosX(eHWhich) || nY2 < pViewData->GetPosY(eVWhich) ) - return; - - Update(); // wegen XOR - - MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); - - SCTAB nTab = pViewData->GetTabNo(); - - SCCOL nPosX = pViewData->GetPosX(WhichH(eWhich)); - SCROW nPosY = pViewData->GetPosY(WhichV(eWhich)); - if (nX1 < nPosX) nX1 = nPosX; - if (nX2 < nPosX) nX2 = nPosX; - if (nY1 < nPosY) nY1 = nPosY; - if (nY2 < nPosY) nY2 = nPosY; - - Point aScrPos( pViewData->GetScrPos( nX1, nY1, eWhich ) ); - - long nSizeXPix=0; - long nSizeYPix=0; - ScDocument* pDoc = pViewData->GetDocument(); - double nPPTX = pViewData->GetPPTX(); - double nPPTY = pViewData->GetPPTY(); - SCCOLROW i; - - BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); - long nLayoutSign = bLayoutRTL ? -1 : 1; - - if (ValidCol(nX2) && nX2>=nX1) - for (i=nX1; i<=nX2; i++) - nSizeXPix += ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(i), nTab ), nPPTX ); - else - { - aScrPos.X() -= nLayoutSign; - nSizeXPix += 2; - } - - if (ValidRow(nY2) && nY2>=nY1) - for (i=nY1; i<=nY2; i++) - nSizeYPix += ScViewData::ToPixel( pDoc->GetRowHeight( i, nTab ), nPPTY ); - else - { - aScrPos.Y() -= 1; - nSizeYPix += 2; - } - - 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 ) - { - aRect.Left() = aRect.Right(); // end position is left - aRect.Right() = aScrPos.X(); - } - - Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() )); - Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() )); - Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 )); - Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() )); - - SetMapMode(aOld); -} +//UNUSED2008-05 void ScGridWindow::DrawDragRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( nX2 < pViewData->GetPosX(eHWhich) || nY2 < pViewData->GetPosY(eVWhich) ) +//UNUSED2008-05 return; +//UNUSED2008-05 +//UNUSED2008-05 Update(); // wegen XOR +//UNUSED2008-05 +//UNUSED2008-05 MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); +//UNUSED2008-05 +//UNUSED2008-05 SCTAB nTab = pViewData->GetTabNo(); +//UNUSED2008-05 +//UNUSED2008-05 SCCOL nPosX = pViewData->GetPosX(WhichH(eWhich)); +//UNUSED2008-05 SCROW nPosY = pViewData->GetPosY(WhichV(eWhich)); +//UNUSED2008-05 if (nX1 < nPosX) nX1 = nPosX; +//UNUSED2008-05 if (nX2 < nPosX) nX2 = nPosX; +//UNUSED2008-05 if (nY1 < nPosY) nY1 = nPosY; +//UNUSED2008-05 if (nY2 < nPosY) nY2 = nPosY; +//UNUSED2008-05 +//UNUSED2008-05 Point aScrPos( pViewData->GetScrPos( nX1, nY1, eWhich ) ); +//UNUSED2008-05 +//UNUSED2008-05 long nSizeXPix=0; +//UNUSED2008-05 long nSizeYPix=0; +//UNUSED2008-05 ScDocument* pDoc = pViewData->GetDocument(); +//UNUSED2008-05 double nPPTX = pViewData->GetPPTX(); +//UNUSED2008-05 double nPPTY = pViewData->GetPPTY(); +//UNUSED2008-05 SCCOLROW i; +//UNUSED2008-05 +//UNUSED2008-05 BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); +//UNUSED2008-05 long nLayoutSign = bLayoutRTL ? -1 : 1; +//UNUSED2008-05 +//UNUSED2008-05 if (ValidCol(nX2) && nX2>=nX1) +//UNUSED2008-05 for (i=nX1; i<=nX2; i++) +//UNUSED2008-05 nSizeXPix += ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(i), nTab ), nPPTX ); +//UNUSED2008-05 else +//UNUSED2008-05 { +//UNUSED2008-05 aScrPos.X() -= nLayoutSign; +//UNUSED2008-05 nSizeXPix += 2; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 if (ValidRow(nY2) && nY2>=nY1) +//UNUSED2008-05 for (i=nY1; i<=nY2; i++) +//UNUSED2008-05 nSizeYPix += ScViewData::ToPixel( pDoc->GetRowHeight( i, nTab ), nPPTY ); +//UNUSED2008-05 else +//UNUSED2008-05 { +//UNUSED2008-05 aScrPos.Y() -= 1; +//UNUSED2008-05 nSizeYPix += 2; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 aScrPos.X() -= 2 * nLayoutSign; +//UNUSED2008-05 aScrPos.Y() -= 2; +//UNUSED2008-05 // Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) ); +//UNUSED2008-05 Rectangle aRect( aScrPos.X(), aScrPos.Y(), +//UNUSED2008-05 aScrPos.X() + ( nSizeXPix + 2 ) * nLayoutSign, aScrPos.Y() + nSizeYPix + 2 ); +//UNUSED2008-05 if ( bLayoutRTL ) +//UNUSED2008-05 { +//UNUSED2008-05 aRect.Left() = aRect.Right(); // end position is left +//UNUSED2008-05 aRect.Right() = aScrPos.X(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() )); +//UNUSED2008-05 Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() )); +//UNUSED2008-05 Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 )); +//UNUSED2008-05 Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() )); +//UNUSED2008-05 +//UNUSED2008-05 SetMapMode(aOld); +//UNUSED2008-05 } // ------------------------------------------------------------------------- diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 042c4cf7d461..5ac563987e65 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: olinewin.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.32.1 $ * * This file is part of OpenOffice.org. * @@ -151,14 +151,6 @@ void ScOutlineWindow::ScrollPixel( long nDiff ) ShowFocus(); } -void ScOutlineWindow::ScrollRel( long nEntryDiff ) -{ - if ( mbHoriz ) - Scroll( nEntryDiff, 0 ); - else - Scroll( 0, nEntryDiff ); -} - void ScOutlineWindow::ScrollRel( long nEntryDiff, long nEntryStart, long nEntryEnd ) { Rectangle aRect( GetRectangle( 0, nEntryStart, GetOutputSizeLevel() - 1, nEntryEnd ) ); diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 5691af60d7c4..936e083cd0af 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -1146,11 +1146,6 @@ size_t lclGetArrayColFromCellInfoX( USHORT nCellInfoX, USHORT nCellInfoFirstX, U return static_cast< size_t >( bRTL ? (nCellInfoLastX + 2 - nCellInfoX) : (nCellInfoX - nCellInfoFirstX) ); } -USHORT lclGetCellInfoXFromArrayCol( size_t nCol, USHORT nCellInfoFirstX, USHORT nCellInfoLastX, bool bRTL ) -{ - return static_cast< USHORT >( bRTL ? (nCellInfoLastX + 2 - nCol) : (nCol + nCellInfoFirstX) ); -} - void ScOutputData::DrawFrame() { ULONG nOldDrawMode = pDev->GetDrawMode(); @@ -1690,81 +1685,6 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) // Drucker -void ScOutputData::DrawPageBorder( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY ) -{ - PutInOrder( nStartX, nEndX ); - PutInOrder( nStartY, nEndY ); - - if ( nStartX <= nX2 && nEndX >= nX1 && - nStartY <= nY2 && nEndY >= nY1 ) - { - long nMinX = nScrX; - long nMinY = nScrY; - long nMaxX = nScrX+nScrW-1; - long nMaxY = nScrY+nScrH-1; - BOOL bTop = FALSE; - BOOL bBottom = FALSE; - BOOL bLeft = FALSE; - BOOL bRight = FALSE; - - long nPosY = nScrY; - for (SCSIZE nArrY=1; nArrY+1<nArrCount; nArrY++) - { - SCROW nY = pRowInfo[nArrY].nRowNo; - - if ( nY==nStartY ) - { - nMinY = nPosY; - bTop = TRUE; - } - - if ( nY==nEndY ) - { -// nMaxY = nPosY + pRowInfo[nArrY].nHeight - 2; - nMaxY = nPosY + pRowInfo[nArrY].nHeight; - bBottom = TRUE; - } - - nPosY += pRowInfo[nArrY].nHeight; - } - - long nPosX = nScrX; - for (SCCOL nX=nX1; nX<=nX2; nX++) - { - if ( nX==nStartX ) - { - nMinX = nPosX; - bLeft = TRUE; - } - if ( nX==nEndX ) - { -// nMaxX = nPosX + pRowInfo[0].pCellInfo[nX+1].nWidth - 2; - nMaxX = nPosX + pRowInfo[0].pCellInfo[nX+1].nWidth; - bRight = TRUE; - } - nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth; - } - - pDev->SetLineColor( COL_BLACK ); - if (bTop && bBottom && bLeft && bRight) - { - pDev->SetFillColor(); - pDev->DrawRect( Rectangle( nMinX, nMinY, nMaxX, nMaxY ) ); - } - else - { - if (bTop) - pDev->DrawLine( Point( nMinX,nMinY ), Point( nMaxX,nMinY ) ); - if (bBottom) - pDev->DrawLine( Point( nMinX,nMaxY ), Point( nMaxX,nMaxY ) ); - if (bLeft) - pDev->DrawLine( Point( nMinX,nMinY ), Point( nMinX,nMaxY ) ); - if (bRight) - pDev->DrawLine( Point( nMaxX,nMinY ), Point( nMaxX,nMaxY ) ); - } - } -} - PolyPolygon ScOutputData::GetChangedArea() { PolyPolygon aPoly; @@ -2402,64 +2322,6 @@ void ScOutputData::AddPDFNotes() } } -long lcl_FindInList( const List& rPosList, const ScAddress &rPos ) -{ - long nCount = rPosList.Count(); - for (long i=0; i<nCount; i++) - if (*(ScAddress*)rPosList.GetObject(i) == rPos) - return i+1; - - return 0; -} - -void ScOutputData::PrintNoteMarks( const List& rPosList ) -{ - Font aFont; - ScAutoFontColorMode eColorMode = bUseStyleColor ? - ( bForceAutoColor ? SC_AUTOCOL_IGNOREFONT : SC_AUTOCOL_DISPLAY ) : - SC_AUTOCOL_PRINT; - ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).GetFont(aFont, eColorMode); - aFont.SetSize( Size( 0, (long) ( 120 * nPPTY ) ) ); // 6 pt - pDev->SetFont( aFont ); - - String aStr; - - long nPosY = nScrY; - for (SCSIZE nArrY=1; nArrY+1<nArrCount; nArrY++) - { - RowInfo* pThisRowInfo = &pRowInfo[nArrY]; - if ( pThisRowInfo->bChanged ) - { - long nPosX = nScrX; - for (SCCOL nX=nX1; nX<=nX2; nX++) - { - CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1]; - ScBaseCell* pCell = pInfo->pCell; - if ( pCell && pCell->GetNotePtr() ) // auch verdeckte wegen der Numerierung - { - aStr = String::CreateFromInt32( lcl_FindInList( rPosList, - ScAddress( nX, pThisRowInfo->nRowNo, nTab))); - long nMarkX = nPosX + pRowInfo[0].pCellInfo[nX+1].nWidth - 2 - - pDev->GetTextWidth(aStr); - pDev->DrawText( Point( nMarkX,nPosY ), aStr ); - } - - nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth; - } - } - nPosY += pThisRowInfo->nHeight; - } -} - -void ScOutputData::ConnectObject( const uno::Reference < embed::XEmbeddedObject >& rRef, SdrOle2Obj* pOleObj ) -{ - if (rRef.is()) - { - if ( rRef->getStatus( pOleObj->GetAspect() ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) - pViewShell->ConnectObject( pOleObj ); - } -} - void ScOutputData::DrawClipMarks() { if (!bAnyClipped) diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 3aa452bd2229..63b2eafefce7 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -136,7 +136,6 @@ public: void SetPatternSimple( const ScPatternAttr* pNew, const SfxItemSet* pSet ); BOOL SetText( ScBaseCell* pCell ); // TRUE -> pOldPattern vergessen - void ResetText(); void SetHashText(); void SetAutoText( const String& rAutoText ); @@ -165,7 +164,6 @@ public: BOOL HasCondHeight() const { return pCondSet && SFX_ITEM_SET == pCondSet->GetItemState( ATTR_FONT_HEIGHT, TRUE ); } - BOOL IsRightToLeftAttr() const; BOOL HasEditCharacters() const; }; @@ -508,14 +506,6 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell ) return bChanged; } -void ScDrawStringsVars::ResetText() -{ - aString.Erase(); - pLastCell = NULL; - aTextSize = Size(0,0); - nOriginalWidth = 0; -} - void ScDrawStringsVars::SetHashText() { SetAutoText( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("###")) ); @@ -551,14 +541,6 @@ void ScDrawStringsVars::SetAutoText( const String& rAutoText ) pLastCell = NULL; // derselbe Text kann in der naechsten Zelle wieder passen } -BOOL ScDrawStringsVars::IsRightToLeftAttr() const -{ - SvxFrameDirection eCellDir = (SvxFrameDirection)((const SvxFrameDirectionItem&) - pPattern->GetItem( ATTR_WRITINGDIR, pCondSet )).GetValue(); - return ( eCellDir == FRMDIR_HORI_RIGHT_TOP || - ( eCellDir == FRMDIR_ENVIRONMENT && pOutput->nTabTextDirection == EE_HTEXTDIR_R2L ) ); -} - BOOL ScDrawStringsVars::HasEditCharacters() const { static const sal_Unicode pChars[] = @@ -847,31 +829,6 @@ inline void lcl_CreateInterpretProgress( BOOL& bProgress, ScDocument* pDoc, } } -BOOL lcl_IsValueDataAtPos( BOOL& bProgress, ScDocument* pDoc, - SCCOL nCol, SCROW nRow, SCTAB nTab ) -{ - ScBaseCell* pCell; - pDoc->GetCell( nCol, nRow, nTab, pCell ); - if ( pCell ) - { - if ( pCell->GetCellType() == CELLTYPE_FORMULA ) - { // kein weiteres Interpret anstossen - ScFormulaCell* pFCell = (ScFormulaCell*) pCell; - if ( pFCell->IsRunning() ) - return TRUE; - else - { - lcl_CreateInterpretProgress( bProgress, pDoc, pFCell ); - return pFCell->HasValueData(); - } - } - else - return pCell->HasValueData(); - } - else - return FALSE; -} - inline BYTE GetScriptType( ScDocument* pDoc, ScBaseCell* pCell, const ScPatternAttr* pPattern, const SfxItemSet* pCondSet ) @@ -954,38 +911,6 @@ BOOL ScOutputData::IsAvailable( SCCOL nX, SCROW nY ) return TRUE; } -long ScOutputData::GetAvailableWidth( SCCOL nX, SCROW nY, long nNeeded ) -{ - // get the pixel width that's available for the cell's text, - // including cells outside of the current screen area - - long nAvailable = (long) ( pDoc->GetColWidth( nX, nTab ) * nPPTX ); // cell itself - - const ScMergeAttr* pMerge = (const ScMergeAttr*)pDoc->GetAttr( nX, nY, nTab, ATTR_MERGE ); - if ( pMerge->IsMerged() ) - { - // for merged cells, allow only the merged area - SCCOL nCount = pMerge->GetColMerge(); - for (SCCOL nAdd=1; nAdd<nCount; nAdd++) - nAvailable += (long) ( pDoc->GetColWidth( nX + nAdd, nTab ) * nPPTX ); - } - else - { - // look for empty cells into which the text can be extended - while ( nAvailable < nNeeded && nX < MAXCOL && IsAvailable( nX+1, nY ) ) - { - ++nX; - nAvailable += (long) ( pDoc->GetColWidth( nX, nTab ) * nPPTX ); - } - } - - if ( bMarkClipped && nAvailable < nNeeded ) - nAvailable -= (long)( SC_CLIPMARK_SIZE * nPPTX ); - - return nAvailable; -} - - // nX, nArrY: loop variables from DrawStrings / DrawEdit // nPosX, nPosY: corresponding positions for nX, nArrY // nCellX, nCellY: position of the cell that contains the text @@ -1791,28 +1716,6 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) // ------------------------------------------------------------------------------- -Size lcl_GetVertPaperSize( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) -{ - const double nPPTY = HMM_PER_TWIPS; - - const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab ); - const ScMergeAttr& rMerge = (const ScMergeAttr&)pPattern->GetItem(ATTR_MERGE); - - long nCellY = (long) ( pDoc->GetRowHeight(nRow,nTab) * nPPTY ); - if ( rMerge.GetRowMerge() > 1 ) - { - SCROW nCountY = rMerge.GetRowMerge(); - nCellY += (long) pDoc->GetScaledRowHeight( nRow+1, nRow+nCountY-1, nTab, nPPTY); - } - - // only top/bottom margin are interesting - const SvxMarginItem& rMargin = (const SvxMarginItem&)pPattern->GetItem(ATTR_MARGIN); - nCellY -= (long) ( rMargin.GetTopMargin() * nPPTY ); - nCellY -= (long) ( rMargin.GetBottomMargin() * nPPTY ); - - return Size( nCellY - 1, 1000000 ); // cell height as width for PaperSize -} - void lcl_ClearEdit( EditEngine& rEngine ) // Text und Attribute { rEngine.SetUpdateMode( FALSE ); @@ -2381,80 +2284,6 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } pEngine->SetDefaultItem( SvxAdjustItem( eSvxAdjust, EE_PARA_JUST ) ); - // Raender - - //! Position und Papersize auf EditUtil umstellen !!! - -/* Rectangle aPixRect = ScEditUtil( pDoc, - nX,nY,nTab, Point(nStartX,nStartY), - pDev, nPPTX, nPPTY, nZoom ) - .GetEditArea( pPattern ); - - pDev->SetFillInBrush(Brush(Color(COL_LIGHTRED))); - pDev->DrawRect(pDev->PixelToLogic(aPixRect)); -*/ - -#if 0 - Size aPaperSize = Size( 1000000, 1000000 ); - if ( eOrient==SVX_ORIENTATION_STACKED ) - aPaperSize.Width() = nOutWidth; // zum Zentrieren - else if (bAsianVertical) - { - aPaperSize.Width() = nOutWidth; - if (bBreak) - { - // add some extra height (default margin value) for safety - // as long as GetEditArea isn't used below - long nExtraHeight = (long)( 20 * nPPTY ); - aPaperSize.Height() = nOutHeight + nExtraHeight; - } - } - else if (bBreak) - { - if (eOrient == SVX_ORIENTATION_STANDARD) - { - if (eType==OUTTYPE_WINDOW && - eOrient!=SVX_ORIENTATION_STACKED && - pInfo && pInfo->bAutoFilter) - { - long nSub = Min( pRowInfo[nArrY].nHeight, - (USHORT) DROPDOWN_BITMAP_SIZE ); - if ( nOutWidth > nSub ) - nOutWidth -= nSub; - } - aPaperSize.Width() = nOutWidth; - } - else - aPaperSize.Width() = nOutHeight - 1; - } - if (bPixelToLogic) - { - //! also handle bAsianVertical in GetEditArea - if ( bBreak && pFmtDevice != pRefDevice && !bAsianVertical ) - { - // calculate PaperSize for automatic line breaks from logic size, - // not pixel sizes, to get the same breaks at all scales - - if ( eOrient == SVX_ORIENTATION_STANDARD ) - { - Fraction aFract(1,1); - Rectangle aUtilRect = ScEditUtil( pDoc,nX,nY,nTab, - Point(nStartX,nStartY), pDev, - HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ) - .GetEditArea( pPattern, FALSE ); - Size aLogic = aUtilRect.GetSize(); - pEngine->SetPaperSize( aLogic ); - } - else - pEngine->SetPaperSize( lcl_GetVertPaperSize(pDoc,nX,nY,nTab) ); - } - else - pEngine->SetPaperSize(pRefDevice->PixelToLogic(aPaperSize)); - } - else - pEngine->SetPaperSize(aPaperSize); -#endif - // Read content from cell BOOL bWrapFields = FALSE; diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 94824c1720ec..51f6712c70ca 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: prevloc.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.32.2 $ * * This file is part of OpenOffice.org. * @@ -285,18 +285,6 @@ void ScPreviewLocationData::GetDrawRange( USHORT nPos, Rectangle& rPixelRect, Ma } } -ScPreviewLocationEntry* lcl_GetEntryByPosition( const List& rEntries, const Point& rPos, ScPreviewLocationType eType ) -{ - ULONG nCount = rEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) - { - ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)rEntries.GetObject(nListPos); - if ( pEntry->eType == eType && pEntry->aPixelRect.IsInside( rPos ) ) - return pEntry; - } - return NULL; -} - ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAddress& rPos, ScPreviewLocationType eType ) { ULONG nCount = rEntries.Count(); @@ -309,44 +297,44 @@ ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAdd return NULL; } -ScAddress ScPreviewLocationData::GetCellFromRange( const Size& rOffsetPixel, const ScRange& rRange ) const -{ - const double nScaleX = HMM_PER_TWIPS; - const double nScaleY = HMM_PER_TWIPS; - - Size aOffsetLogic = pWindow->PixelToLogic( rOffsetPixel, aCellMapMode ); - SCTAB nTab = rRange.aStart.Tab(); - - long nPosX = 0; - SCCOL nCol = rRange.aStart.Col(); - SCCOL nEndCol = rRange.aEnd.Col(); - while ( nCol <= nEndCol && nPosX < aOffsetLogic.Width() ) - { - USHORT nDocW = pDoc->GetColWidth( nCol, nTab ); - if (nDocW) - nPosX += (long) (nDocW * nScaleX); - ++nCol; - } - if ( nCol > rRange.aStart.Col() ) - --nCol; - - long nPosY = 0; - ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter( - pDoc->GetRowFlagsArray( nTab), rRange.aStart.Row(), - rRange.aEnd.Row(), CR_HIDDEN, 0, pDoc->GetRowHeightArray( nTab)); - while ( aIter && nPosY < aOffsetLogic.Height() ) - { - USHORT nDocH = *aIter; - if (nDocH) - nPosY += (long) (nDocH * nScaleY); - ++aIter; - } - SCROW nRow = aIter.GetPos(); - if ( nRow > rRange.aStart.Row() ) - --nRow; - - return ScAddress( nCol, nRow, nTab ); -} +//UNUSED2008-05 ScAddress ScPreviewLocationData::GetCellFromRange( const Size& rOffsetPixel, const ScRange& rRange ) const +//UNUSED2008-05 { +//UNUSED2008-05 const double nScaleX = HMM_PER_TWIPS; +//UNUSED2008-05 const double nScaleY = HMM_PER_TWIPS; +//UNUSED2008-05 +//UNUSED2008-05 Size aOffsetLogic = pWindow->PixelToLogic( rOffsetPixel, aCellMapMode ); +//UNUSED2008-05 SCTAB nTab = rRange.aStart.Tab(); +//UNUSED2008-05 +//UNUSED2008-05 long nPosX = 0; +//UNUSED2008-05 SCCOL nCol = rRange.aStart.Col(); +//UNUSED2008-05 SCCOL nEndCol = rRange.aEnd.Col(); +//UNUSED2008-05 while ( nCol <= nEndCol && nPosX < aOffsetLogic.Width() ) +//UNUSED2008-05 { +//UNUSED2008-05 USHORT nDocW = pDoc->GetColWidth( nCol, nTab ); +//UNUSED2008-05 if (nDocW) +//UNUSED2008-05 nPosX += (long) (nDocW * nScaleX); +//UNUSED2008-05 ++nCol; +//UNUSED2008-05 } +//UNUSED2008-05 if ( nCol > rRange.aStart.Col() ) +//UNUSED2008-05 --nCol; +//UNUSED2008-05 +//UNUSED2008-05 long nPosY = 0; +//UNUSED2008-05 ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter( +//UNUSED2008-05 pDoc->GetRowFlagsArray( nTab), rRange.aStart.Row(), +//UNUSED2008-05 rRange.aEnd.Row(), CR_HIDDEN, 0, pDoc->GetRowHeightArray( nTab)); +//UNUSED2008-05 while ( aIter && nPosY < aOffsetLogic.Height() ) +//UNUSED2008-05 { +//UNUSED2008-05 USHORT nDocH = *aIter; +//UNUSED2008-05 if (nDocH) +//UNUSED2008-05 nPosY += (long) (nDocH * nScaleY); +//UNUSED2008-05 ++aIter; +//UNUSED2008-05 } +//UNUSED2008-05 SCROW nRow = aIter.GetPos(); +//UNUSED2008-05 if ( nRow > rRange.aStart.Row() ) +//UNUSED2008-05 --nRow; +//UNUSED2008-05 +//UNUSED2008-05 return ScAddress( nCol, nRow, nTab ); +//UNUSED2008-05 } Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const { @@ -377,24 +365,6 @@ Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, cons return Rectangle( Point( aOffsetPixel.Width(), aOffsetPixel.Height() ), aSizePixel ); } -BOOL ScPreviewLocationData::GetCell( const Point& rPos, ScAddress& rCellPos, Rectangle& rCellRect ) const -{ - ScPreviewLocationEntry* pEntry = lcl_GetEntryByPosition( aEntries, rPos, SC_PLOC_CELLRANGE ); - if ( pEntry ) - { - Size aOffsetPixel( rPos.X() - pEntry->aPixelRect.Left(), rPos.Y() - pEntry->aPixelRect.Top() ); - rCellPos = GetCellFromRange( aOffsetPixel, pEntry->aCellRange ); - - Rectangle aOffsetRect = GetOffsetPixel( rCellPos, pEntry->aCellRange ); - rCellRect = Rectangle( aOffsetRect.Left() + pEntry->aPixelRect.Left(), - aOffsetRect.Top() + pEntry->aPixelRect.Top(), - aOffsetRect.Right() + pEntry->aPixelRect.Left(), - aOffsetRect.Bottom() + pEntry->aPixelRect.Top() ); - return TRUE; - } - return FALSE; -} - BOOL ScPreviewLocationData::GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const { ScPreviewLocationEntry* pEntry = lcl_GetEntryByAddress( aEntries, rCellPos, SC_PLOC_CELLRANGE ); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 7d2c30a140ea..6f733caecd66 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: prevwsh.cxx,v $ - * $Revision: 1.45 $ + * $Revision: 1.44.30.2 $ * * This file is part of OpenOffice.org. * @@ -144,27 +144,6 @@ void ScPreviewShell::Construct( Window* pParent ) } ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, - const ScPreviewShell& rWin ) : - SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), - pDocShell( rWin.pDocShell ), - aSourceData( rWin.aSourceData ), - nSourceDesignMode( rWin.nSourceDesignMode ), - pAccessibilityBroadcaster( NULL ) -{ - Construct( &pViewFrame->GetWindow() ); -} - -ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, - Window *pParent ) : - SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), - pDocShell( (ScDocShell*)pViewFrame->GetObjectShell() ), - nSourceDesignMode( SC_FORCEMODE_NONE ), - pAccessibilityBroadcaster( NULL ) -{ - Construct( pParent ); -} - -ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, SfxViewShell* pOldSh ) : SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), pDocShell( (ScDocShell*)pViewFrame->GetObjectShell() ), diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 4d5f1f72fabe..b035fc3ad8d7 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1144,7 +1144,7 @@ void ScPrintFunc::SetDateTime( const Date& rDate, const Time& rTime ) } void lcl_DrawGraphic( const Graphic &rGraphic, OutputDevice *pOut, - const Rectangle &rGrf, const Rectangle &rOut ) + const Rectangle &rGrf, const Rectangle &rOut ) { const FASTBOOL bNotInside = !rOut.IsInside( rGrf ); if ( bNotInside ) @@ -1159,22 +1159,6 @@ void lcl_DrawGraphic( const Graphic &rGraphic, OutputDevice *pOut, pOut->Pop(); } -void lcl_DrawGraphic( const Bitmap& rBitmap, OutputDevice *pOut, - const Rectangle &rGrf, const Rectangle &rOut ) -{ - const FASTBOOL bNotInside = !rOut.IsInside( rGrf ); - if ( bNotInside ) - { - pOut->Push(); - pOut->IntersectClipRegion( rOut ); - } - - pOut->DrawBitmap( rGrf.TopLeft(), rGrf.GetSize(), rBitmap ); - - if ( bNotInside ) - pOut->Pop(); -} - void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevice* pRefDev, const Rectangle &rOrg, const Rectangle &rOut ) { @@ -1770,15 +1754,6 @@ void ScPrintFunc::MakeTableString() pDoc->GetName( nPrintTab, aFieldData.aTabName ); } -String lcl_CmdStr( USHORT nId ) -{ - String aDel( ScGlobal::GetRscString( STR_HFCMD_DELIMITER ) ); - String aCmd = aDel; - aCmd += ScGlobal::GetRscString( nId ); - aCmd += aDel; - return aCmd; -} - void ScPrintFunc::MakeEditEngine() { if (!pEditEngine) diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 21e440da24df..986de54aacdf 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -1086,10 +1086,10 @@ void ScTabView::SetActivePointer( const Pointer& rPointer ) */ } -void ScTabView::SetActivePointer( const ResId& ) -{ - DBG_ERRORFILE( "keine Pointer mit ResId!" ); -} +//UNUSED2008-05 void ScTabView::SetActivePointer( const ResId& ) +//UNUSED2008-05 { +//UNUSED2008-05 DBG_ERRORFILE( "keine Pointer mit ResId!" ); +//UNUSED2008-05 } void ScTabView::ActiveGrabFocus() { @@ -1098,28 +1098,28 @@ void ScTabView::ActiveGrabFocus() pGridWin[ePos]->GrabFocus(); } -void ScTabView::ActiveCaptureMouse() -{ - ScSplitPos ePos = aViewData.GetActivePart(); - if (pGridWin[ePos]) - pGridWin[ePos]->CaptureMouse(); -} - -void ScTabView::ActiveReleaseMouse() -{ - ScSplitPos ePos = aViewData.GetActivePart(); - if (pGridWin[ePos]) - pGridWin[ePos]->ReleaseMouse(); -} - -Point ScTabView::ActivePixelToLogic( const Point& rDevicePoint ) -{ - ScSplitPos ePos = aViewData.GetActivePart(); - if (pGridWin[ePos]) - return pGridWin[ePos]->PixelToLogic(rDevicePoint); - else - return Point(); -} +//UNUSED2008-05 void ScTabView::ActiveCaptureMouse() +//UNUSED2008-05 { +//UNUSED2008-05 ScSplitPos ePos = aViewData.GetActivePart(); +//UNUSED2008-05 if (pGridWin[ePos]) +//UNUSED2008-05 pGridWin[ePos]->CaptureMouse(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void ScTabView::ActiveReleaseMouse() +//UNUSED2008-05 { +//UNUSED2008-05 ScSplitPos ePos = aViewData.GetActivePart(); +//UNUSED2008-05 if (pGridWin[ePos]) +//UNUSED2008-05 pGridWin[ePos]->ReleaseMouse(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 Point ScTabView::ActivePixelToLogic( const Point& rDevicePoint ) +//UNUSED2008-05 { +//UNUSED2008-05 ScSplitPos ePos = aViewData.GetActivePart(); +//UNUSED2008-05 if (pGridWin[ePos]) +//UNUSED2008-05 return pGridWin[ePos]->PixelToLogic(rDevicePoint); +//UNUSED2008-05 else +//UNUSED2008-05 return Point(); +//UNUSED2008-05 } ScSplitPos ScTabView::FindWindow( Window* pWindow ) const { diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 1c13effac8df..bcde44041299 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabview3.cxx,v $ - * $Revision: 1.69 $ + * $Revision: 1.67.22.6 $ * * This file is part of OpenOffice.org. * @@ -112,93 +112,6 @@ using namespace com::sun::star; // ----------------------------------------------------------------------- -// helper class for DoChartSelection - -#define SC_BGCOLLECT_FIRST 0 -#define SC_BGCOLLECT_FOUND 1 -#define SC_BGCOLLECT_AMBIGUOUS 2 - -class ScBackgroundCollector -{ -private: - ScDocument* pDoc; - BOOL bTransparent; - Color aBackColor; - USHORT nMode; -public: - ScBackgroundCollector( ScDocument* pD ); - void AddRange( const ScRange& rRange ); - Color GetHighlightColor() const; -}; - -ScBackgroundCollector::ScBackgroundCollector( ScDocument* pD ) : - pDoc( pD ), - bTransparent( FALSE ), - nMode( SC_BGCOLLECT_FIRST ) -{ -} - -void ScBackgroundCollector::AddRange( const ScRange& rRange ) -{ - if ( nMode == SC_BGCOLLECT_AMBIGUOUS ) - return; // nothing more to do - - ScDocAttrIterator aIter( pDoc, rRange.aStart.Tab(), - rRange.aStart.Col(), rRange.aStart.Row(), - rRange.aEnd.Col(), rRange.aEnd.Row() ); - SCCOL nCol; - SCROW nRow1, nRow2; - const ScPatternAttr* pPattern = aIter.GetNext( nCol, nRow1, nRow2 ); - while ( pPattern ) - { - //! look at conditional formats? - const Color& rAttrColor = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor(); - BOOL bAttrTransp = ( rAttrColor.GetTransparency() != 0 ); - - if ( nMode == SC_BGCOLLECT_FIRST ) - { - // just copy first background - bTransparent = bAttrTransp; - aBackColor = rAttrColor; - nMode = SC_BGCOLLECT_FOUND; - } - else if ( nMode == SC_BGCOLLECT_FOUND ) - { - BOOL bEqual = ( bTransparent == bAttrTransp ); - if ( bEqual && !bTransparent ) - bEqual = ( aBackColor == rAttrColor ); - if ( !bEqual ) - { - nMode = SC_BGCOLLECT_AMBIGUOUS; // different backgrounds found - return; // dont need to continue - } - } - - pPattern = aIter.GetNext( nCol, nRow1, nRow2 ); - } -} - -Color ScBackgroundCollector::GetHighlightColor() const -{ - if ( nMode == SC_BGCOLLECT_FOUND && !bTransparent ) - { - // everything formatted with a single background color - // -> use contrasting color (blue or yellow) - - Color aBlue( COL_LIGHTBLUE ); - Color aYellow( COL_YELLOW ); - - if ( aBackColor.GetColorError(aBlue) >= aBackColor.GetColorError(aYellow) ) - return aBlue; - else - return aYellow; - } - else - return Color( COL_LIGHTBLUE ); // default for transparent or ambiguous background -} - -// ----------------------------------------------------------------------- - // // --- Public-Funktionen // @@ -548,6 +461,7 @@ void ScTabView::CursorPosChanged() // Broadcast, damit andere Views des Dokuments auch umschalten ScDocument* pDoc = aViewData.GetDocument(); +#if OLD_PIVOT_IMPLEMENTATION BOOL bPivot = ( NULL != pDoc->GetPivotAtCursor( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo() ) || @@ -555,6 +469,11 @@ void ScTabView::CursorPosChanged() aViewData.GetCurY(), aViewData.GetTabNo() ) ); aViewData.GetViewShell()->SetPivotShell(bPivot); +#else + bool bDP = NULL != pDoc->GetDPAtCursor( + aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo() ); + aViewData.GetViewShell()->SetPivotShell(bDP); +#endif // UpdateInputHandler jetzt in CellContentChanged @@ -2018,20 +1937,6 @@ void ScTabView::UpdateFormulas() UpdateEditView(); } -// PaintCell - einzelne Zelle neu zeichnen - -void ScTabView::PaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) -{ - if ( aViewData.GetTabNo() == nTab ) - { - USHORT i; - for (i=0; i<4; i++) - if (pGridWin[i]) - if (pGridWin[i]->IsVisible()) - pGridWin[i]->Draw( nCol, nRow, nCol, nRow ); - } -} - // PaintArea -Block neu zeichnen void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, @@ -2278,19 +2183,43 @@ void ScTabView::DoChartSelection( // DrawDragRect - Drag&Drop-Rechteck zeichnen (XOR) -void ScTabView::DrawDragRect( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, - ScSplitPos ePos ) -{ - if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX || aViewData.GetVSplitMode() == SC_SPLIT_FIX ) - { - for (USHORT i=0; i<4; i++) - if (pGridWin[i]) - if (pGridWin[i]->IsVisible()) - pGridWin[i]->DrawDragRect( nStartX, nStartY, nEndX, nEndY ); - } - else - pGridWin[ePos]->DrawDragRect( nStartX, nStartY, nEndX, nEndY ); -} +//UNUSED2008-05 void ScTabView::DrawDragRect( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, +//UNUSED2008-05 ScSplitPos ePos ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX || aViewData.GetVSplitMode() == SC_SPLIT_FIX ) +//UNUSED2008-05 { +//UNUSED2008-05 for (USHORT i=0; i<4; i++) +//UNUSED2008-05 if (pGridWin[i]) +//UNUSED2008-05 if (pGridWin[i]->IsVisible()) +//UNUSED2008-05 pGridWin[i]->DrawDragRect( nStartX, nStartY, nEndX, nEndY ); +//UNUSED2008-05 } +//UNUSED2008-05 else +//UNUSED2008-05 pGridWin[ePos]->DrawDragRect( nStartX, nStartY, nEndX, nEndY ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 // PaintCell - einzelne Zelle neu zeichnen +//UNUSED2008-05 +//UNUSED2008-05 void ScTabView::PaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( aViewData.GetTabNo() == nTab ) +//UNUSED2008-05 { +//UNUSED2008-05 USHORT i; +//UNUSED2008-05 for (i=0; i<4; i++) +//UNUSED2008-05 if (pGridWin[i]) +//UNUSED2008-05 if (pGridWin[i]->IsVisible()) +//UNUSED2008-05 pGridWin[i]->Draw( nCol, nRow, nCol, nRow ); +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void ScTabView::PaintLeftRow( SCROW nRow ) +//UNUSED2008-05 { +//UNUSED2008-05 PaintLeftArea( nRow, nRow ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void ScTabView::PaintTopCol( SCCOL nCol ) +//UNUSED2008-05 { +//UNUSED2008-05 PaintTopArea( nCol, nCol ); +//UNUSED2008-05 } // PaintGrid - Datenbereiche neu zeichnen @@ -2333,11 +2262,6 @@ void ScTabView::CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress) } } -void ScTabView::PaintTopCol( SCCOL nCol ) -{ - PaintTopArea( nCol, nCol ); -} - void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ) { // Pixel-Position der linken Kante @@ -2395,11 +2319,6 @@ void ScTabView::PaintLeft() } } -void ScTabView::PaintLeftRow( SCROW nRow ) -{ - PaintLeftArea( nRow, nRow ); -} - void ScTabView::PaintLeftArea( SCROW nStartRow, SCROW nEndRow ) { // Pixel-Position der oberen Kante diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index d8699f8d62c9..bd9b154f10b8 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabview4.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.32.2 $ * * This file is part of OpenOffice.org. * @@ -335,13 +335,13 @@ void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eT } } -void ScTabView::EndSelection() -{ - ScModule* pScMod = SC_MOD(); - BOOL bRefMode = pScMod->IsFormulaMode(); - if ( bRefMode ) - pScMod->EndReference(); -} +//UNUSED2008-05 void ScTabView::EndSelection() +//UNUSED2008-05 { +//UNUSED2008-05 ScModule* pScMod = SC_MOD(); +//UNUSED2008-05 BOOL bRefMode = pScMod->IsFormulaMode(); +//UNUSED2008-05 if ( bRefMode ) +//UNUSED2008-05 pScMod->EndReference(); +//UNUSED2008-05 } // static void ScTabView::SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL ) diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 571ea8c30a9f..03f5892427a5 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabview5.cxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.25.32.4 $ * * This file is part of OpenOffice.org. * @@ -431,13 +431,13 @@ BOOL ScTabView::IsDrawTextEdit() const return FALSE; } -String ScTabView::GetSelectedChartName() const -{ - if (pDrawView) - return pDrawView->GetSelectedChartName(); - else - return EMPTY_STRING; -} +//UNUSED2008-05 String ScTabView::GetSelectedChartName() const +//UNUSED2008-05 { +//UNUSED2008-05 if (pDrawView) +//UNUSED2008-05 return pDrawView->GetSelectedChartName(); +//UNUSED2008-05 else +//UNUSED2008-05 return EMPTY_STRING; +//UNUSED2008-05 } SvxZoomType ScTabView::GetZoomType() const { @@ -587,7 +587,6 @@ void ScTabView::DrawEnableAnim(BOOL bSet) else { pDrawView->SetAnimationEnabled(FALSE); - // StopAnimations am Dokument ist nicht mehr noetig } } } diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 3ac6d9f4734d..f84031af23ec 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabvwsh2.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.27.32.2 $ * * This file is part of OpenOffice.org. * @@ -323,7 +323,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) break; case SID_DRAW_CHART: - bChartDlgIsEdit = FALSE; +//UNUSED2008-05 bChartDlgIsEdit = FALSE; pTabView->SetDrawFuncPtr(new FuMarkRect(this, pWin, pView, pDoc, aNewReq)); break; diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 3f1d83848924..c0dc1c97705d 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabvwsh4.cxx,v $ - * $Revision: 1.76 $ + * $Revision: 1.75.24.3 $ * * This file is part of OpenOffice.org. * @@ -648,37 +648,26 @@ void ScTabViewShell::DoReadUserData( const String& rData ) //! if ViewData has more tables than document, remove tables in ViewData } - //------------------------------------------------------------------ -void ScTabViewShell::TestFunction( USHORT /* nPar */ ) -{ -/* switch (nPar) - { - } -*/ -} - -//------------------------------------------------------------------ - -void ScTabViewShell::ExecuteShowNIY( SfxRequest& /* rReq */ ) -{ - ErrorMessage(STR_BOX_YNI); -} - -//------------------------------------------------------------------ - -void ScTabViewShell::StateDisabled( SfxItemSet& rSet ) -{ - SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); - - while ( nWhich ) - { - rSet.DisableItem( nWhich ); - nWhich = aIter.NextWhich(); - } -} +//UNUSED2008-05 void ScTabViewShell::ExecuteShowNIY( SfxRequest& /* rReq */ ) +//UNUSED2008-05 { +//UNUSED2008-05 ErrorMessage(STR_BOX_YNI); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 //------------------------------------------------------------------ +//UNUSED2008-05 +//UNUSED2008-05 void ScTabViewShell::StateDisabled( SfxItemSet& rSet ) +//UNUSED2008-05 { +//UNUSED2008-05 SfxWhichIter aIter( rSet ); +//UNUSED2008-05 USHORT nWhich = aIter.FirstWhich(); +//UNUSED2008-05 +//UNUSED2008-05 while ( nWhich ) +//UNUSED2008-05 { +//UNUSED2008-05 rSet.DisableItem( nWhich ); +//UNUSED2008-05 nWhich = aIter.NextWhich(); +//UNUSED2008-05 } +//UNUSED2008-05 } void ScTabViewShell::SetDrawShellOrSub() { @@ -1117,17 +1106,17 @@ SfxShell* ScTabViewShell::GetMySubShell() const return NULL; // keine von meinen dabei } -void ScTabViewShell::SetMySubShell( SfxShell* pShell ) -{ - SfxShell* pOld = GetMySubShell(); - if ( pOld != pShell ) - { - if (pOld) - RemoveSubShell(pOld); // alte SubShell entfernen - if (pShell) - AddSubShell(*pShell); // neue setzen - } -} +//UNUSED2008-05 void ScTabViewShell::SetMySubShell( SfxShell* pShell ) +//UNUSED2008-05 { +//UNUSED2008-05 SfxShell* pOld = GetMySubShell(); +//UNUSED2008-05 if ( pOld != pShell ) +//UNUSED2008-05 { +//UNUSED2008-05 if (pOld) +//UNUSED2008-05 RemoveSubShell(pOld); // alte SubShell entfernen +//UNUSED2008-05 if (pShell) +//UNUSED2008-05 AddSubShell(*pShell); // neue setzen +//UNUSED2008-05 } +//UNUSED2008-05 } BOOL ScTabViewShell::IsDrawTextShell() const { @@ -1701,7 +1690,7 @@ FASTBOOL __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) bPrintSelected(FALSE), \ bReadOnly(FALSE), \ pScSbxObject(NULL), \ - bChartDlgIsEdit(FALSE), \ + /*bChartDlgIsEdit(FALSE),*/ \ bChartAreaValid(FALSE), \ nCurRefDlgId(0), \ pAccessibilityBroadcaster(NULL) @@ -1894,29 +1883,29 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) //------------------------------------------------------------------ -ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, - const ScTabViewShell& rWin ) : - SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), - ScDBFunc( &pViewFrame->GetWindow(), rWin, this ), - __INIT_ScTabViewShell -{ - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabViewShell::ScTabViewShell" ); - - Construct(); - - UpdatePageBreakData(); - - /*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 ); - - SetCurSubShell(OST_Cell); - SvBorder aBorder; - GetBorderSize( aBorder, Size() ); - SetBorderPixel( aBorder ); -} +//UNUSED2008-05 ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, +//UNUSED2008-05 const ScTabViewShell& rWin ) : +//UNUSED2008-05 SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), +//UNUSED2008-05 ScDBFunc( &pViewFrame->GetWindow(), rWin, this ), +//UNUSED2008-05 __INIT_ScTabViewShell +//UNUSED2008-05 { +//UNUSED2008-05 RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabViewShell::ScTabViewShell" ); +//UNUSED2008-05 +//UNUSED2008-05 Construct(); +//UNUSED2008-05 +//UNUSED2008-05 UpdatePageBreakData(); +//UNUSED2008-05 +//UNUSED2008-05 /*uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame()->GetFrameInterface(); +//UNUSED2008-05 if (xFrame.is()) +//UNUSED2008-05 xFrame->setComponent( uno::Reference<awt::XWindow>(), new ScTabViewObj( this ) );*/ +//UNUSED2008-05 // make Controller known to SFX +//UNUSED2008-05 new ScTabViewObj( this ); +//UNUSED2008-05 +//UNUSED2008-05 SetCurSubShell(OST_Cell); +//UNUSED2008-05 SvBorder aBorder; +//UNUSED2008-05 GetBorderSize( aBorder, Size() ); +//UNUSED2008-05 SetBorderPixel( aBorder ); +//UNUSED2008-05 } //------------------------------------------------------------------ @@ -2059,10 +2048,10 @@ void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangl nChartDestTab = GetViewData()->GetTabNo(); } -void ScTabViewShell::ResetChartArea() -{ - bChartAreaValid = FALSE; -} +//UNUSED2008-05 void ScTabViewShell::ResetChartArea() +//UNUSED2008-05 { +//UNUSED2008-05 bChartAreaValid = FALSE; +//UNUSED2008-05 } BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const { @@ -2072,15 +2061,15 @@ BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SC return bChartAreaValid; } -BOOL ScTabViewShell::IsChartDlgEdit() const -{ - return bChartDlgIsEdit; -} - -const String& ScTabViewShell::GetEditChartName() const -{ - return aEditChartName; -} +//UNUSED2008-05 BOOL ScTabViewShell::IsChartDlgEdit() const +//UNUSED2008-05 { +//UNUSED2008-05 return bChartDlgIsEdit; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 const String& ScTabViewShell::GetEditChartName() const +//UNUSED2008-05 { +//UNUSED2008-05 return aEditChartName; +//UNUSED2008-05 } ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings() { diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 30fff7df5c62..d64ac1b21915 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabvwsh5.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.32.1 $ * * This file is part of OpenOffice.org. * @@ -194,10 +194,6 @@ void __EXPORT ScTabViewShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBC { SCCOL nCol = pHint->GetCol(); SCROW nRow = pHint->GetRow(); -#if 0 -// Abfrage ist ueberfluessig, passiert bereits in ScInputHandler StartTable -// if (pDoc->IsSelectionOrBlockEditable( nTab, nCol,nRow, nCol,nRow )) -#endif { HideNoteMarker(); @@ -217,11 +213,6 @@ void __EXPORT ScTabViewShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBC SetEditShell(pView ,TRUE); } } -#if 0 -// else -// if (GetViewData()->IsActive()) -// ErrorMessage(STR_PROTECTIONERR); -#endif } } else if (rHint.ISA(ScTablesHint)) // Tabelle eingefuegt / geloescht diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index bdecdaeb9606..eb1cdf38ff12 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabvwshc.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.32.1 $ * * This file is part of OpenOffice.org. * @@ -72,19 +72,6 @@ #include "simpref.hxx" #include "dpobject.hxx" -// ----------------------------------------------------------------------- - -//! nach document verschieben !!! - -BOOL lcl_IsValueCol( ScDocument* pDoc, SCCOL nCol, SCROW nRow1, SCROW nRow2, SCTAB nTab ) -{ - BOOL bVal = TRUE; - for (SCROW nRow=nRow1; nRow<=nRow2 && bVal; nRow++) - if (pDoc->HasStringData( nCol, nRow, nTab )) - bVal = FALSE; - return bVal; -} - //------------------------------------------------------------------ void ScTabViewShell::SetCurRefDlgId( USHORT nNew ) @@ -267,109 +254,6 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( { GetViewData()->SetRefTabNo( GetViewData()->GetTabNo() ); pResult = new ScDPLayoutDlg( pB, pCW, pParent, *pDialogDPObject ); - -#if 0 - ScDocument* pDoc = GetViewData()->GetDocument(); - SCTAB nTab = 0; - SCCOL nCol1 = 0; - SCCOL nCol2 = 0; - SCROW nRow1 = 0; - SCROW nRow2 = 0; - - ScPivot* pPivot = pDoc->GetPivotAtCursor( - GetViewData()->GetCurX(), - GetViewData()->GetCurY(), - GetViewData()->GetTabNo() ); - ScDPObject* pDPObj = pDoc->GetDPAtCursor( - GetViewData()->GetCurX(), - GetViewData()->GetCurY(), - GetViewData()->GetTabNo() ); - ScPivotParam aPivotParam; - - if ( pPivot ) // befinden wir uns auf einer Pivot-Tabelle? - { - ScArea aArea; - ScQueryParam aQuery; - pPivot->GetParam( aPivotParam, aQuery, aArea ); - pPivot->GetSrcArea( nCol1, nRow1, nCol2, nRow2, nTab); - - // Quelldatenbereich markieren - if ( nTab == GetViewData()->GetTabNo() ) - MarkRange( ScRange( nCol1,nRow1,nTab, nCol2,nRow2,nTab ) ); - } - else if ( pDPObj && pDPObj->IsSheetData() ) - { - // get (old) ScPivotParam - - pDPObj->FillOldParam( aPivotParam ); - ScRange aSource = pDPObj->GetSourceRange(); - nCol1 = aSource.aStart.Col(); - nRow1 = aSource.aStart.Row(); - nCol2 = aSource.aEnd.Col(); - nRow2 = aSource.aEnd.Row(); - nTab = aSource.aStart.Tab(); - - if ( nTab == GetViewData()->GetTabNo() ) - MarkRange( ScRange( nCol1,nRow1,nTab, nCol2,nRow2,nTab ) ); - } - else // neue Pivot-Tabelle erzeugen - { - ScDBData* pDBData = GetDBData(); - String aErrMsg; - - pDBData->GetArea( nTab, nCol1, nRow1, nCol2, nRow2 ); - - - if (nRow2+2 <= MAXROW - 4) // Default-Ausgabebereich - { // min. Tabelle hat 5 Zeilen - aPivotParam.nCol = nCol1; - aPivotParam.nRow = nRow2+2; - aPivotParam.nTab = nTab; - } - else - { - aPivotParam.nCol = 0; - aPivotParam.nRow = 0; - aPivotParam.nTab = MAXTAB+1; - } - - } - - SfxItemSet aArgSet( GetPool(), - SCITEM_PIVOTDATA, - SCITEM_PIVOTDATA ); - - // Ermitteln der Ueberschriften: - String aFieldName; - USHORT nLabelCount = nCol2-nCol1+1; - SCsCOL nCol = nCol1; - BOOL bIsValue = FALSE; - LabelData** aLabelArr = new LabelData*[nLabelCount]; - - for ( USHORT i=0; i<nLabelCount; i++ ) - { - pDoc->GetString( nCol, nRow1, nTab, aFieldName ); - if ( !aFieldName ) - aFieldName = ColToAlpha( nCol ); - bIsValue = lcl_IsValueCol( pDoc, nCol, nRow1+1, nRow2, nTab ); - aLabelArr[i] = new LabelData( aFieldName, nCol, bIsValue ); - nCol++; - } - - aPivotParam.SetLabelData( aLabelArr, nLabelCount ); - aArgSet.Put( ScPivotItem( SCITEM_PIVOTDATA, &aPivotParam ) ); - - // aktuelle Tabelle merken (wg. RefInput im Dialog) - GetViewData()->SetRefTabNo( GetViewData()->GetTabNo() ); - - *pPivotSource = ScArea( nTab, nCol1,nRow1, nCol2,nRow2 ); - pResult = new ScPivotLayoutDlg( pB, pCW, pParent, aArgSet ); - - - for ( USHORT p=0; p<nLabelCount; p++ ) - delete aLabelArr[p]; - delete [] aLabelArr; -#endif } } break; diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 6175827f69da..051f4e5c9f78 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewdata.cxx,v $ - * $Revision: 1.66 $ + * $Revision: 1.65.24.3 $ * * This file is part of OpenOffice.org. * @@ -410,57 +410,57 @@ ScViewData::ScViewData( const ScViewData& rViewData ) CalcPPT(); } -void ScViewData::SetDocShell( ScDocShell* pShell ) -{ - pDocShell = pShell; - pDoc = pDocShell->GetDocument(); - *pOptions = pDoc->GetViewOptions(); - CalcPPT(); -} - void ScViewData::InitData( ScDocument* pDocument ) { pDoc = pDocument; *pOptions = pDoc->GetViewOptions(); } -void ScViewData::InitFrom( const ScViewData* pRef ) -{ - if (pRef==NULL) - { - DBG_ERROR("ScViewData::InitFrom mit NULL"); - return; - } - - aScrSize = pRef->aScrSize; - nTabNo = pRef->nTabNo; - eDefZoomType = pRef->eDefZoomType; - aDefZoomX = pRef->aDefZoomX; - aDefZoomY = pRef->aDefZoomY; - aDefPageZoomX = pRef->aDefPageZoomX; - aDefPageZoomY = pRef->aDefPageZoomY; - bPagebreak = pRef->bPagebreak; - aLogicMode = pRef->aLogicMode; - - SetGridMode ( pRef->IsGridMode() ); - SetSyntaxMode ( pRef->IsSyntaxMode() ); - SetHeaderMode ( pRef->IsHeaderMode() ); - SetTabMode ( pRef->IsTabMode() ); - SetVScrollMode ( pRef->IsVScrollMode() ); - SetHScrollMode ( pRef->IsHScrollMode() ); - SetOutlineMode ( pRef->IsOutlineMode() ); - - for (SCTAB i=0; i<=MAXTAB; i++) - { - delete pTabData[i]; - if (pRef->pTabData[i]) - pTabData[i] = new ScViewDataTable( *pRef->pTabData[i] ); - else - pTabData[i] = NULL; - } - pThisTab = pTabData[nTabNo]; - CalcPPT(); -} +//UNUSED2008-05 void ScViewData::InitFrom( const ScViewData* pRef ) +//UNUSED2008-05 { +//UNUSED2008-05 if (pRef==NULL) +//UNUSED2008-05 { +//UNUSED2008-05 DBG_ERROR("ScViewData::InitFrom mit NULL"); +//UNUSED2008-05 return; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 aScrSize = pRef->aScrSize; +//UNUSED2008-05 nTabNo = pRef->nTabNo; +//UNUSED2008-05 eDefZoomType = pRef->eDefZoomType; +//UNUSED2008-05 aDefZoomX = pRef->aDefZoomX; +//UNUSED2008-05 aDefZoomY = pRef->aDefZoomY; +//UNUSED2008-05 aDefPageZoomX = pRef->aDefPageZoomX; +//UNUSED2008-05 aDefPageZoomY = pRef->aDefPageZoomY; +//UNUSED2008-05 bPagebreak = pRef->bPagebreak; +//UNUSED2008-05 aLogicMode = pRef->aLogicMode; +//UNUSED2008-05 +//UNUSED2008-05 SetGridMode ( pRef->IsGridMode() ); +//UNUSED2008-05 SetSyntaxMode ( pRef->IsSyntaxMode() ); +//UNUSED2008-05 SetHeaderMode ( pRef->IsHeaderMode() ); +//UNUSED2008-05 SetTabMode ( pRef->IsTabMode() ); +//UNUSED2008-05 SetVScrollMode ( pRef->IsVScrollMode() ); +//UNUSED2008-05 SetHScrollMode ( pRef->IsHScrollMode() ); +//UNUSED2008-05 SetOutlineMode ( pRef->IsOutlineMode() ); +//UNUSED2008-05 +//UNUSED2008-05 for (SCTAB i=0; i<=MAXTAB; i++) +//UNUSED2008-05 { +//UNUSED2008-05 delete pTabData[i]; +//UNUSED2008-05 if (pRef->pTabData[i]) +//UNUSED2008-05 pTabData[i] = new ScViewDataTable( *pRef->pTabData[i] ); +//UNUSED2008-05 else +//UNUSED2008-05 pTabData[i] = NULL; +//UNUSED2008-05 } +//UNUSED2008-05 pThisTab = pTabData[nTabNo]; +//UNUSED2008-05 CalcPPT(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void ScViewData::SetDocShell( ScDocShell* pShell ) +//UNUSED2008-05 { +//UNUSED2008-05 pDocShell = pShell; +//UNUSED2008-05 pDoc = pDocShell->GetDocument(); +//UNUSED2008-05 *pOptions = pDoc->GetViewOptions(); +//UNUSED2008-05 CalcPPT(); +//UNUSED2008-05 } ScDocument* ScViewData::GetDocument() const { @@ -579,10 +579,10 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab ) aMarkData.InsertTab( nInsTab ); // ggf. angepasst } -void ScViewData::UpdateOle( ScSplitPos /* eWhich */ ) -{ - GetDocShell()->UpdateOle(this); -} +//UNUSED2008-05 void ScViewData::UpdateOle( ScSplitPos /* eWhich */ ) +//UNUSED2008-05 { +//UNUSED2008-05 GetDocShell()->UpdateOle(this); +//UNUSED2008-05 } void ScViewData::SetViewShell( ScTabViewShell* pViewSh ) { @@ -1681,15 +1681,15 @@ SCROW ScViewData::PrevCellsY( ScVSplitPos eWhichY ) const return CellsAtY( GetPosY( eWhichY ), -1, eWhichY, SC_SIZE_NONE ); } -SCCOL ScViewData::LastCellsX( ScHSplitPos eWhichX ) const -{ - return CellsAtX( MAXCOL+1, -1, eWhichX, SC_SIZE_NONE ); -} - -SCROW ScViewData::LastCellsY( ScVSplitPos eWhichY ) const -{ - return CellsAtY( MAXROW+1, -1, eWhichY, SC_SIZE_NONE ); -} +//UNUSED2008-05 SCCOL ScViewData::LastCellsX( ScHSplitPos eWhichX ) const +//UNUSED2008-05 { +//UNUSED2008-05 return CellsAtX( MAXCOL+1, -1, eWhichX, SC_SIZE_NONE ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 SCROW ScViewData::LastCellsY( ScVSplitPos eWhichY ) const +//UNUSED2008-05 { +//UNUSED2008-05 return CellsAtY( MAXROW+1, -1, eWhichY, SC_SIZE_NONE ); +//UNUSED2008-05 } BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ) { diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 5c390ae9013b..36b2b43b4e81 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewfun2.cxx,v $ - * $Revision: 1.41 $ + * $Revision: 1.40.20.3 $ * * This file is part of OpenOffice.org. * @@ -829,36 +829,36 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData //---------------------------------------------------------------------------- -void ScViewFunc::PaintWidthHeight( BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd ) -{ - SCTAB nTab = GetViewData()->GetTabNo(); - ScDocument* pDoc = GetViewData()->GetDocument(); - - USHORT nParts = PAINT_GRID; - SCCOL nStartCol = 0; - SCROW nStartRow = 0; - SCCOL nEndCol = MAXCOL; // fuer Test auf Merge - SCROW nEndRow = MAXROW; - if ( bColumns ) - { - nParts |= PAINT_TOP; - nStartCol = static_cast<SCCOL>(nStart); - nEndCol = static_cast<SCCOL>(nEnd); - } - else - { - nParts |= PAINT_LEFT; - nStartRow = nStart; - nEndRow = nEnd; - } - if (pDoc->HasAttrib( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, - HASATTR_MERGED | HASATTR_OVERLAPPED )) - { - nStartCol = 0; - nStartRow = 0; - } - GetViewData()->GetDocShell()->PostPaint( nStartCol,nStartRow,nTab, MAXCOL,MAXROW,nTab, nParts ); -} +//UNUSED2008-05 void ScViewFunc::PaintWidthHeight( BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd ) +//UNUSED2008-05 { +//UNUSED2008-05 SCTAB nTab = GetViewData()->GetTabNo(); +//UNUSED2008-05 ScDocument* pDoc = GetViewData()->GetDocument(); +//UNUSED2008-05 +//UNUSED2008-05 USHORT nParts = PAINT_GRID; +//UNUSED2008-05 SCCOL nStartCol = 0; +//UNUSED2008-05 SCROW nStartRow = 0; +//UNUSED2008-05 SCCOL nEndCol = MAXCOL; // fuer Test auf Merge +//UNUSED2008-05 SCROW nEndRow = MAXROW; +//UNUSED2008-05 if ( bColumns ) +//UNUSED2008-05 { +//UNUSED2008-05 nParts |= PAINT_TOP; +//UNUSED2008-05 nStartCol = static_cast<SCCOL>(nStart); +//UNUSED2008-05 nEndCol = static_cast<SCCOL>(nEnd); +//UNUSED2008-05 } +//UNUSED2008-05 else +//UNUSED2008-05 { +//UNUSED2008-05 nParts |= PAINT_LEFT; +//UNUSED2008-05 nStartRow = nStart; +//UNUSED2008-05 nEndRow = nEnd; +//UNUSED2008-05 } +//UNUSED2008-05 if (pDoc->HasAttrib( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, +//UNUSED2008-05 HASATTR_MERGED | HASATTR_OVERLAPPED )) +//UNUSED2008-05 { +//UNUSED2008-05 nStartCol = 0; +//UNUSED2008-05 nStartRow = 0; +//UNUSED2008-05 } +//UNUSED2008-05 GetViewData()->GetDocShell()->PostPaint( nStartCol,nStartRow,nTab, MAXCOL,MAXROW,nTab, nParts ); +//UNUSED2008-05 } //---------------------------------------------------------------------------- diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 798caabec739..57fef68c5f83 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewfun4.cxx,v $ - * $Revision: 1.39 $ + * $Revision: 1.39.32.3 $ * * This file is part of OpenOffice.org. * @@ -338,11 +338,11 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) pDocSh->PostPaintGridAll(); } -// Spelling Checker - Undo ok -void ScViewFunc::DoSpellingChecker( BOOL bRecord ) -{ - DoSheetConversion( ScConversionParam( SC_CONVERSION_SPELLCHECK ), bRecord ); -} +//UNUSED2008-05 // Spelling Checker - Undo ok +//UNUSED2008-05 void ScViewFunc::DoSpellingChecker( BOOL bRecord ) +//UNUSED2008-05 { +//UNUSED2008-05 DoSheetConversion( ScConversionParam( SC_CONVERSION_SPELLCHECK ), bRecord ); +//UNUSED2008-05 } void ScViewFunc::DoHangulHanjaConversion( BOOL bRecord ) { @@ -489,16 +489,16 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR } -IMPL_LINK_INLINE_START( ScViewFunc, SpellError, void *, nLang ) -{ - SvtLanguageTable aLangTab; - String aErr = aLangTab.GetString((LanguageType) (ULONG) nLang); - ErrorHandler::HandleError(*new StringErrorInfo( - ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr) ); - - return 0; -} -IMPL_LINK_INLINE_END( ScViewFunc, SpellError, void *, nLang ) +//UNUSED2008-05 IMPL_LINK_INLINE_START( ScViewFunc, SpellError, void *, nLang ) +//UNUSED2008-05 { +//UNUSED2008-05 SvtLanguageTable aLangTab; +//UNUSED2008-05 String aErr = aLangTab.GetString((LanguageType) (ULONG) nLang); +//UNUSED2008-05 ErrorHandler::HandleError(*new StringErrorInfo( +//UNUSED2008-05 ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr) ); +//UNUSED2008-05 +//UNUSED2008-05 return 0; +//UNUSED2008-05 } +//UNUSED2008-05 IMPL_LINK_INLINE_END( ScViewFunc, SpellError, void *, nLang ) // Pasten von FORMAT_FILE-Items // wird nicht direkt aus Drop aufgerufen, sondern asynchron -> Dialoge sind erlaubt diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 3556fb783372..7860b32a01fe 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewfunc.cxx,v $ - * $Revision: 1.46 $ + * $Revision: 1.44.22.2 $ * * This file is part of OpenOffice.org. * @@ -99,11 +99,11 @@ ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pVi { } -ScViewFunc::ScViewFunc( Window* pParent, const ScViewFunc& rViewFunc, ScTabViewShell* pViewShell ) : - ScTabView( pParent, rViewFunc, pViewShell ), - bFormatValid( FALSE ) -{ -} +//UNUSED2008-05 ScViewFunc::ScViewFunc( Window* pParent, const ScViewFunc& rViewFunc, ScTabViewShell* pViewShell ) : +//UNUSED2008-05 ScTabView( pParent, rViewFunc, pViewShell ), +//UNUSED2008-05 bFormatValid( FALSE ) +//UNUSED2008-05 { +//UNUSED2008-05 } ScViewFunc::~ScViewFunc() { |