summaryrefslogtreecommitdiff
path: root/sw/source/ui/ribbar
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/ribbar')
-rw-r--r--sw/source/ui/ribbar/concustomshape.cxx8
-rw-r--r--sw/source/ui/ribbar/drawbase.cxx14
-rw-r--r--sw/source/ui/ribbar/inputwin.cxx8
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx8
4 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/ui/ribbar/concustomshape.cxx b/sw/source/ui/ribbar/concustomshape.cxx
index 032bfb1ac792..2dffc496a70e 100644
--- a/sw/source/ui/ribbar/concustomshape.cxx
+++ b/sw/source/ui/ribbar/concustomshape.cxx
@@ -92,9 +92,9 @@ sal_Bool ConstCustomShape::MouseButtonDown(const MouseEvent& rMEvt)
if ( pObj )
{
SetAttributes( pObj );
- sal_Bool bForceNoFillStyle = sal_False;
+ bool bForceNoFillStyle = false;
if ( ((SdrObjCustomShape*)pObj)->UseNoFillStyle() )
- bForceNoFillStyle = sal_True;
+ bForceNoFillStyle = true;
SfxItemSet aAttr( m_pView->GetPool() );
if ( bForceNoFillStyle )
@@ -138,7 +138,7 @@ void ConstCustomShape::Activate(const sal_uInt16 nSlotId)
void ConstCustomShape::SetAttributes( SdrObject* pObj )
{
- sal_Bool bAttributesAppliedFromGallery = sal_False;
+ bool bAttributesAppliedFromGallery = false;
if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
{
@@ -181,7 +181,7 @@ void ConstCustomShape::SetAttributes( SdrObject* pObj )
double a = nAngle * F_PI18000;
pObj->NbcRotate( pObj->GetSnapRect().Center(), nAngle, sin( a ), cos( a ) );
}
- bAttributesAppliedFromGallery = sal_True;
+ bAttributesAppliedFromGallery = true;
}
}
break;
diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx
index da6a6160c6b6..66e87ea78ef2 100644
--- a/sw/source/ui/ribbar/drawbase.cxx
+++ b/sw/source/ui/ribbar/drawbase.cxx
@@ -224,7 +224,7 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
{
if (!pSdrView->HasMarkablePoints())
{
- sal_Bool bUnlockView = !m_pSh->IsViewLocked();
+ bool bUnlockView = !m_pSh->IsViewLocked();
m_pSh->LockView( sal_True ); //lock visible section
m_pSh->SelectObj(Point(LONG_MAX, LONG_MAX)); // deselect all
if( bUnlockView )
@@ -288,8 +288,8 @@ sal_Bool SwDrawBase::MouseMove(const MouseEvent& rMEvt)
sal_Bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
{
sal_Bool bReturn = sal_False;
- sal_Bool bCheckShell = sal_False;
- sal_Bool bAutoCap = sal_False;
+ bool bCheckShell = false;
+ bool bAutoCap = false;
Point aPnt(m_pWin->PixelToLogic(rMEvt.GetPosPixel()));
@@ -297,7 +297,7 @@ sal_Bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
{
const SdrObjKind nDrawMode = m_pWin->GetSdrDrawMode();
//objects with multiple point may end at the start position
- sal_Bool bMultiPoint = OBJ_PLIN == nDrawMode ||
+ bool bMultiPoint = OBJ_PLIN == nDrawMode ||
OBJ_PATHLINE == nDrawMode ||
OBJ_FREELINE == nDrawMode;
if(rMEvt.IsRight() || (aPnt == m_aStartPos && !bMultiPoint))
@@ -329,7 +329,7 @@ sal_Bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
aReq.AppendItem(SvxSizeItem( FN_PARAM_2, m_pSh->GetObjSize()));
aReq.Done();
}
- bAutoCap = sal_True;
+ bAutoCap = true;
if(m_pWin->GetFrmColCount() > 1)
{
SfxItemSet aSet(m_pView->GetPool(),RES_COL,RES_COL);
@@ -386,7 +386,7 @@ sal_Bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
}
m_pView->NoRotate();
- bCheckShell = sal_True; // ggf BezierShell anwerfen
+ bCheckShell = true; // ggf BezierShell anwerfen
}
else if (!m_pSh->IsObjSelected() && !m_pWin->IsDrawAction())
{
@@ -446,7 +446,7 @@ sal_Bool SwDrawBase::MouseButtonUp(const MouseEvent& rMEvt)
}
m_pView->NoRotate();
- bCheckShell = sal_True; // ggf BezierShell anwerfen
+ bCheckShell = true; // ggf BezierShell anwerfen
}
}
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index 28d0566ef3a1..8016e803d5e4 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.cxx
@@ -569,7 +569,7 @@ void InputEdit::UpdateRange(const String& rBoxes,
}
else
{
- sal_Bool bFound = sal_False;
+ bool bFound = false;
sal_Unicode cCh;
sal_uInt16 nPos, nEndPos = 0, nStartPos = (sal_uInt16) aSelection.Min();
if( nStartPos-- )
@@ -585,13 +585,13 @@ void InputEdit::UpdateRange(const String& rBoxes,
}
if( bFound )
{
- bFound = sal_False;
+ bFound = false;
nEndPos = nStartPos;
while( nEndPos < nLen )
{
if( cClose == (cCh = aActText.GetChar( nEndPos )))
{
- bFound = sal_True;
+ bFound = true;
break;
}
++nEndPos;
@@ -599,7 +599,7 @@ void InputEdit::UpdateRange(const String& rBoxes,
// nur wenn akt. Pos im Breich oder direkt dahinter liegt
if( bFound && !( nStartPos < (sal_uInt16)aSelection.Max() &&
(sal_uInt16)aSelection.Max() <= nEndPos + 1 ))
- bFound = sal_False;
+ bFound = false;
}
if( bFound )
{
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 41088d1153a4..e9373a7ff9cf 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -624,7 +624,7 @@ void SwNaviImageButton::DataChanged( const DataChangedEvent& rDCEvt )
class SwZoomBox_Impl : public ComboBox
{
sal_uInt16 nSlotId;
- sal_Bool bRelease;
+ bool bRelease;
uno::Reference< frame::XDispatchProvider > m_xDispatchProvider;
public:
@@ -648,7 +648,7 @@ SwZoomBox_Impl::SwZoomBox_Impl(
const Reference< XDispatchProvider >& rDispatchProvider ):
ComboBox( pParent, SW_RES(RID_PVIEW_ZOOM_LB)),
nSlotId(nSlot),
- bRelease(sal_True),
+ bRelease(true),
m_xDispatchProvider( rDispatchProvider )
{
EnableAutocomplete( sal_False );
@@ -708,7 +708,7 @@ long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
case KEY_TAB:
{
if ( KEY_TAB == nCode )
- bRelease = sal_False;
+ bRelease = false;
else
nHandled = 1;
Select();
@@ -735,7 +735,7 @@ void SwZoomBox_Impl::ReleaseFocus()
{
if ( !bRelease )
{
- bRelease = sal_True;
+ bRelease = true;
return;
}
SfxViewShell* pCurSh = SfxViewShell::Current();