diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:20:47 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:41:10 +0200 |
| commit | 37e6631cc5d4147e9d0a4ebefbd0c9d2a8137d24 (patch) | |
| tree | 060cf0aafda3f205b3e12508465a5403826d014d /sc/source/ui/view | |
| parent | ed6b8a100c1aabb342573f252509573bbe124d29 (diff) | |
remove whitespace
Change-Id: Ib15413e73409cc33de01fa92a47b9d1237cfc4b2
Diffstat (limited to 'sc/source/ui/view')
71 files changed, 0 insertions, 408 deletions
diff --git a/sc/source/ui/view/cellmergeoption.cxx b/sc/source/ui/view/cellmergeoption.cxx index db8400bb05f8..42b5862e4248 100644 --- a/sc/source/ui/view/cellmergeoption.cxx +++ b/sc/source/ui/view/cellmergeoption.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "cellmergeoption.hxx" #include "address.hxx" diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index ac091beea9c6..3a9f22d07c51 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -74,7 +74,6 @@ void ScCellShell::InitInterface_Impl() GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CELLS)); } - ScCellShell::ScCellShell(ScViewData* pData) : ScFormatShell(pData), pImpl( new CellShell_Impl() ), @@ -1067,6 +1066,4 @@ void ScCellShell::GetState(SfxItemSet &rSet) } // while ( nWitch ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 5e59b6cac486..233a46f6fd60 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -100,7 +100,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; - void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { ScModule* pScMod = SC_MOD(); @@ -140,7 +139,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // insert / delete cells / rows / columns - case FID_INS_ROW: pTabViewShell->InsertCells(INS_INSROWS); rReq.Done(); @@ -313,10 +311,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // delete contents from cells - case SID_DELETE_CONTENTS: pTabViewShell->DeleteContents( IDF_CONTENTS ); rReq.Done(); @@ -408,10 +404,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // fill... - case FID_FILL_TO_BOTTOM: pTabViewShell->FillSimple( FILL_TO_BOTTOM ); rReq.Done(); @@ -642,7 +636,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } - OUString aStartStr; // suggest default Startvalue only, when just 1 row or column @@ -654,7 +647,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pDoc->GetInputString( nStartCol, nStartRow, nStartTab, aStartStr); pDoc->GetValue( nStartCol, nStartRow, nStartTab, fStartVal ); - if(eFillDir==FILL_TO_BOTTOM && nStartRow < nEndRow ) { pDoc->GetInputString( nStartCol, nStartRow+1, nStartTab, aEndStr); @@ -1017,7 +1009,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // disposal (Outlines) // SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl) - case SID_OUTLINE_HIDE: if ( GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ) ) @@ -1221,7 +1212,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // Clipboard case SID_COPY: // for graphs in DrawShell @@ -1601,10 +1591,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? break; - // other - case FID_INS_ROWBRK: pTabViewShell->InsertPageBreak( false ); rReq.Done(); @@ -2024,7 +2012,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pScMod->SetRefDialog( nId, false ); - } break; @@ -2062,7 +2049,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - case SID_TABOP: if (pReqArgs) { @@ -2433,8 +2419,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - - default: OSL_FAIL("incorrect slot in ExecuteEdit"); break; diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 55fa4be7083d..0375c96731ce 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -1042,7 +1042,6 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) } break; - //in case of Redlining and multiselection disable case SID_SORT_ASCENDING: case SID_SORT_DESCENDING: diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 9a5cd3f2dfee..32912761193e 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -514,7 +514,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - case SID_SELECTALL: { pTabViewShell->SelectAll(); @@ -707,7 +706,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) rReq.Done(); break; - case SID_CELL_FORMAT_RESET: { pTabViewShell->DeleteContents( IDF_HARDATTR | IDF_EDITATTR ); diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx index a2a30f84e48d..5c6640b64408 100644 --- a/sc/source/ui/view/cellsh4.cxx +++ b/sc/source/ui/view/cellsh4.cxx @@ -444,5 +444,4 @@ void ScCellShell::ExecutePage( SfxRequest& rReq ) rReq.Done(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 4356a354111d..3472140c0cb3 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -46,10 +46,8 @@ ScDBFunc::~ScDBFunc() { } - // auxiliary functions - void ScDBFunc::GotoDBArea( const OUString& rDBName ) { ScDocument* pDoc = GetViewData().GetDocument(); @@ -238,10 +236,8 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std:: } } - // main functions - // Sort void ScDBFunc::UISort( const ScSortParam& rSortParam, bool bRecord ) @@ -341,7 +337,6 @@ void ScDBFunc::ToggleAutoFilter() pDBData->SetByRow( true ); //! undo, retrieve beforehand ?? pDBData->GetQueryParam( aParam ); - SCCOL nCol; SCROW nRow = aParam.nRow1; SCTAB nTab = GetViewData().GetTabNo(); diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx index 0e3012a4c712..9a9b32e57fe4 100644 --- a/sc/source/ui/view/dbfunc2.cxx +++ b/sc/source/ui/view/dbfunc2.cxx @@ -41,7 +41,4 @@ void ScDBFunc::UpdateCharts( bool bAllCharts ) ErrorMessage(STR_NOCHARTATCURSOR); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index f60471e57491..09293c01589e 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -86,11 +86,8 @@ using ::std::vector; // STATIC DATA ----------------------------------------------------------- - - // Outliner - // Outline-Gruppierung erzeugen void ScDBFunc::MakeOutline( bool bColumns, bool bRecord ) @@ -359,10 +356,8 @@ void ScDBFunc::HideMarkedOutlines( bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } - // Teilergebnisse - void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, const ScSortParam* pForceNewSort ) { @@ -533,10 +528,8 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, } } - // Consolidate - void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord ) { ScDocShell* pDocShell = GetViewData().GetDocShell(); @@ -544,10 +537,8 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord ) SetTabNo( rParam.nTab, true ); } - // Pivot - static OUString lcl_MakePivotTabName( const OUString& rPrefix, SCTAB nNumber ) { OUString aName = rPrefix + OUString::number( nNumber ); @@ -2068,10 +2059,8 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet pMgr->LeaveListAction(); } - // DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen - void ScDBFunc::RepeatDB( bool bRecord ) { SCCOL nCurX = GetViewData().GetCurX(); diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index b3523335dcb4..08ae2b8c6a88 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -69,7 +69,4 @@ sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bo return nFound; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx index 8bcdc8810fd2..668337aac0da 100644 --- a/sc/source/ui/view/drawutil.cxx +++ b/sc/source/ui/view/drawutil.cxx @@ -24,7 +24,6 @@ #include "global.hxx" #include "viewdata.hxx" - void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, OutputDevice* pDev, @@ -87,5 +86,4 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, rScaleY.ReduceInaccurate( 25 ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx index 3d1b90c81d82..5c4396d5e8aa 100644 --- a/sc/source/ui/view/drawvie2.cxx +++ b/sc/source/ui/view/drawvie2.cxx @@ -21,7 +21,6 @@ // STATIC DATA ----------------------------------------------------------- - // UpdateBrowser in MarkListHasChanged gerufen void ScDrawView::UpdateBrowser() @@ -39,6 +38,4 @@ void ScDrawView::VCRemoveWin( Window* /* pWin */ ) // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index abbb48c92bd2..cfdc4f9f4087 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -217,5 +217,4 @@ void ScDrawView::UpdateIMap( SdrObject* pObj ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index ab48a9ceec16..841d23863e17 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -164,7 +164,6 @@ void getRangeFromDataSource( uno::Reference< chart2::data::XDataSource > xDataSo } } - void getRangeFromErrorBar(const uno::Reference< chart2::XChartDocument > xChartDoc, std::vector<OUString>& rRangeRep) { uno::Reference <chart2::XDiagram > xDiagram = xChartDoc->getFirstDiagram(); @@ -553,5 +552,4 @@ void ScDrawView::SetMarkedOriginalSize() delete pUndoGroup; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 77d7941c63cf..7f4ef96f6ae9 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -566,7 +566,6 @@ bool ScDrawView::SdrBeginTextEdit( return bRet; } - SdrEndTextEditKind ScDrawView::SdrEndTextEdit( bool bDontDeleteReally ) { const SdrEndTextEditKind eRet = FmFormView::SdrEndTextEdit( bDontDeleteReally ); @@ -587,7 +586,6 @@ SdrEndTextEditKind ScDrawView::SdrEndTextEdit( bool bDontDeleteReally ) return eRet; } - void ScDrawView::ModelHasChanged() { SdrObject* pEditObj = GetTextEditObject(); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index fed79b5a8d8a..d79de14e17d5 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -80,7 +80,6 @@ using namespace ::com::sun::star; - TYPEINIT1( ScEditShell, SfxShell ); SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL)) @@ -402,7 +401,6 @@ void ScEditShell::Execute( SfxRequest& rReq ) rReq.AppendItem( aStringItem ); rReq.Done(); - } if (pTopView) @@ -1031,10 +1029,8 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) break; } - // anwenden - EditEngine* pEngine = pEditView->GetEditEngine(); bool bOld = pEngine->GetUpdateMode(); pEngine->SetUpdateMode(false); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 900b21d9b345..f7780135fb93 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -72,7 +72,6 @@ #include "markdata.hxx" #include "markarr.hxx" - #define ScFormatShell #define TableFont #define FormatForSelection @@ -257,7 +256,6 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) return; } - SfxBindings& rBindings = pViewData->GetBindings(); const SfxItemSet* pArgs = rReq.GetArgs(); const sal_uInt16 nSlotId = rReq.GetSlot(); @@ -1251,7 +1249,6 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) } } - void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2162,12 +2159,10 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) SfxItemState eState; // const SfxPoolItem* pItem; - // eigene Kontrolle ueber RadioButton-Funktionalitaet: // Unterstreichung - eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE, true ); if ( eState == SFX_ITEM_DONTCARE ) { @@ -2192,10 +2187,8 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( nId, true ) ); } - // horizontale Ausrichtung - const SvxHorJustifyItem* pHorJustify = NULL; const SvxVerJustifyItem* pVerJustify = NULL; SvxCellVerJustify eVerJustify = SVX_VER_JUSTIFY_STANDARD; @@ -2265,10 +2258,8 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) bJustifyStd = false; } - // vertikale Ausrichtung - nWhich = 0; aBoolItem.SetValue( true ); @@ -2328,7 +2319,6 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) } } - void ScFormatShell::GetBorderState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2560,7 +2550,6 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) } } - void ScFormatShell::ExecuteTextDirection( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 20d2558439a1..f5615b5cb185 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <memory> @@ -422,7 +421,6 @@ static bool lcl_GetHyperlinkCell( return bFound; } - // WB_DIALOGCONTROL noetig fuer UNO-Controls ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ) : Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ), @@ -1925,10 +1923,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta } } - // scenario selection - ScRange aScenRange; if ( rMEvt.IsLeft() && HasScenarioButton( aPos, aScenRange ) ) { @@ -1936,10 +1932,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - // Doppelklick angefangen ? - // StopMarking kann aus DrawMouseButtonDown gerufen werden if ( nMouseStatus != SC_GM_IGNORE && !bRefMode ) @@ -1953,10 +1947,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta nMouseStatus = SC_GM_TABDOWN; } - // Links in Edit-Zellen - bool bAlt = rMEvt.IsMod2(); if ( !bAlt && rMEvt.IsLeft() && GetEditUrl(rMEvt.GetPosPixel()) ) // Klick auf Link: Cursor nicht bewegen @@ -1966,10 +1958,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - // Gridwin - SelectionEngine - if ( rMEvt.IsLeft() ) { ScViewSelectionEngine* pSelEng = pViewData->GetView()->GetSelEngine(); @@ -2187,10 +2177,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) if (bRefMode) pScMod->EndReference(); - // Giesskannen-Modus (Gestalter) - if (pScMod->GetIsWaterCan()) { // Abfrage auf Undo schon oben @@ -2241,10 +2229,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pView->ResetBrushDocument(); // invalidates pBrushDoc pointer } - // double click (only left button) - bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() ); if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN && !pScMod->IsRefDialogOpen() ) { @@ -2326,10 +2312,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) return; } - // Links in edit cells - bool bAlt = rMEvt.IsMod2(); if ( !bAlt && !bRefMode && !bDouble && nMouseStatus == SC_GM_URLDOWN ) { @@ -2411,10 +2395,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } } - // Gridwin - SelectionEngine - // SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return // sal_True for any call, so IsLeft must be checked here, too. @@ -3747,7 +3729,6 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) if ( pViewData->GetDocShell()->IsReadOnly() ) return DND_ACTION_NONE; - sal_Int8 nRet = DND_ACTION_NONE; if (rData.pCellTransfer) @@ -4013,7 +3994,6 @@ static sal_uLong lcl_GetDropLinkId( const uno::Reference<datatransfer::XTransfer return nFormatId; } - sal_Int8 ScGridWindow::ExecutePrivateDrop( const ExecuteDropEvent& rEvt ) { // hide drop marker @@ -4067,7 +4047,6 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos ScRange aDest( nDestPosX, nDestPosY, nThisTab, nDestPosX + nSizeX - 1, nDestPosY + nSizeY - 1, nThisTab ); - /* NOTE: AcceptPrivateDrop() already checked for filtered conditions during * dragging and adapted drawing of the selection frame. We check here * (again) because this may actually also be called from PasteSelection(), @@ -4443,7 +4422,6 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) return rEvt.mnAction; } - SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); @@ -4754,7 +4732,6 @@ void ScGridWindow::GetFocus() if (pViewShell->HasAccessibilityObjects()) pViewShell->BroadcastAccessibility(ScAccGridWinFocusGotHint(eWhich, GetAccessible())); - if ( !SC_MOD()->IsFormulaMode() ) { pViewShell->UpdateInputHandler(); @@ -4779,7 +4756,6 @@ void ScGridWindow::LoseFocus() Window::LoseFocus(); } - bool ScGridWindow::HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex, SCsCOL* pAddX, SCsROW* pAddY) { @@ -5342,7 +5318,6 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, } aLogicEdit.Bottom() = aLogicEdit.Top() + nTextHeight; - Point aLogicClick = PixelToLogic(rPos,aEditMode); if ( aLogicEdit.IsInside(aLogicClick) ) { @@ -5438,7 +5413,6 @@ bool ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang ScRangeList aRanges; aMarks.FillRangeListWithMarks( &aRanges, false ); - size_t nRangeCount = aRanges.size(); for (size_t j=0; j< nRangeCount; ++j) { @@ -5766,7 +5740,6 @@ void ScGridWindow::UpdateCopySourceOverlay() Rectangle aRect( aClipStartScrPos, Size(nSizeXPix, nSizeYPix) ); - Color aHighlight = GetSettings().GetStyleSettings().GetHighlightColor(); Rectangle aLogic = PixelToLogic(aRect, aDrawMode); @@ -5794,10 +5767,8 @@ void ScGridWindow::UpdateCursorOverlay() std::vector<Rectangle> aPixelRects; - // determine the cursor rectangles in pixels (moved from ScGridWindow::DrawCursor) - SCTAB nTab = pViewData->GetTabNo(); SCCOL nX = pViewData->GetCurX(); SCROW nY = pViewData->GetCurY(); @@ -5971,10 +5942,8 @@ void ScGridWindow::UpdateAutoFillOverlay() DeleteAutoFillOverlay(); - // get the AutoFill handle rectangle in pixels - if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() && !pViewData->HasEditView(eWhich) && pViewData->IsActive() ) { @@ -6048,10 +6017,8 @@ void ScGridWindow::UpdateDragRectOverlay() DeleteDragRectOverlay(); - // get the rectangles in pixels (moved from DrawDragRect) - if ( bDragRect || bPagebreakDrawn ) { std::vector<Rectangle> aPixelRects; @@ -6224,10 +6191,8 @@ void ScGridWindow::UpdateShrinkOverlay() DeleteShrinkOverlay(); - // get the rectangle in pixels - Rectangle aPixRect; ScRange aRange; SCTAB nTab = pViewData->GetTabNo(); diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 9c79f0c7372e..6578bd62963d 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -239,7 +239,6 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent& // Data Pilot interaction - void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) { OSL_ENSURE(pDragDPObj, "pDragDPObj missing"); @@ -1052,5 +1051,4 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) pViewData->GetView()->ResetTimer(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 22d9c435527c..e9ac6ca2054a 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <editeng/eeitem.hxx> @@ -44,7 +43,6 @@ #include "unitconv.hxx" #include <svx/svdpage.hxx> - bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt) { bool bRet = false; diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index d31da8a24148..24a6fb54ec07 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -375,10 +375,8 @@ void ScGridWindow::Paint( const Rectangle& rRect ) bIsInPaint = false; } - // Draw ---------------------------------------------------------------- - void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode ) { ScModule* pScMod = SC_MOD(); @@ -859,11 +857,9 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod if ( pNoteMarker ) pNoteMarker->Draw(); // ueber den Cursor, im Drawing-MapMode - // Wenn waehrend des Paint etwas invertiert wurde (Selektion geaendert aus Basic-Macro), // ist das jetzt durcheinandergekommen und es muss neu gemalt werden - OSL_ENSURE(nPaintCount, "nPaintCount falsch"); --nPaintCount; if (!nPaintCount) @@ -1127,7 +1123,6 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, Out nRow = pThisRowInfo->nRowNo; - for (nCol=nX1; nCol<=nX2; nCol++) { CellInfo* pInfo = &pThisRowInfo->pCellInfo[nCol+1]; diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index a85a5497549d..bed697b2db5b 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -54,7 +54,6 @@ #include "global.hxx" #include "globstr.hrc" - bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) { bool bDone = false; @@ -383,7 +382,6 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) aHelpText = aClickHlinkStr + aHelpText; } - ScDocument* pDoc = pViewData->GetDocument(); SCsCOL nPosX; SCsROW nPosY; diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 44643d60062b..40997f2da53e 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -413,11 +413,9 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) } } - // loop through entries several times to avoid changing the line color too often // and to allow merging of lines - ScGridMerger aGrid( this, 1, 1 ); // start at SC_HDRPAINT_BOTTOM instead of 0 - selection doesn't get different @@ -934,10 +932,8 @@ void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp(rHEvt); } - // Dummys fuer virtuelle Methoden - SCCOLROW ScHeaderControl::GetHiddenCount( SCCOLROW nEntryNo ) const { SCCOLROW nHidden = 0; diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index 9c670b83d648..e07cd4aa0b4d 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -64,12 +64,10 @@ ScHintWindow::ScHintWindow( Window* pParent, const OUString& rTit, const OUStrin SetOutputSizePixel( aWinSize ); } - ScHintWindow::~ScHintWindow() { } - void ScHintWindow::Paint( const Rectangle& /* rRect */ ) { SetFont( aHeadFont ); diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx index 959ada7a33ba..9ef97dca4298 100644 --- a/sc/source/ui/view/imapwrap.cxx +++ b/sc/source/ui/view/imapwrap.cxx @@ -57,5 +57,4 @@ const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ) return pDlg->GetImageMap(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index 01f960010ac2..8ac68bffeec5 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.cxx @@ -44,7 +44,6 @@ void ScInvertMerger::Flush() // also join vertically if there are non-adjacent columns involved - size_t nComparePos = 0; while ( nComparePos < pRects->size() ) { @@ -161,5 +160,4 @@ void ScInvertMerger::AddRect( const Rectangle& rRect ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index faec9a910545..f7171048f552 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdoutl.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> @@ -187,5 +186,4 @@ void ScNoteMarker::InvalidateWin() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index be76dde7a1b1..165e488d8cf3 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -900,7 +900,6 @@ void ScOutlineWindow::LoseFocus() Window::LoseFocus(); } - // mouse ---------------------------------------------------------------------- void ScOutlineWindow::StartMouseTracking( size_t nLevel, size_t nEntry ) @@ -969,7 +968,6 @@ void ScOutlineWindow::MouseButtonDown( const MouseEvent& rMEvt ) } } - // keyboard ------------------------------------------------------------------- void ScOutlineWindow::KeyInput( const KeyEvent& rKEvt ) @@ -1019,5 +1017,4 @@ void ScOutlineWindow::KeyInput( const KeyEvent& rKEvt ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx index 17e98b13a90b..c96ee1b4528d 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.cxx @@ -45,6 +45,4 @@ void DeActivateOlk( ScViewData* /* pViewData */ ) // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 5fd547f15a19..a3f0a7c0abb3 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -84,7 +84,6 @@ static const ColorData nAuthorColor[ SC_AUTHORCOLORCOUNT ] = { COL_GREEN, COL_RED, COL_BLUE, COL_BROWN, COL_MAGENTA, COL_CYAN }; - // Helper class for color assignment to avoid repeated lookups for the same user ScActionColorChanger::ScActionColorChanger( const ScChangeTrack& rTrack ) : @@ -141,7 +140,6 @@ void ScActionColorChanger::Update( const ScChangeAction& rAction ) } } - ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, ScTableInfo& rTabInfo, ScDocument* pNewDoc, SCTAB nNewTab, long nNewScrX, long nNewScrY, @@ -700,7 +698,6 @@ static const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCR return pBackground; } - static bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther, SCCOL nX1, SCCOL nX2, bool bShowProt, bool bPagebreakMode ) { @@ -1249,7 +1246,6 @@ void ScOutputData::DrawClear() } } - // Lines long lclGetSnappedX( OutputDevice& rDev, long nPosX, bool bSnapPixel ) @@ -1313,7 +1309,6 @@ void ScOutputData::DrawFrame() } long nLayoutSign = bLayoutRTL ? -1 : 1; - // *** set column and row sizes of the frame border array *** svx::frame::Array& rArray = mrTabInfo.maArray; @@ -1389,7 +1384,6 @@ void ScOutputData::DrawFrame() mpDev->SetDrawMode(nOldDrawMode); } - // Line below the cell static const ::editeng::SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, @@ -1445,7 +1439,6 @@ static const ::editeng::SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, return pNextTop; } - static long lcl_getRotate( ScDocument* pDoc, SCTAB nTab, SCCOL nX, SCROW nY ) { long nRotate = 0; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 9381ffeee91e..1493e34c341b 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -82,7 +82,6 @@ const sal_uInt16 SC_SHRINKAGAIN_MAX = 7; // STATIC DATA ----------------------------------------------------------- - class ScDrawStringsVars { ScOutputData* pOutput; // Verbindung @@ -392,11 +391,9 @@ void ScDrawStringsVars::SetPattern( aMetric = pFmtDevice->GetFontMetric(); - // Wenn auf dem Drucker das Leading 0 ist, gibt es Probleme // -> Metric vom Bildschirm nehmen (wie EditEngine!) - if ( pFmtDevice->GetOutDevType() == OUTDEV_PRINTER && aMetric.GetIntLeading() == 0 ) { OutputDevice* pDefaultDev = Application::GetDefaultDevice(); @@ -822,10 +819,8 @@ double ScOutputData::GetStretch() } } - // output strings - static void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, ScRefCellValue& rCell ) { vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() ); @@ -1236,7 +1231,6 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY // construct the rectangles using logical left/right values (justify is called at the end) - // rAlignRect is the single cell or merged area, used for alignment. rParam.maAlignRect.Left() = nCellPosX; @@ -1494,10 +1488,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bool bDoCell = false; bool bNeedEdit = false; - // Part of a merged cell? - bool bOverlapped = (pInfo->bHOverlapped || pInfo->bVOverlapped); if ( bOverlapped ) { @@ -1516,10 +1508,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bMergeEmpty = true; } - // Rest of a long text further to the left? - if ( bEmpty && !bMergeEmpty && nX < nX1 && !bOverlapped ) { SCCOL nTempX=nX1; @@ -1535,10 +1525,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) } } - // Rest of a long text further to the right? - if ( bEmpty && !bMergeEmpty && nX == nX2 && !bOverlapped ) { // don't have to look further than nLastContentCol @@ -1556,17 +1544,13 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) } } - // normal visible cell - if (!bEmpty) bDoCell = true; - // don't output the cell that's being edited - if ( bDoCell && bEditMode && nCellX == nEditCol && nCellY == nEditRow ) bDoCell = false; @@ -1579,10 +1563,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bDoCell = false; } - // output the cell text - ScRefCellValue aCell; if (bDoCell) { @@ -1878,10 +1860,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bVClip = true; } - // horizontalen Platz testen - bool bRightAdjusted = false; // to correct text width calculation later bool bNeedEditEngine = false; if ( !bNeedEditEngine && !bOutside ) @@ -2227,7 +2207,6 @@ static long lcl_GetEditSize( EditEngine& rEngine, bool bWidth, bool bSwap, long return rEngine.GetTextHeight(); } - void ScOutputData::ShrinkEditEngine( EditEngine& rEngine, const Rectangle& rAlignRect, long nLeftM, long nTopM, long nRightM, long nBottomM, bool bWidth, sal_uInt16 nOrient, long nAttrRotate, bool bPixelToLogic, @@ -2787,10 +2766,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.mbBreak) { @@ -2822,10 +2799,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - // default alignment for asian vertical mode is top-right if ( rParam.mbAsianVertical && rParam.meVerJust == SVX_VER_JUSTIFY_STANDARD ) rParam.meVerJust = SVX_VER_JUSTIFY_TOP; @@ -2847,10 +2822,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3290,10 +3263,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.mbBreak) { @@ -3315,10 +3286,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3336,10 +3305,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3556,10 +3523,8 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.hasLineBreak()) { @@ -3581,10 +3546,8 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3602,10 +3565,8 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3829,10 +3790,8 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width @@ -3862,10 +3821,8 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3883,10 +3840,8 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -4191,10 +4146,8 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width @@ -4224,10 +4177,8 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - // default alignment for asian vertical mode is top-right if ( rParam.meVerJust == SVX_VER_JUSTIFY_STANDARD ) rParam.meVerJust = SVX_VER_JUSTIFY_TOP; @@ -4249,10 +4200,8 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -4668,7 +4617,6 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax) nRotMax = pRowInfo[nRotY].nRotMaxCol; - ScModule* pScMod = SC_MOD(); sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; bool bCellContrast = mbUseStyleColor && diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index f949c9dd90c1..4cdcd5017ed9 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -247,5 +247,4 @@ void ScOutputData::DrawingSingle(const sal_uInt16 nLayer) DrawSelectiveObjects( nLayer ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx index 404d4dc3a1c1..556cd2f42935 100644 --- a/sc/source/ui/view/pfuncache.cxx +++ b/sc/source/ui/view/pfuncache.cxx @@ -189,5 +189,4 @@ long ScPrintFuncCache::GetDisplayStart( SCTAB nTab ) const return nDisplayStart; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index d98f8e9ba24c..8f2e7da70792 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -58,10 +58,8 @@ ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) : SetName(OUString("PageBreak")); } - ScPageBreakShell::~ScPageBreakShell() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index cc9f8eb2b00e..a642991cbabd 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -20,7 +20,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <svtools/colorcfg.hxx> #include <svx/fmview.hxx> #include <editeng/sizeitem.hxx> @@ -84,7 +83,6 @@ static long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, std::vector<long> return nDisplayStart; } - ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ) : Window( pParent ), nPageNo( 0 ), @@ -143,7 +141,6 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pView nRight[i] = 0; // initialized with actual positions when markers are drawn } - ScPreview::~ScPreview() { delete pDrawView; @@ -184,7 +181,6 @@ void ScPreview::UpdateDrawView() // nTab must be right } } - void ScPreview::TestLastPage() { if (nPageNo >= nTotalPages) @@ -219,7 +215,6 @@ void ScPreview::TestLastPage() } } - void ScPreview::CalcPages() { WaitObject aWait( this ); @@ -298,7 +293,6 @@ void ScPreview::CalcPages() DoInvalidate(); } - void ScPreview::RecalcPages() // only nPageNo is changed { if (!bValid) @@ -341,7 +335,6 @@ void ScPreview::RecalcPages() // only nPageNo is changed DoInvalidate(); } - void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) { if (!bValid) @@ -653,7 +646,6 @@ void ScPreview::Command( const CommandEvent& rCEvt ) Window::Command( rCEvt ); } - void ScPreview::KeyInput( const KeyEvent& rKEvt ) { // The + and - keys can't be configured as accelerator entries, so they must be handled directly @@ -682,7 +674,6 @@ void ScPreview::KeyInput( const KeyEvent& rKEvt ) Window::KeyInput(rKEvt); } - const ScPreviewLocationData& ScPreview::GetLocationData() { if ( !pLocationData ) @@ -699,7 +690,6 @@ const ScPreviewLocationData& ScPreview::GetLocationData() return *pLocationData; } - void ScPreview::DataChanged(bool bNewTime) { if (bNewTime) @@ -713,7 +703,6 @@ void ScPreview::DataChanged(bool bNewTime) Invalidate(); } - OUString ScPreview::GetPosString() { if (!bValid) @@ -731,7 +720,6 @@ OUString ScPreview::GetPosString() return aString; } - void ScPreview::SetZoom(sal_uInt16 nNewZoom) { if (nNewZoom < 20) @@ -760,7 +748,6 @@ void ScPreview::SetZoom(sal_uInt16 nNewZoom) } } - void ScPreview::SetPageNo( long nPage ) { nPageNo = nPage; @@ -770,7 +757,6 @@ void ScPreview::SetPageNo( long nPage ) Invalidate(); } - long ScPreview::GetFirstPage(SCTAB nTabP) { SCTAB nDocTabCount = pDocShell->GetDocument().GetTableCount(); @@ -797,7 +783,6 @@ long ScPreview::GetFirstPage(SCTAB nTabP) return nPage; } - static Size lcl_GetDocPageSize( ScDocument* pDoc, SCTAB nTab ) { OUString aName = pDoc->GetPageStyle( nTab ); @@ -815,7 +800,6 @@ static Size lcl_GetDocPageSize( ScDocument* pDoc, SCTAB nTab ) } } - sal_uInt16 ScPreview::GetOptimalZoom(bool bWidthOnly) { double nWinScaleX = ScGlobal::nScreenPPTX / pDocShell->GetOutputFactor(); @@ -850,7 +834,6 @@ sal_uInt16 ScPreview::GetOptimalZoom(bool bWidthOnly) return nZoom; } - void ScPreview::SetXOffset( long nX ) { if ( aOffset.X() == nX ) @@ -877,7 +860,6 @@ void ScPreview::SetXOffset( long nX ) Paint(Rectangle()); } - void ScPreview::SetYOffset( long nY ) { if ( aOffset.Y() == nY ) @@ -904,7 +886,6 @@ void ScPreview::SetYOffset( long nY ) Paint(Rectangle()); } - void ScPreview::DoInvalidate() { // If the whole GetState of the shell is called @@ -1076,7 +1057,6 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) { SetPointer( Pointer( POINTER_ARROW ) ); - ScDocument& rDoc = pDocShell->GetDocument(); OUString aOldName = rDoc.GetPageStyle( nTab ); bool bUndo = rDoc.IsUndoEnabled(); diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 08ced7a6c71d..7da573bbbe1f 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/outdev.hxx> #include "prevloc.hxx" @@ -278,7 +277,6 @@ static ScPreviewLocationEntry* lcl_GetEntryByAddress( const boost::ptr_list<ScPr return NULL; } - Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const { const double nScaleX = HMM_PER_TWIPS; @@ -535,10 +533,8 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev } } - // get column info - SCCOL nColCount = 0; SCCOL nCol; if ( bHasHeaderCol ) @@ -605,10 +601,8 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev else rInfo.SetColInfo( 0, NULL ); - // get row info - SCROW nRowCount = 0; if ( bHasHeaderRow ) ++nRowCount; @@ -674,10 +668,8 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev else rInfo.SetRowInfo( 0, NULL ); - // limit to visible area - rInfo.SetTab( nTab ); rInfo.LimitToArea( rVisiblePixel ); } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index a1ad80126ae1..691d2b0b17a6 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -267,7 +267,6 @@ void ScPreviewShell::UpdateNeededScrollBars( bool bFromZoom ) long aHeightOffSet = pDevice ? pDevice->PixelToLogic( Size( nBarW, nBarH ), pPreview->GetMapMode() ).Height() : 0; long aWidthOffSet = aHeightOffSet; - if (!GetPageSize( aPageSize )) return; @@ -1205,5 +1204,4 @@ ScDocument& ScPreviewShell::GetDocument() return pDocShell->GetDocument(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index f33443f49ac0..136c797939b2 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -70,6 +70,4 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) pPreview->DataChanged(true); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 9362c0838244..129486f07c0b 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -312,7 +312,6 @@ void ScPrintFunc::GetPrintState( ScPrintState& rState ) rState.nDocPages = nDocPages; } - bool ScPrintFunc::GetLastSourceRange( ScRange& rRange ) const { rRange = aLastSourceRange; @@ -391,7 +390,6 @@ static void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 ) } } - // output to Device (static) // // us used for: @@ -592,10 +590,8 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr aOutputData.PostPrintDrawingLayer(aMMOffset); // #i74768# } - // Printing - static void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet ) { // nDistance must be initialized differently before @@ -854,7 +850,6 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) } lcl_FillHFParam( aFtr, pFooterSet ); - // Compile Table-/Area-Params from single Items // TabPage "Table" @@ -934,10 +929,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) aTableParam.bForceBreaks = pOptions && pOptions->GetForceBreaks(); - // TabPage "Parts": - //! walk throuch all PrintAreas of the table !!! const ScRange* pPrintArea = pDoc->GetPrintRange( nPrintTab, 0 ); const ScRange* pRepeatCol = pDoc->GetRepeatColRange( nPrintTab ); @@ -1020,10 +1013,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) nRepeatStartRow = nRepeatEndRow = SCROW_REPEAT_NONE; } - // Split pages - if (!bState) { nTabPages = CountPages(); // also calculates zoom @@ -1943,7 +1934,6 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, bool bDoPrint, ScPr (long)(aPageSize.Height() * nScaleY * 100 / nZoom)))); } - // adjust aPageRect for left/right page Rectangle aTempRect = Rectangle( Point(), aPageSize ); @@ -2013,7 +2003,6 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO (long)(aPageSize.Height() * nScaleY * 100 / nZoom)))); } - // adjust aPageRect for left/right page Rectangle aTempRect = Rectangle( Point(), aPageSize ); @@ -2373,11 +2362,9 @@ void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects() aTableParam.bNullVals = false; } - // UpdatePages is only called from outside to set the breaks correctly for viewing // - always without UserArea - bool ScPrintFunc::UpdatePages() { if (!pParamSet) @@ -2581,10 +2568,8 @@ void ScPrintFunc::ApplyPrintSettings() // Configure Printer to Printing - Size aEnumSize = aPageSize; - pPrinter->SetOrientation( bLandscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT ); if ( bLandscape ) { @@ -2612,7 +2597,6 @@ void ScPrintFunc::ApplyPrintSettings() } } - // rPageRanges = range for all tables // nStartPage = rPageRanges starts at nStartPage // nDisplayStart = continuous number for displaying the page number @@ -3011,11 +2995,9 @@ void ScPrintFunc::CalcPages() // calculates aPageRect and pages fr maPageRows.resize(nRealCnt+1, ScPageRowEntry()); } - // Page alignment/splitting after breaks in Col/RowFlags // Of several breaks in a hidden area, only one counts. - nPagesX = 0; nPagesY = 0; nTotalY = 0; diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 3d1481cacf5c..6d2bca2183f3 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -123,10 +123,8 @@ IMPL_CHILD_CTOR( ScPrintAreasDlgWrapper, SID_OPENDLG_EDIT_PRINTAREA ) IMPL_CHILD_CTOR( ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION ) - // ScSimpleRefDlgWrapper - static bool bScSimpleRefFlag; static long nScSimpleRefHeight; static long nScSimpleRefWidth; @@ -182,7 +180,6 @@ void ScSimpleRefDlgWrapper::SetDefaultPosSize(Point aPos, Size aSize, bool bSet) } } - void ScSimpleRefDlgWrapper::SetAutoReOpen(bool bFlag) { bAutoReOpen=bFlag; @@ -229,10 +226,8 @@ void ScSimpleRefDlgWrapper::StartRefInput() } } - // ScAcceptChgDlgWrapper //FIXME: should be moved into ViewShell - ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, @@ -265,13 +260,10 @@ void ScAcceptChgDlgWrapper::ReInitDlg() } } - // ScHighlightChgDlgWrapper - IMPL_CHILD_CTOR( ScHighlightChgDlgWrapper, FID_CHG_SHOW ) - namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ) diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 602f9fbd26ea..0bd7d90c9561 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -23,7 +23,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <editeng/langitem.hxx> #include <editeng/editobj.hxx> #include <editeng/editview.hxx> diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index 67fabedf2a4f..80419ee58acd 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -31,7 +31,6 @@ ScTabSplitter::ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pD EnableRTL( false ); } - ScTabSplitter::~ScTabSplitter() { } @@ -72,7 +71,6 @@ void ScTabSplitter::Splitting( Point& rSplitPos ) rSplitPos.Y() = aNew.Y(); } - void ScTabSplitter::SetFixed(bool bSet) { bFixed = bSet; diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 88d623b95570..aafd1144d333 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -141,7 +141,6 @@ void ScCornerButton::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } - void ScCornerButton::Resize() { Invalidate(); @@ -235,7 +234,6 @@ ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pView Init(); } - void ScTabView::InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ) { rScrollBar.SetRange( Range( 0, nMaxVal ) ); @@ -540,10 +538,8 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) else nBarX = nBarY = 0; - // Splitter auswerten - long nLeftSize = nSizeX; long nRightSize = 0; long nTopSize = 0; @@ -654,7 +650,6 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) pRowBar[SC_SPLIT_BOTTOM]->Hide(); } - // Grid-Windows if (bInner) @@ -677,10 +672,8 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) Point(nSplitPosX,nPosY), Size(nRightSize,nTopSize), nTotalWidth, bLayoutRTL ); } - // Scrollbars updaten - if (!bInUpdateHeader) { UpdateScrollBars(); // Scrollbars nicht beim Scrollen neu setzen @@ -858,7 +851,6 @@ double ScTabView::GetRelTabBarWidth() const return 0.0; } - ScGridWindow* ScTabView::GetActiveWin() { ScSplitPos ePos = aViewData.GetActivePart(); @@ -873,7 +865,6 @@ void ScTabView::SetActivePointer( const Pointer& rPointer ) pGridWin[i]->SetPointer( rPointer ); } - void ScTabView::ActiveGrabFocus() { ScSplitPos ePos = aViewData.GetActivePart(); @@ -881,7 +872,6 @@ void ScTabView::ActiveGrabFocus() pGridWin[ePos]->GrabFocus(); } - ScSplitPos ScTabView::FindWindow( Window* pWindow ) const { ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT; // Default @@ -1417,10 +1407,8 @@ void ScTabView::UpdateShow() if ( aViewData.GetDocShell()->IsPreview() ) bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode = bHOutline = bVOutline = false; - // Windows anlegen - if (bShowH && !pGridWin[SC_SPLIT_BOTTOMRIGHT]) { pGridWin[SC_SPLIT_BOTTOMRIGHT] = new ScGridWindow( pFrameWin, &aViewData, SC_SPLIT_BOTTOMRIGHT ); @@ -1454,10 +1442,8 @@ void ScTabView::UpdateShow() pRowBar[SC_SPLIT_TOP] = new ScRowBar( pFrameWin, &aViewData, SC_SPLIT_TOP, &aHdrFunc, pHdrSelEng ); - // Windows anzeigen - ShowHide( &aHScrollLeft, bHScrollMode ); ShowHide( &aHScrollRight, bShowH && bHScrollMode ); ShowHide( &aVScrollBottom, bVScrollMode ); @@ -1483,7 +1469,6 @@ void ScTabView::UpdateShow() ShowHide( pColBar[SC_SPLIT_RIGHT], bShowH && bHeader ); ShowHide( pRowBar[SC_SPLIT_TOP], bShowV && bHeader ); - //! neue Gridwindows eintragen } diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 54b0ec871946..93452fd1d844 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <editeng/eeitem.hxx> #include <vcl/timer.hxx> diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 9589c102fa73..7053037e60a3 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -21,7 +21,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <editeng/brushitem.hxx> #include <editeng/editview.hxx> #include <svx/fmshell.hxx> @@ -94,10 +93,8 @@ ScRange lcl_getSubRangeByIndex( const ScRange& rRange, sal_Int32 nIndex ) using namespace com::sun::star; - // --- Public-Funktionen - void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, bool bControl ) { ScDocument* pDoc = aViewData.GetDocument(); @@ -675,7 +672,6 @@ void ScTabView::RemoveHintWindow() mpInputHintWindow.reset(); } - // find window that should not be over the cursor static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) { @@ -708,17 +704,14 @@ static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) return NULL; } - // Bildschirm an Cursorposition anpassen - void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, const ScSplitPos* pWhich ) { // aktiven Teil umschalten jetzt hier - ScSplitPos eActive = aViewData.GetActivePart(); ScHSplitPos eActiveX = WhichH(eActive); ScVSplitPos eActiveY = WhichV(eActive); @@ -737,10 +730,8 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, eActiveY = SC_SPLIT_BOTTOM; } - // eigentliches Align - if ( eMode != SC_FOLLOW_NONE ) { ScSplitPos eAlign; @@ -771,7 +762,6 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, // VisibleCellsY == CellsAtY( GetPosY( eWhichY ), 1, eWhichY ) - // falls z.B. Suchen-Dialog offen ist, Cursor nicht hinter den Dialog stellen // wenn moeglich, die Zeile mit dem Cursor oberhalb oder unterhalb des Dialogs @@ -839,7 +829,6 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, } } - SCsCOL nNewDeltaX = nDeltaX; SCsROW nNewDeltaY = nDeltaY; bool bDoLine = false; @@ -943,10 +932,8 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, if ( nNewDeltaY != nDeltaY ) ScrollY( nNewDeltaY - nDeltaY, eAlignY ); } - // nochmal aktiven Teil umschalten - if (bHFix) if (eActiveX == SC_SPLIT_RIGHT && nCurX < (SCsCOL)aViewData.GetFixPosX()) { @@ -981,10 +968,8 @@ bool ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt ) return bRet; } - // MoveCursor - mit Anpassung des Bildausschnitts - void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, bool bShift, bool bControl, bool bKeepOld, bool bKeepSel ) { @@ -1250,7 +1235,6 @@ void ScTabView::MoveCursorEnter( bool bShift ) // bShift -> hoch/runter } } - bool ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) { const KeyCode& rKCode = rKeyEvent.GetKeyCode(); @@ -1325,7 +1309,6 @@ bool ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) return false; } - // naechste/vorherige nicht geschuetzte Zelle void ScTabView::FindNextUnprot( bool bShift, bool bInSelection ) { @@ -1539,7 +1522,6 @@ void ScTabView::SelectNextTab( short nDir, bool bExtendSelection ) PaintExtras(); } - // SetTabNo - angezeigte Tabelle void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSameTabButMoved ) @@ -1769,10 +1751,8 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa } } - // Paint-Funktionen - nur fuer diese View - void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow ) { DrawDeselectAll(); @@ -2282,7 +2262,6 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ) } } - // PaintLeft - linke Kontrollelemente neu zeichnen void ScTabView::PaintLeft() diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index e5370806c354..2f72a20a53be 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -33,10 +33,8 @@ extern sal_uInt16 nScFillModeMouseModifier; // global.cxx // STATIC DATA ----------------------------------------------------------- - // --- Referenz-Eingabe / Fill-Cursor - void ScTabView::HideTip() { if ( nTipVisible ) @@ -496,6 +494,4 @@ void ScTabView::InterpretVisible() CheckNeedsRepaint(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 563bd2cf5657..e553fc1b0891 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -55,7 +55,6 @@ using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- - void ScTabView::Init() { /* RTL layout of the view windows is done manually, because it depends on @@ -646,5 +645,4 @@ void ScTabView::ResetBrushDocument() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 064c120a2f9c..197e952b1ef0 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -95,11 +95,9 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) return; } - // Pseudo-Slots von Draw-Toolbox auswerten //! wird das ueberhaupt noch gebraucht ????? - if (nNewId == SID_INSERT_DRAW && pArgs) { const SfxPoolItem* pItem; diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 8e7b24e4e642..21a8a21a4853 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -476,7 +476,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case SID_ATTR_SIZE://XXX ??? break; - case SID_PRINTPREVIEW: { if ( !pThisFrame->GetFrame().IsInPlace() ) // nicht bei OLE @@ -558,7 +557,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - case FID_TOGGLESYNTAX: { bool bSet = !GetViewData().IsSyntaxMode(); @@ -858,7 +856,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - case SID_OUTLINE_DELETEALL: RemoveAllOutlines(); rReq.Done(); @@ -869,7 +866,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rReq.Done(); break; - case SID_WINDOW_SPLIT: { ScSplitMode eHSplit = GetViewData().GetHSplitMode(); @@ -1027,7 +1023,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - case FID_PROTECT_TABLE: { ScDocument* pDoc = GetViewData().GetDocument(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 6067ac1600b1..ed254f05b2d6 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -862,7 +862,6 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, bool bForce) pPageBreakShell->SetRepeatTarget( &aTarget ); } - if ( eOST!=eCurOST || bForce ) { bool bCellBrush = false; // "format paint brush" allowed for cells @@ -1059,7 +1058,6 @@ IMPL_LINK_NOARG(ScTabViewShell, FormControlActivated) return 0; } - // GetMySubShell / SetMySubShell: altes Verhalten simulieren, // dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells) @@ -1082,7 +1080,6 @@ SfxShell* ScTabViewShell::GetMySubShell() const return NULL; // keine von meinen dabei } - bool ScTabViewShell::IsDrawTextShell() const { return ( pDrawTextShell && ( GetMySubShell() == pDrawTextShell ) ); @@ -1567,7 +1564,6 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) pAccessibilityBroadcaster(NULL), \ mbInSwitch(false) - void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) { SfxApplication* pSfxApp = SFX_APP(); @@ -1766,9 +1762,6 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) SetBorderPixel( aBorder ); } - - - ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, SfxViewShell* pOldSh ) : SfxViewShell( pViewFrame, SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), @@ -1921,7 +1914,6 @@ ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings() return pNavSettings; } - void ScTabViewShell::ExecTbx( SfxRequest& rReq ) { const SfxItemSet* pReqArgs = rReq.GetArgs(); diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 43bd5976df8b..53223c4e5853 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -389,7 +389,4 @@ void ScTabViewShell::UpdateNumberFormatter( } } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx index 9b348188d49c..927527094ef9 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.cxx @@ -23,7 +23,6 @@ #include "tabvwsh.hxx" #include "document.hxx" - void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine ) { if ( pLine ) @@ -79,5 +78,4 @@ void ScTabViewShell::UIDeactivated( SfxInPlaceClient* pClient ) SfxViewShell::UIDeactivated( pClient ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 83d7530a49d8..6283fd772efa 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -98,7 +98,6 @@ void ScTabViewShell::GetGalleryState( SfxItemSet& /* rSet */ ) { } - OUString ScTabViewShell::GetDescription() const { return OUString(" ** Test ** "); @@ -218,5 +217,4 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index c01343fe3ff2..0d90705a650f 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -143,7 +143,6 @@ bool ScTabViewShell::GetFunction( OUString& rFuncStr, sal_uInt16 nErrCode ) // FID_DELETE_CELL // FID_VALIDATION - void ScTabViewShell::GetState( SfxItemSet& rSet ) { ScViewData& rViewData = GetViewData(); @@ -455,7 +454,6 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) } // while ( nWitch ) } - void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName) { ScDocument* pDoc = GetViewData().GetDocument(); @@ -795,5 +793,4 @@ void ScTabViewShell::GetDrawOptState( SfxItemSet& rSet ) rSet.Put( aBool ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 6db2356d9130..b3fb6a345b34 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -492,7 +492,6 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet) } } - void ScTabViewShell::ExecuteUndo(SfxRequest& rReq) { SfxShell* pSh = GetViewData().GetDispatcher().GetShell(0); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 99da797cda2e..35a6089c9ee3 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -444,7 +444,6 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( } break; - default: OSL_FAIL( "ScTabViewShell::CreateRefDialog: unbekannte ID" ); break; diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx index 828b3e0fd8b5..22be8e158d5e 100644 --- a/sc/source/ui/view/tabvwshd.cxx +++ b/sc/source/ui/view/tabvwshd.cxx @@ -30,7 +30,6 @@ #include "sc.hrc" #include <gridwin.hxx> - // STATIC DATA ----------------------------------------------------------- //! Parent-Window fuer Dialoge @@ -69,6 +68,4 @@ Window* ScTabViewShell::GetDialogParent() return GetActiveWin(); // for normal views, too } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 6904328d25d4..5a58806d589f 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -345,7 +345,4 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) } } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 06701689f913..5a6725663839 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <boost/scoped_ptr.hpp> #include "scitems.hxx" @@ -386,7 +385,6 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { aName = pDlg->GetInputString(); - switch ( nSlot ) { case FID_TAB_APPEND: @@ -506,7 +504,6 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) ScMarkData& rMark = GetViewData().GetMarkData(); SCTAB nTabSelCount = rMark.GetSelectCount(); - if(nTableCount==nTabSelCount) { pDlg->SetForceCopyTable(); @@ -911,5 +908,4 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index e38b495f9fe7..1f61bdfb509c 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -114,5 +114,4 @@ void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rUR pDrView->InsertObjectSafe( pObj, *pDrView->GetSdrPageView() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 5ce836ce3b64..4ece0051951a 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -269,5 +269,4 @@ bool ScTabViewShell::ExecuteRetypePassDlg(ScPasswordHash eDesiredHash) return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index a1a5c709ff98..95fadbac6fad 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -725,7 +725,6 @@ void ScViewData::SetPagebreakMode( bool bSet ) RefreshZoom(); } - ScMarkType ScViewData::GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const { ScMarkType eMarkType = SC_MARK_NONE; @@ -755,7 +754,6 @@ ScMarkType ScViewData::GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) return eMarkType; } - ScMarkType ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab, SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const { @@ -2221,7 +2219,6 @@ void ScViewData::WriteUserData(OUString& rData) cTabSep = OUString(SC_NEW_TABSEP); // in order to not kill a 3.1-version } - rData += OUString::number( maTabData[i]->nCurX ) + cTabSep + OUString::number( maTabData[i]->nCurY ) + cTabSep + OUString::number( maTabData[i]->eHSplitMode ) + cTabSep + diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 3a9724ccef62..5cdb61095d98 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -100,7 +100,6 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ); // STATIC DATA --------------------------------------------------------------- - bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -160,7 +159,6 @@ bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) return bAnyChanged; } - bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -198,7 +196,6 @@ bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) return bChanged; } - enum ScAutoSum { ScAutoSumNone = 0, @@ -206,7 +203,6 @@ enum ScAutoSum ScAutoSumSum }; - static ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, ScDirection eDir, SCCOLROW& nExtend ) { @@ -229,7 +225,6 @@ static ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, return ScAutoSumNone; } - #define SC_AUTOSUM_MAXCOUNT 20 static ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow, @@ -835,7 +830,6 @@ void ScViewFunc::InsertPageBreak( bool bColumn, bool bRecord, const ScAddress* p UpdatePageBreakData( true ); // for PageBreak-Mode } - void ScViewFunc::DeletePageBreak( bool bColumn, bool bRecord, const ScAddress* pPos, bool bSetModified ) { @@ -1002,7 +996,6 @@ void ScViewFunc::SetPrintRanges( bool bEntireSheet, const OUString* pPrint, pDocSh->SetDocumentModified(); } - // Merge cells bool ScViewFunc::TestMergeCells() // pre-test (for menu) @@ -1019,7 +1012,6 @@ bool ScViewFunc::TestMergeCells() // pre-test (for menu) return false; } - bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bCenter ) { // Editable- and Being-Nested- test must be at the beginning (in DocFunc too), @@ -1114,7 +1106,6 @@ bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bC return bOk; } - bool ScViewFunc::TestRemoveMerge() { bool bMerged = false; @@ -1128,7 +1119,6 @@ bool ScViewFunc::TestRemoveMerge() return bMerged; } - static bool lcl_extendMergeRange(ScCellMergeOption& rOption, const ScRange& rRange) { bool bExtended = false; @@ -1446,7 +1436,6 @@ void ScViewFunc::TransliterateText( sal_Int32 nType ) } } - // AutoFormat ScAutoFormatData* ScViewFunc::CreateAutoFormatData() @@ -1470,7 +1459,6 @@ ScAutoFormatData* ScViewFunc::CreateAutoFormatData() return pData; } - void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord ) { ScRange aRange; @@ -1802,7 +1790,6 @@ void ScViewFunc::TabOp( const ScTabOpParam& rParam, bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } - void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) { @@ -1824,7 +1811,6 @@ void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, } } - void ScViewFunc::ExtendScenario() { ScEditableTester aTester( this ); @@ -1843,7 +1829,6 @@ void ScViewFunc::ExtendScenario() ApplySelectionPattern(aPattern); } - void ScViewFunc::UseScenario( const OUString& rName ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -1867,7 +1852,6 @@ bool ScViewFunc::InsertTable( const OUString& rName, SCTAB nTab, bool bRecord ) return bSuccess; } - // Insert tables bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, @@ -1917,7 +1901,6 @@ bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, } } - bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -1949,7 +1932,6 @@ bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) } } - bool ScViewFunc::DeleteTable( SCTAB nTab, bool bRecord ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -2108,7 +2090,6 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) pUndoDoc, pUndoData )); } - if (bDelDone) { if ( nNewTab >= rDoc.GetTableCount() ) @@ -2125,7 +2106,6 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) pDocSh->PostPaintExtras(); pDocSh->SetDocumentModified(); - SfxApplication* pSfxApp = SFX_APP(); // Navigator pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) ); @@ -2139,7 +2119,6 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) return bDelDone; } - bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) { // order Table/Name is inverted for DocFunc @@ -2153,7 +2132,6 @@ bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) return bSuccess; } - bool ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab ) { bool bSuccess = GetViewData().GetDocShell()->GetDocFunc().SetTabBgColor( nTab, rColor, true, false ); @@ -2187,7 +2165,6 @@ void ScViewFunc::InsertAreaLink( const OUString& rFile, pDocSh->GetDocFunc().InsertAreaLink( rFile, rFilter, rOptions, rSource, aPos, nRefresh, false, false ); } - void ScViewFunc::InsertTableLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rTabName ) @@ -2316,7 +2293,6 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, } } - if (bUndo) { pDocSh->GetUndoManager()->AddUndoAction( @@ -2697,7 +2673,6 @@ void ScViewFunc::MoveTable( } } - void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -2735,7 +2710,6 @@ void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) } } - void ScViewFunc::HideTable( const ScMarkData& rMark ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -2784,7 +2758,6 @@ void ScViewFunc::HideTable( const ScMarkData& rMark ) } } - void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) { ScEditableTester aTester( this ); @@ -2819,7 +2792,6 @@ void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) pViewShell->TabKeyInput( KeyEvent( *(pChar++), KeyCode() ) ); } - void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, const SvxBorderLine* pDestLine, const SvxBorderLine* pSrcLine, @@ -2842,7 +2814,6 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, } } - #define SET_LINE_ATTRIBUTES(LINE,BOXLINE) \ pBoxLine = aBoxItem.Get##LINE(); \ if ( pBoxLine ) \ @@ -2856,7 +2827,6 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, aBoxItem.SetLine( NULL, BOXLINE ); \ } - void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, bool bColorOnly ) { @@ -2899,7 +2869,6 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, ATTR_PATTERN_START, ATTR_PATTERN_END )); - const SvxBorderLine* pBoxLine = NULL; SvxBorderLine aLine; @@ -2978,5 +2947,4 @@ void ScViewFunc::SetValidation( const ScValidationData& rNew ) ApplyAttr( aItem ); // with Paint and Undo... } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 627e870e519e..b00ab735f6c8 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -72,10 +72,8 @@ using namespace com::sun::star; // STATIC DATA --------------------------------------------------------------- - // GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx - // C U T void ScViewFunc::CutToClip( ScDocument* pClipDoc, bool bIncludeObjects ) @@ -434,7 +432,6 @@ ScTransferObj* ScViewFunc::CopyToTransferable() return NULL; } - // P A S T E void ScViewFunc::PasteDraw() @@ -765,10 +762,8 @@ static bool lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL return false; } - // Einfuegen auf Tabelle: - // internes Paste namespace { @@ -1208,11 +1203,9 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, rMark.SetMarkArea( aUserRange ); MarkDataChanged(); - // Aus Clipboard kopieren, // wenn gerechnet werden soll, Originaldaten merken - boost::scoped_ptr<ScDocument> pMixDoc; if (nFunction) { @@ -1959,5 +1952,4 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow , } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 9298b6913a71..05efdf5a0b10 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -86,7 +86,6 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, { HideAllCursors(); - ScDocShell* pDocSh = GetViewData().GetDocShell(); ScDocument& rDoc = pDocSh->GetDocument(); SCTAB nTab = GetViewData().GetTabNo(); @@ -619,7 +618,6 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink Graphic aGraphic; GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); - if (!rGraphicFilter.ImportGraphic(aGraphic, aURL, GRFILTER_FORMAT_DONTKNOW, &nFilterFormat )) { @@ -781,5 +779,4 @@ bool ScViewFunc::HasBookmarkAtCursor( SvxHyperlinkItem* pContent ) return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 9ee7fa5dbcea..f5481b8ff0f8 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/MSOLEObjectSystemCreator.hpp> - #include <svx/unomodel.hxx> #include <unotools/streamwrap.hxx> @@ -104,10 +103,8 @@ bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, TransferableDataHelper aDataHelper( rxTransferable ); bool bRet = false; - // handle individual formats - if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE || nFormatId == SOT_FORMATSTR_ID_LINK_SOURCE || nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || @@ -741,5 +738,4 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 74fe5592d660..f6addba08c3d 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> #include <sfx2/bindings.hxx> diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index 77093e4b12c1..68bf8097556c 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -54,7 +54,6 @@ bool bPasteIsMove = false; using namespace com::sun::star; - static void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize ) { SdrPage* pPage = pData->GetScDrawView()->GetModel()->GetPage( static_cast<sal_uInt16>(pData->GetTabNo()) ); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index a996f3735bcd..ed0d0f5e91e0 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -88,7 +88,6 @@ static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDo } } - ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScTabView( pParent, rDocSh, pViewShell ), bFormatValid( false ) @@ -660,10 +659,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, // #i97726# always get text for "repeat" of undo action aString = ScEditUtil::GetSpaceDelimitedString(aEngine); - // undo - EditTextObject* pUndoData = NULL; ScUndoEnterData::ValuesType aOldValues; @@ -681,10 +678,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, pUndoData = rData.Clone(); } - // enter data - if (bCommon) rDoc.ApplyPattern(nCol,nRow,nTab,*pCellAttrs); //! undo @@ -870,12 +865,10 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, } } - // apply attribute - undo OK // // complete set ( ATTR_STARTINDEX, ATTR_ENDINDEX ) - void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, bool bRecord ) @@ -1014,7 +1007,6 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem ) // CellContentChanged is called in ApplySelectionPattern } - // patterns and borders void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem* pNewOuter, @@ -1312,7 +1304,6 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, bool bRecord if ( !pStyleSheet) return; - ScViewData& rViewData = GetViewData(); ScDocShell* pDocSh = rViewData.GetDocShell(); ScDocument& rDoc = pDocSh->GetDocument(); @@ -1399,12 +1390,10 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, bool bRecord StartFormatArea(); } - void ScViewFunc::RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet ) { if ( !pStyleSheet) return; - ScViewData& rViewData = GetViewData(); ScDocument* pDoc = rViewData.GetDocument(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -1431,7 +1420,6 @@ void ScViewFunc::UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet ) { if ( !pStyleSheet) return; - ScViewData& rViewData = GetViewData(); ScDocument* pDoc = rViewData.GetDocument(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -2162,7 +2150,6 @@ void ScViewFunc::SetWidthOrHeight( rDoc.SetDrawPageSize(nTab); } - if (!bOutline) DELETEZ(pUndoTab); diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index c7535a1789fb..17f6008421f2 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -274,7 +274,6 @@ void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc ) rMark.MarkToSimple(); } - bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, ScDocument * pDoc, size_t nRows ) { SCTAB nTab = rRange.aStart.Tab(); @@ -339,7 +338,6 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal rSet.DisableItem( nSlotId ); } - bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont, SfxViewFrame& rFrame, SvxFontItem& rNewFont, @@ -389,7 +387,6 @@ void ScViewUtil::SetFullScreen( SfxViewShell& rViewShell, bool bSet ) } } - ScUpdateRect::ScUpdateRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ) : nNewStartX(0) , nNewStartY(0) diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx index e3139ea18745..e0c3a6e8f9a4 100644 --- a/sc/source/ui/view/waitoff.cxx +++ b/sc/source/ui/view/waitoff.cxx @@ -48,5 +48,4 @@ ScWaitCursorOff::~ScWaitCursorOff() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |