diff options
Diffstat (limited to 'svx/source/table/svdotable.cxx')
| -rwxr-xr-x[-rw-r--r--] | svx/source/table/svdotable.cxx | 60 |
1 files changed, 32 insertions, 28 deletions
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 9ac652f5e025..09dc0f2beec0 100644..100755 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -270,6 +271,7 @@ public: SdrTableObjImpl::SdrTableObjImpl() : mpTableObj( 0 ) , mpLayouter( 0 ) +, mbModifyPending( false ) { } @@ -355,7 +357,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel) } catch( Exception& ) { - DBG_ERROR("svx::SdrTableObjImpl::SetModel(), exception caught!"); + OSL_FAIL("svx::SdrTableObjImpl::SetModel(), exception caught!"); } mxTableStyle = xNewTableStyle; @@ -522,7 +524,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset } catch( Exception& ) { - DBG_ERROR( "svx::SdrTableObjImpl::DragEdge(), exception caught!" ); + OSL_FAIL( "svx::SdrTableObjImpl::DragEdge(), exception caught!" ); } } @@ -627,7 +629,7 @@ CellRef SdrTableObjImpl::getCell( const CellPos& rPos ) const } catch( Exception& ) { - DBG_ERROR( "svx::SdrTableObjImpl::getCell(), exception caught!" ); + OSL_FAIL( "svx::SdrTableObjImpl::getCell(), exception caught!" ); } return xCell; } @@ -1167,7 +1169,7 @@ void SdrTableObj::InsertRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::InsertRows(), exception caught!"); + OSL_FAIL("SdrTableObj::InsertRows(), exception caught!"); } } @@ -1182,7 +1184,7 @@ void SdrTableObj::InsertColumns( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::InsertColumns(), exception caught!"); + OSL_FAIL("SdrTableObj::InsertColumns(), exception caught!"); } } @@ -1197,7 +1199,7 @@ void SdrTableObj::DeleteRows( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::DeleteRows(), exception caught!"); + OSL_FAIL("SdrTableObj::DeleteRows(), exception caught!"); } } @@ -1212,7 +1214,7 @@ void SdrTableObj::DeleteColumns( sal_Int32 nIndex, sal_Int32 nCount /*= 1*/ ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::DeleteColumns(), exception caught!"); + OSL_FAIL("SdrTableObj::DeleteColumns(), exception caught!"); } } @@ -1351,16 +1353,16 @@ void SdrTableObj::FitFrameToTextSize() // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::IsAutoGrowHeight() const +bool SdrTableObj::IsAutoGrowHeight() const { - return sal_True; + return true; } // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::IsAutoGrowWidth() const +bool SdrTableObj::IsAutoGrowWidth() const { - return sal_True; + return true; } // -------------------------------------------------------------------- @@ -1460,7 +1462,7 @@ void SdrTableObj::SetModel(SdrModel* pNewModel) // -------------------------------------------------------------------- -void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, sal_Bool bLineWidth ) const +void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool bLineWidth ) const { if( mpImpl ) TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth ); @@ -1468,7 +1470,7 @@ void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FA // -------------------------------------------------------------------- -void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/ ) const +void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const { if( !mpImpl ) return; @@ -1616,7 +1618,7 @@ void SdrTableObj::setActiveCell( const CellPos& rPos ) } catch( Exception& ) { - DBG_ERROR("SdrTableObj::setActiveCell(), exception caught!"); + OSL_FAIL("SdrTableObj::setActiveCell(), exception caught!"); } } @@ -2050,7 +2052,7 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) rOutl.SetRefDevice( pModel->GetRefDevice() ); // -- - FASTBOOL bUpdMerk=rOutl.GetUpdateMode(); + bool bUpdMerk=rOutl.GetUpdateMode(); if (bUpdMerk) rOutl.SetUpdateMode(sal_False); Size aPaperMin; Size aPaperMax; @@ -2212,10 +2214,10 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt) +bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) { Rectangle aNeuRect(maLogicRect); - FASTBOOL bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt); + bool bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt); if (bRet) { Rectangle aBoundRect0; @@ -2232,7 +2234,7 @@ FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHeight, FASTBOOL bWidth) const +bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const { if((pModel == NULL) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() ) return sal_False; @@ -2328,9 +2330,9 @@ bool SdrTableObj::IsRealyEdited() const // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::IsFontwork() const +bool SdrTableObj::IsFontwork() const { - return sal_False; + return false; } // -------------------------------------------------------------------- @@ -2599,19 +2601,19 @@ basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag // Create // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::BegCreate(SdrDragStat& rStat) +bool SdrTableObj::BegCreate(SdrDragStat& rStat) { rStat.SetOrtho4Possible(); Rectangle aRect1(rStat.GetStart(), rStat.GetNow()); aRect1.Justify(); rStat.SetActionRect(aRect1); aRect = aRect1; - return sal_True; + return true; } // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::MovCreate(SdrDragStat& rStat) +bool SdrTableObj::MovCreate(SdrDragStat& rStat) { Rectangle aRect1; rStat.TakeCreateRect(aRect1); @@ -2620,12 +2622,12 @@ FASTBOOL SdrTableObj::MovCreate(SdrDragStat& rStat) aRect=aRect1; // fuer ObjName SetBoundRectDirty(); bSnapRectDirty=sal_True; - return sal_True; + return true; } // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) +bool SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) { rStat.TakeCreateRect(aRect); ImpJustifyRect(aRect); @@ -2638,9 +2640,9 @@ void SdrTableObj::BrkCreate(SdrDragStat& /*rStat*/) // -------------------------------------------------------------------- -FASTBOOL SdrTableObj::BckCreate(SdrDragStat& /*rStat*/) +bool SdrTableObj::BckCreate(SdrDragStat& /*rStat*/) { - return sal_True; + return true; } // -------------------------------------------------------------------- @@ -2734,7 +2736,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd } catch( Exception& ) { - DBG_ERROR( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" ); + OSL_FAIL( "svx::SvxTableController::GetMarkedObjModel(), exception caught!" ); } } @@ -2818,3 +2820,5 @@ void SdrTableObj::uno_unlock() } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |