Skip to content

C
core
Kaydet (Commit) 0f9190b1 authored tarafından Takeshi Abe's avatar Takeshi Abe
Dosyalara gözat
Seçenekler

sal_Bool to bool 

Change-Id: Idc97443436502eea5dec27d553374475a22bd7ce
üst 1155f024
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 60 deletions
svx/source/svdraw/svdotext.cxx
Dosyayı görüntüle @ 0f9190b1
......@@ -748,7 +748,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo
if (pPara)
{
sal_Bool bHitTest = sal_False;
bool bHitTest = false;
if( pModel )
bHitTest = &pModel->GetHitTestOutliner() == &rOutliner;
......@@ -851,7 +851,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const
void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const
{
OutputDevice* pOut = rOutliner.GetRefDevice();
sal_Bool bNoStretching(sal_False);
bool bNoStretching(false);
if(pOut && pOut->GetOutDevType() == OUTDEV_PRINTER)
{
......@@ -886,7 +886,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS
// we don't like that.
if(aSize2.Height() >= aSize1.Height() * 2)
{
bNoStretching = sal_True;
bNoStretching = true;
}
#endif
}
......
svx/source/svdraw/svdotxln.cxx
Dosyayı görüntüle @ 0f9190b1
......@@ -50,7 +50,7 @@ public:
virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
const String& rMimeType, const ::com::sun::star::uno::Any & rValue );
sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
};
ImpSdrObjTextLink::~ImpSdrObjTextLink()
......@@ -168,7 +168,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
if( pData )
{
DateTime aFileDT( DateTime::EMPTY );
sal_Bool bExists = sal_True, bLoad = sal_False;
bool bExists = true, bLoad = false;
try
{
......@@ -184,13 +184,13 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
}
catch( ... )
{
bExists = sal_False;
bExists = false;
}
if( bExists )
{
if( bForceLoad )
bLoad = sal_True;
bLoad = true;
else
bLoad = ( aFileDT > pData->aFileDate0 );
......@@ -209,7 +209,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet)
{
INetURLObject aFileURL( rFileName );
sal_Bool bRet = sal_False;
bool bRet = false;
if( aFileURL.GetProtocol() == INET_PROT_NOT_VALID )
{
......@@ -233,14 +233,14 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/
cRTF[4] = 0;
pIStm->Read(cRTF, 5);
sal_Bool bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f';
bool bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f';
pIStm->Seek(0);
if( !pIStm->GetError() )
{
SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< sal_uInt16 >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) );
bRet = sal_True;
bRet = true;
}
delete pIStm;
......
svx/source/svdraw/svdpage.cxx
Dosyayı görüntüle @ 0f9190b1
......@@ -218,7 +218,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
void SdrObjList::Clear()
{
sal_Bool bObjectsRemoved(sal_False);
bool bObjectsRemoved(false);
while( ! maList.empty())
{
......@@ -230,7 +230,7 @@ void SdrObjList::Clear()
// to delete the object and thus refresh visualisations
pObj->GetViewContact().flushViewObjectContacts(true);
bObjectsRemoved = sal_True;
bObjectsRemoved = true;
// sent remove hint (after removal, see RemoveObject())
if(pModel)
......
svx/source/svdraw/svdpagv.cxx
Dosyayı görüntüle @ 0f9190b1
......@@ -291,13 +291,13 @@ void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rRe
if(GetPage())
{
SdrPageWindow* pPageWindow = FindPageWindow(rPaintWindow);
sal_Bool bIsTempTarget(sal_False);
bool bIsTempTarget(false);
if(!pPageWindow)
{
// create temp PageWindow
pPageWindow = new SdrPageWindow(*((SdrPageView*)this), rPaintWindow);
bIsTempTarget = sal_True;
bIsTempTarget = true;
}
// do the redraw
......
svx/source/svdraw/svdpntv.cxx
Dosyayı görüntüle @ 0f9190b1
......@@ -271,7 +271,7 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
return;
}
sal_Bool bObjChg=!bSomeObjChgdFlag; // if sal_True, evaluate for ComeBack timer
bool bObjChg=!bSomeObjChgdFlag; // if true, evaluate for ComeBack timer
if (bObjChg) {
SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
if (pSdrHint!=NULL) {
......@@ -1046,13 +1046,13 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
{
#ifdef DBG_UTIL
{
sal_Bool bHasEEFeatureItems=sal_False;
bool bHasEEFeatureItems=false;
SfxItemIter aIter(rAttr);
const SfxPoolItem* pItem=aIter.FirstItem();
while (!bHasEEFeatureItems && pItem!=NULL) {
if (!IsInvalidItem(pItem)) {
sal_uInt16 nW=pItem->Which();
if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=sal_True;
if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=true;
}
pItem=aIter.NextItem();
}
......@@ -1159,12 +1159,12 @@ void SdrPaintView::MakeVisible(const Rectangle& rRect, Window& rWin)
if( aActualSize.Height() > 0 && aActualSize.Width() > 0 )
{
Size aNewSize(rRect.GetSize());
sal_Bool bNewScale=sal_False;
sal_Bool bNeedMoreX=aNewSize.Width()>aActualSize.Width();
sal_Bool bNeedMoreY=aNewSize.Height()>aActualSize.Height();
bool bNewScale=false;
bool bNeedMoreX=aNewSize.Width()>aActualSize.Width();
bool bNeedMoreY=aNewSize.Height()>aActualSize.Height();
if (bNeedMoreX || bNeedMoreY)
{
bNewScale=sal_True;
bNewScale=true;
// set new MapMode (Size+Org) and invalidate everything
Fraction aXFact(aNewSize.Width(),aActualSize.Width());
Fraction aYFact(aNewSize.Height(),aActualSize.Height());
......
svx/source/svdraw/svdpoev.cxx
Dosyayı görüntüle @ 0f9190b1
......@@ -371,7 +371,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
{
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
sal_Bool bKorregFlag(sal_False);
bool bKorregFlag(false);
sal_uInt32 nMax(pObj->GetHdlCount());
for(SdrUShortCont::const_reverse_iterator it = pPts->rbegin(); it != pPts->rend(); ++it)
......@@ -391,10 +391,10 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
if(nNewPt0Idx)
{
// correction necessary?
DBG_ASSERT(bKorregFlag==sal_False,"Multiple index corrections at SdrPolyEditView::RipUp().");
DBG_ASSERT(bKorregFlag==false,"Multiple index corrections at SdrPolyEditView::RipUp().");
if(!bKorregFlag)
{
bKorregFlag = sal_True;
bKorregFlag = true;
SdrUShortCont aReplaceSet;
for(SdrUShortCont::const_iterator it2 = pPts->begin(); it2 != pPts->end(); ++it2)
......
svx/source/svdraw/svdtext.cxx
Dosyayı görüntüle @ 0f9190b1
......@@ -137,8 +137,8 @@ void SdrText::SetModel( SdrModel* pNewModel )
// see whether we need to use AutoGrow!
sal_uIntPtr nOldFontHgt=pOldModel->GetDefaultFontHeight();
sal_uIntPtr nNewFontHgt=pNewModel->GetDefaultFontHeight();
sal_Bool bDefHgtChanged=nNewFontHgt!=nOldFontHgt;
sal_Bool bSetHgtItem=bDefHgtChanged && !bHgtSet;
bool bDefHgtChanged=nNewFontHgt!=nOldFontHgt;
bool bSetHgtItem=bDefHgtChanged && !bHgtSet;
if (bSetHgtItem)
{
// fix the value of HeightItem, so
......
svx/source/svdraw/svdundo.cxx
Dosyayı görüntüle @ 0f9190b1
......@@ -267,8 +267,8 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSave
bStyleSheet = bStyleSheet1;
SdrObjList* pOL = rNewObj.GetSubList();
sal_Bool bIsGroup(pOL!=NULL && pOL->GetObjCount());
sal_Bool bIs3DScene(bIsGroup && pObj->ISA(E3dScene));
bool bIsGroup(pOL!=NULL && pOL->GetObjCount());
bool bIs3DScene(bIsGroup && pObj->ISA(E3dScene));
if(bIsGroup)
{
......@@ -320,7 +320,7 @@ SdrUndoAttrObj::~SdrUndoAttrObj()
void SdrUndoAttrObj::Undo()
{
E3DModifySceneSnapRectUpdater aUpdater(pObj);
sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene));
bool bIs3DScene(pObj && pObj->ISA(E3dScene));
// Trigger PageChangeCall
ImpShowPageOfThisObject();
......@@ -420,7 +420,7 @@ void SdrUndoAttrObj::Undo()
void SdrUndoAttrObj::Redo()
{
E3DModifySceneSnapRectUpdater aUpdater(pObj);
sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene));
bool bIs3DScene(pObj && pObj->ISA(E3dScene));
if(!pUndoGroup || bIs3DScene)
{
......
svx/source/svdraw/svdview.cxx
Dosyayı görüntüle @ 0f9190b1
......@@ -814,7 +814,7 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
MarkObj(rVEvt.pRootObj,rVEvt.pPV);
if (eHit==SDRHIT_TEXTEDIT)
{
sal_Bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() &&
bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() &&
SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, sal_False, (SdrOutliner*)0L));
if(bRet2)
......@@ -921,9 +921,9 @@ sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
if (bRet && pActualOutDev!=NULL && pActualOutDev->GetOutDevType()==OUTDEV_WINDOW) {
Window* pWin=(Window*)pActualOutDev;
// left mouse button pressed?
sal_Bool bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown;
bool bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown;
// left mouse button released?
sal_Bool bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp;
bool bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp;
// left mouse button pressed or held?
sal_Bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp;
pWin->SetPointer(GetPreferedPointer(rVEvt.aLogicPos,pWin,
......@@ -1047,14 +1047,14 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
default: break;
}
sal_Bool bMarkHit=eHit==SDRHIT_MARKEDOBJECT;
bool bMarkHit=eHit==SDRHIT_MARKEDOBJECT;
SdrHdl* pHdl=aVEvt.pHdl;
// now check the pointers for dragging
if (pHdl!=NULL || bMarkHit) {
SdrHdlKind eHdl= pHdl!=NULL ? pHdl->GetKind() : HDL_MOVE;
sal_Bool bCorner=pHdl!=NULL && pHdl->IsCornerHdl();
sal_Bool bVertex=pHdl!=NULL && pHdl->IsVertexHdl();
sal_Bool bMov=eHdl==HDL_MOVE;
bool bCorner=pHdl!=NULL && pHdl->IsCornerHdl();
bool bVertex=pHdl!=NULL && pHdl->IsVertexHdl();
bool bMov=eHdl==HDL_MOVE;
if (bMov && (eDragMode==SDRDRAG_MOVE || eDragMode==SDRDRAG_RESIZE || bMarkedHitMovesAlways)) {
if (!IsMoveAllowed()) return Pointer(POINTER_ARROW); // because double click or drag & drop is possible
return Pointer(POINTER_MOVE);
......@@ -1065,11 +1065,11 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
return Pointer(POINTER_NOTALLOWED);
// are 3D objects selected?
sal_Bool b3DObjSelected = sal_False;
bool b3DObjSelected = false;
for (sal_uInt32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) {
SdrObject* pObj = GetMarkedObjectByIndex(a);
if(pObj && pObj->ISA(E3dObject))
b3DObjSelected = sal_True;
b3DObjSelected = true;
}
// If we have a 3D object, go on despite !IsShearAllowed,
// because then we have a rotation instead of a shear.
......@@ -1093,18 +1093,18 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
if (bCorner || bVertex || bMov) {
SdrHdl* pH1=aHdl.GetHdl(HDL_REF1);
SdrHdl* pH2=aHdl.GetHdl(HDL_REF2);
sal_Bool b90=sal_False;
sal_Bool b45=sal_False;
bool b90=false;
bool b45=false;
Point aDif;
if (pH1!=NULL && pH2!=NULL) {
aDif=pH2->GetPos()-pH1->GetPos();
b90=(aDif.X()==0) || aDif.Y()==0;
b45=b90 || (Abs(aDif.X())==Abs(aDif.Y()));
}
sal_Bool bNo=sal_False;
if (!IsMirrorAllowed(sal_True,sal_True)) bNo=sal_True; // any mirroring is forbidden
if (!IsMirrorAllowed(sal_False,sal_False) && !b45) bNo=sal_True; // mirroring freely is forbidden
if (!IsMirrorAllowed(sal_True,sal_False) && !b90) bNo=sal_True; // mirroring horizontally/vertically is allowed
bool bNo=false;
if (!IsMirrorAllowed(sal_True,sal_True)) bNo=true; // any mirroring is forbidden
if (!IsMirrorAllowed(sal_False,sal_False) && !b45) bNo=true; // mirroring freely is forbidden
if (!IsMirrorAllowed(sal_True,sal_False) && !b90) bNo=true; // mirroring horizontally/vertically is allowed
if (bNo) return Pointer(POINTER_NOTALLOWED);
if (b90) {
return Pointer(POINTER_MIRROR);
......@@ -1234,7 +1234,7 @@ XubString SdrView::GetStatusText()
// position of the next line of the same paragraph, if there is one.
sal_uInt16 nParaLine=0;
sal_uIntPtr nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara);
sal_Bool bBrk=sal_False;
bool bBrk=false;
while (!bBrk) {
sal_uInt16 nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine);
sal_Bool bLastLine=(nParaLine==nParaLineAnz-1);
......@@ -1242,8 +1242,8 @@ XubString SdrView::GetStatusText()
nCol-=nLen;
nLin++;
nParaLine++;
} else bBrk=sal_True;
if (nLen==0) bBrk=sal_True; // to be sure
} else bBrk=true;
if (nLen==0) bBrk=true; // to be sure
}
aStr.SearchAndReplaceAscii("%1", OUString::valueOf(nPar + 1));
......@@ -1296,10 +1296,10 @@ SdrViewContext SdrView::GetContext() const
if( HasMarkablePoints() && !IsFrameHandles() )
{
sal_Bool bPath=sal_True;
bool bPath=true;
for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ )
if (!GetMarkedObjectByIndex(nMarkNum)->ISA(SdrPathObj))
bPath=sal_False;
bPath=false;
if( bPath )
return SDRCONTEXT_POINTEDIT;
......@@ -1307,7 +1307,7 @@ SdrViewContext SdrView::GetContext() const
if( GetMarkedObjectCount() )
{
sal_Bool bGraf = sal_True, bMedia = sal_True, bTable = sal_True;
bool bGraf = true, bMedia = true, bTable = true;
for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ )
{
......@@ -1318,13 +1318,13 @@ SdrViewContext SdrView::GetContext() const
continue;
if( !pMarkObj->ISA( SdrGrafObj ) )
bGraf = sal_False;
bGraf = false;
if( !pMarkObj->ISA( SdrMediaObj ) )
bMedia = sal_False;
bMedia = false;
if( !pMarkObj->ISA( ::sdr::table::SdrTableObj ) )
bTable = sal_False;
bTable = false;
}
if( bGraf )
......
svx/source/svdraw/svdxcgv.cxx
Dosyayı görüntüle @ 0f9190b1
......@@ -130,7 +130,7 @@ sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObj
if (pLst==NULL) return sal_False;
SdrLayerID nLayer;
if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
if (bUnmark) UnmarkAllObj();
Rectangle aTextRect(0,0,500,500);
SdrPage* pPage=pLst->GetPage();
......@@ -167,7 +167,7 @@ sal_Bool SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, sal_uI
if (pLst==NULL) return sal_False;
SdrLayerID nLayer;
if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
if (bUnmark) UnmarkAllObj();
Rectangle aTextRect(0,0,500,500);
SdrPage* pPage=pLst->GetPage();
......@@ -250,7 +250,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
if (pLst==NULL)
return sal_False;
sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
if (bUnmark)
UnmarkAllObj();
......@@ -258,7 +258,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
// Calculate the necessary factors first.
MapUnit eSrcUnit=pSrcMod->GetScaleUnit();
MapUnit eDstUnit=pMod->GetScaleUnit();
sal_Bool bResize=eSrcUnit!=eDstUnit;
bool bResize=eSrcUnit!=eDstUnit;
Fraction xResize,yResize;
Point aPt0;
if (bResize)
......@@ -282,7 +282,7 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
Size aSiz(aDist.X(),aDist.Y());
sal_uIntPtr nCloneErrCnt=0;
sal_uIntPtr nOb,nObAnz=pSrcPg->GetObjCount();
sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
// #i13033#
// New mechanism to re-create the connections of cloned connectors
......@@ -431,7 +431,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po
pMarkPV=pPV;
}
sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
if (bMark)
{ // select object the first PageView we found
MarkObj(pObj,pMarkPV);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment