summaryrefslogtreecommitdiff
path: root/svx/source/table/svdotable.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/table/svdotable.cxx')
-rw-r--r--svx/source/table/svdotable.cxx110
1 files changed, 55 insertions, 55 deletions
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 7f9250a90561..2ec740fc1974 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -756,7 +756,7 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int
void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows )
{
- bClosedObj = TRUE;
+ bClosedObj = sal_True;
mpImpl = new SdrTableObjImpl;
mpImpl->acquire();
@@ -1351,16 +1351,16 @@ void SdrTableObj::FitFrameToTextSize()
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::IsAutoGrowHeight() const
+int SdrTableObj::IsAutoGrowHeight() const
{
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::IsAutoGrowWidth() const
+int SdrTableObj::IsAutoGrowWidth() const
{
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
@@ -1399,34 +1399,34 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bResizeFreeAllowed=TRUE;
- rInfo.bResizePropAllowed=TRUE;
- rInfo.bRotateFreeAllowed=FALSE;
- rInfo.bRotate90Allowed =FALSE;
- rInfo.bMirrorFreeAllowed=FALSE;
- rInfo.bMirror45Allowed =FALSE;
- rInfo.bMirror90Allowed =FALSE;
+ rInfo.bResizeFreeAllowed=sal_True;
+ rInfo.bResizePropAllowed=sal_True;
+ rInfo.bRotateFreeAllowed=sal_False;
+ rInfo.bRotate90Allowed =sal_False;
+ rInfo.bMirrorFreeAllowed=sal_False;
+ rInfo.bMirror45Allowed =sal_False;
+ rInfo.bMirror90Allowed =sal_False;
// allow transparence
- rInfo.bTransparenceAllowed = TRUE;
+ rInfo.bTransparenceAllowed = sal_True;
// gradient depends on fillstyle
XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
- rInfo.bShearAllowed =FALSE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bCanConvToPath =FALSE;
- rInfo.bCanConvToPoly =FALSE;
- rInfo.bCanConvToPathLineToArea=FALSE;
- rInfo.bCanConvToPolyLineToArea=FALSE;
- rInfo.bCanConvToContour = FALSE;
+ rInfo.bShearAllowed =sal_False;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bCanConvToPath =sal_False;
+ rInfo.bCanConvToPoly =sal_False;
+ rInfo.bCanConvToPathLineToArea=sal_False;
+ rInfo.bCanConvToPolyLineToArea=sal_False;
+ rInfo.bCanConvToContour = sal_False;
}
// --------------------------------------------------------------------
-UINT16 SdrTableObj::GetObjIdentifier() const
+sal_uInt16 SdrTableObj::GetObjIdentifier() const
{
- return static_cast<UINT16>(OBJ_TABLE);
+ return static_cast<sal_uInt16>(OBJ_TABLE);
}
// --------------------------------------------------------------------
@@ -1460,7 +1460,7 @@ void SdrTableObj::SetModel(SdrModel* pNewModel)
// --------------------------------------------------------------------
-void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, BOOL bLineWidth ) const
+void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText, Rectangle* pAnchorRect, sal_Bool bLineWidth ) const
{
if( mpImpl )
TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
@@ -1468,7 +1468,7 @@ void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FA
// --------------------------------------------------------------------
-void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, BOOL /*bLineWidth*/ ) const
+void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText, Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/ ) const
{
if( !mpImpl )
return;
@@ -1483,7 +1483,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
SdrTextVertAdjust eVAdj=xCell->GetTextVerticalAdjust();
// SdrTextHorzAdjust eHAdj=xCell->GetTextHorizontalAdjust();
- ULONG nStat0=rOutliner.GetControlWord();
+ sal_uIntPtr nStat0=rOutliner.GetControlWord();
Size aNullSize;
nStat0 |= EE_CNTRL_AUTOPAGESIZE;
rOutliner.SetControlWord(nStat0);
@@ -1519,7 +1519,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
if( bHitTest ) // #i33696# take back fix #i27510#
rOutliner.SetTextObj( this );
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetText(*pPara);
}
}
@@ -1531,7 +1531,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
if (pEdtOutl && !bNoEditText && pPara && mpImpl->mxActiveCell == xCell )
delete pPara;
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetControlWord(nStat0);
Point aTextPos(aAnkRect.TopLeft());
@@ -1750,7 +1750,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size*
// --------------------------------------------------------------------
-USHORT SdrTableObj::GetOutlinerViewAnchorMode() const
+sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const
{
EVAnchorMode eRet=ANCHOR_TOP_LEFT;
CellRef xCell( getActiveCell() );
@@ -1807,7 +1807,7 @@ USHORT SdrTableObj::GetOutlinerViewAnchorMode() const
}
*/
}
- return (USHORT)eRet;
+ return (sal_uInt16)eRet;
}
// --------------------------------------------------------------------
@@ -2044,14 +2044,14 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
// ForceOutlinerParaObject();
- mbInEditMode = TRUE;
+ mbInEditMode = sal_True;
rOutl.Init( OUTLINERMODE_TEXTOBJECT );
rOutl.SetRefDevice( pModel->GetRefDevice() );
// --
- FASTBOOL bUpdMerk=rOutl.GetUpdateMode();
- if (bUpdMerk) rOutl.SetUpdateMode(FALSE);
+ int bUpdMerk=rOutl.GetUpdateMode();
+ if (bUpdMerk) rOutl.SetUpdateMode(sal_False);
Size aPaperMin;
Size aPaperMax;
Rectangle aEditArea;
@@ -2061,10 +2061,10 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
rOutl.SetMaxAutoPaperSize(aPaperMax);
rOutl.SetPaperSize(aPaperMax);
- if (bUpdMerk) rOutl.SetUpdateMode(TRUE);
+ if (bUpdMerk) rOutl.SetUpdateMode(sal_True);
//---
- ULONG nStat=rOutl.GetControlWord();
+ sal_uIntPtr nStat=rOutl.GetControlWord();
// nStat &= ~EE_CNTRL_AUTOPAGESIZE;
nStat |= EE_CNTRL_AUTOPAGESIZE;
nStat &=~EE_CNTRL_STRETCHING;
@@ -2093,7 +2093,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
OutlinerParaObject* pNewText = 0;
Paragraph* p1stPara = rOutl.GetParagraph( 0 );
- UINT32 nParaAnz = rOutl.GetParagraphCount();
+ sal_uInt32 nParaAnz = rOutl.GetParagraphCount();
if(p1stPara)
{
@@ -2123,11 +2123,11 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
pEdtOutl = 0;
rOutl.Clear();
- UINT32 nStat = rOutl.GetControlWord();
+ sal_uInt32 nStat = rOutl.GetControlWord();
nStat &= ~EE_CNTRL_AUTOPAGESIZE;
rOutl.SetControlWord(nStat);
- mbInEditMode = FALSE;
+ mbInEditMode = sal_False;
}
// --------------------------------------------------------------------
@@ -2212,10 +2212,10 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt)
+int SdrTableObj::AdjustTextFrameWidthAndHeight(int bHgt, int bWdt)
{
Rectangle aNeuRect(maLogicRect);
- FASTBOOL bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt);
+ int bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt);
if (bRet)
{
Rectangle aBoundRect0;
@@ -2232,10 +2232,10 @@ FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHeight, FASTBOOL bWidth) const
+int SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHeight, int bWidth) const
{
if((pModel == NULL) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() )
- return FALSE;
+ return sal_False;
Rectangle aRectangle( rR );
mpImpl->LayoutTable( aRectangle, !bWidth, !bHeight );
@@ -2243,11 +2243,11 @@ FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHei
if( aRectangle != rR )
{
rR = aRectangle;
- return TRUE;
+ return sal_True;
}
else
{
- return FALSE;
+ return sal_False;
}
}
@@ -2328,9 +2328,9 @@ bool SdrTableObj::IsRealyEdited() const
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::IsFontwork() const
+int SdrTableObj::IsFontwork() const
{
- return FALSE;
+ return sal_False;
}
// --------------------------------------------------------------------
@@ -2439,8 +2439,8 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const
rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomCenter(),HDL_LOWER) ); pH->SetMoveOutside( true );
rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomRight(),HDL_LWRGT) ); pH->SetMoveOutside( true );
- ULONG nHdlCount = rHdlList.GetHdlCount();
- for( ULONG nHdl = 0; nHdl < nHdlCount; nHdl++ )
+ sal_uIntPtr nHdlCount = rHdlList.GetHdlCount();
+ for( sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ )
rHdlList.GetHdl(nHdl)->SetObj((SdrObject*)this);
}
@@ -2599,19 +2599,19 @@ basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag
// Create
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::BegCreate(SdrDragStat& rStat)
+int SdrTableObj::BegCreate(SdrDragStat& rStat)
{
rStat.SetOrtho4Possible();
Rectangle aRect1(rStat.GetStart(), rStat.GetNow());
aRect1.Justify();
rStat.SetActionRect(aRect1);
aRect = aRect1;
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::MovCreate(SdrDragStat& rStat)
+int SdrTableObj::MovCreate(SdrDragStat& rStat)
{
Rectangle aRect1;
rStat.TakeCreateRect(aRect1);
@@ -2619,13 +2619,13 @@ FASTBOOL SdrTableObj::MovCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
aRect=aRect1; // fuer ObjName
SetBoundRectDirty();
- bSnapRectDirty=TRUE;
- return TRUE;
+ bSnapRectDirty=sal_True;
+ return sal_True;
}
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+int SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
rStat.TakeCreateRect(aRect);
ImpJustifyRect(aRect);
@@ -2638,9 +2638,9 @@ void SdrTableObj::BrkCreate(SdrDragStat& /*rStat*/)
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::BckCreate(SdrDragStat& /*rStat*/)
+int SdrTableObj::BckCreate(SdrDragStat& /*rStat*/)
{
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
generated by cgit (git 2.34.1) at 2024-07-13 05:51:54 +0000