[Libreoffice-commits] core.git: 2 commits - svx/inc svx/source sw/source
Takeshi Abe
tabe at fixedpoint.jp
Tue Mar 26 07:20:41 PDT 2013
svx/inc/svx/sdrmasterpagedescriptor.hxx | 4 ++--
svx/inc/svx/sdrpaintwindow.hxx | 4 ++--
svx/inc/svx/svdcrtv.hxx | 6 +++---
svx/inc/svx/svddrgv.hxx | 3 +--
svx/inc/svx/svdhdl.hxx | 12 ++++++------
svx/source/sdr/contact/objectcontactofpageview.cxx | 6 +++---
svx/source/svdraw/charthelper.cxx | 16 ++--------------
svx/source/svdraw/clonelist.cxx | 8 ++++----
svx/source/svdraw/gradtrns.cxx | 2 +-
svx/source/svdraw/gradtrns.hxx | 2 +-
svx/source/svdraw/sdrmasterpagedescriptor.cxx | 4 ++--
svx/source/svdraw/sdrpagewindow.cxx | 6 +++---
svx/source/svdraw/sdrpaintwindow.cxx | 4 ++--
svx/source/svdraw/svdattr.cxx | 6 +++---
svx/source/svdraw/svdcrtv.cxx | 14 +++++++-------
svx/source/svdraw/svddrgv.cxx | 14 +++++++-------
svx/source/svdraw/svdmrkv.cxx | 8 ++++----
svx/source/svdraw/svdpntv.cxx | 4 ++--
svx/source/svdraw/svdview.cxx | 6 +++---
sw/source/ui/inc/view.hxx | 6 +++---
sw/source/ui/uiview/viewdraw.cxx | 4 ++--
sw/source/ui/uiview/viewport.cxx | 14 +++++++-------
22 files changed, 70 insertions(+), 83 deletions(-)
New commits:
commit 0bd5a8d3f26590f467379042597f91be681fe25e
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Mar 26 22:25:24 2013 +0900
sal_Bool to bool
Change-Id: I27a444a8313bff276e377ffb87458213f4e19707
diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx
index 20658c1..1917a68 100644
--- a/svx/inc/svx/sdrmasterpagedescriptor.hxx
+++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx
@@ -80,8 +80,8 @@ namespace sdr
void SetVisibleLayers(const SetOfByte& rNew);
// operators
- sal_Bool operator==(const MasterPageDescriptor& rCandidate) const;
- sal_Bool operator!=(const MasterPageDescriptor& rCandidate) const;
+ bool operator==(const MasterPageDescriptor& rCandidate) const;
+ bool operator!=(const MasterPageDescriptor& rCandidate) const;
const SdrPageProperties* getCorrectSdrPageProperties() const;
};
diff --git a/svx/inc/svx/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx
index 5191f73..bf8620c 100644
--- a/svx/inc/svx/sdrpaintwindow.hxx
+++ b/svx/inc/svx/sdrpaintwindow.hxx
@@ -112,7 +112,7 @@ public:
Rectangle GetVisibleArea() const;
// Is OutDev a printer?
- sal_Bool OutputToPrinter() const { return (OUTDEV_PRINTER == mrOutputDevice.GetOutDevType()); }
+ bool OutputToPrinter() const { return (OUTDEV_PRINTER == mrOutputDevice.GetOutDevType()); }
// Is OutDev a window?
sal_Bool OutputToWindow() const { return (OUTDEV_WINDOW == mrOutputDevice.GetOutDevType()); }
@@ -121,7 +121,7 @@ public:
sal_Bool OutputToVirtualDevice() const { return (OUTDEV_VIRDEV == mrOutputDevice.GetOutDevType()); }
// Is OutDev a recording MetaFile?
- sal_Bool OutputToRecordingMetaFile() const;
+ bool OutputToRecordingMetaFile() const;
// prepare PreRendering (evtl.)
void PreparePreRenderDevice();
diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx
index 5e42e5f..9a95ba1 100644
--- a/svx/inc/svx/svdcrtv.hxx
+++ b/svx/inc/svx/svdcrtv.hxx
@@ -114,13 +114,13 @@ public:
void SetGluePointEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); }
// Determine whether a text tool is activated
- sal_Bool IsTextTool() const;
+ bool IsTextTool() const;
// Determine whether an object connector tool activated
- sal_Bool IsEdgeTool() const;
+ bool IsEdgeTool() const;
// Determine whether a measurement tool activated
- sal_Bool IsMeasureTool() const;
+ bool IsMeasureTool() const;
void SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent=SdrInventor);
void TakeCurrentObj(sal_uInt16& nIdent, sal_uInt32& nInvent) const { nInvent=nAktInvent; nIdent=nAktIdent; }
diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx
index 47ac8a8..1997dfb 100644
--- a/svx/inc/svx/svddrgv.hxx
+++ b/svx/inc/svx/svddrgv.hxx
@@ -139,8 +139,7 @@ public:
sal_Bool IsInsertGluePoint() const { return bInsGluePoint; }
// Interaktives einfuegen eines neuen Punktes. nIdx=0 => vor dem ersten Punkt.
- sal_Bool IsInsObjPointPossible() const;
- sal_Bool IsInsPointPossible() const { return IsInsObjPointPossible(); }
+ bool IsInsObjPointPossible() const;
sal_Bool BegInsObjPoint(const Point& rPnt, sal_Bool bNewObj) { return ImpBegInsObjPoint(sal_False, 0L, rPnt, bNewObj, 0L); }
void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); }
sal_Bool EndInsObjPoint(SdrCreateCmd eCmd);
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 5b46d35..2a58f61 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -302,8 +302,8 @@ private:
unsigned bGradient : 1;
// select which handle to move
- unsigned bMoveSingleHandle : 1;
- unsigned bMoveFirstHandle : 1;
+ bool bMoveSingleHandle : 1;
+ bool bMoveFirstHandle : 1;
// create marker for this kind
virtual void CreateB2dIAObject();
@@ -329,10 +329,10 @@ public:
void FromIAOToItem(SdrObject* pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo);
// selection flags for interaction
- sal_Bool IsMoveSingleHandle() const { return bMoveSingleHandle; }
- void SetMoveSingleHandle(sal_Bool bNew) { bMoveSingleHandle = bNew; }
- sal_Bool IsMoveFirstHandle() const { return bMoveFirstHandle; }
- void SetMoveFirstHandle(sal_Bool bNew) { bMoveFirstHandle = bNew; }
+ bool IsMoveSingleHandle() const { return bMoveSingleHandle; }
+ void SetMoveSingleHandle(bool bNew) { bMoveSingleHandle = bNew; }
+ bool IsMoveFirstHandle() const { return bMoveFirstHandle; }
+ void SetMoveFirstHandle(bool bNew) { bMoveFirstHandle = bNew; }
};
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index 89ab683..d53539f 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -144,7 +144,7 @@ namespace sdr
{
// visualize entered group when that feature is switched on and it's not
// a print output. #i29129# No ghosted display for printing.
- sal_Bool bVisualizeEnteredGroup(DoVisualizeEnteredGroup() && !isOutputToPrinter());
+ bool bVisualizeEnteredGroup(DoVisualizeEnteredGroup() && !isOutputToPrinter());
// Visualize entered groups: Set to ghosted as default
// start. Do this only for the DrawPage, not for MasterPages
@@ -156,12 +156,12 @@ namespace sdr
// #114359# save old and set clip region
OutputDevice* pOutDev = TryToGetOutputDevice();
OSL_ENSURE(0 != pOutDev, "ObjectContactOfPageView without OutDev, someone has overloaded TryToGetOutputDevice wrong (!)");
- sal_Bool bClipRegionPushed(sal_False);
+ bool bClipRegionPushed(false);
const Region& rRedrawArea(rDisplayInfo.GetRedrawArea());
if(!rRedrawArea.IsEmpty())
{
- bClipRegionPushed = sal_True;
+ bClipRegionPushed = true;
pOutDev->Push(PUSH_CLIPREGION);
pOutDev->IntersectClipRegion(rRedrawArea);
}
diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx
index 0687809..fc4c94a 100644
--- a/svx/source/svdraw/clonelist.cxx
+++ b/svx/source/svdraw/clonelist.cxx
@@ -31,14 +31,14 @@ void CloneList::AddPair(const SdrObject* pOriginal, SdrObject* pClone)
maCloneList.push_back(pClone);
// look for subobjects, too.
- sal_Bool bOriginalIsGroup(pOriginal->IsGroupObject());
- sal_Bool bCloneIsGroup(pClone->IsGroupObject());
+ bool bOriginalIsGroup(pOriginal->IsGroupObject());
+ bool bCloneIsGroup(pClone->IsGroupObject());
if(bOriginalIsGroup && pOriginal->ISA(E3dObject) && !pOriginal->ISA(E3dScene))
- bOriginalIsGroup = sal_False;
+ bOriginalIsGroup = false;
if(bCloneIsGroup && pClone->ISA(E3dObject) && !pClone->ISA(E3dScene))
- bCloneIsGroup = sal_False;
+ bCloneIsGroup = false;
if(bOriginalIsGroup && bCloneIsGroup)
{
diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx
index d44dfcd..f0bdfeb 100644
--- a/svx/source/svdraw/gradtrns.cxx
+++ b/svx/source/svdraw/gradtrns.cxx
@@ -179,7 +179,7 @@ void GradTransformer::GradToVec(GradTransGradient& rG, GradTransVector& rV, cons
//////////////////////////////////////////////////////////////////////////////
void GradTransformer::VecToGrad(GradTransVector& rV, GradTransGradient& rG, GradTransGradient& rGOld, const SdrObject* pObj,
- sal_Bool bMoveSingle, sal_Bool bMoveFirst)
+ bool bMoveSingle, bool bMoveFirst)
{
// fill old gradient to new gradient to have a base
rG = rGOld;
diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx
index 23cf3e9..0d14a3e 100644
--- a/svx/source/svdraw/gradtrns.hxx
+++ b/svx/source/svdraw/gradtrns.hxx
@@ -48,7 +48,7 @@ public:
void GradToVec(GradTransGradient& rG, GradTransVector& rV,
const SdrObject* pObj);
void VecToGrad(GradTransVector& rV, GradTransGradient& rG,
- GradTransGradient& rGOld, const SdrObject* pObj, sal_Bool bMoveSingle, sal_Bool bMoveFirst);
+ GradTransGradient& rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst);
};
#endif // _GRADTRANS_HXX
diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
index 1b84890..9e8e80d 100644
--- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx
+++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx
@@ -90,14 +90,14 @@ namespace sdr
}
// operators
- sal_Bool MasterPageDescriptor::operator==(const MasterPageDescriptor& rCandidate) const
+ bool MasterPageDescriptor::operator==(const MasterPageDescriptor& rCandidate) const
{
return (&maOwnerPage == &rCandidate.maOwnerPage
&& &maUsedPage == &rCandidate.maUsedPage
&& maVisibleLayers == rCandidate.maVisibleLayers);
}
- sal_Bool MasterPageDescriptor::operator!=(const MasterPageDescriptor& rCandidate) const
+ bool MasterPageDescriptor::operator!=(const MasterPageDescriptor& rCandidate) const
{
return (&maOwnerPage != &rCandidate.maOwnerPage
|| &maUsedPage != &rCandidate.maUsedPage
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index f89fdfa..99a8323 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -276,7 +276,7 @@ void SdrPageWindow::RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedire
SdrModel& rModel = *((SdrModel*)rView.GetModel());
// get to be processed layers
- const sal_Bool bPrinter(GetPaintWindow().OutputToPrinter());
+ const bool bPrinter(GetPaintWindow().OutputToPrinter());
SetOfByte aProcessLayers = bPrinter ? mrPageView.GetPrintableLayers() : mrPageView.GetVisibleLayers();
// create PaintInfoRec; use Rectangle only temporarily
@@ -328,7 +328,7 @@ void SdrPageWindow::RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectC
SdrModel& rModel = *((SdrModel*)rView.GetModel());
// get the layers to process
- const sal_Bool bPrinter(GetPaintWindow().OutputToPrinter());
+ const bool bPrinter(GetPaintWindow().OutputToPrinter());
SetOfByte aProcessLayers = bPrinter ? mrPageView.GetPrintableLayers() : mrPageView.GetVisibleLayers();
// is the given layer visible at all?
@@ -337,7 +337,7 @@ void SdrPageWindow::RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectC
// find out if we are painting the ControlLayer
const SdrLayerAdmin& rLayerAdmin = rModel.GetLayerAdmin();
const SdrLayerID nControlLayerId = rLayerAdmin.GetLayerID(rLayerAdmin.GetControlLayerName(), sal_False);
- const sal_Bool bControlLayerProcessingActive(pId && nControlLayerId == *pId);
+ const bool bControlLayerProcessingActive(pId && nControlLayerId == *pId);
// create PaintInfoRec, use Rectangle only temporarily
const Region& rRegion = GetPaintWindow().GetRedrawRegion();
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index f2084cb..3df44a1 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -183,7 +183,7 @@ Rectangle SdrPaintWindow::GetVisibleArea() const
return Rectangle(GetOutputDevice().PixelToLogic(Rectangle(Point(0,0), aVisSizePixel)));
}
-sal_Bool SdrPaintWindow::OutputToRecordingMetaFile() const
+bool SdrPaintWindow::OutputToRecordingMetaFile() const
{
GDIMetaFile* pMetaFile = mrOutputDevice.GetConnectMetaFile();
return (pMetaFile && pMetaFile->IsRecord() && !pMetaFile->IsPause());
@@ -191,7 +191,7 @@ sal_Bool SdrPaintWindow::OutputToRecordingMetaFile() const
void SdrPaintWindow::PreparePreRenderDevice()
{
- const sal_Bool bPrepareBufferedOutput(
+ const bool bPrepareBufferedOutput(
mrPaintView.IsBufferedOutputAllowed()
&& !OutputToPrinter()
&& !OutputToVirtualDevice()
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 77ea536..550e599 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -840,7 +840,7 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
OUString& rText, const IntlWrapper * pIntlWrapper) const
{
sal_Int32 nValue(GetValue());
- sal_Bool bNeg(nValue < 0);
+ bool bNeg(nValue < 0);
if(bNeg)
nValue = -nValue;
@@ -864,8 +864,8 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
aText.insert(0, aUnicodeNull);
sal_Int32 nLen = aText.getLength();
- sal_Bool bNull1(aText[nLen-1] == aUnicodeNull);
- sal_Bool bNull2(bNull1 && aText[nLen-2] == aUnicodeNull);
+ bool bNull1(aText[nLen-1] == aUnicodeNull);
+ bool bNull2(bNull1 && aText[nLen-2] == aUnicodeNull);
if(bNull2)
{
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 0bf9178..e6980bd 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -326,7 +326,7 @@ sal_Bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
{
// TODO: Change default hit tolerance at IsMarkedHit() some time!
Point aPos(pWin->PixelToLogic(rMEvt.GetPosPixel()));
- sal_Bool bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos);
+ bool bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos);
SdrObjConnection aCon;
if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,NULL,pWin);
SetConnectMarker(aCon,*pPV);
@@ -335,17 +335,17 @@ sal_Bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
return SdrDragView::MouseMove(rMEvt,pWin);
}
-sal_Bool SdrCreateView::IsTextTool() const
+bool SdrCreateView::IsTextTool() const
{
return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT);
}
-sal_Bool SdrCreateView::IsEdgeTool() const
+bool SdrCreateView::IsEdgeTool() const
{
return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE);
}
-sal_Bool SdrCreateView::IsMeasureTool() const
+bool SdrCreateView::IsMeasureTool() const
{
return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE);
}
@@ -605,7 +605,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
return sal_False; // sal_False = event not interpreted
}
- sal_Bool bPntsEq=nAnz>1;
+ bool bPntsEq=nAnz>1;
sal_uIntPtr i=1;
Point aP0=aDragStat.GetPoint(0);
while (bPntsEq && i<nAnz) { bPntsEq=aP0==aDragStat.GetPoint(i); i++; }
@@ -642,7 +642,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
pObj->SetLayer(nLayer);
// recognize creation of a new 3D object inside a 3D scene
- sal_Bool bSceneIntoScene(sal_False);
+ bool bSceneIntoScene(false);
if(pObjMerk
&& pObjMerk->ISA(E3dScene)
@@ -659,7 +659,7 @@ sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
SdrObject::Free( pObjMerk );
pObjMerk = 0L;
bRet = sal_False;
- bSceneIntoScene = sal_True;
+ bSceneIntoScene = true;
}
}
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 9838b47..e4cbdd4 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -169,7 +169,7 @@ sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const
if (pObj->ISA(SdrCaptionObj))
{
Point aPt(((SdrCaptionObj*)pObj)->GetTailPos());
- sal_Bool bTail=eDragHdl==HDL_POLY; // drag tail
+ bool bTail=eDragHdl==HDL_POLY; // drag tail
sal_Bool bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // specific to object
if (!bTail)
{ // for bTail, TakeActionRect already does the right thing
@@ -246,7 +246,7 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
bDragHdl=eDragHdl==HDL_REF1 || eDragHdl==HDL_REF2 || eDragHdl==HDL_MIRX;
// Expand test for HDL_ANCHOR_TR
- sal_Bool bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl);
+ bool bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl);
if(pHdl && (pHdl->GetKind() == HDL_SMARTTAG) && pForcedMeth )
{
@@ -268,12 +268,12 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
case HDL_UPPER: case HDL_LOWER:
{
// 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 yes, allow shear even when !IsShearAllowed,
// because 3D objects are limited rotations
@@ -416,14 +416,14 @@ sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl*
return sal_False;
}
- sal_Bool bSingleTextObjMark = sal_False; // SJ: #i100490#
+ bool bSingleTextObjMark = false; // SJ: #i100490#
if ( GetMarkedObjectCount() == 1 )
{
pMarkedObj=GetMarkedObjectByIndex(0);
if ( pMarkedObj &&
pMarkedObj->ISA( SdrTextObj ) &&
static_cast<SdrTextObj*>(pMarkedObj)->IsTextFrame() )
- bSingleTextObjMark = sal_True;
+ bSingleTextObjMark = true;
}
if ( bSingleTextObjMark )
mpCurrentSdrDragMethod = new SdrDragObjOwn(*this);
@@ -623,7 +623,7 @@ void SdrDragView::BrkDragObj()
}
}
-sal_Bool SdrDragView::IsInsObjPointPossible() const
+bool SdrDragView::IsInsObjPointPossible() const
{
return pMarkedObj!=NULL && pMarkedObj->IsPolyObj();
}
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 9a66432..3b09919 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -1192,12 +1192,12 @@ void SdrMarkView::SetFrameHandles(sal_Bool bOn)
void SdrMarkView::SetEditMode(SdrViewEditMode eMode)
{
if (eMode!=eEditMode) {
- sal_Bool bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
- sal_Bool bEdge0=((SdrCreateView*)this)->IsEdgeTool();
+ bool bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
+ bool bEdge0=((SdrCreateView*)this)->IsEdgeTool();
eEditMode0=eEditMode;
eEditMode=eMode;
- sal_Bool bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
- sal_Bool bEdge1=((SdrCreateView*)this)->IsEdgeTool();
+ bool bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
+ bool bEdge1=((SdrCreateView*)this)->IsEdgeTool();
// avoid flickering when switching between GlueEdit and EdgeTool
if (bGlue1 && !bGlue0) ImpSetGlueVisible2(bGlue1);
if (bEdge1!=bEdge0) ImpSetGlueVisible3(bEdge1);
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 6e9993a..6d7ca24 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -1014,7 +1014,7 @@ bool SdrPaintView::IsGroupEntered() const
void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/)
{
// bReplaceAll has no effect here at all.
- sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
+ bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
const SfxPoolItem *pPoolItem=NULL;
if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) {
SdrLayerID nLayerId=((const SdrLayerIdItem*)pPoolItem)->GetValue();
@@ -1033,7 +1033,7 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*
void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const
{
// bOnlyHardAttr has no effect here at all.
- sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
+ bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
const XubString& aNam=bMeasure?aMeasureLayer:aAktLayer;
rAttr.Put(SdrLayerNameItem(aNam));
SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,sal_True);
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index b9c9f99..19e5acf 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -322,10 +322,10 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
const Point aLocalLogicPosition(rLogicPos);
sal_Bool bEditMode=IsEditMode();
- sal_Bool bPointMode=bEditMode && HasMarkablePoints();
+ bool bPointMode=bEditMode && HasMarkablePoints();
sal_Bool bGluePointMode=IsGluePointEditMode();
- sal_Bool bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible();
- sal_Bool bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible();
+ bool bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible();
+ bool bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible();
sal_Bool bIsTextEdit=IsTextEdit();
sal_Bool bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/);
sal_Bool bTextEditSel=IsTextEditInSelectionMode();
diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx
index 2268c63..3c06d7d 100644
--- a/sw/source/ui/inc/view.hxx
+++ b/sw/source/ui/inc/view.hxx
@@ -277,9 +277,9 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SW_DLLPRIVATE sal_uLong FUNC_Search( const SwSearchOptions& rOptions );
SW_DLLPRIVATE void Replace();
- sal_Bool IsDocumentBorder();
+ bool IsDocumentBorder();
- SW_DLLPRIVATE sal_Bool IsTextTool() const;
+ SW_DLLPRIVATE bool IsTextTool() const;
// create control elements
SW_DLLPRIVATE void CreateBtns();
@@ -563,7 +563,7 @@ public:
void LeaveDrawCreate() { m_nDrawSfxId = m_nFormSfxId = USHRT_MAX; m_sDrawCustom.Erase();}
sal_Bool IsDrawMode() { return (m_nDrawSfxId != USHRT_MAX || m_nFormSfxId != USHRT_MAX); }
bool IsFormMode() const;
- sal_Bool IsBezierEditMode();
+ bool IsBezierEditMode();
bool AreOnlyFormsSelected() const;
sal_Bool HasDrwObj(SdrObject *pSdrObj) const;
sal_Bool HasOnlyObj(SdrObject *pSdrObj, sal_uInt32 eObjInventor) const;
diff --git a/sw/source/ui/uiview/viewdraw.cxx b/sw/source/ui/uiview/viewdraw.cxx
index d65846c..1ab4270 100644
--- a/sw/source/ui/uiview/viewdraw.cxx
+++ b/sw/source/ui/uiview/viewdraw.cxx
@@ -593,7 +593,7 @@ sal_Bool SwView::BeginTextEdit(SdrObject* pObj, SdrPageView* pPV, Window* pWin,
/******************************************************************************
* Beschreibung: Ist ein DrawTextObjekt selektiert?
******************************************************************************/
-sal_Bool SwView::IsTextTool() const
+bool SwView::IsTextTool() const
{
sal_uInt16 nId;
sal_uInt32 nInvent;
@@ -612,7 +612,7 @@ SdrView* SwView::GetDrawView() const
return GetWrtShell().GetDrawView();
}
-sal_Bool SwView::IsBezierEditMode()
+bool SwView::IsBezierEditMode()
{
return (!IsDrawSelMode() && GetWrtShell().GetDrawView()->HasMarkablePoints());
}
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index f723322..0a8ea0d 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -51,11 +51,11 @@
#define WB_RIGHT_ALIGNED ((WinBits)0x00008000)
#endif
-static sal_Bool bProtectDocShellVisArea = sal_False;
+static bool bProtectDocShellVisArea = false;
static sal_uInt16 nPgNum = 0;
-sal_Bool SwView::IsDocumentBorder()
+bool SwView::IsDocumentBorder()
{
return GetDocShell()->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ||
m_pWrtShell->GetViewOptions()->getBrowseMode() ||
@@ -74,7 +74,7 @@ inline long GetLeftMargin( SwView &rView )
static void lcl_GetPos(SwView* pView,
Point& rPos,
SwScrollbar* pScrollbar,
- sal_Bool bBorder)
+ bool bBorder)
{
SwWrtShell &rSh = pView->GetWrtShell();
const Size m_aDocSz( rSh.GetDocSize() );
@@ -744,7 +744,7 @@ IMPL_LINK( SwView, EndScrollHdl, SwScrollbar *, pScrollbar )
Help::ShowQuickHelp(pScrollbar, Rectangle(), aEmptyStr, 0);
}
Point aPos( m_aVisArea.TopLeft() );
- sal_Bool bBorder = IsDocumentBorder();
+ bool bBorder = IsDocumentBorder();
lcl_GetPos(this, aPos, pScrollbar, bBorder);
if ( bBorder && aPos == m_aVisArea.TopLeft() )
UpdateScrollbars();
@@ -1035,7 +1035,7 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize )
//EditWin niemals einstellen!
//VisArea einstellen, aber dort nicht das SetVisArea der DocShell rufen!
- bProtectDocShellVisArea = sal_True;
+ bProtectDocShellVisArea = true;
CalcVisArea( aEditSz );
//visibility changes of the automatic horizontal scrollbar
//require to repeat the ViewResizePixel() call - but only once!
@@ -1045,7 +1045,7 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize )
bVScrollVisible != m_pVScrollbar->IsVisible(sal_True))
bRepeat = sal_True;
}while( bRepeat );
- bProtectDocShellVisArea = sal_False;
+ bProtectDocShellVisArea = false;
m_bInInnerResizePixel = sal_False;
}
@@ -1209,7 +1209,7 @@ sal_Bool SwView::UpdateScrollbars()
sal_Bool bRet = sal_False;
if ( !m_aVisArea.IsEmpty() )
{
- const sal_Bool bBorder = IsDocumentBorder();
+ const bool bBorder = IsDocumentBorder();
Rectangle aTmpRect( m_aVisArea );
if ( bBorder )
{
commit 0d0718a6d0fcf301b25e8964fb842d3ee87a56f5
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Mar 26 22:22:23 2013 +0900
Remove useless comments; add mode lines
Change-Id: Ib96d394954326a2c8f52ae4a161d9b505dbc35a3
diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx
index fa7ea9b..383e5d8 100644
--- a/svx/source/svdraw/charthelper.cxx
+++ b/svx/source/svdraw/charthelper.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -29,20 +30,8 @@
#include <com/sun/star/graphic/PrimitiveFactory2D.hpp>
#include <drawinglayer/geometry/viewinformation2d.hxx>
-//// header for function rtl_createUuid
-//#include <rtl/uuid.h>
-//#include <vcl/pdfextoutdevdata.hxx>
-//
-//#include <com/sun/star/lang/XUnoTunnel.hpp>
-//#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-//#include <svtools/embedhlp.hxx>
-
-//////////////////////////////////////////////////////////////////////////////
-
using namespace ::com::sun::star;
-//////////////////////////////////////////////////////////////////////////////
-
bool ChartHelper::IsChart(const svt::EmbeddedObjectRef& xObjRef)
{
if(!xObjRef.is())
@@ -129,5 +118,4 @@ drawinglayer::primitive2d::Primitive2DSequence ChartHelper::tryToGetChartContent
return aRetval;
}
-//////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list