summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-25 14:19:24 +0200
committerNoel Grandin <noel@peralex.com>2014-02-27 12:30:26 +0200
commit57779aa0195d77239b339c6dbe17209b3f0cc4ee (patch)
treefb07a1ccf2c6394da9d4c63ca0ae139af9669e8a /svx
parent127f62ccbdf090e2b5fc4d92c30a9c152b60f0e0 (diff)
editeng: sal_Bool->bool
Change-Id: Id4174904487fc153d8e80471da7c829c52092f78
Diffstat (limited to 'svx')
-rw-r--r--svx/source/sdr/properties/textproperties.cxx2
-rw-r--r--svx/source/svdraw/svdedxv.cxx14
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/svdraw/svdoashp.cxx6
-rw-r--r--svx/source/svdraw/svdomeas.cxx2
-rw-r--r--svx/source/svdraw/svdotext.cxx14
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx2
-rw-r--r--svx/source/svdraw/svdotxat.cxx2
-rw-r--r--svx/source/svdraw/svdotxed.cxx4
-rw-r--r--svx/source/svdraw/svdoutl.cxx2
-rw-r--r--svx/source/table/cell.cxx6
-rw-r--r--svx/source/table/svdotable.cxx8
-rw-r--r--svx/source/table/tablecontroller.cxx2
-rw-r--r--svx/source/table/tablertfimporter.cxx4
-rw-r--r--svx/source/unodraw/unoshtxt.cxx2
15 files changed, 36 insertions, 36 deletions
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index fc1c7c850678..b2b32d3222ec 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -185,7 +185,7 @@ namespace sdr
if(nParaCount)
{
ESelection aSelection( 0, 0, EE_PARA_ALL, EE_TEXTPOS_ALL);
- rOutliner.RemoveAttribs(aSelection, sal_True, 0);
+ rOutliner.RemoveAttribs(aSelection, true, 0);
OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, nParaCount);
rOutliner.Clear();
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 283d36920df3..9e42ed049675 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -199,7 +199,7 @@ void SdrObjEditView::ModelHasChanged()
pTextEditOutliner->GetMinAutoPaperSize()!=aPaperMin1 || pTextEditOutliner->GetMaxAutoPaperSize()!=aPaperMax1) {
aTextEditArea=aEditArea1;
aMinTextEditArea=aMinArea1;
- pTextEditOutliner->SetUpdateMode(sal_False);
+ pTextEditOutliner->SetUpdateMode(false);
pTextEditOutliner->SetMinAutoPaperSize(aPaperMin1);
pTextEditOutliner->SetMaxAutoPaperSize(aPaperMax1);
pTextEditOutliner->SetPaperSize(Size(0,0)); // re-format Outliner
@@ -225,7 +225,7 @@ void SdrObjEditView::ModelHasChanged()
else nStat&=~EV_CNTRL_AUTOSIZE;
if (nStat!=nStat0) pOLV->SetControlWord(nStat);
}
- pTextEditOutliner->SetUpdateMode(sal_True);
+ pTextEditOutliner->SetUpdateMode(true);
bAreaChg=true;
}
}
@@ -328,7 +328,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
aBlankRect.Union(aMinTextEditArea);
Rectangle aPixRect(rTargetDevice.LogicToPixel(aBlankRect));
aBlankRect.Intersection(rRect);
- rOutlView.GetOutliner()->SetUpdateMode(sal_True); // Bugfix #22596#
+ rOutlView.GetOutliner()->SetUpdateMode(true); // Bugfix #22596#
rOutlView.Paint(aBlankRect, &rTargetDevice);
if(!bModifyMerk)
@@ -431,8 +431,8 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, bool /*bNoPaint*
bool bContourFrame=pText!=NULL && pText->IsContourTextFrame();
// create OutlinerView
OutlinerView* pOutlView=pGivenView;
- pTextEditOutliner->SetUpdateMode(sal_False);
- if (pOutlView==NULL) pOutlView=new OutlinerView(pTextEditOutliner,pWin);
+ pTextEditOutliner->SetUpdateMode(false);
+ if (pOutlView==NULL) pOutlView = new OutlinerView(pTextEditOutliner,pWin);
else pOutlView->SetWindow(pWin);
// disallow scrolling
sal_uIntPtr nStat=pOutlView->GetControlWord();
@@ -452,7 +452,7 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, bool /*bNoPaint*
pTextEditOutliner->SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
}
// do update before setting output area so that aTextEditArea can be recalculated
- pTextEditOutliner->SetUpdateMode(sal_True);
+ pTextEditOutliner->SetUpdateMode(true);
pOutlView->SetOutputArea(aTextEditArea);
ImpInvalidateOutlinerView(*pOutlView);
return pOutlView;
@@ -1607,7 +1607,7 @@ sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplace
{
// and now the attributes to the EditEngine
if (bReplaceAll) {
- pTextEditOutlinerView->RemoveAttribs( sal_True );
+ pTextEditOutlinerView->RemoveAttribs( true );
}
pTextEditOutlinerView->SetAttribs(rSet);
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index b1d4a05445bb..e47a83e34444 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -809,7 +809,7 @@ void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit )
if( bInit )
{
pOutliner->EraseVirtualDevice();
- pOutliner->SetUpdateMode(sal_False);
+ pOutliner->SetUpdateMode(false);
pOutliner->SetEditTextObjectPool(pItemPool);
pOutliner->SetDefTab(nDefaultTabulator);
}
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 70ead2ba1c25..0ae93339113d 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2366,7 +2366,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt,
{
Outliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetPaperSize(aSiz);
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
// TODO: add the optimization with bPortionInfoChecked again.
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
if( pOutlinerParaObject != NULL )
@@ -2725,7 +2725,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
if( bHitTest )
rOutliner.SetTextObj( this );
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
rOutliner.SetText(*pPara);
}
}
@@ -2736,7 +2736,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
if (pEdtOutl && !bNoEditText && pPara)
delete pPara;
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
rOutliner.SetControlWord(nStat0);
SdrText* pText = getActiveText();
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 5f31c1897b28..c4f2b1a9f4b0 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -630,7 +630,7 @@ void SdrMeasureObj::UndirtyText() const
rOutliner.SetText(*pOutlinerParaObject);
}
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
rOutliner.UpdateFields();
Size aSiz(rOutliner.CalcTextSize());
rOutliner.Clear();
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 01f63c1c4899..ec701aa5bd69 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -210,7 +210,7 @@ void SdrTextObj::FitFrameToTextSize()
{
SdrOutliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetPaperSize(Size(aRect.Right()-aRect.Left(),aRect.Bottom()-aRect.Top()));
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
rOutliner.SetText(*pText->GetOutlinerParaObject());
Size aNewSize(rOutliner.CalcTextSize());
rOutliner.Clear();
@@ -230,7 +230,7 @@ void SdrTextObj::NbcSetText(const OUString& rStr)
{
SdrOutliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetStyleSheet( 0, GetStyleSheet());
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
rOutliner.SetText(rStr,rOutliner.GetParagraph( 0 ));
OutlinerParaObject* pNewText=rOutliner.CreateParaObject();
Size aSiz(rOutliner.CalcTextSize());
@@ -255,7 +255,7 @@ void SdrTextObj::NbcSetText(SvStream& rInput, const OUString& rBaseURL, sal_uInt
rOutliner.SetStyleSheet( 0, GetStyleSheet());
rOutliner.Read(rInput,rBaseURL,eFormat);
OutlinerParaObject* pNewText=rOutliner.CreateParaObject();
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
Size aSiz(rOutliner.CalcTextSize());
rOutliner.Clear();
NbcSetOutlinerParaObject(pNewText);
@@ -282,7 +282,7 @@ const Size& SdrTextObj::GetTextSize() const
{
SdrOutliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetText(*pText->GetOutlinerParaObject());
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
aSiz=rOutliner.CalcTextSize();
rOutliner.Clear();
}
@@ -770,7 +770,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
}
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
rOutliner.SetText(*pPara);
}
}
@@ -782,7 +782,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
if (pEdtOutl && !bNoEditText && pPara)
delete pPara;
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
rOutliner.SetControlWord(nStat0);
if( pText )
@@ -1196,7 +1196,7 @@ void SdrTextObj::ImpCheckMasterCachable()
// Extracted from ImpGetDrawOutliner()
void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const
{
- rOutl.SetUpdateMode(sal_False);
+ rOutl.SetUpdateMode(false);
sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
if ( !IsOutlText() )
nOutlinerMode = OUTLINERMODE_TEXTOBJECT;
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 42657e0385a9..56c43ea014aa 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -92,7 +92,7 @@ namespace
maFont(rInfo.mrFont),
maDblDXArray(),
maLocale(rInfo.mpLocale ? *rInfo.mpLocale : ::com::sun::star::lang::Locale()),
- mbRTL(rInfo.mrFont.IsVertical() ? false : rInfo.IsRTL())
+ mbRTL(rInfo.mrFont.IsVertical() ? sal_False : rInfo.IsRTL())
{
if(mnTextLength && rInfo.mpDXArray)
{
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 3961c0d0db62..792f82b85939 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -117,7 +117,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW
} else {
Outliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetPaperSize(aSiz);
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
// TODO: add the optimization with bPortionInfoChecked etc. here
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
if ( pOutlinerParaObject != NULL )
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index c40dfaa7a35a..eb5d9d8dd51c 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -315,7 +315,7 @@ void SdrTextObj::ImpSetTextEditParams() const
{
if (pEdtOutl!=NULL) {
bool bUpdMerk=pEdtOutl->GetUpdateMode();
- if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_False);
+ if (bUpdMerk) pEdtOutl->SetUpdateMode(false);
Size aPaperMin;
Size aPaperMax;
Rectangle aEditArea;
@@ -329,7 +329,7 @@ void SdrTextObj::ImpSetTextEditParams() const
TakeTextAnchorRect(aAnchorRect);
ImpSetContourPolygon(*pEdtOutl,aAnchorRect, sal_True);
}
- if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_True);
+ if (bUpdMerk) pEdtOutl->SetUpdateMode(true);
}
}
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index e0fa528778f8..7e46447ff208 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -46,7 +46,7 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj )
{
if( pObj && pObj != mpTextObj.get() )
{
- SetUpdateMode(sal_False);
+ SetUpdateMode(false);
sal_uInt16 nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT;
if ( !pObj->IsOutlText() )
nOutlinerMode2 = OUTLINERMODE_TEXTOBJECT;
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index d56e5c7ae22c..26db3dfed1f0 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -451,7 +451,7 @@ void Cell::mergeContent( const CellRef& xSourceCell )
if( xSourceCell->hasText() )
{
SdrOutliner& rOutliner=rTableObj.ImpGetDrawOutliner();
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
if( hasText() )
{
@@ -699,7 +699,7 @@ sal_Int32 Cell::getMinimumHeight()
{
Outliner& rOutliner=rTableObj.ImpGetDrawOutliner();
rOutliner.SetPaperSize(aSize);
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT );
if( GetOutlinerParaObject() )
@@ -1598,7 +1598,7 @@ void SAL_CALL Cell::setAllPropertiesToDefault()
if(nParaCount)
{
ESelection aSelection( 0, 0, EE_PARA_ALL, EE_TEXTPOS_ALL);
- rOutliner.RemoveAttribs(aSelection, sal_True, 0);
+ rOutliner.RemoveAttribs(aSelection, true, 0);
OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, nParaCount);
rOutliner.Clear();
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 9e5a6fd31f02..a603afe30614 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1451,7 +1451,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
if( bHitTest ) // #i33696# take back fix #i27510#
rOutliner.SetTextObj( this );
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
rOutliner.SetText(*pPara);
}
}
@@ -1463,7 +1463,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
if (pEdtOutl && !bNoEditText && pPara && mpImpl->mxActiveCell == xCell )
delete pPara;
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
rOutliner.SetControlWord(nStat0);
Point aTextPos(aAnkRect.TopLeft());
@@ -1835,7 +1835,7 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
rOutl.SetRefDevice( pModel->GetRefDevice() );
bool bUpdMerk=rOutl.GetUpdateMode();
- if (bUpdMerk) rOutl.SetUpdateMode(sal_False);
+ if (bUpdMerk) rOutl.SetUpdateMode(false);
Size aPaperMin;
Size aPaperMax;
Rectangle aEditArea;
@@ -1845,7 +1845,7 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
rOutl.SetMaxAutoPaperSize(aPaperMax);
rOutl.SetPaperSize(aPaperMax);
- if (bUpdMerk) rOutl.SetUpdateMode(sal_True);
+ if (bUpdMerk) rOutl.SetUpdateMode(true);
sal_uIntPtr nStat=rOutl.GetControlWord();
nStat |= EE_CNTRL_AUTOPAGESIZE;
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index e999b52a95b0..d096b47332bc 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1690,7 +1690,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const
// create new outliner, owner will be the SdrObjEditView
SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpModel );
if( pTableObj->IsVerticalWriting() )
- pOutl->SetVertical( sal_True );
+ pOutl->SetVertical( true );
if(mpView->SdrBeginTextEdit(pTableObj, pPV, pWindow, sal_True, pOutl))
{
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 009b71707329..2e93278b70d1 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -138,7 +138,7 @@ SdrTableRTFParser::SdrTableRTFParser( SdrTableObj& rTableObj )
, mpDefMerge( 0 )
, mxTable( rTableObj.getTable() )
{
- mpOutliner->SetUpdateMode(sal_True);
+ mpOutliner->SetUpdateMode(true);
mpOutliner->SetStyleSheet( 0, mrTableObj.GetStyleSheet() );
mpInsDefault = new RTFCellDefault( &mrItemPool );
}
@@ -276,7 +276,7 @@ void SdrTableRTFParser::FillTable()
if( pTextObject )
{
SdrOutliner& rOutliner=mrTableObj.ImpGetDrawOutliner();
- rOutliner.SetUpdateMode(sal_True);
+ rOutliner.SetUpdateMode(true);
rOutliner.SetText( *pTextObject );
mrTableObj.NbcSetOutlinerParaObjectForText( rOutliner.CreateParaObject(), xCell.get() );
delete pTextObject;
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 3c72deaa3ed1..070c065f532f 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -676,7 +676,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
mpOutliner->SetStyleSheet( 0, pStyleSheet );
if( bVertical )
- mpOutliner->SetVertical( sal_True );
+ mpOutliner->SetVertical( true );
}
// evtually we have to set the border attributes