diff options
Diffstat (limited to 'sc/source/ui')
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleCell.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/Accessibility/AccessibleText.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuconstr.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/viewdata.hxx | 66 | ||||
-rw-r--r-- | sc/source/ui/unoobj/viewuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/drawview.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 14 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin2.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin3.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 18 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin5.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/olinewin.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/select.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/tabview.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 130 |
15 files changed, 135 insertions, 135 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 8691ac6d8174..c164040817ec 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -176,7 +176,7 @@ Rectangle ScAccessibleCell::GetBoundingBox() const mpViewShell->GetViewData()->GetMergeSizePixel( maCellAddress.Col(), maCellAddress.Row(), nSizeX, nSizeY); aCellRect.SetSize(Size(nSizeX, nSizeY)); - aCellRect.SetPos(mpViewShell->GetViewData()->GetScrPos(maCellAddress.Col(), maCellAddress.Row(), meSplitPos, sal_True)); + aCellRect.SetPos(mpViewShell->GetViewData()->GetScrPos(maCellAddress.Col(), maCellAddress.Row(), meSplitPos, true)); Window* pWindow = mpViewShell->GetWindowByPos(meSplitPos); if (pWindow) diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 5fa62bd17811..b644e1a18e32 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -97,8 +97,8 @@ Rectangle ScViewForwarder::GetVisArea() const SC_SPLIT_TOP : SC_SPLIT_BOTTOM; Point aBaseCellPos(mpViewShell->GetViewData()->GetScrPos(mpViewShell->GetViewData()->GetPosX(eWhichH), - mpViewShell->GetViewData()->GetPosY(eWhichV), meSplitPos, sal_True)); - Point aCellPos(mpViewShell->GetViewData()->GetScrPos(maCellPos.Col(), maCellPos.Row(), meSplitPos, sal_True)); + mpViewShell->GetViewData()->GetPosY(eWhichV), meSplitPos, true)); + Point aCellPos(mpViewShell->GetViewData()->GetScrPos(maCellPos.Col(), maCellPos.Row(), meSplitPos, true)); aVisArea.SetPos(aCellPos - aBaseCellPos); } } diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index ab70eefdda1a..fa6d53bdd60f 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -91,7 +91,7 @@ Point FuConstruct::CurrentGridSyncOffsetAndPos( Point& rInOutPos ) ScSplitPos eWhich = pViewData->GetActivePart(); ScGridWindow* pGridWin = (ScGridWindow*)pViewData->GetActiveWin(); // and equiv screen pos - Point aScreenPos = pViewShell->GetViewData()->GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, sal_True ); + Point aScreenPos = pViewShell->GetViewData()->GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, true ); MapMode aDrawMode = pGridWin->GetDrawMapMode(); Point aCurPosHmm = pGridWin->PixelToLogic(aScreenPos, aDrawMode ); Point aOff = ( rInOutPos - aCurPosHmm ); diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 64b92d5dd075..87c380e7ca9a 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -248,9 +248,9 @@ public: Window* GetDialogParent(); // forwarded from tabvwsh Window* GetActiveWin(); // from View ScDrawView* GetScDrawView(); // from View - sal_Bool IsMinimized(); // from View + bool IsMinimized(); // from View - void UpdateInputHandler( sal_Bool bForce = false, sal_Bool bStopEditing = sal_True ); + void UpdateInputHandler( bool bForce = false, bool bStopEditing = true ); void WriteUserData(OUString& rData); void ReadUserData(const OUString& rData); @@ -339,10 +339,10 @@ public: ScMarkType GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const; void GetMultiArea( ScRangeListRef& rRange ) const; - sal_Bool SimpleColMarked(); - sal_Bool SimpleRowMarked(); + bool SimpleColMarked(); + bool SimpleRowMarked(); - sal_Bool IsMultiMarked(); + bool IsMultiMarked(); void SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); void SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, @@ -350,18 +350,18 @@ public: void GetFillData( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ); void ResetFillMode(); - sal_Bool IsAnyFillMode() { return nFillMode != SC_FILL_NONE; } - sal_Bool IsFillMode() { return nFillMode == SC_FILL_FILL; } - sal_uInt8 GetFillMode() { return nFillMode; } + bool IsAnyFillMode() { return nFillMode != SC_FILL_NONE; } + bool IsFillMode() { return nFillMode == SC_FILL_FILL; } + sal_uInt8 GetFillMode() { return nFillMode; } // TRUE: Cell is merged - bool GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ) const; - sal_Bool GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, + bool GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ) const; + bool GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, SCsCOL& rPosX, SCsROW& rPosY, - sal_Bool bTestMerge = sal_True, sal_Bool bRepair = false, - sal_Bool bNextIfLarge = sal_True ); + bool bTestMerge = true, bool bRepair = false, + bool bNextIfLarge = true ); void GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich, - SCsCOL nPosX, SCsROW nPosY, sal_Bool& rLeft, sal_Bool& rTop ); + SCsCOL nPosX, SCsROW nPosY, bool& rLeft, bool& rTop ); bool IsRefMode() const { return bIsRefMode; } ScRefType GetRefType() const { return eRefType; } @@ -390,20 +390,20 @@ public: const ScViewOptions& GetOptions() const { return *pOptions; } void SetOptions( const ScViewOptions& rOpt ); - sal_Bool IsGridMode () const { return pOptions->GetOption( VOPT_GRID ); } - void SetGridMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_GRID, bNewMode ); } - sal_Bool IsSyntaxMode () const { return pOptions->GetOption( VOPT_SYNTAX ); } - void SetSyntaxMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_SYNTAX, bNewMode ); } - sal_Bool IsHeaderMode () const { return pOptions->GetOption( VOPT_HEADER ); } - void SetHeaderMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_HEADER, bNewMode ); } - sal_Bool IsTabMode () const { return pOptions->GetOption( VOPT_TABCONTROLS ); } - void SetTabMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); } - sal_Bool IsVScrollMode () const { return pOptions->GetOption( VOPT_VSCROLL ); } - void SetVScrollMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_VSCROLL, bNewMode ); } - sal_Bool IsHScrollMode () const { return pOptions->GetOption( VOPT_HSCROLL ); } - void SetHScrollMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_HSCROLL, bNewMode ); } - sal_Bool IsOutlineMode () const { return pOptions->GetOption( VOPT_OUTLINER ); } - void SetOutlineMode ( sal_Bool bNewMode ) { pOptions->SetOption( VOPT_OUTLINER, bNewMode ); } + bool IsGridMode () const { return pOptions->GetOption( VOPT_GRID ); } + void SetGridMode ( bool bNewMode ) { pOptions->SetOption( VOPT_GRID, bNewMode ); } + bool IsSyntaxMode () const { return pOptions->GetOption( VOPT_SYNTAX ); } + void SetSyntaxMode ( bool bNewMode ) { pOptions->SetOption( VOPT_SYNTAX, bNewMode ); } + bool IsHeaderMode () const { return pOptions->GetOption( VOPT_HEADER ); } + void SetHeaderMode ( bool bNewMode ) { pOptions->SetOption( VOPT_HEADER, bNewMode ); } + bool IsTabMode () const { return pOptions->GetOption( VOPT_TABCONTROLS ); } + void SetTabMode ( bool bNewMode ) { pOptions->SetOption( VOPT_TABCONTROLS, bNewMode ); } + bool IsVScrollMode () const { return pOptions->GetOption( VOPT_VSCROLL ); } + void SetVScrollMode ( bool bNewMode ) { pOptions->SetOption( VOPT_VSCROLL, bNewMode ); } + bool IsHScrollMode () const { return pOptions->GetOption( VOPT_HSCROLL ); } + void SetHScrollMode ( bool bNewMode ) { pOptions->SetOption( VOPT_HSCROLL, bNewMode ); } + bool IsOutlineMode () const { return pOptions->GetOption( VOPT_OUTLINER ); } + void SetOutlineMode ( bool bNewMode ) { pOptions->SetOption( VOPT_OUTLINER, bNewMode ); } void KillEditView(); void ResetEditView(); @@ -417,7 +417,7 @@ public: { return pEditView[eWhich]; } void EditGrowX(); - void EditGrowY( sal_Bool bInitial = false ); + void EditGrowY( bool bInitial = false ); ScSplitPos GetEditActivePart() const { return eEditActivePart; } SCCOL GetEditViewCol() const { return nEditCol; } @@ -428,13 +428,13 @@ public: SCROW GetEditEndRow() const { return nEditEndRow; } Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin, - const ScPatternAttr* pPattern, sal_Bool bForceToTop ); + const ScPatternAttr* pPattern, bool bForceToTop ); void SetTabNo( SCTAB nNewTab ); void SetActivePart( ScSplitPos eNewActive ); Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, - sal_Bool bAllowNeg = false ) const; + bool bAllowNeg = false ) const; Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScHSplitPos eWhich ) const; Point GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich ) const; @@ -446,7 +446,7 @@ public: SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Cells on the preceding page SCROW PrevCellsY( ScVSplitPos eWhichY ) const; - sal_Bool IsOle(); + bool IsOle(); void SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); void SetScreen( const Rectangle& rVisArea ); void SetScreenPos( const Point& rVisAreaStart ); @@ -466,8 +466,8 @@ public: Point GetMousePosPixel(); - sal_Bool UpdateFixX(SCTAB nTab = MAXTAB+1); - sal_Bool UpdateFixY(SCTAB nTab = MAXTAB+1); + bool UpdateFixX(SCTAB nTab = MAXTAB+1); + bool UpdateFixY(SCTAB nTab = MAXTAB+1); SCCOL GetTabStartCol() const { return nTabStartCol; } void SetTabStartCol(SCCOL nNew) { nTabStartCol = nNew; } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index c2cfb4aa610b..f54eba652565 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1721,7 +1721,7 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow aWinStart = pWin->GetPosPixel(); ScViewData* pViewData = pViewSh->GetViewData(); - Point aSplit(pViewData->GetScrPos( (SCCOL)nColumns, (SCROW)nRows, SC_SPLIT_BOTTOMLEFT, sal_True )); + Point aSplit(pViewData->GetScrPos( (SCCOL)nColumns, (SCROW)nRows, SC_SPLIT_BOTTOMLEFT, true )); aSplit += aWinStart; pViewSh->SplitAtPixel( aSplit, true, true ); diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index ffca2662ebad..89d227e6dfd1 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -939,7 +939,7 @@ void ScDrawView::SyncForGrid( SdrObject* pObj ) aOldPos.X() = sc::TwipsToHMM( aOldPos.X() ); aOldPos.Y() = sc::TwipsToHMM( aOldPos.Y() ); // find position of same point on the screen ( e.g. grid ) - Point aCurPos = pViewData->GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, sal_True ); + Point aCurPos = pViewData->GetScrPos( aOldStt.Col(), aOldStt.Row(), eWhich, true ); Point aCurPosHmm = pGridWin->PixelToLogic(aCurPos, aDrawMode ); Point aGridOff = ( aCurPosHmm - aOldPos ); // fdo#63878 Fix the X position for RTL Sheet diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 9020afd0d735..3202560e67c0 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2860,7 +2860,7 @@ static void lcl_SetTextCursorPos( ScViewData* pViewData, ScSplitPos eWhich, Wind { SCCOL nCol = pViewData->GetCurX(); SCROW nRow = pViewData->GetCurY(); - Rectangle aEditArea = pViewData->GetEditArea( eWhich, nCol, nRow, pWin, NULL, sal_True ); + Rectangle aEditArea = pViewData->GetEditArea( eWhich, nCol, nRow, pWin, NULL, true ); aEditArea.Right() = aEditArea.Left(); aEditArea = pWin->PixelToLogic( aEditArea ); pWin->SetCursorRect( &aEditArea ); @@ -3081,7 +3081,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt ) SCCOL nCurX = pViewData->GetCurX(); SCROW nCurY = pViewData->GetCurY(); - aMenuPos = pViewData->GetScrPos( nCurX, nCurY, eWhich, sal_True ); + aMenuPos = pViewData->GetScrPos( nCurX, nCurY, eWhich, true ); long nSizeXPix; long nSizeYPix; pViewData->GetMergeSizePixel( nCurX, nCurY, nSizeXPix, nSizeYPix ); @@ -4582,7 +4582,7 @@ void ScGridWindow::UpdateEditViewPos() else { // bForceToTop = sal_True for editing - Rectangle aPixRect = pViewData->GetEditArea( eWhich, nCol, nRow, this, NULL, sal_True ); + Rectangle aPixRect = pViewData->GetEditArea( eWhich, nCol, nRow, this, NULL, true ); Point aScrPos = PixelToLogic( aPixRect.TopLeft(), pViewData->GetLogicMode() ); Rectangle aRect = pView->GetOutputArea(); @@ -5358,12 +5358,12 @@ bool ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang if ( bTextBelow ) { aButtonPos = pViewData->GetScrPos( aRange.aEnd.Col()+1, aRange.aEnd.Row()+1, - eWhich, sal_True ); + eWhich, true ); } else { aButtonPos = pViewData->GetScrPos( aRange.aEnd.Col()+1, aRange.aStart.Row(), - eWhich, sal_True ); + eWhich, true ); aButtonPos.Y() -= nBHeight; } if ( bLayoutRTL ) @@ -5734,7 +5734,7 @@ void ScGridWindow::UpdateCursorOverlay() if ( bVis && !bOverlapped && !pViewData->HasEditView(eWhich) && pViewData->IsActive() ) { - Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, sal_True ); + Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, true ); sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); // completely right of/below the screen? @@ -5894,7 +5894,7 @@ void ScGridWindow::UpdateAutoFillOverlay() ScDocument* pDoc = pViewData->GetDocument(); sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTab ); - Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, sal_True ); + Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, true ); long nSizeXPix; long nSizeYPix; pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index ef4d5113ab17..6cbcff78d6a5 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -282,8 +282,8 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aPixel.X(), aPixel.Y(), eWhich, nPosX, nPosY ); - sal_Bool bMouseLeft; - sal_Bool bMouseTop; + bool bMouseLeft; + bool bMouseTop; pViewData->GetMouseQuadrant( aPixel, eWhich, nPosX, nPosY, bMouseLeft, bMouseTop ); ScAddress aPos( nPosX, nPosY, pViewData->GetTabNo() ); @@ -851,7 +851,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); - sal_Bool bLeft, bTop; + bool bLeft, bTop; pViewData->GetMouseQuadrant( aPos, eWhich, nPosX, nPosY, bLeft, bTop ); if ( !bLeft ) ++nPosX; if ( !bTop ) ++nPosY; diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index a151035c2b15..b9a400dce490 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -302,7 +302,7 @@ void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddres if(rOpts.GetOption( VOPT_ANCHOR )) { sal_Bool bNegativePage = pViewData->GetDocument()->IsNegativePage( pViewData->GetTabNo() ); - Point aPos = pViewData->GetScrPos( rAddress.Col(), rAddress.Row(), eWhich, sal_True ); + Point aPos = pViewData->GetScrPos( rAddress.Col(), rAddress.Row(), eWhich, true ); aPos = PixelToLogic(aPos); rHdl.AddHdl(new SdrHdl(aPos, bNegativePage ? HDL_ANCHOR_TR : HDL_ANCHOR)); } diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 7c2040d1e0b2..c0f9456a185b 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -215,9 +215,9 @@ static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, S if ( aRange.Intersects( aViewRange ) ) //! Platz fuer Text/Button? { Point aStartPos = pViewData->GetScrPos( - aRange.aStart.Col(), aRange.aStart.Row(), eWhich, sal_True ); + aRange.aStart.Col(), aRange.aStart.Row(), eWhich, true ); Point aEndPos = pViewData->GetScrPos( - aRange.aEnd.Col()+1, aRange.aEnd.Row()+1, eWhich, sal_True ); + aRange.aEnd.Col()+1, aRange.aEnd.Row()+1, eWhich, true ); // on the grid: aStartPos.X() -= nLayoutSign; aStartPos.Y() -= 1; @@ -966,9 +966,9 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, pContentDev->SetFillColor( aManual ); Point aStart = pViewData->GetScrPos( - aRange.aStart.Col(), aRange.aStart.Row(), eWhich, sal_True ); + aRange.aStart.Col(), aRange.aStart.Row(), eWhich, true ); Point aEnd = pViewData->GetScrPos( - aRange.aEnd.Col() + 1, aRange.aEnd.Row() + 1, eWhich, sal_True ); + aRange.aEnd.Col() + 1, aRange.aEnd.Row() + 1, eWhich, true ); aStart.X() -= 2; aStart.Y() -= 2; @@ -1002,7 +1002,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, else pContentDev->SetFillColor( aAutomatic ); Point aBreak = pViewData->GetScrPos( - nBreak, aRange.aStart.Row(), eWhich, sal_True ); + nBreak, aRange.aStart.Row(), eWhich, true ); pContentDev->DrawRect( Rectangle( aBreak.X()-1, aStart.Y(), aBreak.X(), aEnd.Y() ) ); } } @@ -1021,7 +1021,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, else pContentDev->SetFillColor( aAutomatic ); Point aBreak = pViewData->GetScrPos( - aRange.aStart.Col(), nBreak, eWhich, sal_True ); + aRange.aStart.Col(), nBreak, eWhich, true ); pContentDev->DrawRect( Rectangle( aStart.X(), aBreak.Y()-1, aEnd.X(), aBreak.Y() ) ); } } @@ -1041,9 +1041,9 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if ( nPrEndX >= nX1 && nPrStartX <= nX2 ) { Point aPageStart = pViewData->GetScrPos( - nPrStartX, nPrStartY, eWhich, sal_True ); + nPrStartX, nPrStartY, eWhich, true ); Point aPageEnd = pViewData->GetScrPos( - nPrEndX+1,nPrEndY+1, eWhich, sal_True ); + nPrEndX+1,nPrEndY+1, eWhich, true ); long nPageNo = rData.GetFirstPage(); if ( rData.IsTopDown() ) @@ -1301,7 +1301,7 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos ) if ( nCellSizeY < aBtnSize.Height() ) aBtnSize.Height() = nCellSizeY; - Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich, sal_True ); + Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich, true ); aPos.X() += nCellSizeX * nLayoutSign; // start of next cell if (!bNextCell) aPos.X() -= aBtnSize.Width() * nLayoutSign; // right edge of cell if next cell not available diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 219fa4bf80a7..182eec707c49 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -221,7 +221,7 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) aOldPos.Y() = sc::TwipsToHMM( aOldPos.Y() ); // get screen pos in hmm for aCellPos // and equiv screen pos - Point aScreenPos = pViewData->GetScrPos( aCellPos.Col(), aCellPos.Row(), eWhich, sal_True ); + Point aScreenPos = pViewData->GetScrPos( aCellPos.Col(), aCellPos.Row(), eWhich, true ); MapMode aDrawMode = GetDrawMapMode(); Point aCurPosHmm = PixelToLogic(aScreenPos, aDrawMode ); Point aGridOff = aCurPosHmm -aOldPos; diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index a6de25b34dff..2ca1ceb2f854 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -257,8 +257,8 @@ size_t ScOutlineWindow::GetLevelFromPos( long nLevelPos ) const long ScOutlineWindow::GetColRowPos( SCCOLROW nColRowIndex ) const { long nDocPos = mbHoriz ? - mrViewData.GetScrPos( static_cast<SCCOL>(nColRowIndex), 0, meWhich, sal_True ).X() : - mrViewData.GetScrPos( 0, static_cast<SCROW>(nColRowIndex), meWhich, sal_True ).Y(); + mrViewData.GetScrPos( static_cast<SCCOL>(nColRowIndex), 0, meWhich, true ).X() : + mrViewData.GetScrPos( 0, static_cast<SCROW>(nColRowIndex), meWhich, true ).Y(); return mnMainFirstPos + nDocPos; } diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index fd7e35c7e404..008954f60554 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -329,13 +329,13 @@ sal_Bool ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, sal_Bool SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aEffPos.X(), aEffPos.Y(), GetWhich(), - nPosX, nPosY, sal_True, sal_True ); // with Repair + nPosX, nPosY, true, true ); // with Repair // for Autofill switch in the center of cell // thereby don't prevent scrolling to bottom/right if ( pViewData->IsFillMode() || pViewData->GetFillMode() == SC_FILL_MATRIX ) { - sal_Bool bLeft, bTop; + bool bLeft, bTop; pViewData->GetMouseQuadrant( aEffPos, GetWhich(), nPosX, nPosY, bLeft, bTop ); ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index e4c7ae714461..3a53aa0eb2b7 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -1980,14 +1980,14 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel ) SCsROW nPosY; // bNextIfLarge=FALSE: nicht auf naechste Zelle, wenn ausserhalb des Fensters aViewData.GetPosFromPixel( aMouse.X(), aMouse.Y(), ePos, nPosX, nPosY, true, false, false ); - sal_Bool bLeft; - sal_Bool bTop; + bool bLeft; + bool bTop; aViewData.GetMouseQuadrant( aMouse, ePos, nPosX, nPosY, bLeft, bTop ); if (!bLeft) ++nPosX; if (!bTop) ++nPosY; - aMouse = aViewData.GetScrPos( static_cast<SCCOL>(nPosX), static_cast<SCROW>(nPosY), ePos, sal_True ); + aMouse = aViewData.GetScrPos( static_cast<SCCOL>(nPosX), static_cast<SCROW>(nPosY), ePos, true ); rScreenPosPixel = pWin->OutputToNormalizedScreenPixel( aMouse ); } @@ -2024,8 +2024,8 @@ void ScTabView::FreezeSplitters( bool bFreeze ) aSplit.Y() = aViewData.GetVSplitPos() - aWinStart.Y(); aViewData.GetPosFromPixel( aSplit.X(), aSplit.Y(), ePos, nPosX, nPosY ); - sal_Bool bLeft; - sal_Bool bTop; + bool bLeft; + bool bTop; aViewData.GetMouseQuadrant( aSplit, ePos, nPosX, nPosY, bLeft, bTop ); if (!bLeft) ++nPosX; @@ -2126,7 +2126,7 @@ void ScTabView::SplitAtCursor() SCCOL nPosX = aViewData.GetCurX(); SCROW nPosY = aViewData.GetCurY(); - Point aSplit = aViewData.GetScrPos( nPosX, nPosY, ePos, sal_True ); + Point aSplit = aViewData.GetScrPos( nPosX, nPosY, ePos, true ); if ( nPosX > 0 ) DoHSplit( aSplit.X() + aWinStart.X() ); else diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index f0ac6a722847..7b764c362af9 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -71,7 +71,7 @@ using namespace com::sun::star; #define TAG_TABBARWIDTH "tw:" -static sal_Bool bMoveArea = false; //! Member? +static bool bMoveArea = false; //! Member? sal_uInt16 nEditAdjust = SVX_ADJUST_LEFT; //! Member !!! ScViewDataTable::ScViewDataTable() : @@ -317,13 +317,13 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) : { mpMarkData->SelectOneTable(0); // Sync with nTabNo. - SetGridMode ( sal_True ); + SetGridMode ( true ); SetSyntaxMode ( false ); - SetHeaderMode ( sal_True ); - SetTabMode ( sal_True ); - SetVScrollMode ( sal_True ); - SetHScrollMode ( sal_True ); - SetOutlineMode ( sal_True ); + SetHeaderMode ( true ); + SetTabMode ( true ); + SetVScrollMode ( true ); + SetHScrollMode ( true ); + SetOutlineMode ( true ); aScrSize = Size( (long) ( STD_COL_WIDTH * PIXEL_PER_TWIPS * OLE_STD_CELLS_X ), (long) ( ScGlobal::nStdRowHeight * PIXEL_PER_TWIPS * OLE_STD_CELLS_Y ) ); @@ -555,7 +555,7 @@ void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs ) void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs ) { - sal_Bool bAll = ( tabs.empty() ); + bool bAll = ( tabs.empty() ); if ( !bAll ) // create associated table data CreateTabData( tabs ); @@ -595,7 +595,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, bool bAll ) void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, std::vector< SCTAB >& tabs ) { - sal_Bool bAll = ( tabs.empty() ); + bool bAll = ( tabs.empty() ); if ( !bAll ) // create associated table data CreateTabData( tabs ); Fraction aFrac20( 1,5 ); @@ -762,7 +762,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const ScMarkData aNewMark(*mpMarkData); // use a local copy for MarkToSimple - sal_Bool bMulti = aNewMark.IsMultiMarked(); + bool bMulti = aNewMark.IsMultiMarked(); if (bMulti) { aNewMark.MarkToSimple(); @@ -782,7 +782,7 @@ void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const } } -sal_Bool ScViewData::SimpleColMarked() +bool ScViewData::SimpleColMarked() { SCCOL nStartCol; SCROW nStartRow; @@ -792,12 +792,12 @@ sal_Bool ScViewData::SimpleColMarked() SCTAB nEndTab; if (GetSimpleArea(nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab) == SC_MARK_SIMPLE) if (nStartRow==0 && nEndRow==MAXROW) - return sal_True; + return true; return false; } -sal_Bool ScViewData::SimpleRowMarked() +bool ScViewData::SimpleRowMarked() { SCCOL nStartCol; SCROW nStartRow; @@ -807,12 +807,12 @@ sal_Bool ScViewData::SimpleRowMarked() SCTAB nEndTab; if (GetSimpleArea(nStartCol,nStartRow,nStartTab,nEndCol,nEndRow,nEndTab) == SC_MARK_SIMPLE) if (nStartCol==0 && nEndCol==MAXCOL) - return sal_True; + return true; return false; } -sal_Bool ScViewData::IsMultiMarked() +bool ScViewData::IsMultiMarked() { // Test for "real" multi selection, calling MarkToSimple on a local copy, // and taking filtered in simple area marks into account. @@ -885,9 +885,9 @@ void ScViewData::ResetOldCursor() Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW nPosY, Window* pWin, const ScPatternAttr* pPattern, - sal_Bool bForceToTop ) + bool bForceToTop ) { - return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, GetScrPos(nPosX,nPosY,eWhich,sal_True), + return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, GetScrPos(nPosX,nPosY,eWhich,true), pWin, nPPTX, nPPTY, GetZoomX(), GetZoomY() ). GetEditArea( pPattern, bForceToTop ); } @@ -896,16 +896,16 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, ScEditEngineDefaulter* pNewEngine, Window* pWin, SCCOL nNewX, SCROW nNewY ) { - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo ); ScHSplitPos eHWhich = WhichH(eWhich); - sal_Bool bWasThere = false; + bool bWasThere = false; if (pEditView[eWhich]) { // Wenn die View schon da ist, nichts aufrufen, was die Cursorposition aendert if (bEditActive[eWhich]) - bWasThere = sal_True; + bWasThere = true; else pEditView[eWhich]->SetEditEngine(pNewEngine); @@ -934,10 +934,10 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&) pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue(); - sal_Bool bBreak = ( eJust == SVX_HOR_JUSTIFY_BLOCK ) || + bool bBreak = ( eJust == SVX_HOR_JUSTIFY_BLOCK ) || ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue(); - sal_Bool bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler + bool bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler Rectangle aPixRect = ScEditUtil( pDoc, nNewX,nNewY,nTabNo, GetScrPos(nNewX,nNewY,eWhich), pWin, nPPTX,nPPTY,GetZoomX(),GetZoomY() ). @@ -971,9 +971,9 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // For growing use only the alignment value from the attribute, numbers // (existing or started) with default aligment extend to the right. - sal_Bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); - sal_Bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left - sal_Bool bGrowBackwards = bGrowToLeft; // logical left + bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); + bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left + bool bGrowBackwards = bGrowToLeft; // logical left if ( bLayoutRTL ) bGrowBackwards = !bGrowBackwards; // invert on RTL sheet if ( bAsianVertical ) @@ -1032,7 +1032,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, else if ( nEditAdjust == SVX_ADJUST_CENTER ) { aVis.Right() = ( aPaper.Width() - 1 + nDiff ) / 2; - bMoveArea = sal_True; // always + bMoveArea = true; // always } else { @@ -1049,11 +1049,11 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, pEditView[eWhich]->SetVisArea(aVis); // UpdateMode has been disabled in ScInputHandler::StartTable // must be enabled before EditGrowY (GetTextHeight) - pNewEngine->SetUpdateMode( sal_True ); + pNewEngine->SetUpdateMode( true ); pNewEngine->SetStatusEventHdl( LINK( this, ScViewData, EditEngineHdl ) ); - EditGrowY( sal_True ); // adjust to existing text content + EditGrowY( true ); // adjust to existing text content EditGrowX(); Point aDocPos = pEditView[eWhich]->GetWindowPosTopLeft(0); @@ -1115,7 +1115,7 @@ void ScViewData::EditGrowX() if ( !pCurView || !bEditActive[eWhich]) return; - sal_Bool bLayoutRTL = pLocalDoc->IsLayoutRTL( nTabNo ); + bool bLayoutRTL = pLocalDoc->IsLayoutRTL( nTabNo ); ScEditEngineDefaulter* pEngine = (ScEditEngineDefaulter*) pCurView->GetEditEngine(); @@ -1131,22 +1131,22 @@ void ScViewData::EditGrowX() // Margin ist schon bei der urspruenglichen Breite beruecksichtigt long nTextWidth = pEngine->CalcTextWidth(); - sal_Bool bChanged = false; - sal_Bool bAsianVertical = pEngine->IsVertical(); + bool bChanged = false; + bool bAsianVertical = pEngine->IsVertical(); // get bGrow... variables the same way as in SetEditEngine const ScPatternAttr* pPattern = pLocalDoc->GetPattern( nEditCol, nEditRow, nTabNo ); SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&) pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue(); - sal_Bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); - sal_Bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left - sal_Bool bGrowBackwards = bGrowToLeft; // logical left + bool bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); + bool bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left + bool bGrowBackwards = bGrowToLeft; // logical left if ( bLayoutRTL ) bGrowBackwards = !bGrowBackwards; // invert on RTL sheet if ( bAsianVertical ) bGrowCentered = bGrowToLeft = bGrowBackwards = false; // keep old behavior for asian mode - sal_Bool bUnevenGrow = false; + bool bUnevenGrow = false; if ( bGrowCentered ) { while (aArea.GetWidth() + 0 < nTextWidth && ( nEditStartCol > nLeft || nEditEndCol < nRight ) ) @@ -1177,9 +1177,9 @@ void ScViewData::EditGrowX() aArea.Right() = nCenter + aSize.Width() - nHalf - 1; } - bChanged = sal_True; + bChanged = true; if ( nLogicLeft != nLogicRight ) - bUnevenGrow = sal_True; + bUnevenGrow = true; } } else if ( bGrowBackwards ) @@ -1202,7 +1202,7 @@ void ScViewData::EditGrowX() aArea.Right() = aArea.Left() + aSize.Width() - 1; } - bChanged = sal_True; + bChanged = true; } } else @@ -1225,7 +1225,7 @@ void ScViewData::EditGrowX() aArea.Right() = aArea.Left() + aSize.Width() - 1; } - bChanged = sal_True; + bChanged = true; } } @@ -1286,7 +1286,7 @@ void ScViewData::EditGrowX() } } -void ScViewData::EditGrowY( sal_Bool bInitial ) +void ScViewData::EditGrowY( bool bInitial ) { ScSplitPos eWhich = GetActivePart(); ScVSplitPos eVWhich = WhichV(eWhich); @@ -1332,8 +1332,8 @@ void ScViewData::EditGrowY( sal_Bool bInitial ) nAllowedExtra = SC_GROWY_BIG_EXTRA; } - sal_Bool bChanged = false; - sal_Bool bMaxReached = false; + bool bChanged = false; + bool bMaxReached = false; while (aArea.GetHeight() + nAllowedExtra < nTextHeight && nEditEndRow < nBottom && !bMaxReached) { ++nEditEndRow; @@ -1344,10 +1344,10 @@ void ScViewData::EditGrowY( sal_Bool bInitial ) if ( aArea.Bottom() > aArea.Top() + aSize.Height() - 1 ) { aArea.Bottom() = aArea.Top() + aSize.Height() - 1; - bMaxReached = sal_True; // don't occupy more cells beyond paper size + bMaxReached = true; // don't occupy more cells beyond paper size } - bChanged = sal_True; + bChanged = true; nAllowedExtra = SC_GROWY_SMALL_EXTRA; // larger value is only for first row } @@ -1472,7 +1472,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScVSplitPos eWhich ) } Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, - sal_Bool bAllowNeg ) const + bool bAllowNeg ) const { ScHSplitPos eWhichX = SC_SPLIT_LEFT; ScVSplitPos eWhichY = SC_SPLIT_BOTTOM; @@ -1606,12 +1606,12 @@ SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, sal_ else nX = nPosX-1; // rueckwaerts - sal_Bool bOut = false; + bool bOut = false; for ( ; nScrPosX<=nScrSizeX && !bOut; nX = sal::static_int_cast<SCsCOL>(nX + nDir) ) { SCsCOL nColNo = nX; if ( nColNo < 0 || nColNo > MAXCOL ) - bOut = sal_True; + bOut = true; else { sal_uInt16 nTSize = pDoc->GetColWidth( nColNo, nTabNo ); @@ -1728,9 +1728,9 @@ bool ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& r } } -sal_Bool ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, +bool ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, SCsCOL& rPosX, SCsROW& rPosY, - sal_Bool bTestMerge, sal_Bool bRepair, sal_Bool bNextIfLarge ) + bool bTestMerge, bool bRepair, bool bNextIfLarge ) { // special handling of 0 is now in ScViewFunctionSet::SetCursorAtPoint @@ -1838,12 +1838,12 @@ sal_Bool ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWh } void ScViewData::GetMouseQuadrant( const Point& rClickPos, ScSplitPos eWhich, - SCsCOL nPosX, SCsROW nPosY, sal_Bool& rLeft, sal_Bool& rTop ) + SCsCOL nPosX, SCsROW nPosY, bool& rLeft, bool& rTop ) { - sal_Bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo ); + bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo ); long nLayoutSign = bLayoutRTL ? -1 : 1; - Point aCellStart = GetScrPos( nPosX, nPosY, eWhich, sal_True ); + Point aCellStart = GetScrPos( nPosX, nPosY, eWhich, true ); long nSizeX; long nSizeY; GetMergeSizePixel( nPosX, nPosY, nSizeX, nSizeY ); @@ -1997,7 +1997,7 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart ) long nSize; long nTwips; long nAdd; - sal_Bool bEnd; + bool bEnd; nSize = 0; nTwips = (long) (rVisAreaStart.X() / HMM_PER_TWIPS); @@ -2014,7 +2014,7 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart ) ++nX1; } else - bEnd = sal_True; + bEnd = true; } nSize = 0; @@ -2030,7 +2030,7 @@ void ScViewData::SetScreenPos( const Point& rVisAreaStart ) ++nY1; } else - bEnd = sal_True; + bEnd = true; } SetActivePart( SC_SPLIT_BOTTOMLEFT ); @@ -2104,7 +2104,7 @@ ScDrawView* ScViewData::GetScDrawView() return pView->GetScDrawView(); } -sal_Bool ScViewData::IsMinimized() +bool ScViewData::IsMinimized() { OSL_ENSURE( pView, "IsMinimized() ohne View" ); return pView->IsMinimized(); @@ -2715,7 +2715,7 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue> sal_Int32 nCount(rSettings.getLength()); sal_Int32 nTemp32(0); sal_Int16 nTemp16(0); - sal_Bool bPageMode(false); + bool bPageMode(false); EnsureTabDataSize(GetDocument()->GetTableCount()-1); @@ -2883,11 +2883,11 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue> void ScViewData::SetOptions( const ScViewOptions& rOpt ) { // if visibility of horiz. ScrollBar is changed, TabBar may have to be resized... - sal_Bool bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) ); + bool bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) ); // if graphics are turned on or off, animation has to be started or stopped // graphics are controlled by VOBJ_TYPE_OLE - sal_Bool bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) != + bool bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) != rOpt.GetObjMode(VOBJ_TYPE_OLE) ); *pOptions = rOpt; @@ -2905,18 +2905,18 @@ Point ScViewData::GetMousePosPixel() return pView->GetMousePosPixel(); } -void ScViewData::UpdateInputHandler( sal_Bool bForce, sal_Bool bStopEditing ) +void ScViewData::UpdateInputHandler( bool bForce, bool bStopEditing ) { if (pViewShell) pViewShell->UpdateInputHandler( bForce, bStopEditing ); } -sal_Bool ScViewData::IsOle() +bool ScViewData::IsOle() { return pDocShell && pDocShell->IsOle(); } -sal_Bool ScViewData::UpdateFixX( SCTAB nTab ) // sal_True = Wert geaendert +bool ScViewData::UpdateFixX( SCTAB nTab ) // true = Wert geaendert { if (!ValidTab(nTab)) // Default nTab=nTabNo; // akuelle Tabelle @@ -2945,13 +2945,13 @@ sal_Bool ScViewData::UpdateFixX( SCTAB nTab ) // sal_True = Wert g maTabData[nTab]->nHSplitPos = nNewPos; if (nTab == nTabNo) RecalcPixPos(); //! sollte nicht noetig sein !!! - return sal_True; + return true; } return false; } -sal_Bool ScViewData::UpdateFixY( SCTAB nTab ) // sal_True = Wert geaendert +bool ScViewData::UpdateFixY( SCTAB nTab ) // true = Wert geaendert { if (!ValidTab(nTab)) // Default nTab=nTabNo; // akuelle Tabelle @@ -2980,7 +2980,7 @@ sal_Bool ScViewData::UpdateFixY( SCTAB nTab ) // sal_True = Wert g maTabData[nTab]->nVSplitPos = nNewPos; if (nTab == nTabNo) RecalcPixPos(); //! sollte nicht noetig sein !!! - return sal_True; + return true; } return false; |